16 files changed, 1218 insertions, 1166 deletions

diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/model/ModelWithBDD.di b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/model/ModelWithBDD.di
index 3b41d552d1e..f1a1021f136 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/model/ModelWithBDD.di
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/model/ModelWithBDD.di
@@ -1,17 +1,24 @@
-<?xml version="1.0" encoding="ASCII"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+    <pageList>
+      <availablePage>
+        <emfPageIdentifier href="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>
+      </availablePage>
+    </pageList>
+    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
+      <windows>
+        <children xsi:type="di:TabFolder">
+          <children>
+            <emfPageIdentifier href="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>
+          </children>
+        </children>
+      </windows>
+    </sashModel>
+  </di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.launch b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.launch
index 629359dc71c..737881209ca 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.launch
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.launch
@@ -1,42 +1,45 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JAVA_COMMAND" value="java"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.suites.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.sysml.diagram.blockdefinition.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx4096m -XX:+CMSClassUnloadingEnabled"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JAVA_COMMAND" value="java"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.suites.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.sysml.diagram.blockdefinition.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx4096m -XX:+CMSClassUnloadingEnabled"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="ca.odell.glazedlists@default:default,ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.gerrit.common@default:default,com.google.gerrit.prettify@default:default,com.google.gerrit.reviewdb@default:default,com.google.gson@default:default,com.google.guava@default:default,com.google.gwt.servlet@default:default,com.google.gwtjsonrpc@default:default,com.google.gwtorm@default:default,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.gradleware.tooling.client@default:default,com.gradleware.tooling.model@default:default,com.gradleware.tooling.utils@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,fr.obeo.releng.targetplatform.ui@default:default,fr.obeo.releng.targetplatform@default:default,javaewah@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.servlet.jsp@default:default,javax.xml@default:default,lpg.runtime.java@default:default,net.sourceforge.nattable.core@default:default,org.antlr.runtime*3.2.0.v201101311130@default:default,org.antlr.runtime*4.3.0.v201502022030@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.compress@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath*1.2.0.v20080604-1500@default:default,org.apache.commons.jxpath*1.3.0.v200911051830@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.math@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201411290715@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201511171540@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.solr.client.solrj@default:default,org.apache.ws.commons.util@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlrpc@default:default,org.eclipse.acceleo.annotations@default:default,org.eclipse.acceleo.common.ide@default:default,org.eclipse.acceleo.common.ui@default:default,org.eclipse.acceleo.common@default:default,org.eclipse.acceleo.engine@default:default,org.eclipse.acceleo.ide.ui@default:default,org.eclipse.acceleo.model@default:default,org.eclipse.acceleo.parser@default:default,org.eclipse.acceleo.profiler@default:default,org.eclipse.acceleo.query@default:default,org.eclipse.acceleo.traceability.model@default:default,org.eclipse.acceleo.traceability@default:default,org.eclipse.acceleo.ui.interpreter@default:default,org.eclipse.aether.api@default:default,org.eclipse.aether.connector.basic@default:default,org.eclipse.aether.impl@default:default,org.eclipse.aether.maven@default:default,org.eclipse.aether.spi@default:default,org.eclipse.aether.transport.file@default:default,org.eclipse.aether.transport.http@default:default,org.eclipse.aether.util@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.b3.aggregator.edit@default:default,org.eclipse.b3.aggregator.editor@default:default,org.eclipse.b3.aggregator.engine.maven@default:default,org.eclipse.b3.aggregator.engine@default:default,org.eclipse.b3.aggregator.legacy.ui@default:default,org.eclipse.b3.aggregator.legacy@default:default,org.eclipse.b3.aggregator@default:default,org.eclipse.b3.cli@default:default,org.eclipse.b3.p2.edit@default:default,org.eclipse.b3.p2.maven.indexer@default:default,org.eclipse.b3.p2.maven@default:default,org.eclipse.b3.p2@default:default,org.eclipse.b3.util@default:default,org.eclipse.buckminster.osgi.filter@default:default,org.eclipse.buildship.branding@default:default,org.eclipse.buildship.core@default:default,org.eclipse.buildship.stsmigration@default:default,org.eclipse.buildship.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.tools.compat@default:default,org.eclipse.e4.tools.emf.editor3x@default:default,org.eclipse.e4.tools.emf.ui@default:default,org.eclipse.e4.tools.jdt.templates@default:default,org.eclipse.e4.tools.services@default:default,org.eclipse.e4.tools@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.eef.common.ui@default:default,org.eclipse.eef.common@default:default,org.eclipse.eef.core.ext.widgets.reference@default:default,org.eclipse.eef.core@default:default,org.eclipse.eef.ext.widgets.reference@default:default,org.eclipse.eef.ide.ui.ext.widgets.reference@default:default,org.eclipse.eef.ide.ui.properties@default:default,org.eclipse.eef.ide.ui@default:default,org.eclipse.eef.ide@default:default,org.eclipse.eef.properties.ui.legacy@default:default,org.eclipse.eef.properties.ui@default:default,org.eclipse.eef@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.mylyn.ui@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cdo.admin@default:default,org.eclipse.emf.cdo.common.db@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.compare@default:default,org.eclipse.emf.cdo.defs@default:default,org.eclipse.emf.cdo.doc@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.examples.installer@default:default,org.eclipse.emf.cdo.explorer.ui@default:default,org.eclipse.emf.cdo.explorer@default:default,org.eclipse.emf.cdo.expressions.edit@default:default,org.eclipse.emf.cdo.expressions.editor@default:default,org.eclipse.emf.cdo.expressions@default:default,org.eclipse.emf.cdo.migrator@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.sdk@default:default,org.eclipse.emf.cdo.security.edit@default:default,org.eclipse.emf.cdo.security.editor@default:default,org.eclipse.emf.cdo.security.ui@default:default,org.eclipse.emf.cdo.security@default:default,org.eclipse.emf.cdo.server.admin@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.lissome@default:default,org.eclipse.emf.cdo.server.mongodb@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server.ocl@default:default,org.eclipse.emf.cdo.server.product@default:default,org.eclipse.emf.cdo.server.security@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo.transfer.repository@default:default,org.eclipse.emf.cdo.transfer.ui@default:default,org.eclipse.emf.cdo.transfer.workspace.ui@default:default,org.eclipse.emf.cdo.transfer.workspace@default:default,org.eclipse.emf.cdo.transfer@default:default,org.eclipse.emf.cdo.ui.admin@default:default,org.eclipse.emf.cdo.ui.compare@default:default,org.eclipse.emf.cdo.ui.defs@default:default,org.eclipse.emf.cdo.ui.shared@default:default,org.eclipse.emf.cdo.ui.team@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.workspace@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore.xtext@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diagram.edit@default:default,org.eclipse.emf.compare.diagram.ide.ui.papyrus@default:default,org.eclipse.emf.compare.diagram.ide.ui@default:default,org.eclipse.emf.compare.diagram.papyrus@default:default,org.eclipse.emf.compare.diagram@default:default,org.eclipse.emf.compare.doc@default:default,org.eclipse.emf.compare.edit@default:default,org.eclipse.emf.compare.egit.ui@default:default,org.eclipse.emf.compare.egit@default:default,org.eclipse.emf.compare.ide.ui@default:default,org.eclipse.emf.compare.ide@default:default,org.eclipse.emf.compare.rcp.ui@default:default,org.eclipse.emf.compare.rcp@default:default,org.eclipse.emf.compare.uml2.edit.papyrus@default:default,org.eclipse.emf.compare.uml2.edit@default:default,org.eclipse.emf.compare.uml2.rcp.ui@default:default,org.eclipse.emf.compare.uml2.rcp@default:default,org.eclipse.emf.compare.uml2@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xcore.lib@default:default,org.eclipse.emf.ecore.xcore@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.eef.runtime@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.examples.library@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.facet.aggregate.doc@default:default,org.eclipse.emf.facet.aggregate.metamodel.notgenerated@default:default,org.eclipse.emf.facet.aggregate.metamodel@default:default,org.eclipse.emf.facet.aggregate.tests@default:default,org.eclipse.emf.facet.capabilities@default:default,org.eclipse.emf.facet.common.core@default:default,org.eclipse.emf.facet.common.sdk.core@default:default,org.eclipse.emf.facet.common.sdk.ui@default:default,org.eclipse.emf.facet.common.ui@default:default,org.eclipse.emf.facet.custom.core.tests@default:default,org.eclipse.emf.facet.custom.core@default:default,org.eclipse.emf.facet.custom.doc@default:default,org.eclipse.emf.facet.custom.metamodel.edit@default:default,org.eclipse.emf.facet.custom.metamodel.editor@default:default,org.eclipse.emf.facet.custom.metamodel@default:default,org.eclipse.emf.facet.custom.sdk.core@default:default,org.eclipse.emf.facet.custom.sdk.tests@default:default,org.eclipse.emf.facet.custom.sdk.ui@default:default,org.eclipse.emf.facet.custom.tests.metamodel@default:default,org.eclipse.emf.facet.custom.tests@default:default,org.eclipse.emf.facet.custom.ui@default:default,org.eclipse.emf.facet.dev.core@default:default,org.eclipse.emf.facet.dev.ui@default:default,org.eclipse.emf.facet.doc.api.report@default:default,org.eclipse.emf.facet.doc.metric.report@default:default,org.eclipse.emf.facet.doc.test.report@default:default,org.eclipse.emf.facet.doc@default:default,org.eclipse.emf.facet.ecore.ui@default:default,org.eclipse.emf.facet.ecore@default:default,org.eclipse.emf.facet.efacet.core@default:default,org.eclipse.emf.facet.efacet.doc@default:default,org.eclipse.emf.facet.efacet.edit.core@default:default,org.eclipse.emf.facet.efacet.edit.ui@default:default,org.eclipse.emf.facet.efacet.examples.library.core@default:default,org.eclipse.emf.facet.efacet.examples.library.metamodel.edit@default:default,org.eclipse.emf.facet.efacet.examples.library.metamodel@default:default,org.eclipse.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.emf.facet.efacet.metamodel.editor@default:default,org.eclipse.emf.facet.efacet.metamodel@default:default,org.eclipse.emf.facet.efacet.sdk.ui@default:default,org.eclipse.emf.facet.efacet.tests.metamodel@default:default,org.eclipse.emf.facet.efacet.tests@default:default,org.eclipse.emf.facet.efacet.ui@default:default,org.eclipse.emf.facet.query.java.core@default:default,org.eclipse.emf.facet.query.java.metamodel@default:default,org.eclipse.emf.facet.query.java.sdk.ui@default:default,org.eclipse.emf.facet.query.java.tests@default:default,org.eclipse.emf.facet.query.java.ui.tests@default:default,org.eclipse.emf.facet.query.java.ui@default:default,org.eclipse.emf.facet.query.ocl.core@default:default,org.eclipse.emf.facet.query.ocl.metamodel@default:default,org.eclipse.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.emf.facet.tests@default:default,org.eclipse.emf.facet.util.core.tests@default:default,org.eclipse.emf.facet.util.core@default:default,org.eclipse.emf.facet.util.efacet.ocl.core@default:default,org.eclipse.emf.facet.util.emf.catalog.metamodel@default:default,org.eclipse.emf.facet.util.emf.catalog@default:default,org.eclipse.emf.facet.util.emf.core.tests@default:default,org.eclipse.emf.facet.util.emf.core@default:default,org.eclipse.emf.facet.util.emf.doc@default:default,org.eclipse.emf.facet.util.emf.ui.tests@default:default,org.eclipse.emf.facet.util.emf.ui@default:default,org.eclipse.emf.facet.util.jface.ui@default:default,org.eclipse.emf.facet.util.junit.core@default:default,org.eclipse.emf.facet.util.pde.core@default:default,org.eclipse.emf.facet.util.swt@default:default,org.eclipse.emf.facet.util.tests.swtbot@default:default,org.eclipse.emf.facet.util.ui@default:default,org.eclipse.emf.facet.widgets.celleditors.ecore.tests.samplemm@default:default,org.eclipse.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.emf.facet.widgets.celleditors.edit@default:default,org.eclipse.emf.facet.widgets.celleditors.editor@default:default,org.eclipse.emf.facet.widgets.celleditors@default:default,org.eclipse.emf.facet.widgets.table.doc@default:default,org.eclipse.emf.facet.widgets.table.examples.library.core@default:default,org.eclipse.emf.facet.widgets.table.metamodel.edit@default:default,org.eclipse.emf.facet.widgets.table.metamodel@default:default,org.eclipse.emf.facet.widgets.table.tests@default:default,org.eclipse.emf.facet.widgets.table.ui.nattable@default:default,org.eclipse.emf.facet.widgets.table.ui.workbench@default:default,org.eclipse.emf.facet.widgets.table.ui@default:default,org.eclipse.emf.facet.widgets@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch.ui@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.query.doc@default:default,org.eclipse.emf.query.examples@default:default,org.eclipse.emf.query.ocl@default:default,org.eclipse.emf.query@default:default,org.eclipse.emf.transaction.doc@default:default,org.eclipse.emf.transaction.examples@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.doc@default:default,org.eclipse.emf.validation.examples@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui.ide@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.doc@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.epp.logging.aeri.core@default:default,org.eclipse.epp.logging.aeri.ide@default:default,org.eclipse.epp.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.epp.package.committers@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.bridge.trace@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen.xtend.ui@default:default,org.eclipse.gmf.codegen.xtend@default:default,org.eclipse.gmf.codegen@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.doc.ui@default:default,org.eclipse.gmf.doc@default:default,org.eclipse.gmf.ecore.editor@default:default,org.eclipse.gmf.examples.runtime.diagram.geoshapes@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model.edit@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model.editor@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model@default:default,org.eclipse.gmf.examples.runtime.diagram.logic@default:default,org.eclipse.gmf.examples.runtime.ui.pde@default:default,org.eclipse.gmf.examples.runtime@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing.win32@default:false,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd.ide@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.dnd@default:default,org.eclipse.gmf.runtime.diagram.ui.geoshapes@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.type.ui@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.lite.svg@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation.providers@default:default,org.eclipse.gmf.runtime.notation.sdk@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.runtime.sdk@default:default,org.eclipse.gmf.sdk@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.tooling.runtime@default:default,org.eclipse.gmf.tooling@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.editor@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.gmf@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.100.v20160418-1457@default:default,org.eclipse.jdt.annotation*2.1.0.v20160418-1457@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.jdt.launching.ui.macosx@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit.archive@default:default,org.eclipse.jgit.http.apache@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.discovery@default:default,org.eclipse.m2e.editor.xml@default:default,org.eclipse.m2e.editor@default:default,org.eclipse.m2e.importer@default:default,org.eclipse.m2e.jdt.ui@default:false,org.eclipse.m2e.jdt@default:default,org.eclipse.m2e.launching@default:default,org.eclipse.m2e.lifecyclemapping.defaults@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.profiles.core@default:default,org.eclipse.m2e.profiles.ui@default:default,org.eclipse.m2e.refactoring@default:default,org.eclipse.m2e.scm@default:default,org.eclipse.m2e.workspace.cli@default:default,org.eclipse.m2m.qvt.oml.common.ui@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.debug.core@default:default,org.eclipse.m2m.qvt.oml.debug.ui@default:default,org.eclipse.m2m.qvt.oml.doc@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.editor.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.ocl@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime.jdt@default:default,org.eclipse.m2m.qvt.oml.runtime.ui@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml.samples@default:default,org.eclipse.m2m.qvt.oml.trace.edit@default:default,org.eclipse.m2m.qvt.oml.ui@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.mylyn.bugzilla.core@default:default,org.eclipse.mylyn.bugzilla.ui@default:default,org.eclipse.mylyn.builds.core@default:default,org.eclipse.mylyn.builds.ui@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.identity.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.commons.notifications.core@default:default,org.eclipse.mylyn.commons.notifications.feed@default:default,org.eclipse.mylyn.commons.notifications.ui@default:default,org.eclipse.mylyn.commons.repositories.core@default:default,org.eclipse.mylyn.commons.repositories.http.core@default:default,org.eclipse.mylyn.commons.repositories.ui@default:default,org.eclipse.mylyn.commons.screenshots@default:default,org.eclipse.mylyn.commons.ui@default:default,org.eclipse.mylyn.commons.workbench@default:default,org.eclipse.mylyn.commons.xmlrpc@default:default,org.eclipse.mylyn.context.core@default:default,org.eclipse.mylyn.context.tasks.ui@default:default,org.eclipse.mylyn.context.ui@default:default,org.eclipse.mylyn.debug.ui@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.mylyn.discovery.ui@default:default,org.eclipse.mylyn.gerrit.core@default:default,org.eclipse.mylyn.gerrit.dashboard.core@default:default,org.eclipse.mylyn.gerrit.dashboard.ui@default:default,org.eclipse.mylyn.gerrit.ui@default:default,org.eclipse.mylyn.git.core@default:default,org.eclipse.mylyn.git.ui@default:default,org.eclipse.mylyn.hudson.core@default:default,org.eclipse.mylyn.hudson.ui@default:default,org.eclipse.mylyn.ide.ant@default:default,org.eclipse.mylyn.ide.ui@default:default,org.eclipse.mylyn.java.tasks@default:default,org.eclipse.mylyn.java.ui@default:default,org.eclipse.mylyn.monitor.core@default:default,org.eclipse.mylyn.monitor.ui@default:default,org.eclipse.mylyn.resources.ui@default:default,org.eclipse.mylyn.reviews.core@default:default,org.eclipse.mylyn.reviews.edit@default:default,org.eclipse.mylyn.reviews.ui@default:default,org.eclipse.mylyn.tasks.core@default:default,org.eclipse.mylyn.tasks.index.core@default:default,org.eclipse.mylyn.tasks.index.ui@default:default,org.eclipse.mylyn.tasks.search@default:default,org.eclipse.mylyn.tasks.ui@default:default,org.eclipse.mylyn.team.ui@default:default,org.eclipse.mylyn.versions.core@default:default,org.eclipse.mylyn.versions.ui@default:default,org.eclipse.mylyn.wikitext.asciidoc.core@default:default,org.eclipse.mylyn.wikitext.asciidoc.ui@default:default,org.eclipse.mylyn.wikitext.confluence.core@default:default,org.eclipse.mylyn.wikitext.confluence.ui@default:default,org.eclipse.mylyn.wikitext.context.ui@default:default,org.eclipse.mylyn.wikitext.core.ant@default:default,org.eclipse.mylyn.wikitext.core.osgi@default:default,org.eclipse.mylyn.wikitext.core@default:default,org.eclipse.mylyn.wikitext.help.ui@default:default,org.eclipse.mylyn.wikitext.html.core@default:default,org.eclipse.mylyn.wikitext.markdown.core@default:default,org.eclipse.mylyn.wikitext.markdown.ui@default:default,org.eclipse.mylyn.wikitext.mediawiki.core.ant@default:default,org.eclipse.mylyn.wikitext.mediawiki.core@default:default,org.eclipse.mylyn.wikitext.mediawiki.ui@default:default,org.eclipse.mylyn.wikitext.tasks.ui@default:default,org.eclipse.mylyn.wikitext.textile.core@default:default,org.eclipse.mylyn.wikitext.textile.ui@default:default,org.eclipse.mylyn.wikitext.tracwiki.core@default:default,org.eclipse.mylyn.wikitext.tracwiki.ui@default:default,org.eclipse.mylyn.wikitext.twiki.core@default:default,org.eclipse.mylyn.wikitext.twiki.ui@default:default,org.eclipse.mylyn.wikitext.ui@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.nebula.widgets.nattable.extension.glazedlists@default:default,org.eclipse.nebula.widgets.nattable.extension.nebula@default:default,org.eclipse.nebula.widgets.richtext@default:default,org.eclipse.nebula.widgets.tablecombo@default:default,org.eclipse.net4j.db.doc@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db.jdbc@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.debug@default:default,org.eclipse.net4j.defs@default:default,org.eclipse.net4j.doc@default:default,org.eclipse.net4j.examples.installer@default:default,org.eclipse.net4j.http.common@default:default,org.eclipse.net4j.http.server@default:default,org.eclipse.net4j.http@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j.sdk@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.ui.defs@default:default,org.eclipse.net4j.ui.shared@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.net4j.util.defs@default:default,org.eclipse.net4j.util.doc@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.doc@default:default,org.eclipse.ocl.ecore.edit@default:default,org.eclipse.ocl.ecore.tests@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.edit@default:default,org.eclipse.ocl.examples.classic@default:default,org.eclipse.ocl.examples.codegen@default:default,org.eclipse.ocl.examples.debug.ui@default:default,org.eclipse.ocl.examples.debug.vm.ui@default:default,org.eclipse.ocl.examples.debug.vm@default:default,org.eclipse.ocl.examples.debug@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.emf.validation.validity.ui@default:default,org.eclipse.ocl.examples.emf.validation.validity@default:default,org.eclipse.ocl.examples.eventmanager.tests@default:default,org.eclipse.ocl.examples.eventmanager@default:default,org.eclipse.ocl.examples.impactanalyzer.testmodel.company@default:default,org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm@default:default,org.eclipse.ocl.examples.impactanalyzer.tests@default:default,org.eclipse.ocl.examples.impactanalyzer.testutils@default:default,org.eclipse.ocl.examples.impactanalyzer.ui@default:default,org.eclipse.ocl.examples.impactanalyzer.util@default:default,org.eclipse.ocl.examples.impactanalyzer@default:default,org.eclipse.ocl.examples.interpreter@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.standalone@default:default,org.eclipse.ocl.examples.tests@default:default,org.eclipse.ocl.examples.testutils@default:default,org.eclipse.ocl.examples.ui@default:default,org.eclipse.ocl.examples.uml25@default:default,org.eclipse.ocl.examples.unified@default:default,org.eclipse.ocl.examples.validity.test@default:default,org.eclipse.ocl.examples.validity@default:default,org.eclipse.ocl.examples.xtext.base.ui@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.completeocl.ui@default:default,org.eclipse.ocl.examples.xtext.completeocl@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl.examples.xtext.markup.ui@default:default,org.eclipse.ocl.examples.xtext.markup@default:default,org.eclipse.ocl.examples.xtext.oclinecore.ui@default:default,org.eclipse.ocl.examples.xtext.oclinecore@default:default,org.eclipse.ocl.examples.xtext.oclstdlib.ui@default:default,org.eclipse.ocl.examples.xtext.oclstdlib@default:default,org.eclipse.ocl.examples.xtext.tests@default:default,org.eclipse.ocl.examples@default:default,org.eclipse.ocl.master@default:default,org.eclipse.ocl.pivot.ui@default:default,org.eclipse.ocl.pivot.uml@default:default,org.eclipse.ocl.pivot@default:default,org.eclipse.ocl.tests@default:default,org.eclipse.ocl.ui@default:default,org.eclipse.ocl.uml.edit@default:default,org.eclipse.ocl.uml.tests@default:default,org.eclipse.ocl.uml.ui@default:default,org.eclipse.ocl.uml@default:default,org.eclipse.ocl.xtext.base.ui@default:default,org.eclipse.ocl.xtext.base@default:default,org.eclipse.ocl.xtext.completeocl.ui@default:default,org.eclipse.ocl.xtext.completeocl@default:default,org.eclipse.ocl.xtext.essentialocl.ui@default:default,org.eclipse.ocl.xtext.essentialocl@default:default,org.eclipse.ocl.xtext.markup.ui@default:default,org.eclipse.ocl.xtext.markup@default:default,org.eclipse.ocl.xtext.oclinecore.ui@default:default,org.eclipse.ocl.xtext.oclinecore@default:default,org.eclipse.ocl.xtext.oclstdlib.ui@default:default,org.eclipse.ocl.xtext.oclstdlib@default:default,org.eclipse.ocl@default:default,org.eclipse.oomph.base.edit@default:default,org.eclipse.oomph.base@default:default,org.eclipse.oomph.extractor.lib@default:default,org.eclipse.oomph.jreinfo.ui@default:default,org.eclipse.oomph.jreinfo@default:default,org.eclipse.oomph.p2.core@default:default,org.eclipse.oomph.p2.doc@default:default,org.eclipse.oomph.p2.edit@default:default,org.eclipse.oomph.p2.ui@default:default,org.eclipse.oomph.p2@default:default,org.eclipse.oomph.predicates.edit@default:default,org.eclipse.oomph.predicates@default:default,org.eclipse.oomph.preferences.edit@default:default,org.eclipse.oomph.preferences.editor@default:default,org.eclipse.oomph.preferences@default:default,org.eclipse.oomph.projectconfig.edit@default:default,org.eclipse.oomph.projectconfig.editor@default:default,org.eclipse.oomph.projectconfig@default:default,org.eclipse.oomph.resources.edit@default:default,org.eclipse.oomph.resources@default:default,org.eclipse.oomph.setup.core@default:default,org.eclipse.oomph.setup.doc@default:default,org.eclipse.oomph.setup.edit@default:default,org.eclipse.oomph.setup.editor@default:default,org.eclipse.oomph.setup.git.edit@default:default,org.eclipse.oomph.setup.git@default:default,org.eclipse.oomph.setup.jdt.edit@default:default,org.eclipse.oomph.setup.jdt@default:default,org.eclipse.oomph.setup.launching.edit@default:default,org.eclipse.oomph.setup.launching@default:default,org.eclipse.oomph.setup.maven.edit@default:default,org.eclipse.oomph.setup.maven@default:default,org.eclipse.oomph.setup.mylyn.edit@default:default,org.eclipse.oomph.setup.mylyn@default:default,org.eclipse.oomph.setup.p2.edit@default:default,org.eclipse.oomph.setup.p2@default:default,org.eclipse.oomph.setup.pde.edit@default:default,org.eclipse.oomph.setup.pde@default:default,org.eclipse.oomph.setup.projects.edit@default:default,org.eclipse.oomph.setup.projects@default:default,org.eclipse.oomph.setup.projectset.edit@default:default,org.eclipse.oomph.setup.projectset@default:default,org.eclipse.oomph.setup.sdk@default:default,org.eclipse.oomph.setup.sync@default:default,org.eclipse.oomph.setup.targlets.edit@default:default,org.eclipse.oomph.setup.targlets@default:default,org.eclipse.oomph.setup.ui.ide@default:default,org.eclipse.oomph.setup.ui.questionnaire@default:default,org.eclipse.oomph.setup.ui@default:default,org.eclipse.oomph.setup.workbench.edit@default:default,org.eclipse.oomph.setup.workbench@default:default,org.eclipse.oomph.setup.workingsets.edit@default:default,org.eclipse.oomph.setup.workingsets@default:default,org.eclipse.oomph.setup@default:default,org.eclipse.oomph.targlets.core@default:default,org.eclipse.oomph.targlets.doc@default:default,org.eclipse.oomph.targlets.edit@default:default,org.eclipse.oomph.targlets.editor@default:default,org.eclipse.oomph.targlets.ui@default:default,org.eclipse.oomph.targlets@default:default,org.eclipse.oomph.ui@default:default,org.eclipse.oomph.util.pde@default:default,org.eclipse.oomph.util@default:default,org.eclipse.oomph.version.digest@default:default,org.eclipse.oomph.version.ui@default:default,org.eclipse.oomph.version@default:default,org.eclipse.oomph.workingsets.edit@default:default,org.eclipse.oomph.workingsets.editor@default:default,org.eclipse.oomph.workingsets@default:default,org.eclipse.orbit.mongodb@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.dsml.validation@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.types.doc@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.m2m.qvto@default:default,org.eclipse.papyrus.migration.rsa@default:default,org.eclipse.papyrus.req.reqif.doc@default:default,org.eclipse.papyrus.sysml14.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml14.diagram.common@default:default,org.eclipse.papyrus.sysml14.diagram.internalblock@default:default,org.eclipse.papyrus.sysml14.diagram.parametric@default:default,org.eclipse.papyrus.sysml14.diagram.requirement@default:default,org.eclipse.papyrus.sysml14.edit@default:default,org.eclipse.papyrus.sysml14.nattable.allocation@default:default,org.eclipse.papyrus.sysml14.nattable.common@default:default,org.eclipse.papyrus.sysml14.nattable.requirement@default:default,org.eclipse.papyrus.sysml14.nattable.ui@default:default,org.eclipse.papyrus.sysml14.service.types@default:default,org.eclipse.papyrus.sysml14.ui@default:default,org.eclipse.papyrus.sysml14.validation@default:default,org.eclipse.papyrus.sysml14.viewpoint@default:default,org.eclipse.papyrus.sysml14@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.modelrepair.doc@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.profile.assistants.doc@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.views.references.doc@default:default,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.annotations@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.recommenders.apidocs.rcp@default:default,org.eclipse.recommenders.apidocs@default:default,org.eclipse.recommenders.calls.rcp@default:default,org.eclipse.recommenders.calls@default:default,org.eclipse.recommenders.chain.rcp@default:default,org.eclipse.recommenders.completion.rcp@default:default,org.eclipse.recommenders.constructors.rcp@default:default,org.eclipse.recommenders.constructors@default:default,org.eclipse.recommenders.coordinates.rcp@default:default,org.eclipse.recommenders.coordinates@default:default,org.eclipse.recommenders.injection@default:default,org.eclipse.recommenders.jayes.io@default:default,org.eclipse.recommenders.jayes@default:default,org.eclipse.recommenders.jdt@default:default,org.eclipse.recommenders.models.rcp@default:default,org.eclipse.recommenders.models@default:default,org.eclipse.recommenders.mylyn.rcp@default:default,org.eclipse.recommenders.net@default:default,org.eclipse.recommenders.news.api@default:default,org.eclipse.recommenders.news.impl@default:default,org.eclipse.recommenders.news.rcp@default:default,org.eclipse.recommenders.news@default:default,org.eclipse.recommenders.overrides.rcp@default:default,org.eclipse.recommenders.overrides@default:default,org.eclipse.recommenders.rcp@default:default,org.eclipse.recommenders.snipmatch.rcp@default:default,org.eclipse.recommenders.snipmatch@default:default,org.eclipse.recommenders.subwords.rcp@default:default,org.eclipse.recommenders.types.rcp@default:default,org.eclipse.recommenders.utils.rcp@default:default,org.eclipse.recommenders.utils@default:default,org.eclipse.search@default:default,org.eclipse.sirius.common.acceleo.aql.ide@default:default,org.eclipse.sirius.common.acceleo.aql@default:default,org.eclipse.sirius.common.acceleo.mtl.ide@default:default,org.eclipse.sirius.common.acceleo.mtl@default:default,org.eclipse.sirius.common.interpreter@default:default,org.eclipse.sirius.common.ocl@default:default,org.eclipse.sirius.common.ui.ext@default:default,org.eclipse.sirius.common.ui@default:default,org.eclipse.sirius.common.xtext@default:default,org.eclipse.sirius.common@default:default,org.eclipse.sirius.diagram.formatdata@default:default,org.eclipse.sirius.diagram.layoutdata@default:default,org.eclipse.sirius.diagram.sequence.edit@default:default,org.eclipse.sirius.diagram.sequence.ui@default:default,org.eclipse.sirius.diagram.sequence@default:default,org.eclipse.sirius.diagram.ui.ext@default:default,org.eclipse.sirius.diagram.ui@default:default,org.eclipse.sirius.diagram@default:default,org.eclipse.sirius.doc@default:default,org.eclipse.sirius.ecore.extender@default:default,org.eclipse.sirius.editor.diagram@default:default,org.eclipse.sirius.editor.properties.ext.widgets.reference@default:default,org.eclipse.sirius.editor.properties@default:default,org.eclipse.sirius.editor.sequence@default:default,org.eclipse.sirius.editor.table@default:default,org.eclipse.sirius.editor.tree@default:default,org.eclipse.sirius.editor@default:default,org.eclipse.sirius.eef.adapters@default:default,org.eclipse.sirius.ext.base@default:default,org.eclipse.sirius.ext.draw2d@default:default,org.eclipse.sirius.ext.e3.ui@default:default,org.eclipse.sirius.ext.e3@default:default,org.eclipse.sirius.ext.emf.edit@default:default,org.eclipse.sirius.ext.emf.tx@default:default,org.eclipse.sirius.ext.emf.ui@default:default,org.eclipse.sirius.ext.emf@default:default,org.eclipse.sirius.ext.gef@default:default,org.eclipse.sirius.ext.gmf.notation@default:default,org.eclipse.sirius.ext.gmf.runtime@default:default,org.eclipse.sirius.ext.jface@default:default,org.eclipse.sirius.ext.swt@default:default,org.eclipse.sirius.interpreter@default:default,org.eclipse.sirius.properties.edit@default:default,org.eclipse.sirius.properties.ext.widgets.reference.edit@default:default,org.eclipse.sirius.properties.ext.widgets.reference@default:default,org.eclipse.sirius.properties@default:default,org.eclipse.sirius.samples.family@default:default,org.eclipse.sirius.synchronizer@default:default,org.eclipse.sirius.table.ui.ext@default:default,org.eclipse.sirius.table.ui@default:default,org.eclipse.sirius.table@default:default,org.eclipse.sirius.tree.ui.ext@default:default,org.eclipse.sirius.tree.ui@default:default,org.eclipse.sirius.tree@default:default,org.eclipse.sirius.ui.ext@default:default,org.eclipse.sirius.ui.properties.ext.widgets.reference@default:default,org.eclipse.sirius.ui.properties@default:default,org.eclipse.sirius.ui@default:default,org.eclipse.sirius@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.team.svn.ui.startup@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.standard@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml.validation@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.upr.depl.papyrus@default:default,org.eclipse.upr.depl@default:default,org.eclipse.upr.soaml.papyrus@default:default,org.eclipse.upr.soaml@default:default,org.eclipse.upr.utp.papyrus@default:default,org.eclipse.upr.utp@default:default,org.eclipse.userstorage.ui@default:default,org.eclipse.userstorage@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide.common@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.m2e@default:default,org.eclipse.xtend.standalone@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend2.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder.standalone@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.idea.generator@default:default,org.eclipse.xtext.java@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.m2e@default:default,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.ide@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.generator@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext.xtext.wizard@default:default,org.eclipse.xtext@default:default,org.eclipse.xwt@default:default,org.gradle.toolingapi@default:default,org.h2@default:default,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.jsoup@default:default,org.junit@default:default,org.kohsuke.args4j@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.polarion.eclipse.team.svn.connector.javahl19@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:false,org.sonatype.m2e.mavenarchiver@default:default,org.sonatype.tycho.m2e@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.papyrus.bundles.tests@default:default,org.eclipse.papyrus.codegen@default:default,org.eclipse.papyrus.customization.nattableconfiguration@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.customization@default:default,org.eclipse.papyrus.def@default:default,org.eclipse.papyrus.dev.assistants.codegen@default:default,org.eclipse.papyrus.dev.java.utils@default:default,org.eclipse.papyrus.dev.project.management@default:default,org.eclipse.papyrus.dev.tests.framework.ui@default:default,org.eclipse.papyrus.dev.tests.framework@default:default,org.eclipse.papyrus.dev.types@default:default,org.eclipse.papyrus.dev.view.services.edit.request@default:default,org.eclipse.papyrus.developer.profile@default:default,org.eclipse.papyrus.eclipse.project.editors.tests@default:default,org.eclipse.papyrus.eclipse.project.editors@default:default,org.eclipse.papyrus.editor.integration.tests@default:default,org.eclipse.papyrus.editor.perspectiveconfiguration@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.emf.facet.aggregate.doc@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.doc@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.gmf.editpartview@default:default,org.eclipse.papyrus.gmf.editpoliciesstates@default:default,org.eclipse.papyrus.gmf.figureview@default:default,org.eclipse.papyrus.gmfgenextension@default:default,org.eclipse.papyrus.infra.core.architecture.edit@default:default,org.eclipse.papyrus.infra.architecture.representation.edit@default:default,org.eclipse.papyrus.infra.architecture.representation@default:default,org.eclipse.papyrus.infra.architecture@default:default,org.eclipse.papyrus.infra.core.architecture.ui@default:default,org.eclipse.papyrus.infra.core.architecture@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints.ui@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.clipboard.tests@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di.tests@default:default,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.tests@default:default,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.sashwindows.di@default:default,org.eclipse.papyrus.infra.core.tests@default:default,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.editor.welcome.internationalization@default:default,org.eclipse.papyrus.infra.editor.welcome.nattable@default:default,org.eclipse.papyrus.infra.editor.welcome.tests@default:default,org.eclipse.papyrus.infra.editor.welcome@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.commandstack@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.gmf.tests@default:default,org.eclipse.papyrus.infra.emf.gmf@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.readonly.tests@default:default,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.tests@default:default,org.eclipse.papyrus.infra.emf.types.ui.properties@default:default,org.eclipse.papyrus.infra.emf.types.ui@default:default,org.eclipse.papyrus.infra.emf.types@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.filters.edit@default:default,org.eclipse.papyrus.infra.filters.tests@default:default,org.eclipse.papyrus.infra.filters@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical@default:default,org.eclipse.papyrus.infra.gmfdiag.commands.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.debug@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.expansion.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.expansion.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gef@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.welcome.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.welcome@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.internationalization.common@default:default,org.eclipse.papyrus.infra.internationalization.controlmode@default:default,org.eclipse.papyrus.infra.internationalization.edit@default:default,org.eclipse.papyrus.infra.internationalization.readonly@default:default,org.eclipse.papyrus.infra.internationalization.tests@default:default,org.eclipse.papyrus.infra.internationalization.ui@default:default,org.eclipse.papyrus.infra.internationalization.utils@default:default,org.eclipse.papyrus.infra.internationalization@default:default,org.eclipse.papyrus.infra.nattable.common.tests@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.gmfdiag@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor.tests@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model.tests@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.tests@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable.views.tests@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.editor@default:default,org.eclipse.papyrus.infra.newchild.tests@default:default,org.eclipse.papyrus.infra.newchild.ui@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile.ui@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties.ui.tests@default:default,org.eclipse.papyrus.infra.properties.ui@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode.tests@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:default,org.eclipse.papyrus.infra.services.edit.ui.tests@default:default,org.eclipse.papyrus.infra.services.edit.ui@default:default,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider.tests@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.tests@default:default,org.eclipse.papyrus.infra.services.resourceloading.ui@default:default,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic.tests@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.sync@default:default,org.eclipse.papyrus.infra.tools.tests@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.types.core@default:default,org.eclipse.papyrus.infra.types.edit@default:default,org.eclipse.papyrus.infra.types.editor@default:default,org.eclipse.papyrus.infra.types.rulebased@default:default,org.eclipse.papyrus.infra.types.tests@default:default,org.eclipse.papyrus.infra.types.ui.tests@default:default,org.eclipse.papyrus.infra.types.ui@default:default,org.eclipse.papyrus.infra.types@default:default,org.eclipse.papyrus.infra.ui.emf.tests@default:default,org.eclipse.papyrus.infra.ui.emf@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.ui.tests@default:default,org.eclipse.papyrus.infra.ui@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.tests@default:default,org.eclipse.papyrus.infra.viewpoints.policy.edit@default:default,org.eclipse.papyrus.infra.viewpoints.policy.tests@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.mwe2.utils@default:default,org.eclipse.papyrus.releng.dev.release@default:default,org.eclipse.papyrus.releng.main.release@default:default,org.eclipse.papyrus.sdk@default:default,org.eclipse.papyrus.search.tests@default:default,org.eclipse.papyrus.sysml.architecture@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:default,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:default,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement.tests@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer.tests@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation.tests@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement.tests@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:default,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml.tests@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.team.svn@default:default,org.eclipse.papyrus.tests.diagramassistants@default:default,org.eclipse.papyrus.tests.framework.annotations@default:default,org.eclipse.papyrus.tests.framework.edit@default:default,org.eclipse.papyrus.tests.framework.editor@default:default,org.eclipse.papyrus.tests.framework@default:default,org.eclipse.papyrus.tests@default:default,org.eclipse.papyrus.uml.alf.backend.tests@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.libraries@default:default,org.eclipse.papyrus.uml.alf.tests@default:default,org.eclipse.papyrus.uml.alf.to.fuml@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.architecture@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode.tests@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.tests@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.developer.mde@default:default,org.eclipse.papyrus.uml.diagram.activity.tests@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz.tests@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common.tests@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication.tests@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component.tests@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite.tests@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css.palette@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment.tests@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd.tests@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview.tests@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.linklf@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.editor@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile.tests@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence.tests@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine.tests@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.tests@default:default,org.eclipse.papyrus.uml.diagram.timing.tests@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase.tests@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards.tests@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.dynamic.profile.tests@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.filters.edit@default:default,org.eclipse.papyrus.uml.filters.tests@default:default,org.eclipse.papyrus.uml.filters@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.internationalization.controlmode.tests@default:default,org.eclipse.papyrus.uml.internationalization.edit@default:default,org.eclipse.papyrus.uml.internationalization.tests@default:default,org.eclipse.papyrus.uml.internationalization.utils@default:default,org.eclipse.papyrus.uml.internationalization@default:default,org.eclipse.papyrus.uml.modelexplorer.tests@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.tests@default:default,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.clazz.config.tests@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic.tests@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.richtext@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display.tests@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display@default:default,org.eclipse.papyrus.uml.nattable.tests@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.tests@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.ui@default:default,org.eclipse.papyrus.uml.profile.assistants.generator@default:default,org.eclipse.papyrus.uml.profile.drafter.documentation@default:default,org.eclipse.papyrus.uml.profile.drafter.tests@default:default,org.eclipse.papyrus.uml.profile.drafter@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator@default:default,org.eclipse.papyrus.uml.profile.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.ui@default:default,org.eclipse.papyrus.uml.profile.types.generator@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types.tests@default:default,org.eclipse.papyrus.uml.service.types.ui.tests@default:default,org.eclipse.papyrus.uml.service.types.ui@default:default,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.tests@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.tests@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.tests@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.tests@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.tests@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext@default:default,org.eclipse.papyrus.uml.tools.tests@default:default,org.eclipse.papyrus.uml.tools.utils.tests@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.types.core@default:default,org.eclipse.papyrus.uml.types.ui.properties@default:default,org.eclipse.papyrus.uml.ui@default:default,org.eclipse.papyrus.uml.validation.tests.genvalidation@default:default,org.eclipse.papyrus.uml.validation.tests.staticprofile@default:default,org.eclipse.papyrus.uml.validation.tests@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.documentation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.tests@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.references@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.validation@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java
index 09cccf1cd39..5d05dbf30b7 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java
@@ -1,201 +1,211 @@
-/*****************************************************************************

- * Copyright (c) 2011-2012 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:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils;

-

-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramCommandStack;

-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getEditPart;

-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getTransactionalEditingDomain;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

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

-import org.eclipse.draw2d.geometry.Point;

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

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

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.RequestConstants;

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

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

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

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

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

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

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

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;

-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

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

-import org.junit.Assert;

-

-

-public class TestPrepareUtils {

-

-	public static void changeVisibility(View view) throws Exception {

-		SetCommand changeVisibilityCommand = new SetCommand(getTransactionalEditingDomain(), view, NotationPackage.eINSTANCE.getView_Visible(), !view.isVisible());

-		//getCommandStack().execute(new EMFtoGEFCommandWrapper(changeVisibilityCommand));

-		getTransactionalEditingDomain().getCommandStack().execute(changeVisibilityCommand);

-

-		//Workaround for CSS refresh issue (Bug 416737: [CSS] Setters of the CSS runtime notation API don't take into consideration CSS values)

-		DiagramHelper.refresh(EditorUtils.getDiagramEditPart(), true);

-	}

-

-	public static EObject createElement(IElementType elementType, View containerView) throws Exception {

-		return createElement(elementType, containerView.getElement());

-	}

-

-	@SuppressWarnings("unchecked")

-	public static EObject createElement(IElementType elementType, EObject container) throws Exception {

-		CreateElementRequest createElementRequest = new CreateElementRequest(getTransactionalEditingDomain(), container, elementType);

-

-		if(elementType == SysMLElementTypes.PART_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), SysMLElementTypes.BLOCK);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);

-			getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));

-

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), SysMLElementTypes.BLOCK);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);

-			getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));

-

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.VALUE_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), UMLElementTypes.DATA_TYPE);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);

-			getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));

-

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		}

-

-		ICommand createElementCommand = ElementEditServiceUtils.getCommandProvider(container).getEditCommand(createElementRequest);

-		getDiagramCommandStack().execute(new ICommandProxy(createElementCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createElementCommand);

-	}

-

-	public static EObject createLink(IElementType elementType, EObject source, EObject target) throws Exception {

-		CreateRelationshipRequest createRelationshipRequest = new CreateRelationshipRequest(getTransactionalEditingDomain(), source, target, elementType);

-

-		ICommand createRelationshipCommand = ElementEditServiceUtils.getCommandProvider(elementType).getEditCommand(createRelationshipRequest);

-		getDiagramCommandStack().execute(new ICommandProxy(createRelationshipCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createRelationshipCommand);

-	}

-

-	public static View createGraphicalNode(IElementType elementType, String graphicalType, View containerView) throws Exception {

-

-		EObject newObject = createElement(elementType, containerView);

-

-		// Add view

-		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);

-		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);

-		getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-

-	public static View createGraphicalLink(IElementType elementType, String graphicalType, View containerView, EditPart sourceEP, EditPart targetEP) throws Exception {

-		CreateConnectionViewRequest request = createConnectionRequest(elementType, sourceEP, targetEP);

-

-		Command command = targetEP.getCommand(request);

-		Assert.assertNotNull("Command to create graphical link should not be null", command);

-		Assert.assertTrue("Command should be executable", command.canExecute());

-

-		getDiagramCommandStack().execute(command);

-

-		IAdaptable viewAdapter = (IAdaptable)request.getNewObject();

-		View newView = (View)viewAdapter.getAdapter(View.class);

-		Assert.assertNotNull("View should not be null", newView);

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(newView, erefs);

-

-		return (View)views.toArray()[0];

-

-	}

-

-	public static CreateConnectionViewRequest createConnectionRequest(IElementType type, EditPart source, EditPart target) {

-		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, Activator.DIAGRAM_PREFERENCES_HINT);

-

-		connectionRequest.setSourceEditPart(null);

-		connectionRequest.setTargetEditPart(source);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);

-		source.getCommand(connectionRequest);

-

-		// Now, setup the request in preparation to get the

-		// connection end

-		// command.

-		connectionRequest.setSourceEditPart(source);

-		connectionRequest.setTargetEditPart(target);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);

-		return connectionRequest;

-	}

-

-

-	public static View dropFromModelExplorer(IElementType elementType, View containerView) throws Exception {

-		EObject newObject = createElement(elementType, containerView);

-		return dropFromModelExplorer(newObject, containerView);

-	}

-

-	public static View dropFromModelExplorer(EObject eObject, View containerView) throws Exception {

-

-		// Find container EditPart (for command creation)

-		EditPart containerEditPart = getEditPart(containerView);

-

-		// Prepare drop request

-		DropObjectsRequest dropRequest = new DropObjectsRequest();

-		ArrayList<EObject> list = new ArrayList<EObject>();

-		list.add(eObject);

-		dropRequest.setObjects(list);

-		dropRequest.setLocation(new Point(20, 20));

-

-		// Get drop command

-		Command command = containerEditPart.getCommand(dropRequest);

-		getDiagramCommandStack().execute(command);

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(eObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011-2012 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:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils;
+
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramCommandStack;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getEditPart;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getTransactionalEditingDomain;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
+import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Assert;
+
+
+public class TestPrepareUtils {
+
+	public static void changeVisibility(View view) throws Exception {
+		SetCommand changeVisibilityCommand = new SetCommand(getTransactionalEditingDomain(), view, NotationPackage.eINSTANCE.getView_Visible(), !view.isVisible());
+		//getCommandStack().execute(new EMFtoGEFCommandWrapper(changeVisibilityCommand));
+		getTransactionalEditingDomain().getCommandStack().execute(changeVisibilityCommand);
+
+		//Workaround for CSS refresh issue (Bug 416737: [CSS] Setters of the CSS runtime notation API don't take into consideration CSS values)
+		DiagramHelper.refresh(EditorUtils.getDiagramEditPart(), true);
+	}
+
+	public static EObject createElement(IElementType elementType, View containerView) throws Exception {
+		return createElement(elementType, containerView.getElement());
+	}
+
+	@SuppressWarnings("unchecked")
+	public static EObject createElement(IElementType elementType, EObject container) throws Exception {
+		CreateElementRequest createElementRequest = new CreateElementRequest(getTransactionalEditingDomain(), container, elementType);
+
+		if(elementType == SysMLElementTypes.PART_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), SysMLElementTypes.BLOCK);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);
+			getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));
+
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), SysMLElementTypes.BLOCK);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);
+			getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));
+
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.VALUE_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), UMLElementTypes.DATA_TYPE);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);
+			getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));
+
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		}
+
+		ICommand createElementCommand = ElementEditServiceUtils.getCommandProvider(container).getEditCommand(createElementRequest);
+		getDiagramCommandStack().execute(new ICommandProxy(createElementCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createElementCommand);
+	}
+
+	public static EObject createLink(IElementType elementType, EObject source, EObject target) throws Exception {
+		CreateRelationshipRequest createRelationshipRequest = new CreateRelationshipRequest(getTransactionalEditingDomain(), source, target, elementType);
+
+		IClientContext context;
+		try {
+			context = TypeContext.getContext(getTransactionalEditingDomain());
+		} catch (ServiceException e) {
+			return null;
+		}
+
+		ICommand createRelationshipCommand = ElementEditServiceUtils.getCommandProvider(elementType, context).getEditCommand(createRelationshipRequest);
+		getDiagramCommandStack().execute(new ICommandProxy(createRelationshipCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createRelationshipCommand);
+	}
+
+	public static View createGraphicalNode(IElementType elementType, String graphicalType, View containerView) throws Exception {
+
+		EObject newObject = createElement(elementType, containerView);
+
+		// Add view
+		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);
+		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);
+		getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+
+	public static View createGraphicalLink(IElementType elementType, String graphicalType, View containerView, EditPart sourceEP, EditPart targetEP) throws Exception {
+		CreateConnectionViewRequest request = createConnectionRequest(elementType, sourceEP, targetEP);
+
+		Command command = targetEP.getCommand(request);
+		Assert.assertNotNull("Command to create graphical link should not be null", command);
+		Assert.assertTrue("Command should be executable", command.canExecute());
+
+		getDiagramCommandStack().execute(command);
+
+		IAdaptable viewAdapter = (IAdaptable)request.getNewObject();
+		View newView = (View)viewAdapter.getAdapter(View.class);
+		Assert.assertNotNull("View should not be null", newView);
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(newView, erefs);
+
+		return (View)views.toArray()[0];
+
+	}
+
+	public static CreateConnectionViewRequest createConnectionRequest(IElementType type, EditPart source, EditPart target) {
+		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, Activator.DIAGRAM_PREFERENCES_HINT);
+
+		connectionRequest.setSourceEditPart(null);
+		connectionRequest.setTargetEditPart(source);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);
+		source.getCommand(connectionRequest);
+
+		// Now, setup the request in preparation to get the
+		// connection end
+		// command.
+		connectionRequest.setSourceEditPart(source);
+		connectionRequest.setTargetEditPart(target);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);
+		return connectionRequest;
+	}
+
+
+	public static View dropFromModelExplorer(IElementType elementType, View containerView) throws Exception {
+		EObject newObject = createElement(elementType, containerView);
+		return dropFromModelExplorer(newObject, containerView);
+	}
+
+	public static View dropFromModelExplorer(EObject eObject, View containerView) throws Exception {
+
+		// Find container EditPart (for command creation)
+		EditPart containerEditPart = getEditPart(containerView);
+
+		// Prepare drop request
+		DropObjectsRequest dropRequest = new DropObjectsRequest();
+		ArrayList<EObject> list = new ArrayList<EObject>();
+		list.add(eObject);
+		dropRequest.setObjects(list);
+		dropRequest.setLocation(new Point(20, 20));
+
+		// Get drop command
+		Command command = containerEditPart.getCommand(dropRequest);
+		getDiagramCommandStack().execute(command);
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(eObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/model/ModelWithIBD.di b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/model/ModelWithIBD.di
index 30eafffc3e5..523d7f0822c 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/model/ModelWithIBD.di
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/model/ModelWithIBD.di
@@ -1,17 +1,25 @@
-<?xml version="1.0" encoding="ASCII"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="ModelWithIBD.notation#_hbf7wGbVEeGgmux_Cozgdg"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ModelWithIBD.notation#_hbf7wGbVEeGgmux_Cozgdg"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+	  <pageList>
+	    <availablePage>
+	      <emfPageIdentifier href="ModelWithIBD.notation#_hbf7wGbVEeGgmux_Cozgdg"/>
+	    </availablePage>
+	  </pageList>
+	  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+	    <windows>
+	      <children xsi:type="di:TabFolder">
+	        <children>
+	          <emfPageIdentifier href="ModelWithIBD.notation#_hbf7wGbVEeGgmux_Cozgdg"/>
+	        </children>
+	      </children>
+	    </windows>
+	  </sashModel>
+  </di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
+  
\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestPrepareUtils.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestPrepareUtils.java
index 7bc4d5b4449..72790b12254 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestPrepareUtils.java
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestPrepareUtils.java
@@ -1,308 +1,318 @@
-/*****************************************************************************

- * Copyright (c) 2012 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:

- *		

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.internalblock.tests.utils;

-

-import static org.eclipse.papyrus.sysml.diagram.internalblock.tests.utils.EditorUtils.getEditPart;

-import static org.eclipse.papyrus.sysml.diagram.internalblock.tests.utils.EditorUtils.getTransactionalEditingDomain;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

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

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

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

-import org.eclipse.draw2d.geometry.Point;

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

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

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.gef.EditPart;

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

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

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

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

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

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

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

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

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

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

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

-import org.eclipse.uml2.uml.ConnectableElement;

-import org.eclipse.uml2.uml.Connector;

-import org.eclipse.uml2.uml.ConnectorEnd;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.EncapsulatedClassifier;

-import org.eclipse.uml2.uml.Property;

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

-import org.eclipse.uml2.uml.util.UMLUtil;

-import org.junit.Assert;

-

-

-public class TestPrepareUtils {

-

-	public static void changeVisibility(View view) throws Exception {

-		SetCommand changeVisibilityCommand = new SetCommand(getTransactionalEditingDomain(), view, NotationPackage.eINSTANCE.getView_Visible(), !view.isVisible());

-		getTransactionalEditingDomain().getCommandStack().execute(changeVisibilityCommand);

-	}

-

-	public static EObject createElement(IElementType elementType, View containerView) throws Exception {

-		return createElement(elementType, containerView.getElement());

-	}

-

-	@SuppressWarnings("unchecked")

-	public static EObject createElement(IElementType elementType, EObject container) throws Exception {

-		CreateElementRequest createElementRequest = new CreateElementRequest(getTransactionalEditingDomain(), container, elementType);

-

-		EObject typeOwner = EMFCoreUtil.getContainer(container, UMLPackage.eINSTANCE.getPackage());

-

-		if(elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, UMLElementTypes.ACTOR);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.PART_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.VALUE_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, UMLElementTypes.DATA_TYPE);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.FLOW_PORT_NA) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.FLOW_SPECIFICATION);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == UMLElementTypes.PROPERTY) {

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-		}

-

-		ICommand createElementCommand = ElementEditServiceUtils.getCommandProvider(container).getEditCommand(createElementRequest);

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createElementCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createElementCommand);

-	}

-

-	public static void setBlockIsEncapsulated(final Element block, final boolean isEncapsulated) throws Exception {

-		AbstractTransactionalCommand setCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Set Block isEncapsulated", null) {

-

-			@Override

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

-				Block blockApp = UMLUtil.getStereotypeApplication(block, Block.class);

-				blockApp.setIsEncapsulated(isEncapsulated);

-				return CommandResult.newOKCommandResult(block);

-			}

-		};

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));

-	}

-

-	public static EObject createLink(IElementType elementType, EObject source, EObject target) throws Exception {

-		CreateRelationshipRequest createRelationshipRequest = new CreateRelationshipRequest(getTransactionalEditingDomain(), source, target, elementType);

-

-		ICommand createRelationshipCommand = ElementEditServiceUtils.getCommandProvider(elementType).getEditCommand(createRelationshipRequest);

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createRelationshipCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createRelationshipCommand);

-	}

-

-	public static EObject createConnectorLink(final EncapsulatedClassifier container, final ConnectableElement sourceRole, final Property sourcePartWithPort, final ConnectableElement targetRole, final Property targetPartWithPort) throws Exception {

-

-		AbstractTransactionalCommand createConnectorCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Create connector", null) {

-

-			@Override

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

-				Connector connector = container.createOwnedConnector("ConnectorTest");

-

-				ConnectorEnd connectorEndSrc = connector.createEnd();

-				connectorEndSrc.setRole(sourceRole);

-				connectorEndSrc.setPartWithPort(sourcePartWithPort);

-

-				ConnectorEnd connectorEndTgt = connector.createEnd();

-				connectorEndTgt.setRole(targetRole);

-				connectorEndTgt.setPartWithPort(targetPartWithPort);

-

-				return CommandResult.newOKCommandResult(connector);

-			}

-

-		};

-

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createConnectorCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createConnectorCommand);

-	}

-

-	public static View createGraphicalNode(IElementType elementType, String graphicalType, View containerView) throws Exception {

-		EObject newObject = createElement(elementType, containerView);

-

-		// Add view

-		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);

-		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);

-		Assert.assertTrue("Command should be executable", createViewCommand.canExecute());

-		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-

-	public static View createGraphicalNode(IElementType elementType, EObject semanticContainer, String graphicalType, View containerView) throws Exception {

-

-		EObject newObject = createElement(elementType, semanticContainer);

-

-		// Add view

-		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);

-		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);

-		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-

-	public static View createGraphicalLink(IElementType elementType, String graphicalType, View containerView, EditPart sourceEP, EditPart targetEP) throws Exception {

-		CreateConnectionViewRequest request = createConnectionRequest(elementType, sourceEP, targetEP);

-

-		Command command = targetEP.getCommand(request);

-		Assert.assertNotNull("Command to create graphical link should not be null", command);

-		Assert.assertTrue("Command should be executable", command.canExecute());

-

-		EditorUtils.getDiagramCommandStack().execute(command);

-

-		IAdaptable viewAdapter = (IAdaptable)request.getNewObject();

-		View newView = (View)viewAdapter.getAdapter(View.class);

-		Assert.assertNotNull("View should not be null", newView);

-

-		return newView;

-	}

-

-	public static CreateConnectionViewRequest createConnectionRequest(IElementType type, EditPart source, EditPart target) {

-		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, Activator.DIAGRAM_PREFERENCES_HINT);

-

-		connectionRequest.setSourceEditPart(null);

-		connectionRequest.setTargetEditPart(source);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);

-		source.getCommand(connectionRequest);

-

-		// Now, setup the request in preparation to get the

-		// connection end

-		// command.

-		connectionRequest.setSourceEditPart(source);

-		connectionRequest.setTargetEditPart(target);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);

-		return connectionRequest;

-	}

-

-

-	public static View dropFromModelExplorer(IElementType elementType, View containerView) throws Exception {

-		EObject newObject = createElement(elementType, containerView);

-		return dropFromModelExplorer(newObject, containerView);

-	}

-

-	public static View dropFromModelExplorer(EObject eObject, View containerView) throws Exception {

-

-		// Find container EditPart (for command creation)

-		EditPart containerEditPart = getEditPart(containerView);

-

-		// Prepare drop request

-		DropObjectsRequest dropRequest = new DropObjectsRequest();

-		ArrayList<EObject> list = new ArrayList<EObject>();

-		list.add(eObject);

-		dropRequest.setObjects(list);

-		dropRequest.setLocation(new Point(20, 20));

-

-		// Get drop command

-		Command command = containerEditPart.getCommand(dropRequest);

-		EditorUtils.getDiagramCommandStack().execute(command);

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(eObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 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:
+ *		
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.utils;
+
+import static org.eclipse.papyrus.sysml.diagram.internalblock.tests.utils.EditorUtils.getEditPart;
+import static org.eclipse.papyrus.sysml.diagram.internalblock.tests.utils.EditorUtils.getTransactionalEditingDomain;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
+import org.eclipse.papyrus.sysml.blocks.Block;
+import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.eclipse.uml2.uml.ConnectableElement;
+import org.eclipse.uml2.uml.Connector;
+import org.eclipse.uml2.uml.ConnectorEnd;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.EncapsulatedClassifier;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.junit.Assert;
+
+
+public class TestPrepareUtils {
+
+	public static void changeVisibility(View view) throws Exception {
+		SetCommand changeVisibilityCommand = new SetCommand(getTransactionalEditingDomain(), view, NotationPackage.eINSTANCE.getView_Visible(), !view.isVisible());
+		getTransactionalEditingDomain().getCommandStack().execute(changeVisibilityCommand);
+	}
+
+	public static EObject createElement(IElementType elementType, View containerView) throws Exception {
+		return createElement(elementType, containerView.getElement());
+	}
+
+	@SuppressWarnings("unchecked")
+	public static EObject createElement(IElementType elementType, EObject container) throws Exception {
+		CreateElementRequest createElementRequest = new CreateElementRequest(getTransactionalEditingDomain(), container, elementType);
+
+		EObject typeOwner = EMFCoreUtil.getContainer(container, UMLPackage.eINSTANCE.getPackage());
+
+		if(elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, UMLElementTypes.ACTOR);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.PART_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.VALUE_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, UMLElementTypes.DATA_TYPE);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.FLOW_PORT_NA) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.FLOW_SPECIFICATION);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == UMLElementTypes.PROPERTY) {
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+		}
+
+		ICommand createElementCommand = ElementEditServiceUtils.getCommandProvider(container).getEditCommand(createElementRequest);
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createElementCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createElementCommand);
+	}
+
+	public static void setBlockIsEncapsulated(final Element block, final boolean isEncapsulated) throws Exception {
+		AbstractTransactionalCommand setCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Set Block isEncapsulated", null) {
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				Block blockApp = UMLUtil.getStereotypeApplication(block, Block.class);
+				blockApp.setIsEncapsulated(isEncapsulated);
+				return CommandResult.newOKCommandResult(block);
+			}
+		};
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));
+	}
+
+	public static EObject createLink(IElementType elementType, EObject source, EObject target) throws Exception {
+		CreateRelationshipRequest createRelationshipRequest = new CreateRelationshipRequest(getTransactionalEditingDomain(), source, target, elementType);
+
+		IClientContext context;
+		try {
+			context = TypeContext.getContext(getTransactionalEditingDomain());
+		} catch (ServiceException e) {
+			return null;
+		}
+
+		ICommand createRelationshipCommand = ElementEditServiceUtils.getCommandProvider(elementType, context).getEditCommand(createRelationshipRequest);
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createRelationshipCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createRelationshipCommand);
+	}
+
+	public static EObject createConnectorLink(final EncapsulatedClassifier container, final ConnectableElement sourceRole, final Property sourcePartWithPort, final ConnectableElement targetRole, final Property targetPartWithPort) throws Exception {
+
+		AbstractTransactionalCommand createConnectorCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Create connector", null) {
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				Connector connector = container.createOwnedConnector("ConnectorTest");
+
+				ConnectorEnd connectorEndSrc = connector.createEnd();
+				connectorEndSrc.setRole(sourceRole);
+				connectorEndSrc.setPartWithPort(sourcePartWithPort);
+
+				ConnectorEnd connectorEndTgt = connector.createEnd();
+				connectorEndTgt.setRole(targetRole);
+				connectorEndTgt.setPartWithPort(targetPartWithPort);
+
+				return CommandResult.newOKCommandResult(connector);
+			}
+
+		};
+
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createConnectorCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createConnectorCommand);
+	}
+
+	public static View createGraphicalNode(IElementType elementType, String graphicalType, View containerView) throws Exception {
+		EObject newObject = createElement(elementType, containerView);
+
+		// Add view
+		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);
+		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);
+		Assert.assertTrue("Command should be executable", createViewCommand.canExecute());
+		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+
+	public static View createGraphicalNode(IElementType elementType, EObject semanticContainer, String graphicalType, View containerView) throws Exception {
+
+		EObject newObject = createElement(elementType, semanticContainer);
+
+		// Add view
+		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);
+		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);
+		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+
+	public static View createGraphicalLink(IElementType elementType, String graphicalType, View containerView, EditPart sourceEP, EditPart targetEP) throws Exception {
+		CreateConnectionViewRequest request = createConnectionRequest(elementType, sourceEP, targetEP);
+
+		Command command = targetEP.getCommand(request);
+		Assert.assertNotNull("Command to create graphical link should not be null", command);
+		Assert.assertTrue("Command should be executable", command.canExecute());
+
+		EditorUtils.getDiagramCommandStack().execute(command);
+
+		IAdaptable viewAdapter = (IAdaptable)request.getNewObject();
+		View newView = (View)viewAdapter.getAdapter(View.class);
+		Assert.assertNotNull("View should not be null", newView);
+
+		return newView;
+	}
+
+	public static CreateConnectionViewRequest createConnectionRequest(IElementType type, EditPart source, EditPart target) {
+		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, Activator.DIAGRAM_PREFERENCES_HINT);
+
+		connectionRequest.setSourceEditPart(null);
+		connectionRequest.setTargetEditPart(source);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);
+		source.getCommand(connectionRequest);
+
+		// Now, setup the request in preparation to get the
+		// connection end
+		// command.
+		connectionRequest.setSourceEditPart(source);
+		connectionRequest.setTargetEditPart(target);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);
+		return connectionRequest;
+	}
+
+
+	public static View dropFromModelExplorer(IElementType elementType, View containerView) throws Exception {
+		EObject newObject = createElement(elementType, containerView);
+		return dropFromModelExplorer(newObject, containerView);
+	}
+
+	public static View dropFromModelExplorer(EObject eObject, View containerView) throws Exception {
+
+		// Find container EditPart (for command creation)
+		EditPart containerEditPart = getEditPart(containerView);
+
+		// Prepare drop request
+		DropObjectsRequest dropRequest = new DropObjectsRequest();
+		ArrayList<EObject> list = new ArrayList<EObject>();
+		list.add(eObject);
+		dropRequest.setObjects(list);
+		dropRequest.setLocation(new Point(20, 20));
+
+		// Get drop command
+		Command command = containerEditPart.getCommand(dropRequest);
+		EditorUtils.getDiagramCommandStack().execute(command);
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(eObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/Copy of ModelWithPD.di b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/Copy of ModelWithPD.di
index bf088778d68..3c8ec0119bd 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/Copy of ModelWithPD.di
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/Copy of ModelWithPD.di
@@ -1,17 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+	  <pageList>
+	    <availablePage>
+	      <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>
+	    </availablePage>
+	  </pageList>
+	  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+	    <windows>
+	      <children xsi:type="di:TabFolder">
+	        <children>
+	          <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>
+	        </children>
+	      </children>
+	    </windows>
+	  </sashModel>
+	</di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
+	
\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/ModelWithPD.di b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/ModelWithPD.di
index 734a7eeec94..a9a1f4f5430 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/ModelWithPD.di
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/ModelWithPD.di
@@ -1,23 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="ModelWithPD.notation#_VpI8wA5KEeO7JIqowJboVA"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="ModelWithPD.notation#_VpI8wA5KEeO7JIqowJboVA"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+	  <pageList>
+	    <availablePage>
+	      <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>
+	    </availablePage>
+	    <availablePage>
+	      <emfPageIdentifier href="ModelWithPD.notation#_VpI8wA5KEeO7JIqowJboVA"/>
+	    </availablePage>
+	  </pageList>
+	  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+	    <windows>
+	      <children xsi:type="di:TabFolder">
+	        <children>
+	          <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>
+	        </children>
+	        <children>
+	          <emfPageIdentifier href="ModelWithPD.notation#_VpI8wA5KEeO7JIqowJboVA"/>
+	        </children>
+	      </children>
+	    </windows>
+	  </sashModel>
+	</di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
+	
\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/utils/TestPrepareUtils.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/utils/TestPrepareUtils.java
index a265334f7e2..8e941c84652 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/utils/TestPrepareUtils.java
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/utils/TestPrepareUtils.java
@@ -1,295 +1,306 @@
-/*****************************************************************************

- * Copyright (c) 2012 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:

- *		

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.parametric.tests.utils;

-

-import static org.eclipse.papyrus.sysml.diagram.parametric.tests.utils.EditorUtils.getEditPart;

-import static org.eclipse.papyrus.sysml.diagram.parametric.tests.utils.EditorUtils.getTransactionalEditingDomain;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

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

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

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

-import org.eclipse.draw2d.geometry.Point;

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

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

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.gef.EditPart;

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

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

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

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

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

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

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

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

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

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

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

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

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.papyrus.sysml.diagram.parametric.Activator;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

-import org.eclipse.uml2.uml.ConnectableElement;

-import org.eclipse.uml2.uml.Connector;

-import org.eclipse.uml2.uml.ConnectorEnd;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.EncapsulatedClassifier;

-import org.eclipse.uml2.uml.Property;

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

-import org.eclipse.uml2.uml.util.UMLUtil;

-import org.junit.Assert;

-

-

-public class TestPrepareUtils {

-

-	public static void changeVisibility(View view) throws Exception {

-		SetCommand changeVisibilityCommand = new SetCommand(getTransactionalEditingDomain(), view, NotationPackage.eINSTANCE.getView_Visible(), !view.isVisible());

-		getTransactionalEditingDomain().getCommandStack().execute(changeVisibilityCommand);

-	}

-

-	public static EObject createElement(IElementType elementType, View containerView) throws Exception {

-		return createElement(elementType, containerView.getElement());

-	}

-

-	@SuppressWarnings("unchecked")

-	public static EObject createElement(IElementType elementType, EObject container) throws Exception {

-		CreateElementRequest createElementRequest = new CreateElementRequest(getTransactionalEditingDomain(), container, elementType);

-

-		EObject typeOwner = EMFCoreUtil.getContainer(container, UMLPackage.eINSTANCE.getPackage());

-

-		if(elementType == SysMLElementTypes.CONSTRAINT_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.CONSTRAINT_BLOCK);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.PART_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.VALUE_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, UMLElementTypes.DATA_TYPE);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == UMLElementTypes.PROPERTY) {

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-		}

-

-		ICommand createElementCommand = ElementEditServiceUtils.getCommandProvider(container).getEditCommand(createElementRequest);

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createElementCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createElementCommand);

-	}

-

-	public static void setBlockIsEncapsulated(final Element block, final boolean isEncapsulated) throws Exception {

-		AbstractTransactionalCommand setCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Set Block isEncapsulated", null) {

-

-			@Override

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

-				Block blockApp = UMLUtil.getStereotypeApplication(block, Block.class);

-				blockApp.setIsEncapsulated(isEncapsulated);

-				return CommandResult.newOKCommandResult(block);

-			}

-		};

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));

-	}

-

-	public static EObject createLink(IElementType elementType, EObject source, EObject target) throws Exception {

-		CreateRelationshipRequest createRelationshipRequest = new CreateRelationshipRequest(getTransactionalEditingDomain(), source, target, elementType);

-

-		ICommand createRelationshipCommand = ElementEditServiceUtils.getCommandProvider(elementType).getEditCommand(createRelationshipRequest);

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createRelationshipCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createRelationshipCommand);

-	}

-

-	public static EObject createConnectorLink(final EncapsulatedClassifier container, final ConnectableElement sourceRole, final Property sourcePartWithPort, final ConnectableElement targetRole, final Property targetPartWithPort) throws Exception {

-

-		AbstractTransactionalCommand createConnectorCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Create connector", null) {

-

-			@Override

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

-				Connector connector = container.createOwnedConnector("ConnectorTest");

-

-				ConnectorEnd connectorEndSrc = connector.createEnd();

-				connectorEndSrc.setRole(sourceRole);

-				connectorEndSrc.setPartWithPort(sourcePartWithPort);

-

-				ConnectorEnd connectorEndTgt = connector.createEnd();

-				connectorEndTgt.setRole(targetRole);

-				connectorEndTgt.setPartWithPort(targetPartWithPort);

-

-				return CommandResult.newOKCommandResult(connector);

-			}

-

-		};

-

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createConnectorCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createConnectorCommand);

-	}

-

-	public static View createGraphicalNode(IElementType elementType, String graphicalType, View containerView) throws Exception {

-		EObject newObject = createElement(elementType, containerView);

-

-		// Add view

-		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);

-		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);

-		Assert.assertTrue("Command should be executable", createViewCommand.canExecute());

-		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-

-	public static View createGraphicalNode(IElementType elementType, EObject semanticContainer, String graphicalType, View containerView) throws Exception {

-

-		EObject newObject = createElement(elementType, semanticContainer);

-

-		// Add view

-		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);

-		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);

-		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-

-	public static View createGraphicalLink(IElementType elementType, String graphicalType, View containerView, EditPart sourceEP, EditPart targetEP) throws Exception {

-		CreateConnectionViewRequest request = createConnectionRequest(elementType, sourceEP, targetEP);

-

-		Command command = targetEP.getCommand(request);

-		Assert.assertNotNull("Command to create graphical link should not be null", command);

-		Assert.assertTrue("Command should be executable", command.canExecute());

-

-		EditorUtils.getDiagramCommandStack().execute(command);

-

-		IAdaptable viewAdapter = (IAdaptable)request.getNewObject();

-		View newView = (View)viewAdapter.getAdapter(View.class);

-		Assert.assertNotNull("View should not be null", newView);

-

-		return newView;

-	}

-

-	public static CreateConnectionViewRequest createConnectionRequest(IElementType type, EditPart source, EditPart target) {

-		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, Activator.DIAGRAM_PREFERENCES_HINT);

-

-		connectionRequest.setSourceEditPart(null);

-		connectionRequest.setTargetEditPart(source);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);

-		source.getCommand(connectionRequest);

-

-		// Now, setup the request in preparation to get the

-		// connection end

-		// command.

-		connectionRequest.setSourceEditPart(source);

-		connectionRequest.setTargetEditPart(target);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);

-		return connectionRequest;

-	}

-

-

-	public static View dropFromModelExplorer(IElementType elementType, View containerView) throws Exception {

-		EObject newObject = createElement(elementType, containerView);

-		return dropFromModelExplorer(newObject, containerView);

-	}

-

-	public static View dropFromModelExplorer(EObject eObject, View containerView) throws Exception {

-

-		// Find container EditPart (for command creation)

-		EditPart containerEditPart = getEditPart(containerView);

-

-		// Prepare drop request

-		DropObjectsRequest dropRequest = new DropObjectsRequest();

-		ArrayList<EObject> list = new ArrayList<EObject>();

-		list.add(eObject);

-		dropRequest.setObjects(list);

-		dropRequest.setLocation(new Point(20, 20));

-

-		// Get drop command

-		Command command = containerEditPart.getCommand(dropRequest);

-		EditorUtils.getDiagramCommandStack().execute(command);

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(eObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 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:
+ *		
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.parametric.tests.utils;
+
+import static org.eclipse.papyrus.sysml.diagram.parametric.tests.utils.EditorUtils.getEditPart;
+import static org.eclipse.papyrus.sysml.diagram.parametric.tests.utils.EditorUtils.getTransactionalEditingDomain;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
+import org.eclipse.papyrus.sysml.blocks.Block;
+import org.eclipse.papyrus.sysml.diagram.parametric.Activator;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.eclipse.uml2.uml.ConnectableElement;
+import org.eclipse.uml2.uml.Connector;
+import org.eclipse.uml2.uml.ConnectorEnd;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.EncapsulatedClassifier;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.junit.Assert;
+
+
+public class TestPrepareUtils {
+
+	public static void changeVisibility(View view) throws Exception {
+		SetCommand changeVisibilityCommand = new SetCommand(getTransactionalEditingDomain(), view, NotationPackage.eINSTANCE.getView_Visible(), !view.isVisible());
+		getTransactionalEditingDomain().getCommandStack().execute(changeVisibilityCommand);
+	}
+
+	public static EObject createElement(IElementType elementType, View containerView) throws Exception {
+		return createElement(elementType, containerView.getElement());
+	}
+
+	@SuppressWarnings("unchecked")
+	public static EObject createElement(IElementType elementType, EObject container) throws Exception {
+		CreateElementRequest createElementRequest = new CreateElementRequest(getTransactionalEditingDomain(), container, elementType);
+
+		EObject typeOwner = EMFCoreUtil.getContainer(container, UMLPackage.eINSTANCE.getPackage());
+
+		if(elementType == SysMLElementTypes.CONSTRAINT_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.CONSTRAINT_BLOCK);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.PART_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.VALUE_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, UMLElementTypes.DATA_TYPE);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == UMLElementTypes.PROPERTY) {
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+		}
+
+		ICommand createElementCommand = ElementEditServiceUtils.getCommandProvider(container).getEditCommand(createElementRequest);
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createElementCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createElementCommand);
+	}
+
+	public static void setBlockIsEncapsulated(final Element block, final boolean isEncapsulated) throws Exception {
+		AbstractTransactionalCommand setCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Set Block isEncapsulated", null) {
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				Block blockApp = UMLUtil.getStereotypeApplication(block, Block.class);
+				blockApp.setIsEncapsulated(isEncapsulated);
+				return CommandResult.newOKCommandResult(block);
+			}
+		};
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));
+	}
+
+	public static EObject createLink(IElementType elementType, EObject source, EObject target) throws Exception {
+		CreateRelationshipRequest createRelationshipRequest = new CreateRelationshipRequest(getTransactionalEditingDomain(), source, target, elementType);
+
+		IClientContext context;
+		try {
+			context = TypeContext.getContext(getTransactionalEditingDomain());
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+			return null;
+		}
+
+		ICommand createRelationshipCommand = ElementEditServiceUtils.getCommandProvider(elementType, context).getEditCommand(createRelationshipRequest);
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createRelationshipCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createRelationshipCommand);
+	}
+
+	public static EObject createConnectorLink(final EncapsulatedClassifier container, final ConnectableElement sourceRole, final Property sourcePartWithPort, final ConnectableElement targetRole, final Property targetPartWithPort) throws Exception {
+
+		AbstractTransactionalCommand createConnectorCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Create connector", null) {
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				Connector connector = container.createOwnedConnector("ConnectorTest");
+
+				ConnectorEnd connectorEndSrc = connector.createEnd();
+				connectorEndSrc.setRole(sourceRole);
+				connectorEndSrc.setPartWithPort(sourcePartWithPort);
+
+				ConnectorEnd connectorEndTgt = connector.createEnd();
+				connectorEndTgt.setRole(targetRole);
+				connectorEndTgt.setPartWithPort(targetPartWithPort);
+
+				return CommandResult.newOKCommandResult(connector);
+			}
+
+		};
+
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createConnectorCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createConnectorCommand);
+	}
+
+	public static View createGraphicalNode(IElementType elementType, String graphicalType, View containerView) throws Exception {
+		EObject newObject = createElement(elementType, containerView);
+
+		// Add view
+		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);
+		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);
+		Assert.assertTrue("Command should be executable", createViewCommand.canExecute());
+		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+
+	public static View createGraphicalNode(IElementType elementType, EObject semanticContainer, String graphicalType, View containerView) throws Exception {
+
+		EObject newObject = createElement(elementType, semanticContainer);
+
+		// Add view
+		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);
+		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);
+		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+
+	public static View createGraphicalLink(IElementType elementType, String graphicalType, View containerView, EditPart sourceEP, EditPart targetEP) throws Exception {
+		CreateConnectionViewRequest request = createConnectionRequest(elementType, sourceEP, targetEP);
+
+		Command command = targetEP.getCommand(request);
+		Assert.assertNotNull("Command to create graphical link should not be null", command);
+		Assert.assertTrue("Command should be executable", command.canExecute());
+
+		EditorUtils.getDiagramCommandStack().execute(command);
+
+		IAdaptable viewAdapter = (IAdaptable)request.getNewObject();
+		View newView = (View)viewAdapter.getAdapter(View.class);
+		Assert.assertNotNull("View should not be null", newView);
+
+		return newView;
+	}
+
+	public static CreateConnectionViewRequest createConnectionRequest(IElementType type, EditPart source, EditPart target) {
+		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, Activator.DIAGRAM_PREFERENCES_HINT);
+
+		connectionRequest.setSourceEditPart(null);
+		connectionRequest.setTargetEditPart(source);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);
+		source.getCommand(connectionRequest);
+
+		// Now, setup the request in preparation to get the
+		// connection end
+		// command.
+		connectionRequest.setSourceEditPart(source);
+		connectionRequest.setTargetEditPart(target);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);
+		return connectionRequest;
+	}
+
+
+	public static View dropFromModelExplorer(IElementType elementType, View containerView) throws Exception {
+		EObject newObject = createElement(elementType, containerView);
+		return dropFromModelExplorer(newObject, containerView);
+	}
+
+	public static View dropFromModelExplorer(EObject eObject, View containerView) throws Exception {
+
+		// Find container EditPart (for command creation)
+		EditPart containerEditPart = getEditPart(containerView);
+
+		// Prepare drop request
+		DropObjectsRequest dropRequest = new DropObjectsRequest();
+		ArrayList<EObject> list = new ArrayList<EObject>();
+		list.add(eObject);
+		dropRequest.setObjects(list);
+		dropRequest.setLocation(new Point(20, 20));
+
+		// Get drop command
+		Command command = containerEditPart.getCommand(dropRequest);
+		EditorUtils.getDiagramCommandStack().execute(command);
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(eObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+}
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/resources/modelSysMLRequirement.di b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/resources/modelSysMLRequirement.di
index cb4ecb440a9..5e3ea0eea85 100755
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/resources/modelSysMLRequirement.di
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/resources/modelSysMLRequirement.di
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" 

-xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 

-

-xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" >

-

-  <di:SashWindowsMngr>

-    <pageList>

-      <availablePage>

-        <emfPageIdentifier href="modelSysMLRequirement.notation#_pBS2xAKOEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="modelSysMLRequirement.notation#_B7qCgAKPEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="modelSysMLRequirement.notation#_C2IGsAKPEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="modelSysMLRequirement.notation#_EGhXkAKPEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="modelSysMLRequirement.notation#_ffxOYAKUEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="modelSysMLRequirement.notation#_ZfPQ8Av4EeSOiKqWiKPo8w"/>

-      </availablePage>

-    </pageList>

-    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">

-      <windows>

-        <children xsi:type="di:TabFolder">

-          <children>

-            <emfPageIdentifier href="modelSysMLRequirement.notation#_pBS2xAKOEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="modelSysMLRequirement.notation#_B7qCgAKPEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="modelSysMLRequirement.notation#_EGhXkAKPEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="modelSysMLRequirement.notation#_C2IGsAKPEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="modelSysMLRequirement.notation#_ffxOYAKUEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="modelSysMLRequirement.notation#_ZfPQ8Av4EeSOiKqWiKPo8w"/>

-          </children>

-        </children>

-      </windows>

-    </sashModel>

-  </di:SashWindowsMngr>

-  

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" >
+   <di:SashWindowsMngr>
+    <pageList>
+      <availablePage>
+        <emfPageIdentifier href="modelSysMLRequirement.notation#_pBS2xAKOEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="modelSysMLRequirement.notation#_B7qCgAKPEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="modelSysMLRequirement.notation#_C2IGsAKPEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="modelSysMLRequirement.notation#_EGhXkAKPEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="modelSysMLRequirement.notation#_ffxOYAKUEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="modelSysMLRequirement.notation#_ZfPQ8Av4EeSOiKqWiKPo8w"/>
+      </availablePage>
+    </pageList>
+    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
+      <windows>
+        <children xsi:type="di:TabFolder">
+          <children>
+            <emfPageIdentifier href="modelSysMLRequirement.notation#_pBS2xAKOEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="modelSysMLRequirement.notation#_B7qCgAKPEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="modelSysMLRequirement.notation#_EGhXkAKPEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="modelSysMLRequirement.notation#_C2IGsAKPEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="modelSysMLRequirement.notation#_ffxOYAKUEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="modelSysMLRequirement.notation#_ZfPQ8Av4EeSOiKqWiKPo8w"/>
+          </children>
+        </children>
+      </windows>
+    </sashModel>
+  </di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/SysMLNatTableRequirementTests.launch b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/SysMLNatTableRequirementTests.launch
deleted file mode 100644
index 3248c1b5f0d..00000000000
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/SysMLNatTableRequirementTests.launch
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<listAttribute key="classFilters">

-<listEntry value="ClassFilter(include, org.eclipse.papyrus.infra.emf.*)"/>

-<listEntry value="ClassFilter(include, org.eclipse.papyrus.uml.tools.*)"/>

-<listEntry value="ClassFilter(include, *.tests.*)"/>

-</listAttribute>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.sysml.nattable.requirement.tests/src/org/eclipse/papyrus/sysml/nattable/requirement/tests/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.sysml.nattable.requirement.tests.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.sysml.nattable.requirement.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms120m -Xmx512m -XX:PermSize=256M -XX:MaxPermSize=512M"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/resources/sysmlModel.di b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/resources/sysmlModel.di
index 279b08e24e1..1b030e72138 100644
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/resources/sysmlModel.di
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/resources/sysmlModel.di
@@ -1,9 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList/>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder"/>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+	  <pageList/>
+	  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+	    <windows>
+	      <children xsi:type="di:TabFolder"/>
+	    </windows>
+	  </sashModel>
+	</di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
+	
\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/Bug435197.di b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/Bug435197.di
index 006edbd98cc..abcec13590d 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/Bug435197.di
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/Bug435197.di
@@ -1,47 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
-  <pageList>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-  </pageList>
-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
-    <windows>
-      <children xsi:type="di:TabFolder"/>
-    </windows>
-  </sashModel>
-</di:SashWindowsMngr>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+	  <pageList>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	  </pageList>
+	  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+	    <windows>
+	      <children xsi:type="di:TabFolder"/>
+	    </windows>
+	  </sashModel>
+	</di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
+	
\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/ModelWithBDD.di b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/ModelWithBDD.di
index 3422e22dab1..ce0a01bc94c 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/ModelWithBDD.di
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/ModelWithBDD.di
@@ -1,29 +1,37 @@
-<?xml version="1.0" encoding="ASCII"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="ModelWithBDD.notation#_D85CYKWDEeG49_vdcs7Y7g"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="ModelWithBDD.notation#_flho4LnoEeG1Fot6xcIh4g"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="ModelWithBDD.notation#_D85CYKWDEeG49_vdcs7Y7g"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="ModelWithBDD.notation#_flho4LnoEeG1Fot6xcIh4g"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+	  <pageList>
+	    <availablePage>
+	      <emfPageIdentifier href="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>
+	    </availablePage>
+	    <availablePage>
+	      <emfPageIdentifier href="ModelWithBDD.notation#_D85CYKWDEeG49_vdcs7Y7g"/>
+	    </availablePage>
+	    <availablePage>
+	      <emfPageIdentifier href="ModelWithBDD.notation#_flho4LnoEeG1Fot6xcIh4g"/>
+	    </availablePage>
+	  </pageList>
+	  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+	    <windows>
+	      <children xsi:type="di:TabFolder">
+	        <children>
+	          <emfPageIdentifier href="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>
+	        </children>
+	        <children>
+	          <emfPageIdentifier href="ModelWithBDD.notation#_D85CYKWDEeG49_vdcs7Y7g"/>
+	        </children>
+	        <children>
+	          <emfPageIdentifier href="ModelWithBDD.notation#_flho4LnoEeG1Fot6xcIh4g"/>
+	        </children>
+	      </children>
+	    </windows>
+	  </sashModel>
+	</di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
+	
\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/SysMLModelExplorerCopyPasteTestModel.di b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/SysMLModelExplorerCopyPasteTestModel.di
index 86d19ca6083..715509f6e10 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/SysMLModelExplorerCopyPasteTestModel.di
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/SysMLModelExplorerCopyPasteTestModel.di
@@ -1,35 +1,43 @@
-<?xml version="1.0" encoding="ASCII"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_TmNkwHpOEeGpML05YPbTgg"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_skVUkHphEeGr6LTFg6LEhg"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_ByR8IH2bEeGYcfVa7z8CyQ"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_4Yzc4KW-EeGN-cBhs2fFJg"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_TmNkwHpOEeGpML05YPbTgg"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_skVUkHphEeGr6LTFg6LEhg"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_ByR8IH2bEeGYcfVa7z8CyQ"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_4Yzc4KW-EeGN-cBhs2fFJg"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+	  <pageList>
+	    <availablePage>
+	      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_TmNkwHpOEeGpML05YPbTgg"/>
+	    </availablePage>
+	    <availablePage>
+	      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_skVUkHphEeGr6LTFg6LEhg"/>
+	    </availablePage>
+	    <availablePage>
+	      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_ByR8IH2bEeGYcfVa7z8CyQ"/>
+	    </availablePage>
+	    <availablePage>
+	      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_4Yzc4KW-EeGN-cBhs2fFJg"/>
+	    </availablePage>
+	  </pageList>
+	  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+	    <windows>
+	      <children xsi:type="di:TabFolder">
+	        <children>
+	          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_TmNkwHpOEeGpML05YPbTgg"/>
+	        </children>
+	        <children>
+	          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_skVUkHphEeGr6LTFg6LEhg"/>
+	        </children>
+	        <children>
+	          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_ByR8IH2bEeGYcfVa7z8CyQ"/>
+	        </children>
+	        <children>
+	          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_4Yzc4KW-EeGN-cBhs2fFJg"/>
+	        </children>
+	      </children>
+	    </windows>
+	  </sashModel>
+	</di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
+	
\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
index b6b34adfbc2..cecd0cabbe5 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,8 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
  org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
  org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml;bundle-version="1.2.0"
+ org.eclipse.papyrus.sysml;bundle-version="1.2.0",
+ org.eclipse.papyrus.sysml.architecture;bundle-version="1.0.0"
 Export-Package: org.eclipse.papyrus.sysml.service.types.tests.suites
 Bundle-Vendor: %providerName
 Bundle-Version: 1.2.0.qualifier
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/registry/TestElementTypeRegistryContent.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/registry/TestElementTypeRegistryContent.java
index 3723ecabe22..720c8c10929 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/registry/TestElementTypeRegistryContent.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/registry/TestElementTypeRegistryContent.java
@@ -7,15 +7,17 @@ import java.util.Iterator;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
 import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider;
 import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;
 import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;
+import org.eclipse.papyrus.sysml.architecture.SysMLArchitectureContextIds;
 import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
 import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;
 import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;
@@ -31,18 +33,22 @@ import org.junit.Test;
  *
  */
 public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
-
-	private static final String PAPYRUS_CONTEXT_ID = "org.eclipse.papyrus.infra.services.edit.TypeContext"; //$NON-NLS-1$
-
+	private static IClientContext context;
+	
 	private static final String PAPYRUS_ELEMENT_TYPE_PREFIX = "org.eclipse.papyrus.sysml."; //$NON-NLS-1$
 
 	private static final String PAPYRUS_ST_APPLICATION_TYPE_PREFIX = "org.eclipse.papyrus.sysml.stereotype."; //$NON-NLS-1$
 
 	@BeforeClass
 	public static void before() {
-		ElementTypeSetConfigurationRegistry registry = ElementTypeSetConfigurationRegistry.getInstance();
-		Assert.assertNotNull("registry should not be null after init", registry);
+		Assert.assertNotNull("registry should not be null after init", ElementTypeSetConfigurationRegistry.getInstance());
 		Assert.assertNotNull("element type should not be null", SysMLElementTypes.BLOCK);
+		
+		try {
+			context = TypeContext.getContext(SysMLArchitectureContextIds.SysML);
+		} catch (ServiceException e) {
+			fail("Default client context could not be found.");
+		}
 	}
 
 
@@ -56,7 +62,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 
 				EClass eClass = (EClass) eObject;
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -71,7 +77,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 
 				EClass eClass = (EClass) eObject;
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -116,7 +122,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 					continue;
 				}
 
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -131,7 +137,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 				EClass eClass = (EClass) eObject;
 
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -146,7 +152,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 
 				EClass eClass = (EClass) eObject;
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -161,7 +167,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 
 				EClass eClass = (EClass) eObject;
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -176,7 +182,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 
 				EClass eClass = (EClass) eObject;
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -201,7 +207,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 					continue;
 				}
 
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -216,7 +222,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 				EClass eClass = (EClass) eObject;
 
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -241,7 +247,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 					continue;
 				}
 
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -256,7 +262,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 				EClass eClass = (EClass) eObject;
 
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -271,7 +277,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 
 				EClass eClass = (EClass) eObject;
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -286,7 +292,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 
 				EClass eClass = (EClass) eObject;
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -294,12 +300,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 	@Test
 	public void testRegistryContentForSysMLAssociations() {
 
-		IClientContext context = ClientContextManager.getInstance().getClientContext(PAPYRUS_CONTEXT_ID);
-		if (context == null) {
-			fail("Papyrus IClientContext could not be found.");
-		}
-
-		IElementEditServiceProvider service = ElementEditServiceUtils.getEditServiceProvider();
+		IElementEditServiceProvider service = ElementEditServiceUtils.getEditServiceProvider(context);
 
 		assertTrue("No ISpecializationType found for SysML Association in Papyrus context", service.isKnownElementType("org.eclipse.papyrus.sysml.Association"));