Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristian W. Damus2014-04-22 16:33:40 +0000
committerChristian W. Damus2014-04-22 16:33:40 +0000
commitebde630de0593d0278d5ab36bfc024b3d9dc0737 (patch)
treef2db080acfd99c5ea71331b80726672a4da0702f /tests
parent1021d79f1ef9e27245464e445d795b8d336b57d4 (diff)
parentcd03d0c5e3808d3831f70679ff3c17a67c4b2873 (diff)
downloadorg.eclipse.papyrus-ebde630de0593d0278d5ab36bfc024b3d9dc0737.tar.gz
org.eclipse.papyrus-ebde630de0593d0278d5ab36bfc024b3d9dc0737.tar.xz
org.eclipse.papyrus-ebde630de0593d0278d5ab36bfc024b3d9dc0737.zip
Merge branch 'refs/heads/master' into bugs/431953-stereo-repair2
Conflicts: plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypeApplicationRepairParticipant.java
Diffstat (limited to 'tests')
-rw-r--r--tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/META-INF/MANIFEST.MF7
-rw-r--r--tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/org.eclipse.papyrus.customization.properties.tests.launch7
-rw-r--r--tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.di2
-rw-r--r--tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.notation57
-rw-r--r--tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.uml104
-rw-r--r--tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/qvt/TransformationsTests.java156
-rw-r--r--tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/ModelExplorerUtils.java425
-rw-r--r--tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/PackageExplorerUtils.java182
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/common/AbstractModelExplorerTest.java52
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteBlockTest.java10
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteReferenceTest.java3
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteTest.java26
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleBlock2Test.java8
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleBlockTest.java8
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimplePartTest.java10
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleReferenceTest.java14
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/dragdrop/AbstractDragDropTest.java334
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/utils/EditorUtils.java150
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/.classpath7
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/.project28
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/META-INF/MANIFEST.MF22
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/build.properties4
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/org.eclipse.papyrus.diagram.profile.tests.launch41
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/Activator.java30
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/AllTests.java22
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/IProfileDiagramTest.java21
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/canonical/AllCanonicalTests.java21
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/canonical/TestProfileDiagramChildNode.java95
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/canonical/TestProfileDiagramTopNode.java71
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityChildNodeInStructuredActivity.java11
-rw-r--r--tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/DeleteHandlerTest.java410
-rw-r--r--tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/ModelExplorerViewTests.java442
-rw-r--r--tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/RenameHandlerTest.java124
-rw-r--r--tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/paste/CopyPasteHandlerTest.java12
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/META-INF/MANIFEST.MF3
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractPapyrusTestCase.java90
-rw-r--r--tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/AllTests.launch3
-rw-r--r--tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF1
-rw-r--r--tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/DependencyManagementTest.java97
-rw-r--r--tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AbstractHandlerTest.java8
-rw-r--r--tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/OpendiagramTest.java238
42 files changed, 1966 insertions, 1397 deletions
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/META-INF/MANIFEST.MF
index 92ddbf63699..fecf01bac4e 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.resources;bundle-version="3.8.0",
org.eclipse.papyrus.junit.utils;bundle-version="1.0.0",
org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.junit;bundle-version="4.10.0"
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.core.databinding;bundle-version="1.4.1"
Export-Package: org.eclipse.papyrus.customization.properties.tests,
org.eclipse.papyrus.customization.properties.tests.qvt
Bundle-Vendor: Eclipse Modeling Project
@@ -23,7 +24,5 @@ Bundle-Name: Properties view customization Tests (Incubation)
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.customization.properties.tests.A
ctivator
-Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.test
- s
+Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.tests
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/org.eclipse.papyrus.customization.properties.tests.launch b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/org.eclipse.papyrus.customization.properties.tests.launch
index 0caf3584e76..09eb4aa2140 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/org.eclipse.papyrus.customization.properties.tests.launch
+++ b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/org.eclipse.papyrus.customization.properties.tests.launch
@@ -23,16 +23,17 @@
<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/J2SE-1.5"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.customization.properties.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.customization.properties.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 -Xms1024m -Xmx4096m -XX:PermSize=256M -XX:MaxPermSize=512M"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms1024m -Xmx256m -XX:PermSize=256M -XX:MaxPermSize=512M"/>
<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="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.cea.papyrus.fuml.gen@default:default,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*10.0.1.v201203051515@default:default,com.google.guava*11.0.1@default:default,com.google.gwt.servlet@default:default,com.google.gwtjsonrpc@default:default,com.google.gwtorm@default:default,com.google.inject.assistedinject@default:false,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.mountainminds.eclemma.core@default:default,com.mountainminds.eclemma.doc@default:default,com.mountainminds.eclemma.ui@default:default,com.ning.async-http-client@default:default,com.sun.el@default:default,com.sun.syndication@default:default,com.sun.xml.bind@default:default,de.cau.cs.kieler.core.kgraph@default:default,de.cau.cs.kieler.core.ui@default:default,de.cau.cs.kieler.core@default:default,de.cau.cs.kieler.kiml.gmf@default:default,de.cau.cs.kieler.kiml.service@default:default,de.cau.cs.kieler.kiml.ui@default:default,de.cau.cs.kieler.kiml@default:default,de.cau.cs.kieler.klay.force@default:default,de.cau.cs.kieler.klay.layered@default:default,javax.activation@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml.bind@default:default,javax.xml.stream@default:default,javax.xml@default:default,lpg.runtime.java@default:default,metrics@default:default,net.sf.jautodoc.velocity@default:default,net.sf.jautodoc@default:default,net.sourceforge.nattable.core@default:default,org.antlr.runtime*3.0.0.v200803061811@default:default,org.antlr.runtime*3.2.0.v201101311130@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@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.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@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.commons.primitives@default:default,org.apache.derby@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@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene*2.9.1.v201101211721@default:default,org.apache.lucene*3.5.0.v20120319-2345@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core*2.9.1.v201101211721@default:default,org.apache.lucene.core*3.5.0.v20120319-2345@default:default,org.apache.lucene.highlighter@default:default,org.apache.lucene.memory@default:default,org.apache.lucene.misc*2.9.1.v20100421-0704@default:default,org.apache.lucene.misc*3.5.0.v20120319-2345@default:default,org.apache.lucene.queries*2.9.1.v20100421-0704@default:default,org.apache.lucene.queries*3.5.0.v20120319-2345@default:default,org.apache.lucene.snowball@default:default,org.apache.lucene.spellchecker@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.common.ui@default:default,org.eclipse.acceleo.common@default:default,org.eclipse.acceleo.compatibility.ui@default:default,org.eclipse.acceleo.compatibility@default:default,org.eclipse.acceleo.doc@default:default,org.eclipse.acceleo.engine@default:default,org.eclipse.acceleo.examples@default:default,org.eclipse.acceleo.ide.ui@default:default,org.eclipse.acceleo.model.edit@default:default,org.eclipse.acceleo.model@default:default,org.eclipse.acceleo.parser@default:default,org.eclipse.acceleo.profiler.edit@default:default,org.eclipse.acceleo.profiler.editor@default:default,org.eclipse.acceleo.profiler@default:default,org.eclipse.acceleo.traceability.model@default:default,org.eclipse.acceleo.traceability@default:default,org.eclipse.acceleo.ui.capabilities@default:default,org.eclipse.acceleo.ui.interpreter@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@default:default,org.eclipse.b3.p2@default:default,org.eclipse.b3.util@default:default,org.eclipse.buckminster.osgi.filter@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@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.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@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.dltk.console.ui@default:default,org.eclipse.dltk.console@default:default,org.eclipse.dltk.core.index.sql.h2@default:default,org.eclipse.dltk.core.index.sql@default:default,org.eclipse.dltk.core.index@default:default,org.eclipse.dltk.core.manipulation@default:default,org.eclipse.dltk.core@default:default,org.eclipse.dltk.debug.ui@default:default,org.eclipse.dltk.debug@default:default,org.eclipse.dltk.formatter@default:default,org.eclipse.dltk.launching@default:default,org.eclipse.dltk.logconsole.ui@default:default,org.eclipse.dltk.logconsole@default:default,org.eclipse.dltk.testing@default:default,org.eclipse.dltk.ui@default:default,org.eclipse.dltk.validators.core@default:default,org.eclipse.dltk.validators.externalchecker@default:default,org.eclipse.dltk.validators.ui@default:default,org.eclipse.dltk@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.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@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.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@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.discovery@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.discovery@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.provider.jmdns@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.import@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.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@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.diff.edit@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare.ui@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.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.example.installer@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.facet.aggregate.doc@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@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@default:default,org.eclipse.emf.facet.custom.sdk.core@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@default:default,org.eclipse.emf.facet.ecore@default:default,org.eclipse.emf.facet.efacet.catalog@default:default,org.eclipse.emf.facet.efacet.core@default:default,org.eclipse.emf.facet.efacet.doc@default:default,org.eclipse.emf.facet.efacet.edit@default:default,org.eclipse.emf.facet.efacet.editor@default:default,org.eclipse.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.emf.facet.efacet.metamodel@default:default,org.eclipse.emf.facet.efacet.ui@default:default,org.eclipse.emf.facet.efacet@default:default,org.eclipse.emf.facet.infra.browser.custom.core@default:default,org.eclipse.emf.facet.infra.browser.custom.edit@default:default,org.eclipse.emf.facet.infra.browser.custom.editor@default:default,org.eclipse.emf.facet.infra.browser.custom.examples.uml@default:default,org.eclipse.emf.facet.infra.browser.custom.ui@default:default,org.eclipse.emf.facet.infra.browser.custom@default:default,org.eclipse.emf.facet.infra.browser.doc@default:default,org.eclipse.emf.facet.infra.browser.uicore.examples.cnf@default:default,org.eclipse.emf.facet.infra.browser.uicore@default:default,org.eclipse.emf.facet.infra.browser@default:default,org.eclipse.emf.facet.infra.common.core@default:default,org.eclipse.emf.facet.infra.common.ui@default:default,org.eclipse.emf.facet.infra.facet.core@default:default,org.eclipse.emf.facet.infra.facet.edit@default:default,org.eclipse.emf.facet.infra.facet.editor@default:default,org.eclipse.emf.facet.infra.facet.ui@default:default,org.eclipse.emf.facet.infra.facet@default:default,org.eclipse.emf.facet.infra.query.core@default:default,org.eclipse.emf.facet.infra.query.edit@default:default,org.eclipse.emf.facet.infra.query.editor@default:default,org.eclipse.emf.facet.infra.query.ui@default:default,org.eclipse.emf.facet.infra.query@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.ui@default:default,org.eclipse.emf.facet.query.java@default:default,org.eclipse.emf.facet.releng.tools@default:default,org.eclipse.emf.facet.util.core@default:default,org.eclipse.emf.facet.util.emf.catalog@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@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.nattable.doc@default:default,org.eclipse.emf.facet.widgets.nattable.examples.ecore@default:default,org.eclipse.emf.facet.widgets.nattable.instance.edit@default:default,org.eclipse.emf.facet.widgets.nattable.instance@default:default,org.eclipse.emf.facet.widgets.nattable.tableconfiguration.edit@default:default,org.eclipse.emf.facet.widgets.nattable.tableconfiguration.editor@default:default,org.eclipse.emf.facet.widgets.nattable.tableconfiguration@default:default,org.eclipse.emf.facet.widgets.nattable@default:default,org.eclipse.emf.facet.widgets.table.doc@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@default:default,org.eclipse.emf.generic.editor@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.ui@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@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@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.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.epp.package.rcp@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.win32.win32.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.ql@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.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,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@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.ecore.editor@default:default,org.eclipse.gmf.examples.runtime.ui.pde@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.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.tooldef.edit@default:default,org.eclipse.gmf.tooldef@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.gmt.modisco.examples@default:default,org.eclipse.gmt.modisco.infra.browser.custom.core@default:default,org.eclipse.gmt.modisco.infra.browser.custom.editor@default:default,org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk@default:default,org.eclipse.gmt.modisco.infra.browser.custom.examples.uml@default:default,org.eclipse.gmt.modisco.infra.browser.custom.ui@default:default,org.eclipse.gmt.modisco.infra.browser.custom@default:default,org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf@default:default,org.eclipse.gmt.modisco.infra.browser.uicore@default:default,org.eclipse.gmt.modisco.infra.browser@default:default,org.eclipse.gmt.modisco.infra.capabilities@default:default,org.eclipse.gmt.modisco.infra.common.cdo@default:default,org.eclipse.gmt.modisco.infra.common.core@default:default,org.eclipse.gmt.modisco.infra.common.ui@default:default,org.eclipse.gmt.modisco.infra.discoverymanager@default:default,org.eclipse.gmt.modisco.infra.facet.core@default:default,org.eclipse.gmt.modisco.infra.facet.edit@default:default,org.eclipse.gmt.modisco.infra.facet.editor@default:default,org.eclipse.gmt.modisco.infra.facet.ui@default:default,org.eclipse.gmt.modisco.infra.facet@default:default,org.eclipse.gmt.modisco.infra.query.core@default:default,org.eclipse.gmt.modisco.infra.query.edit@default:default,org.eclipse.gmt.modisco.infra.query.editor@default:default,org.eclipse.gmt.modisco.infra.query.jxpath@default:default,org.eclipse.gmt.modisco.infra.query.ui@default:default,org.eclipse.gmt.modisco.infra.query@default:default,org.eclipse.gmt.modisco.java.browser.customization@default:default,org.eclipse.gmt.modisco.java.cdo@default:default,org.eclipse.gmt.modisco.java.discoverer.cdo@default:default,org.eclipse.gmt.modisco.java.discoverer@default:default,org.eclipse.gmt.modisco.java.generation@default:default,org.eclipse.gmt.modisco.java.queries@default:default,org.eclipse.gmt.modisco.java@default:default,org.eclipse.gmt.modisco.kdm.browser.extension@default:default,org.eclipse.gmt.modisco.kdm.source.discoverer@default:default,org.eclipse.gmt.modisco.kdm.uml2converter@default:default,org.eclipse.gmt.modisco.omg.kdm@default:default,org.eclipse.gmt.modisco.omg.smm@default:default,org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder@default:default,org.eclipse.gmt.modisco.workflow.mwe@default:default,org.eclipse.gmt.modisco.workflow@default:default,org.eclipse.gmt.modisco.xml.browser.customization@default:default,org.eclipse.gmt.modisco.xml.discoverer@default:default,org.eclipse.gmt.modisco.xml@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@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@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.jmx@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.jetty.webapp@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@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.jdt@default:default,org.eclipse.m2e.launching@default:default,org.eclipse.m2e.lifecyclemapping.defaults@default:default,org.eclipse.m2e.logback.appender@default:false,org.eclipse.m2e.logback.configuration@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.refactoring@default:default,org.eclipse.m2e.scm@default:default,org.eclipse.m2m.atl.adt.debug@default:default,org.eclipse.m2m.atl.adt.editor@default:default,org.eclipse.m2m.atl.adt.ui@default:default,org.eclipse.m2m.atl.adt@default:default,org.eclipse.m2m.atl.cheatsheets@default:default,org.eclipse.m2m.atl.common@default:default,org.eclipse.m2m.atl.core.ant@default:default,org.eclipse.m2m.atl.core.emf@default:default,org.eclipse.m2m.atl.core.ui.vm@default:default,org.eclipse.m2m.atl.core.ui@default:default,org.eclipse.m2m.atl.core@default:default,org.eclipse.m2m.atl.debug.core@default:default,org.eclipse.m2m.atl.doc@default:default,org.eclipse.m2m.atl.drivers.emf4atl@default:default,org.eclipse.m2m.atl.drivers.uml24atl@default:default,org.eclipse.m2m.atl.dsls@default:default,org.eclipse.m2m.atl.engine.emfvm.launch@default:default,org.eclipse.m2m.atl.engine.emfvm@default:default,org.eclipse.m2m.atl.engine.vm@default:default,org.eclipse.m2m.atl.engine@default:default,org.eclipse.m2m.atl.examples@default:default,org.eclipse.m2m.atl.profiler.core@default:default,org.eclipse.m2m.atl.profiler.emfvm@default:default,org.eclipse.m2m.atl.profiler.exportmodel.editor@default:default,org.eclipse.m2m.atl.profiler.exportmodel@default:default,org.eclipse.m2m.atl.profiler.model@default:default,org.eclipse.m2m.atl.profiler.ui@default:default,org.eclipse.m2m.atl.profiler.vm@default:default,org.eclipse.m2m.atl@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.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.mat.api@default:default,org.eclipse.mat.dtfj@default:default,org.eclipse.mat.hprof@default:default,org.eclipse.mat.ibmdumps@default:default,org.eclipse.mat.jdt@default:default,org.eclipse.mat.jruby.resolver@default:default,org.eclipse.mat.parser@default:default,org.eclipse.mat.report@default:default,org.eclipse.mat.ui.help@default:default,org.eclipse.mat.ui@default:default,org.eclipse.modisco.doc@default:default,org.eclipse.modisco.infra.discovery.core@default:default,org.eclipse.modisco.infra.discovery.ui@default:default,org.eclipse.modisco.infra.discovery@default:default,org.eclipse.modisco.infra.omg.doc@default:default,org.eclipse.modisco.infrastructure.doc@default:default,org.eclipse.modisco.java.composition.browser.customization@default:default,org.eclipse.modisco.java.composition.discoverer.ui@default:default,org.eclipse.modisco.java.composition.discoverer@default:default,org.eclipse.modisco.java.composition.ui@default:default,org.eclipse.modisco.java.composition@default:default,org.eclipse.modisco.java.discoverer.cdo@default:default,org.eclipse.modisco.java.discoverer.ui@default:default,org.eclipse.modisco.java.discoverer@default:default,org.eclipse.modisco.java.doc@default:default,org.eclipse.modisco.jee.doc@default:default,org.eclipse.modisco.jee.ejbjar.discoverer.ui@default:default,org.eclipse.modisco.jee.ejbjar.discoverer@default:default,org.eclipse.modisco.jee.ejbjar@default:default,org.eclipse.modisco.jee.facet@default:default,org.eclipse.modisco.jee.jsp.browser.customization@default:default,org.eclipse.modisco.jee.jsp.discoverer.ui@default:default,org.eclipse.modisco.jee.jsp.discoverer@default:default,org.eclipse.modisco.jee.jsp.generation@default:default,org.eclipse.modisco.jee.jsp@default:default,org.eclipse.modisco.jee.queries@default:default,org.eclipse.modisco.jee.webapp.discoverer.ui@default:default,org.eclipse.modisco.jee.webapp.discoverer@default:default,org.eclipse.modisco.jee.webapp@default:default,org.eclipse.modisco.jee@default:default,org.eclipse.modisco.kdm.source.discoverer.ui@default:default,org.eclipse.modisco.kdm.source.discoverer@default:default,org.eclipse.modisco.kdm.source.extension.ui.browser@default:default,org.eclipse.modisco.kdm.source.extension.ui@default:default,org.eclipse.modisco.kdm.source.extension@default:default,org.eclipse.modisco.kdm.uml2converter.ui@default:default,org.eclipse.modisco.kdm.uml2converter@default:default,org.eclipse.modisco.omg.gastm@default:default,org.eclipse.modisco.omg.smm@default:default,org.eclipse.modisco.util.atl.core@default:default,org.eclipse.modisco.workflow.core@default:default,org.eclipse.modisco.workflow.ui@default:default,org.eclipse.modisco.workflow@default:default,org.eclipse.modisco.xml.discoverer.ui@default:default,org.eclipse.modisco.xml.discoverer@default:default,org.eclipse.modisco.xml.doc@default:default,org.eclipse.mylyn.bugzilla.core@default:default,org.eclipse.mylyn.bugzilla.ide@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.identity@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.notifications@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.repositories@default:default,org.eclipse.mylyn.commons.screenshots@default:default,org.eclipse.mylyn.commons.team@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.discovery.core@default:default,org.eclipse.mylyn.discovery.ui@default:default,org.eclipse.mylyn.gerrit.core@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.help.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.pde.ui@default:default,org.eclipse.mylyn.resources.ui@default:default,org.eclipse.mylyn.reviews.core@default:default,org.eclipse.mylyn.reviews.ui@default:default,org.eclipse.mylyn.tasks.bugs@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.cvs@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.confluence.core@default:default,org.eclipse.mylyn.wikitext.confluence.ui@default:default,org.eclipse.mylyn.wikitext.core@default:default,org.eclipse.mylyn.wikitext.help.ui@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.net4j.db@default:default,org.eclipse.net4j.tcp@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@default:default,org.eclipse.ocl.edit@default:default,org.eclipse.ocl.examples.codegen@default:default,org.eclipse.ocl.examples.common@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.eventmanager@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.modelregistry.edit@default:default,org.eclipse.ocl.examples.modelregistry.editor@default:default,org.eclipse.ocl.examples.modelregistry.ui@default:default,org.eclipse.ocl.examples.modelregistry@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.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@default:default,org.eclipse.ocl.ui@default:default,org.eclipse.ocl.uml.edit@default:default,org.eclipse.ocl.uml.ui@default:default,org.eclipse.ocl.uml@default:default,org.eclipse.ocl@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,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.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.php.core.parser@default:default,org.eclipse.php.core@default:default,org.eclipse.php.debug.core@default:default,org.eclipse.php.debug.daemon@default:default,org.eclipse.php.debug.ui@default:default,org.eclipse.php.help@default:default,org.eclipse.php.server.core@default:default,org.eclipse.php.server.ui@default:default,org.eclipse.php.ui@default:default,org.eclipse.php@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rap.help@default:default,org.eclipse.rap.ui.intro@default:default,org.eclipse.rap.ui.launch.rwt@default:default,org.eclipse.rap.ui.launch@default:default,org.eclipse.rap.ui.templates@default:default,org.eclipse.rcp@default:default,org.eclipse.recommenders.aether@default:default,org.eclipse.recommenders.completion.rcp.calls@default:default,org.eclipse.recommenders.completion.rcp.chain@default:default,org.eclipse.recommenders.completion.rcp.e38@default:false,org.eclipse.recommenders.completion.rcp.overrides@default:default,org.eclipse.recommenders.completion.rcp.subwords@default:default,org.eclipse.recommenders.completion.rcp.templates@default:default,org.eclipse.recommenders.completion.rcp@default:default,org.eclipse.recommenders.doc@default:default,org.eclipse.recommenders.extdoc.rcp@default:default,org.eclipse.recommenders.extdoc@default:default,org.eclipse.recommenders.injection@default:default,org.eclipse.recommenders.jayes.serialization@default:default,org.eclipse.recommenders.jayes@default:default,org.eclipse.recommenders.rcp@default:default,org.eclipse.recommenders.utils.rcp@default:default,org.eclipse.recommenders.utils@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@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.ui@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.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.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@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.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore.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.doc@default:default,org.eclipse.uml2.examples.uml.ui@default:default,org.eclipse.uml2.examples@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.ecore.exporter@default:default,org.eclipse.uml2.uml.ecore.importer@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.l2@default:default,org.eclipse.uml2.uml.profile.l3@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.uml2@default:default,org.eclipse.update.configurator@3:true,org.eclipse.viatra2.core2@default:default,org.eclipse.viatra2.editor.text@default:default,org.eclipse.viatra2.editor@default:default,org.eclipse.viatra2.emf.importer.generic.exporter@default:default,org.eclipse.viatra2.emf.importer.generic@default:default,org.eclipse.viatra2.emf.incquery.codegen.gtasm@default:default,org.eclipse.viatra2.emf.incquery.codegen.patternmatcher@default:default,org.eclipse.viatra2.emf.incquery.codegen.term@default:default,org.eclipse.viatra2.emf.incquery.core@default:default,org.eclipse.viatra2.emf.incquery.gui@default:default,org.eclipse.viatra2.emf.incquery.model.edit@default:default,org.eclipse.viatra2.emf.incquery.model.editor@default:default,org.eclipse.viatra2.emf.incquery.model@default:default,org.eclipse.viatra2.emf.incquery.runtime@default:default,org.eclipse.viatra2.gtasm.interpreter.impl@default:default,org.eclipse.viatra2.gtasm.interpreter.term@default:default,org.eclipse.viatra2.gtasm.interpreter@default:default,org.eclipse.viatra2.gtasm.model.edit@default:default,org.eclipse.viatra2.gtasm.model@default:default,org.eclipse.viatra2.gtasm.patternmatcher.impl@default:default,org.eclipse.viatra2.gtasm.patternmatcher.incremental.rete@default:default,org.eclipse.viatra2.gtasm.patternmatcher.incremental@default:default,org.eclipse.viatra2.gtasm.patternmatcher@default:default,org.eclipse.viatra2.gtasm.support@default:default,org.eclipse.viatra2.gtasm.trigger@default:default,org.eclipse.viatra2.gtasm.typing.model@default:default,org.eclipse.viatra2.gui@default:default,org.eclipse.viatra2.help.wiki@default:default,org.eclipse.viatra2.help@default:default,org.eclipse.viatra2.imports.uml2.galileo@default:default,org.eclipse.viatra2.imports.vtml@default:default,org.eclipse.viatra2.loaders.vtcl_lpgparser@default:default,org.eclipse.viatra2.natives.strings@default:default,org.eclipse.wb.core.databinding@default:default,org.eclipse.wb.core.lib@default:default,org.eclipse.wb.core.ui@default:default,org.eclipse.wb.core@default:default,org.eclipse.wb.discovery.core@default:default,org.eclipse.wb.discovery.ui@default:default,org.eclipse.wb.layout.group@default:default,org.eclipse.wb.os.win32@default:default,org.eclipse.wb.os@default:default,org.eclipse.wb.rcp.databinding.emf@default:default,org.eclipse.wb.rcp.databinding@default:default,org.eclipse.wb.rcp.nebula@default:default,org.eclipse.wb.rcp.swing2swt@default:default,org.eclipse.wb.rcp@default:default,org.eclipse.wb.runtime.lib@default:default,org.eclipse.wb.runtime@default:default,org.eclipse.wb.swt.widgets.baseline@default:default,org.eclipse.wb.swt@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.emfworkbench.integration@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.infopop@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.snippets@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.wst.dtd.core@default:default,org.eclipse.wst.dtd.ui.infopop@default:default,org.eclipse.wst.dtd.ui@default:default,org.eclipse.wst.dtdeditor.doc.user@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.wst.internet.cache@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.jsdt.web.core@default:default,org.eclipse.wst.jsdt.web.ui@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.doc.user@default:default,org.eclipse.wst.sse.ui.infopop@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.standard.schemas@default:default,org.eclipse.wst.validation.infopop@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.web@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui.infopop@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xmleditor.doc.user@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.wst.xsd.ui@default:default,org.eclipse.wst.xsdeditor.doc.user@default:default,org.eclipse.xpand.activities@default:default,org.eclipse.xpand.doc@default:default,org.eclipse.xpand.examples@default:default,org.eclipse.xpand.incremental@default:default,org.eclipse.xpand.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd.edit@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.check.ui@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.profiler@default:default,org.eclipse.xtend.shared.ui@default:default,org.eclipse.xtend.typesystem.emf.ui@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend.typesystem.uml2.ui@default:default,org.eclipse.xtend.typesystem.uml2@default:default,org.eclipse.xtend.typesystem.xsd.ui@default:default,org.eclipse.xtend.typesystem.xsd@default:default,org.eclipse.xtend.ui@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.xtend2.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@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.gmf.glue@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.junit@default:default,org.eclipse.xtext.logging@default:false,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.junit@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.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.xtend@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@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.layouts@default:default,org.h2@default:default,org.hamcrest.core@default:default,org.jacoco.agent@default:default,org.jacoco.core@default:default,org.jacoco.report@default:default,org.jboss.netty@default:default,org.jdom@default:default,org.jsoup@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.junit4@default:default,org.kohsuke.args4j@default:default,org.mortbay.jetty.util@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.tigris.subversion.clientadapter.javahl.win64@default:false,org.tigris.subversion.clientadapter.javahl@default:default,org.tigris.subversion.clientadapter@default:default,org.tigris.subversion.subclipse.core@default:default,org.tigris.subversion.subclipse.doc@default:default,org.tigris.subversion.subclipse.tools.usage@default:default,org.tigris.subversion.subclipse.ui@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.0.v200806040011@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="garbage_collector@default:default,metrics@default:default,org.eclipse.epf.common.html@default:default,org.eclipse.epf.common.ui@default:default,org.eclipse.epf.common.win32.win32.x86_64@default:default,org.eclipse.epf.common@default:default,org.eclipse.epf.richtext@default:default,org.eclipse.papyrus.codegen@default:default,org.eclipse.papyrus.customization.palette.properties@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.tests@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.java.utils@default:default,org.eclipse.papyrus.diagramdev.modelexplorer@default:default,org.eclipse.papyrus.diagramtemplate.doc@default:default,org.eclipse.papyrus.diagramtemplate.edit@default:default,org.eclipse.papyrus.diagramtemplate.editor@default:default,org.eclipse.papyrus.diagramtemplate@default:default,org.eclipse.papyrus.doc@default:default,org.eclipse.papyrus.documentation.plugin@default:default,org.eclipse.papyrus.domaincodegen.ui@default:default,org.eclipse.papyrus.domaincontextcodegen.edit@default:default,org.eclipse.papyrus.domaincontextcodegen.editor@default:default,org.eclipse.papyrus.domaincontextcodegen@default:default,org.eclipse.papyrus.eclipse.project.editors@default:default,org.eclipse.papyrus.editor.perspectiveconfiguration@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.emf.commandstack@default:default,org.eclipse.papyrus.example.text.instance@default:default,org.eclipse.papyrus.example.uml.comment.editor.newresource@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.gmfgenextension@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor@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.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.editor@default:default,org.eclipse.papyrus.infra.emf.embeddededitor@default:default,org.eclipse.papyrus.infra.emf.newchild@default:default,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.export@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.palette@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.css.xtext@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@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.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.queries.core.configuration.edit@default:default,org.eclipse.papyrus.infra.queries.core.configuration@default:default,org.eclipse.papyrus.infra.queries.core@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.resourceloading.preferences@default:default,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.table.common@default:default,org.eclipse.papyrus.infra.table.instance@default:default,org.eclipse.papyrus.infra.table.menu@default:default,org.eclipse.papyrus.infra.table.modelexplorer@default:default,org.eclipse.papyrus.infra.table.properties@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.migration.properties.model@default:default,org.eclipse.papyrus.outline.emftree@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.internalblock@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.facets@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml.table.allocation@default:default,org.eclipse.papyrus.sysml.table.requirement@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.team.svn@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.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.diagram.activity@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@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.emftree@default:default,org.eclipse.papyrus.uml.diagram.icons@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.package@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.documentation@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.pastemanager@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.tabbedproperties.comments@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.standard.edit@default:default,org.eclipse.papyrus.uml.standard@default:default,org.eclipse.papyrus.uml.table.default@default:default,org.eclipse.papyrus.uml.table.widgets.celleditors@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.constraintwithessentialocl.xtext@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.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@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.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.ui.perspectiveconfiguration@default:default,org.eclipse.papyrus.views.documentation.view.papyrus@default:default,org.eclipse.papyrus.views.documentation.view@default:default,org.eclipse.papyrus.views.documentation@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties.model.edit@default:default,org.eclipse.papyrus.views.properties.model.editor@default:default,org.eclipse.papyrus.views.properties.model@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.xwt@default:default,org.eclipse.xtext.gmf.glue@default:default,skip_error_log@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.google.guava*10.0.1.v201203051515@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,com.sun.syndication@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,lpg.runtime.java@default:default,net.sourceforge.nattable.core@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@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.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@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@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.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.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@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@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@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.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@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.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@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.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@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@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.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.example.installer@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.facet.common.core@default:default,org.eclipse.emf.facet.common.ui@default:default,org.eclipse.emf.facet.custom.core@default:default,org.eclipse.emf.facet.custom.metamodel@default:default,org.eclipse.emf.facet.custom.ui@default:default,org.eclipse.emf.facet.efacet.catalog@default:default,org.eclipse.emf.facet.efacet.core@default:default,org.eclipse.emf.facet.efacet.metamodel@default:default,org.eclipse.emf.facet.efacet.ui@default:default,org.eclipse.emf.facet.efacet@default:default,org.eclipse.emf.facet.infra.browser.custom.core@default:default,org.eclipse.emf.facet.infra.browser.custom.edit@default:default,org.eclipse.emf.facet.infra.browser.custom.ui@default:default,org.eclipse.emf.facet.infra.browser.custom@default:default,org.eclipse.emf.facet.infra.browser.uicore@default:default,org.eclipse.emf.facet.infra.browser@default:default,org.eclipse.emf.facet.infra.common.core@default:default,org.eclipse.emf.facet.infra.common.ui@default:default,org.eclipse.emf.facet.infra.facet.core@default:default,org.eclipse.emf.facet.infra.facet.edit@default:default,org.eclipse.emf.facet.infra.facet.editor@default:default,org.eclipse.emf.facet.infra.facet.ui@default:default,org.eclipse.emf.facet.infra.facet@default:default,org.eclipse.emf.facet.infra.query.core@default:default,org.eclipse.emf.facet.infra.query.edit@default:default,org.eclipse.emf.facet.infra.query.editor@default:default,org.eclipse.emf.facet.infra.query.ui@default:default,org.eclipse.emf.facet.infra.query@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@default:default,org.eclipse.emf.facet.util.core@default:default,org.eclipse.emf.facet.util.emf.catalog@default:default,org.eclipse.emf.facet.util.emf.core@default:default,org.eclipse.emf.facet.util.emf.ui@default:default,org.eclipse.emf.facet.util.ui@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@default:default,org.eclipse.emf.facet.widgets.nattable.instance.edit@default:default,org.eclipse.emf.facet.widgets.nattable.instance@default:default,org.eclipse.emf.facet.widgets.nattable.tableconfiguration.edit@default:default,org.eclipse.emf.facet.widgets.nattable.tableconfiguration@default:default,org.eclipse.emf.facet.widgets.nattable@default:default,org.eclipse.emf.facet.widgets.table.metamodel@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.ui@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@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@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.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@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@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.ql@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.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@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.ecore.editor@default:default,org.eclipse.gmf.examples.runtime.ui.pde@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.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.tooldef.edit@default:default,org.eclipse.gmf.tooldef@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.gmt.modisco.infra.common.core@default:default,org.eclipse.gmt.modisco.infra.common.ui@default:default,org.eclipse.gmt.modisco.infra.discoverymanager@default:default,org.eclipse.gmt.modisco.xml.discoverer@default:default,org.eclipse.gmt.modisco.xml@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@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.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@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@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.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.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.modisco.infra.discovery.core@default:default,org.eclipse.modisco.infra.discovery.ui@default:default,org.eclipse.modisco.infra.discovery@default:default,org.eclipse.modisco.xml.discoverer@default:default,org.eclipse.mylyn.bugzilla.core@default:default,org.eclipse.mylyn.bugzilla.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.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.ui@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.mylyn.discovery.ui@default:default,org.eclipse.mylyn.git.core@default:default,org.eclipse.mylyn.git.ui@default:default,org.eclipse.mylyn.monitor.core@default:default,org.eclipse.mylyn.monitor.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.versions.core@default:default,org.eclipse.mylyn.versions.ui@default:default,org.eclipse.mylyn.wikitext.confluence.core@default:default,org.eclipse.mylyn.wikitext.confluence.ui@default:default,org.eclipse.mylyn.wikitext.core@default:default,org.eclipse.mylyn.wikitext.help.ui@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.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.examples.common@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.xtext.base@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.uml@default:default,org.eclipse.ocl@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,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.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.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.ui@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.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.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@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.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore.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.doc@default:default,org.eclipse.uml2.examples.uml.ui@default:default,org.eclipse.uml2.examples@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.ecore.exporter@default:default,org.eclipse.uml2.uml.ecore.importer@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.l2@default:default,org.eclipse.uml2.uml.profile.l3@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.uml2@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.emfworkbench.integration@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.infopop@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.snippets@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.dtd.core@default:default,org.eclipse.wst.dtd.ui.infopop@default:default,org.eclipse.wst.dtd.ui@default:default,org.eclipse.wst.dtdeditor.doc.user@default:default,org.eclipse.wst.internet.cache@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.doc.user@default:default,org.eclipse.wst.sse.ui.infopop@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.standard.schemas@default:default,org.eclipse.wst.validation.infopop@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.infopop@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xmleditor.doc.user@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.wst.xsd.ui@default:default,org.eclipse.wst.xsdeditor.doc.user@default:default,org.eclipse.xpand.activities@default:default,org.eclipse.xpand.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd.edit@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.check.ui@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.profiler@default:default,org.eclipse.xtend.shared.ui@default:default,org.eclipse.xtend.typesystem.emf.ui@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend.typesystem.uml2.ui@default:default,org.eclipse.xtend.typesystem.uml2@default:default,org.eclipse.xtend.typesystem.xsd.ui@default:default,org.eclipse.xtend.typesystem.xsd@default:default,org.eclipse.xtend.ui@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@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.junit4@default:default,org.eclipse.xtext.junit@default:default,org.eclipse.xtext.logging@default:false,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.junit@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.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.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.jdom@default:default,org.jsoup@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.0.v200806040011@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.tests@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.views.properties@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.di b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.di
index a5de4f0839d..db51c0f9812 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.di
+++ b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.di
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>
+<?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>
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.notation b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.notation
index 0e4deeb57d0..0dba8ee24fc 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.notation
+++ b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.notation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_URvJoMD9EeGp8LlPJ4gYgw" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_URvJoMD9EeGp8LlPJ4gYgw" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_Vi9g8MD9EeGp8LlPJ4gYgw" type="1026">
<children xmi:type="notation:DecorationNode" xmi:id="_Vi9g8sD9EeGp8LlPJ4gYgw" type="1034"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_Vi9g88D9EeGp8LlPJ4gYgw" type="1071">
@@ -20,6 +20,10 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_Vi9g-8D9EeGp8LlPJ4gYgw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vi9g_MD9EeGp8LlPJ4gYgw"/>
</children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7PMfoGZQEeOCkJtHBIGqgQ" visible="false" type="compartment_shape_display">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7PMfoWZQEeOCkJtHBIGqgQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7PMfomZQEeOCkJtHBIGqgQ"/>
+ </children>
<element xmi:type="uml:Stereotype" href="model3.profile.uml#_Vi0XAMD9EeGp8LlPJ4gYgw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vi9g8cD9EeGp8LlPJ4gYgw" x="755" y="170"/>
</children>
@@ -43,6 +47,10 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_VvKw-8D9EeGp8LlPJ4gYgw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_VvKw_MD9EeGp8LlPJ4gYgw"/>
</children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7TxdoGZQEeOCkJtHBIGqgQ" visible="false" type="compartment_shape_display">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7TxdoWZQEeOCkJtHBIGqgQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TxdomZQEeOCkJtHBIGqgQ"/>
+ </children>
<element xmi:type="uml:Stereotype" href="model3.profile.uml#_VvA_8MD9EeGp8LlPJ4gYgw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_VvKw8cD9EeGp8LlPJ4gYgw" x="540" y="170"/>
</children>
@@ -66,6 +74,10 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_WCgju8D9EeGp8LlPJ4gYgw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_WCgjvMD9EeGp8LlPJ4gYgw"/>
</children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7T0g8GZQEeOCkJtHBIGqgQ" visible="false" type="compartment_shape_display">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7T0g8WZQEeOCkJtHBIGqgQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7T0g8mZQEeOCkJtHBIGqgQ"/>
+ </children>
<element xmi:type="uml:Stereotype" href="model3.profile.uml#_WCWysMD9EeGp8LlPJ4gYgw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_WCgjscD9EeGp8LlPJ4gYgw" x="165" y="170"/>
</children>
@@ -93,6 +105,10 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_WCzeq8D9EeGp8LlPJ4gYgw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_WCzerMD9EeGp8LlPJ4gYgw"/>
</children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7T29MGZQEeOCkJtHBIGqgQ" visible="false" type="compartment_shape_display">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7T29MWZQEeOCkJtHBIGqgQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7T29MmZQEeOCkJtHBIGqgQ"/>
+ </children>
<element xmi:type="uml:Stereotype" href="model3.profile.uml#_WCptoMD9EeGp8LlPJ4gYgw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_WCzeocD9EeGp8LlPJ4gYgw" x="95" y="370"/>
</children>
@@ -120,6 +136,10 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_WDGZm8D9EeGp8LlPJ4gYgw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_WDGZnMD9EeGp8LlPJ4gYgw"/>
</children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7T5ZcGZQEeOCkJtHBIGqgQ" visible="false" type="compartment_shape_display">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7T5ZcWZQEeOCkJtHBIGqgQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7T5ZcmZQEeOCkJtHBIGqgQ"/>
+ </children>
<element xmi:type="uml:Stereotype" href="model3.profile.uml#_WC9PoMD9EeGp8LlPJ4gYgw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_WDGZkcD9EeGp8LlPJ4gYgw" x="310" y="370"/>
</children>
@@ -151,6 +171,10 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_WDZUi8D9EeGp8LlPJ4gYgw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_WDZUjMD9EeGp8LlPJ4gYgw"/>
</children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7T71sGZQEeOCkJtHBIGqgQ" visible="false" type="compartment_shape_display">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7T71sWZQEeOCkJtHBIGqgQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7T71smZQEeOCkJtHBIGqgQ"/>
+ </children>
<element xmi:type="uml:Stereotype" href="model3.profile.uml#_WDQKkMD9EeGp8LlPJ4gYgw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_WDZUgcD9EeGp8LlPJ4gYgw" x="310" y="170"/>
</children>
@@ -163,6 +187,15 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YOWwNcD9EeGp8LlPJ4gYgw" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_YOM_MsD9EeGp8LlPJ4gYgw" type="1084"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7ULGQGZQEeOCkJtHBIGqgQ" visible="false" type="AppliedStereotypeCompartement">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7ULGQWZQEeOCkJtHBIGqgQ" showTitle="true"/>
+ <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_ShU5IKtKEeGF4uwJob34Mw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ULGQmZQEeOCkJtHBIGqgQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7ULtUGZQEeOCkJtHBIGqgQ" visible="false" type="compartment_shape_display">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7ULtUWZQEeOCkJtHBIGqgQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ULtUmZQEeOCkJtHBIGqgQ"/>
+ </children>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Activity"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_YOM_M8D9EeGp8LlPJ4gYgw" x="155" y="60"/>
</children>
@@ -175,6 +208,15 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YOWwP8D9EeGp8LlPJ4gYgw" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_YOWwOMD9EeGp8LlPJ4gYgw" type="1084"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7UOwoGZQEeOCkJtHBIGqgQ" visible="false" type="AppliedStereotypeCompartement">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7UOwoWZQEeOCkJtHBIGqgQ" showTitle="true"/>
+ <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sh6H8KtKEeGF4uwJob34Mw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UOwomZQEeOCkJtHBIGqgQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7UOwo2ZQEeOCkJtHBIGqgQ" visible="false" type="compartment_shape_display">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7UOwpGZQEeOCkJtHBIGqgQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UOwpWZQEeOCkJtHBIGqgQ"/>
+ </children>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_YOWwOcD9EeGp8LlPJ4gYgw" x="420" y="55"/>
</children>
@@ -187,6 +229,15 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YOf6JsD9EeGp8LlPJ4gYgw" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_YOWwQsD9EeGp8LlPJ4gYgw" type="1084"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7URz8GZQEeOCkJtHBIGqgQ" visible="false" type="AppliedStereotypeCompartement">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7URz8WZQEeOCkJtHBIGqgQ" showTitle="true"/>
+ <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_SievsKtKEeGF4uwJob34Mw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7URz8mZQEeOCkJtHBIGqgQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_7URz82ZQEeOCkJtHBIGqgQ" visible="false" type="compartment_shape_display">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_7URz9GZQEeOCkJtHBIGqgQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7URz9WZQEeOCkJtHBIGqgQ"/>
+ </children>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_YOf6IMD9EeGp8LlPJ4gYgw" x="655" y="60"/>
</children>
@@ -236,7 +287,7 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_bXpcYsD9EeGp8LlPJ4gYgw"/>
<element xmi:type="uml:Generalization" href="model3.profile.uml#_bXpcYMD9EeGp8LlPJ4gYgw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bXpcY8D9EeGp8LlPJ4gYgw" points="[50, -50, -197, 194]$[227, -238, -20, 6]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bXpcY8D9EeGp8LlPJ4gYgw" points="[0, -50, 216, 141]$[0, -115, 216, 76]$[-166, -115, 50, 76]$[-166, -150, 50, 41]"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bXymUMD9EeGp8LlPJ4gYgw" id="(0.2,0.59)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_b0XNkcD9EeGp8LlPJ4gYgw" type="4002" source="_WDGZkMD9EeGp8LlPJ4gYgw" target="_WDZUgMD9EeGp8LlPJ4gYgw">
@@ -245,7 +296,7 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_b0XNksD9EeGp8LlPJ4gYgw"/>
<element xmi:type="uml:Generalization" href="model3.profile.uml#_b0XNkMD9EeGp8LlPJ4gYgw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_b0XNk8D9EeGp8LlPJ4gYgw" points="[-50, -2, 541, 9]$[-598, -61, -7, -50]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_b0XNk8D9EeGp8LlPJ4gYgw" points="[0, -50, 0, 147]$[0, -110, 0, 87]$[0, -144, 0, 53]"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_ciLV0MD9EeGp8LlPJ4gYgw" type="1013" source="_WDZUgMD9EeGp8LlPJ4gYgw" target="_YOWwNsD9EeGp8LlPJ4gYgw" routing="Tree">
<styles xmi:type="notation:FontStyle" xmi:id="_ciLV0cD9EeGp8LlPJ4gYgw"/>
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.uml b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.uml
index f406a86244e..7f61cf16282 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.uml
+++ b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.uml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_URIssMD9EeGp8LlPJ4gYgw" name="profile" metaclassReference="_YN6EQMD9EeGp8LlPJ4gYgw _YN6EQcD9EeGp8LlPJ4gYgw _YN6EQsD9EeGp8LlPJ4gYgw">
- <eAnnotations xmi:id="_deInwcD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_deInwcD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML">
<contents xmi:type="ecore:EPackage" xmi:id="_sWINYcEWEeGmd-DVx7z1xw" name="profile" nsURI="http:///schemas/profile/_sWINYMEWEeGmd-DVx7z1xw/3" nsPrefix="profile">
<eClassifiers xmi:type="ecore:EClass" xmi:id="_sWINYsEWEeGmd-DVx7z1xw" name="Stereotype1">
- <eAnnotations xmi:id="_sWINY8EWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Vi0XAMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sWINY8EWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Vi0XAMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sWINZMEWEeGmd-DVx7z1xw" name="base_Comment" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_sWINZsEWEeGmd-DVx7z1xw" name="Stereotype2">
- <eAnnotations xmi:id="_sWINZ8EWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_VvA_8MD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sWINZ8EWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_VvA_8MD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sWINaMEWEeGmd-DVx7z1xw" name="base_Comment" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment"/>
</eStructuralFeatures>
@@ -18,25 +18,25 @@
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_sWINbMEWEeGmd-DVx7z1xw" name="Stereotype3">
- <eAnnotations xmi:id="_sWINbcEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCWysMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sWINbcEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCWysMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sWINbsEWEeGmd-DVx7z1xw" name="base_Activity" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Activity"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_sWINcMEWEeGmd-DVx7z1xw" name="Stereotype4" eSuperTypes="_sWINbMEWEeGmd-DVx7z1xw">
- <eAnnotations xmi:id="_sWINccEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCptoMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sWINccEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCptoMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_sWINcsEWEeGmd-DVx7z1xw" name="Property1" ordered="false" lowerBound="1"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_sWINdMEWEeGmd-DVx7z1xw" name="Stereotype5" eSuperTypes="_sWINbMEWEeGmd-DVx7z1xw _sWINe8EWEeGmd-DVx7z1xw">
- <eAnnotations xmi:id="_sWINdcEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WC9PoMD9EeGp8LlPJ4gYgw"/>
- <eAnnotations xmi:id="_sWINdsEWEeGmd-DVx7z1xw" source="duplicates">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sWINdcEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WC9PoMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sWINdsEWEeGmd-DVx7z1xw" source="duplicates">
<contents xmi:type="ecore:EAttribute" xmi:id="_sWINd8EWEeGmd-DVx7z1xw" name="Property1" ordered="false" lowerBound="1">
- <eAnnotations xmi:id="_sWINeMEWEeGmd-DVx7z1xw" source="redefines" references="_sWINf8EWEeGmd-DVx7z1xw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sWINeMEWEeGmd-DVx7z1xw" source="redefines" references="_sWINf8EWEeGmd-DVx7z1xw"/>
</contents>
</eAnnotations>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_sWINe8EWEeGmd-DVx7z1xw" name="Stereotype6">
- <eAnnotations xmi:id="_sWINfMEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WDQKkMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sWINfMEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WDQKkMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sWINfcEWEeGmd-DVx7z1xw" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
@@ -46,13 +46,13 @@
</contents>
<contents xmi:type="ecore:EPackage" xmi:id="_k9d9wcEWEeGmd-DVx7z1xw" name="profile" nsURI="http:///schemas/profile/_k9d9wMEWEeGmd-DVx7z1xw/2" nsPrefix="profile">
<eClassifiers xmi:type="ecore:EClass" xmi:id="_k9d9wsEWEeGmd-DVx7z1xw" name="Stereotype1">
- <eAnnotations xmi:id="_k9d9w8EWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Vi0XAMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_k9d9w8EWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Vi0XAMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_k9d9xMEWEeGmd-DVx7z1xw" name="base_Comment" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_k9d9xsEWEeGmd-DVx7z1xw" name="Stereotype2">
- <eAnnotations xmi:id="_k9d9x8EWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_VvA_8MD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_k9d9x8EWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_VvA_8MD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_k9d9yMEWEeGmd-DVx7z1xw" name="base_Comment" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment"/>
</eStructuralFeatures>
@@ -61,25 +61,25 @@
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_k9d9zMEWEeGmd-DVx7z1xw" name="Stereotype3">
- <eAnnotations xmi:id="_k9d9zcEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCWysMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_k9d9zcEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCWysMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_k9d9zsEWEeGmd-DVx7z1xw" name="base_Activity" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Activity"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_k9d90MEWEeGmd-DVx7z1xw" name="Stereotype4" eSuperTypes="_k9d9zMEWEeGmd-DVx7z1xw">
- <eAnnotations xmi:id="_k9d90cEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCptoMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_k9d90cEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCptoMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_k9d90sEWEeGmd-DVx7z1xw" name="Property1" ordered="false" lowerBound="1"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_k9d91MEWEeGmd-DVx7z1xw" name="Stereotype5" eSuperTypes="_k9d9zMEWEeGmd-DVx7z1xw _k9d928EWEeGmd-DVx7z1xw">
- <eAnnotations xmi:id="_k9d91cEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WC9PoMD9EeGp8LlPJ4gYgw"/>
- <eAnnotations xmi:id="_k9d91sEWEeGmd-DVx7z1xw" source="duplicates">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_k9d91cEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WC9PoMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_k9d91sEWEeGmd-DVx7z1xw" source="duplicates">
<contents xmi:type="ecore:EAttribute" xmi:id="_k9d918EWEeGmd-DVx7z1xw" name="Property1" ordered="false" lowerBound="1">
- <eAnnotations xmi:id="_k9d92MEWEeGmd-DVx7z1xw" source="redefines" references="_k9d938EWEeGmd-DVx7z1xw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_k9d92MEWEeGmd-DVx7z1xw" source="redefines" references="_k9d938EWEeGmd-DVx7z1xw"/>
</contents>
</eAnnotations>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_k9d928EWEeGmd-DVx7z1xw" name="Stereotype6">
- <eAnnotations xmi:id="_k9d93MEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WDQKkMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_k9d93MEWEeGmd-DVx7z1xw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WDQKkMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_k9d93cEWEeGmd-DVx7z1xw" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
@@ -89,13 +89,13 @@
</contents>
<contents xmi:type="ecore:EPackage" xmi:id="_nX6wUcD9EeGp8LlPJ4gYgw" name="profile" nsURI="http:///schemas/profile/_nX6wUMD9EeGp8LlPJ4gYgw/1" nsPrefix="profile">
<eClassifiers xmi:type="ecore:EClass" xmi:id="_nX6wUsD9EeGp8LlPJ4gYgw" name="Stereotype1">
- <eAnnotations xmi:id="_nX6wU8D9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Vi0XAMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nX6wU8D9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Vi0XAMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_nX6wVMD9EeGp8LlPJ4gYgw" name="base_Comment" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_nX6wVsD9EeGp8LlPJ4gYgw" name="Stereotype2">
- <eAnnotations xmi:id="_nX6wV8D9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_VvA_8MD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nX6wV8D9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_VvA_8MD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_nX6wWMD9EeGp8LlPJ4gYgw" name="base_Comment" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment"/>
</eStructuralFeatures>
@@ -104,25 +104,25 @@
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_nX6wXMD9EeGp8LlPJ4gYgw" name="Stereotype3">
- <eAnnotations xmi:id="_nX6wXcD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCWysMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nX6wXcD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCWysMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_nX6wXsD9EeGp8LlPJ4gYgw" name="base_Activity" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Activity"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_nX6wYMD9EeGp8LlPJ4gYgw" name="Stereotype4" eSuperTypes="_nX6wXMD9EeGp8LlPJ4gYgw">
- <eAnnotations xmi:id="_nX6wYcD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCptoMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nX6wYcD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCptoMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_nX6wYsD9EeGp8LlPJ4gYgw" name="Property1" ordered="false" lowerBound="1"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_nX6wZMD9EeGp8LlPJ4gYgw" name="Stereotype5" eSuperTypes="_nX6wXMD9EeGp8LlPJ4gYgw _nX6wa8D9EeGp8LlPJ4gYgw">
- <eAnnotations xmi:id="_nX6wZcD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WC9PoMD9EeGp8LlPJ4gYgw"/>
- <eAnnotations xmi:id="_nX6wZsD9EeGp8LlPJ4gYgw" source="duplicates">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nX6wZcD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WC9PoMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nX6wZsD9EeGp8LlPJ4gYgw" source="duplicates">
<contents xmi:type="ecore:EAttribute" xmi:id="_nX6wZ8D9EeGp8LlPJ4gYgw" name="Property1" ordered="false" lowerBound="1">
- <eAnnotations xmi:id="_nX6waMD9EeGp8LlPJ4gYgw" source="redefines" references="_nX6wb8D9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nX6waMD9EeGp8LlPJ4gYgw" source="redefines" references="_nX6wb8D9EeGp8LlPJ4gYgw"/>
</contents>
</eAnnotations>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_nX6wa8D9EeGp8LlPJ4gYgw" name="Stereotype6">
- <eAnnotations xmi:id="_nX6wbMD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WDQKkMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nX6wbMD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WDQKkMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_nX6wbcD9EeGp8LlPJ4gYgw" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
@@ -131,21 +131,21 @@
</eClassifiers>
</contents>
<contents xmi:type="ecore:EPackage" xmi:id="_deInwsD9EeGp8LlPJ4gYgw" name="profile" nsURI="http:///schemas/profile/_deInwMD9EeGp8LlPJ4gYgw/0" nsPrefix="profile">
- <eAnnotations xmi:id="_deSYw8D9EeGp8LlPJ4gYgw" source="PapyrusVersion">
- <details xmi:id="_deSYxMD9EeGp8LlPJ4gYgw" key="Version" value="0.0.1"/>
- <details xmi:id="_deSYxcD9EeGp8LlPJ4gYgw" key="Comment" value=""/>
- <details xmi:id="_deSYxsD9EeGp8LlPJ4gYgw" key="Copyright" value=""/>
- <details xmi:id="_deSYx8D9EeGp8LlPJ4gYgw" key="Date" value="2012-06-28"/>
- <details xmi:id="_deSYyMD9EeGp8LlPJ4gYgw" key="Author" value=""/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_deSYw8D9EeGp8LlPJ4gYgw" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_deSYxMD9EeGp8LlPJ4gYgw" key="Version" value="0.0.1"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_deSYxcD9EeGp8LlPJ4gYgw" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_deSYxsD9EeGp8LlPJ4gYgw" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_deSYx8D9EeGp8LlPJ4gYgw" key="Date" value="2012-06-28"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_deSYyMD9EeGp8LlPJ4gYgw" key="Author" value=""/>
</eAnnotations>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_deInw8D9EeGp8LlPJ4gYgw" name="Stereotype1">
- <eAnnotations xmi:id="_deInxMD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Vi0XAMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_deInxMD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Vi0XAMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_deInxcD9EeGp8LlPJ4gYgw" name="base_Comment" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_deInx8D9EeGp8LlPJ4gYgw" name="Stereotype2">
- <eAnnotations xmi:id="_deInyMD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_VvA_8MD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_deInyMD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_VvA_8MD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_deInycD9EeGp8LlPJ4gYgw" name="base_Comment" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment"/>
</eStructuralFeatures>
@@ -154,67 +154,67 @@
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_deInzcD9EeGp8LlPJ4gYgw" name="Stereotype3">
- <eAnnotations xmi:id="_deInzsD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCWysMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_deInzsD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCWysMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_deInz8D9EeGp8LlPJ4gYgw" name="base_Activity" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Activity"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_deIn0cD9EeGp8LlPJ4gYgw" name="Stereotype4" eSuperTypes="_deInzcD9EeGp8LlPJ4gYgw">
- <eAnnotations xmi:id="_deIn0sD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCptoMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_deIn0sD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WCptoMD9EeGp8LlPJ4gYgw"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_deIn1MD9EeGp8LlPJ4gYgw" name="Stereotype5" eSuperTypes="_deInzcD9EeGp8LlPJ4gYgw _deIn2MD9EeGp8LlPJ4gYgw">
- <eAnnotations xmi:id="_deIn1cD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WC9PoMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_deIn1cD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WC9PoMD9EeGp8LlPJ4gYgw"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_deIn2MD9EeGp8LlPJ4gYgw" name="Stereotype6">
- <eAnnotations xmi:id="_deIn2cD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WDQKkMD9EeGp8LlPJ4gYgw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_deIn2cD9EeGp8LlPJ4gYgw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WDQKkMD9EeGp8LlPJ4gYgw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_deIn2sD9EeGp8LlPJ4gYgw" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
</contents>
</eAnnotations>
- <elementImport xmi:id="_YN6EQMD9EeGp8LlPJ4gYgw" alias="Activity">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_YN6EQMD9EeGp8LlPJ4gYgw" alias="Activity">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Activity"/>
</elementImport>
- <elementImport xmi:id="_YN6EQcD9EeGp8LlPJ4gYgw" alias="Class">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_YN6EQcD9EeGp8LlPJ4gYgw" alias="Class">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
</elementImport>
- <elementImport xmi:id="_YN6EQsD9EeGp8LlPJ4gYgw" alias="Comment">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_YN6EQsD9EeGp8LlPJ4gYgw" alias="Comment">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>
</elementImport>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_Vi0XAMD9EeGp8LlPJ4gYgw" name="Stereotype1">
- <ownedAttribute xmi:id="_Z3_AcMD9EeGp8LlPJ4gYgw" name="base_Comment" association="_Z3_AccD9EeGp8LlPJ4gYgw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_Z3_AcMD9EeGp8LlPJ4gYgw" name="base_Comment" association="_Z3_AccD9EeGp8LlPJ4gYgw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_VvA_8MD9EeGp8LlPJ4gYgw" name="Stereotype2">
- <ownedAttribute xmi:id="_aKuWQMD9EeGp8LlPJ4gYgw" name="base_Comment" association="_aKuWQcD9EeGp8LlPJ4gYgw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_aKuWQMD9EeGp8LlPJ4gYgw" name="base_Comment" association="_aKuWQcD9EeGp8LlPJ4gYgw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_adeTIMD9EeGp8LlPJ4gYgw" name="base_Class" association="_adeTIcD9EeGp8LlPJ4gYgw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_adeTIMD9EeGp8LlPJ4gYgw" name="base_Class" association="_adeTIcD9EeGp8LlPJ4gYgw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_WCWysMD9EeGp8LlPJ4gYgw" name="Stereotype3">
- <ownedAttribute xmi:id="_aw924MD9EeGp8LlPJ4gYgw" name="base_Activity" association="_aw924cD9EeGp8LlPJ4gYgw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_aw924MD9EeGp8LlPJ4gYgw" name="base_Activity" association="_aw924cD9EeGp8LlPJ4gYgw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Activity"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_WCptoMD9EeGp8LlPJ4gYgw" name="Stereotype4">
- <generalization xmi:id="_bG1ZMMD9EeGp8LlPJ4gYgw" general="_WCWysMD9EeGp8LlPJ4gYgw"/>
- <ownedAttribute xmi:id="_nAQeQMD9EeGp8LlPJ4gYgw" name="Property1"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_bG1ZMMD9EeGp8LlPJ4gYgw" general="_WCWysMD9EeGp8LlPJ4gYgw"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_nAQeQMD9EeGp8LlPJ4gYgw" name="Property1"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_WC9PoMD9EeGp8LlPJ4gYgw" name="Stereotype5">
- <generalization xmi:id="_bXpcYMD9EeGp8LlPJ4gYgw" general="_WCWysMD9EeGp8LlPJ4gYgw"/>
- <generalization xmi:id="_b0XNkMD9EeGp8LlPJ4gYgw" general="_WDQKkMD9EeGp8LlPJ4gYgw"/>
- <ownedAttribute xmi:id="_myH7oMD9EeGp8LlPJ4gYgw" name="Property1"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_bXpcYMD9EeGp8LlPJ4gYgw" general="_WCWysMD9EeGp8LlPJ4gYgw"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_b0XNkMD9EeGp8LlPJ4gYgw" general="_WDQKkMD9EeGp8LlPJ4gYgw"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_myH7oMD9EeGp8LlPJ4gYgw" name="Property1"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_WDQKkMD9EeGp8LlPJ4gYgw" name="Stereotype6">
- <ownedAttribute xmi:id="_ciCL4MD9EeGp8LlPJ4gYgw" name="base_Class" association="_ciCL4cD9EeGp8LlPJ4gYgw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_ciCL4MD9EeGp8LlPJ4gYgw" name="base_Class" association="_ciCL4cD9EeGp8LlPJ4gYgw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_lV4nIMD9EeGp8LlPJ4gYgw" name="Property1"/>
- <ownedAttribute xmi:id="_maLVsMD9EeGp8LlPJ4gYgw" name="Property2"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_lV4nIMD9EeGp8LlPJ4gYgw" name="Property1"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_maLVsMD9EeGp8LlPJ4gYgw" name="Property2"/>
</packagedElement>
<packagedElement xmi:type="uml:Extension" xmi:id="_Z3_AccD9EeGp8LlPJ4gYgw" name="E_Stereotype1_Comment1" memberEnd="_Z3_AcsD9EeGp8LlPJ4gYgw _Z3_AcMD9EeGp8LlPJ4gYgw">
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Z3_AcsD9EeGp8LlPJ4gYgw" name="extension_Stereotype1" type="_Vi0XAMD9EeGp8LlPJ4gYgw" aggregation="composite" association="_Z3_AccD9EeGp8LlPJ4gYgw"/>
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/qvt/TransformationsTests.java b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/qvt/TransformationsTests.java
index d7b08984e1c..086f580aeb9 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/qvt/TransformationsTests.java
+++ b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/qvt/TransformationsTests.java
@@ -12,6 +12,7 @@
package org.eclipse.papyrus.customization.properties.tests.qvt;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -23,14 +24,11 @@ import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.m2m.qvt.oml.BasicModelExtent;
import org.eclipse.m2m.qvt.oml.ModelExtent;
import org.eclipse.papyrus.customization.properties.generation.generators.EcoreGenerator;
import org.eclipse.papyrus.customization.properties.generation.generators.IGenerator;
import org.eclipse.papyrus.customization.properties.generation.generators.ProfileGenerator;
-import org.eclipse.papyrus.customization.properties.model.xwt.resource.XWTResource;
import org.eclipse.papyrus.customization.properties.tests.Activator;
import org.eclipse.papyrus.junit.utils.ProjectUtils;
import org.eclipse.papyrus.views.properties.contexts.Context;
@@ -68,26 +66,26 @@ public class TransformationsTests {
targetProject.delete(true, new NullProgressMonitor());
}
- @Test
- public void handleXWTFileFromResource() {
- //From an XWT Resource
- Resource xwtResource = new XWTResource(xwtModelUri);
- try {
- xwtResource.load(null);
- } catch (IOException ex) {
- Activator.log.error(ex);
- Assert.fail("Cannot load the XWT Resource");
- }
- checkContents(xwtResource);
- }
+ // @Test
+ // public void handleXWTFileFromResource() {
+ // //From an XWT Resource
+ // Resource xwtResource = new XWTResource(xwtModelUri);
+ // try {
+ // xwtResource.load(null);
+ // } catch (IOException ex) {
+ // Activator.log.error(ex);
+ // Assert.fail("Cannot load the XWT Resource");
+ // }
+ // checkContents(xwtResource);
+ // }
- @Test
- public void handleXWTFileFromResourceSet() {
- //From a generic ResourceSet
- ResourceSet resourceSet = new ResourceSetImpl();
- Resource xwtResource = resourceSet.getResource(xwtModelUri, true);
- checkContents(xwtResource);
- }
+ // @Test
+ // public void handleXWTFileFromResourceSet() {
+ // //From a generic ResourceSet
+ // ResourceSet resourceSet = new ResourceSetImpl();
+ // Resource xwtResource = resourceSet.getResource(xwtModelUri, true);
+ // checkContents(xwtResource);
+ // }
//Briefly check the resource contents
private void checkContents(Resource xwtResource) {
@@ -118,25 +116,40 @@ public class TransformationsTests {
@Override
protected List<ModelExtent> getModelExtents() {
try {
- EPackage ecorePackage = (EPackage)loadEMFModel(packageURI);
- ModelExtent inPackage = new BasicModelExtent(Collections.singletonList(ecorePackage));
+ ecorePackage = (EPackage)loadEMFModel(packageURI);
+ } catch (IOException e) {
+ // nothing
+ }
+ LinkedList<ModelExtent> result = new LinkedList<ModelExtent>();
+ ModelExtent temp = new BasicModelExtent();
+ ModelExtent inPackage = new BasicModelExtent(Collections.singletonList(ecorePackage));
- PropertiesRoot root = ConfigurationManager.getInstance().getPropertiesRoot();
- ModelExtent inRoot = new BasicModelExtent(Collections.singletonList(root));
- LinkedList<ModelExtent> result = new LinkedList<ModelExtent>();
- result.add(inPackage);
- result.add(inRoot);
- result.add(getOutContextExtent());
- return result;
- } catch (Exception ex) {
- return null;
- }
+
+ PropertiesRoot root = ConfigurationManager.getInstance().getPropertiesRoot();
+ ModelExtent inRoot = new BasicModelExtent(Collections.singletonList(root));
+
+ //Basic Method
+ result.add(inPackage);
+ result.add(inPackage);
+
+
+ result.add(inRoot);
+ result.add(getOutContextExtent());
+ return result;
}
};
URI targetURI = URI.createPlatformResourceURI(targetProject.getName() + "/properties/Ecore/EcoreProperties.ctx", false);
- List<Context> generatedContexts = generator.generate(targetURI);
+
+ ArrayList<URI> listURI = new ArrayList<URI>();
+ listURI.add(targetURI);
+ // List<Object> listObject = generator.getExternalReference();
+ // for(Object p: listObject){
+ // generator.addCheckElement(p);
+ // }
+ List<Context> generatedContexts = generator.generate(listURI);
+
Assert.assertNotNull(generatedContexts);
Assert.assertEquals(1, generatedContexts.size());
@@ -145,7 +158,7 @@ public class TransformationsTests {
Assert.assertEquals(1, context.getDataContexts().size()); //Only one DataContextRoot
Assert.assertEquals(3, context.getDataContexts().get(0).getElements().size()); //3 DataContextElements
- //Assert.assertEquals(6, context.getViews().size());
+ Assert.assertEquals(6, context.getViews().size());
//int numberOfSections = checkGeneratedContents(context);
//Assert.assertEquals(6, numberOfSections);
@@ -191,57 +204,62 @@ public class TransformationsTests {
};
URI targetURI = URI.createPlatformResourceURI(targetProject.getName() + "/properties/Profile/ProfileProperties.ctx", false);
- List<Context> generatedContexts = generator.generate(targetURI);
+ generator.setStrategy(0);
+ ArrayList<URI> listURI = new ArrayList<URI>();
+ listURI.add(targetURI);
+ List<Context> generatedContexts = generator.generate(listURI);
+
Assert.assertNotNull(generatedContexts);
Assert.assertEquals(1, generatedContexts.size());
Context context = generatedContexts.get(0);
Assert.assertEquals(1, context.getDependencies().size());
Assert.assertEquals("UML", context.getDependencies().get(0).getName());
-
Assert.assertEquals(1, context.getDataContexts().size()); //Only one DataContextRoot
+ Assert.assertEquals(12, context.getViews().size()); //12 view for 6 elements
+ // Assert.assertEquals(6, generatedContexts.get(0).getDataContexts().get(0).getElements().size());
Assert.assertEquals(6, context.getDataContexts().get(0).getElements().size()); //6 DataContextElements
+
//Check that all 12 sections have an associated CompositeWidget (xwt file)
- //int numberOfSections = checkGeneratedContents(context);
+ // int numberOfSections = checkGeneratedContents(context);
- //Assert.assertEquals(12, numberOfSections);
+ // Assert.assertEquals(12, numberOfSections);
}
//FIXME: This test is disabled, because we haven't generated the views yet.
//We need to run the full wizard ; not only the IGenerator (Which only generates the Context model)
//The wizard isn't built to be used programmatically
-
- // private int checkGeneratedContents(Context context) {
- // int numberOfSections = 0;
//
- // ResourceSet loadingResourceSet = new ResourceSetImpl();
- //
- // for(Tab tab : context.getTabs()) {
- // for(Section section : tab.getSections()) {
- // //There is a CompositeWidget
- // Assert.assertNotNull(section.getWidget());
- //
- // Resource widgetResource = section.getWidget().eResource();
- // URI widgetURI = widgetResource.getURI();
- //
- // //The CompositeWidget is located in its own *.xwt resource
- // Assert.assertTrue(widgetURI.lastSegment().endsWith(".xwt"));
- //
- // //The Resource is serialized to the XWT Format (Not XMI)
- // Assert.assertTrue(widgetResource instanceof XWTResource);
- //
- // //The XWT Resource can be unserialized
- // Resource xwtResource = loadingResourceSet.getResource(widgetURI, true);
- // Assert.assertTrue(xwtResource instanceof XWTResource);
- // Assert.assertEquals(1, xwtResource.getContents().size());
- // Assert.assertTrue(xwtResource.getContents().get(0) instanceof CompositeWidget);
- //
- // numberOfSections++;
+ // private int checkGeneratedContents(Context context) {
+ // int numberOfSections = 0;
+ //
+ // ResourceSet loadingResourceSet = new ResourceSetImpl();
+ // for(Tab tab : context.getTabs()) {
+ // for(Section section : tab.getSections()) {
+ // //There is a CompositeWidget
+ // Assert.assertNotNull(section.getWidget());
+ //
+ // Resource widgetResource = section.getWidget().eResource();
+ // URI widgetURI = widgetResource.getURI();
+ //
+ // //The CompositeWidget is located in its own *.xwt resource
+ // Assert.assertTrue(widgetURI.lastSegment().endsWith(".xwt"));
+ //
+ // //The Resource is serialized to the XWT Format (Not XMI)
+ // Assert.assertTrue(widgetResource instanceof XWTResource);
+ //
+ // //The XWT Resource can be unserialized
+ // Resource xwtResource = loadingResourceSet.getResource(widgetURI, true);
+ // Assert.assertTrue(xwtResource instanceof XWTResource);
+ // Assert.assertEquals(1, xwtResource.getContents().size());
+ // Assert.assertTrue(xwtResource.getContents().get(0) instanceof CompositeWidget);
+ //
+ // numberOfSections++;
+ // }
// }
+ //
+ // return numberOfSections;
// }
- //
- // return numberOfSections;
- // }
}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/ModelExplorerUtils.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/ModelExplorerUtils.java
index ad3541dd4e7..d9d8bf6a5f7 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/ModelExplorerUtils.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/ModelExplorerUtils.java
@@ -1,211 +1,214 @@
-/*****************************************************************************
- * Copyright (c) 2012, 2014 CEA LIST and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 386118
- *
- *****************************************************************************/
-package org.eclipse.papyrus.junit.utils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.Command;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPage;
-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView;
-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.commands.ICommandService;
-import org.eclipse.ui.part.IPage;
-import org.junit.Assert;
-
-/**
- * Useful methods for the ModelExplorer view
- */
-public class ModelExplorerUtils {
-
- /**
- * the ID of the ModelExplorerView
- */
- private static final String ModelExplorerViewId = "org.eclipse.papyrus.views.modelexplorer.modelexplorer"; //$NON-NLS-1$
-
- private ModelExplorerUtils() {
- // to prevent instanciation
- }
-
- /**
- *
- * @return
- * the opened modelexplorer. Warning, it should be better that Papyrus was opened yet
- * @throws PartInitException
- */
- public static ModelExplorerView openModelExplorerView() throws PartInitException {
- IViewPart modelexplorer = null;
- modelexplorer = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(ModelExplorerViewId);
- final ModelExplorerPageBookView view = (ModelExplorerPageBookView)modelexplorer;
- final IPage currentPage = view.getCurrentPage();
- final ModelExplorerPage page = (ModelExplorerPage)currentPage;
- final IViewPart viewer = page.getViewer();
- Assert.assertNotNull(viewer);
- viewer.setFocus();
- return (ModelExplorerView)viewer;
- }
-
- /**
- *
- * @param view
- * the modelexplorer to manipulate
- * @param elements
- * the elements to select
- */
- public static void setSelectionInTheModelexplorer(final ModelExplorerView view, List<?> elements) {
- view.revealSemanticElement(elements);
- final List<?> currentSelection = getCurrentSelectionInTheModelExplorer();
- Assert.assertTrue("The current selection is not the wanted selection", elements.containsAll(currentSelection));
- Assert.assertTrue("The current selection is not the wanted selection", currentSelection.containsAll(elements));
- }
-
- /**
- *
- * @return
- * the object selected in the ModelExplorer
- * //TODO : should be moved in the ModelExplorer
- */
- public static List<?> getCurrentSelectionInTheModelExplorer() {
- final IStructuredSelection currentSelection = (IStructuredSelection)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection(ModelExplorerViewId);
- final List<Object> selection = new ArrayList<Object>();
- final Iterator<?> iter = currentSelection.iterator();
- while(iter.hasNext()) {
- final Object current = iter.next();
- EObject eObject = EMFHelper.getEObject(current);
- if(eObject != null) {
- selection.add(eObject);
- } else {
- selection.add(current);
- }
-
- }
- return selection;
- }
-
- /**
- *
- * @param view
- * the ModelExplorerView
- * @return
- * the root of the Model
- * //TODO : should be moved in the ModelExplorer
- */
- public static final EObject getRootInModelExplorer(final ModelExplorerView view) {
- view.getCommonViewer().expandToLevel(2);
-
- // store the root of the model
- final Object[] visibleElement = view.getCommonViewer().getVisibleExpandedElements();
- EObject modelRoot = null;
- if(visibleElement.length > 0) {
- modelRoot = EMFHelper.getEObject(visibleElement[0]);
- }
- Assert.assertNotNull(modelRoot);
- while(modelRoot.eContainer() != null) {
- modelRoot = modelRoot.eContainer();
- }
- return modelRoot;
- }
-
- /**
- *
- * @param actionContext
- * the creation context
- * @param wantedResult
- * the wanted result
- */
- public static final void testHandlerStatusInModelExplorer(final ModelExplorerView view, final String commandToTest, final EObject actionContext, boolean wantedResult) {
- setSelectionInTheModelexplorer(view, Collections.singletonList(actionContext));
- ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
- Command cmd = commandService.getCommand(commandToTest);
- IHandler handler = cmd.getHandler();
- if(handler instanceof AbstractHandler) {
- ((AbstractHandler)handler).setEnabled(commandToTest);
- }
- boolean res = handler.isEnabled();
- Assert.assertEquals(wantedResult, res);
- }
-
- /**
- * Execute an editor command creation and returns the current papyrus nested editor (you must verify that it is the correct editor to be sure of
- * the command execution)
- *
- * @param currentPapyrusEditor
- * the current PapyrusEditor
- * @param view
- * the model explorer view
- * @param commandToExecute
- * the command to execute
- * @param actionContext
- * the context used for the commadn (the selected elements)
- * @param bundelID
- * the bundle id
- *
- * @return
- * the current papyrus nested editor (you must verify that it is the correct editor to be sure of
- * the command execution)
- */
- public static final Object executeCreateNestedEditorHandlerInModelExplorer(final IMultiDiagramEditor currentPapyrusEditor, final ModelExplorerView view, final String commandToExecute, final EObject actionContext, final String bundelID) {
- setSelectionInTheModelexplorer(view, Collections.singletonList(actionContext));
- ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
- final Command cmd = commandService.getCommand(commandToExecute);
- final IHandler handler = cmd.getHandler();
- if(handler instanceof AbstractHandler) {
- ((AbstractHandler)handler).setEnabled(commandToExecute);
- }
- final RunnableWithResult<?> runnableWithResult = new RunnableWithResult.Impl<Object>() {
-
- public void run() {
- try {
- handler.execute(new ExecutionEvent(cmd, Collections.emptyMap(), null, null));
- } catch (ExecutionException e) {
- setStatus(new Status(IStatus.ERROR, bundelID, e.getMessage()));
- }
-
- IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IEditorPart activeEditor = activePage.getActiveEditor();
- if(currentPapyrusEditor != activeEditor) {
- setStatus(new Status(IStatus.ERROR, bundelID, "The current active editor is not the wanted Papyrus Editor"));
- }
-
- setResult(currentPapyrusEditor.getActiveEditor());
- setStatus(Status.OK_STATUS);
- }
- };
- Display.getDefault().syncExec(runnableWithResult);
- Assert.assertEquals(runnableWithResult.getStatus().getMessage(), IStatus.OK, runnableWithResult.getStatus().getSeverity());
- Object result = runnableWithResult.getResult();
- Assert.assertNotNull(result);
- return result;
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2012, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 386118
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.utils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPage;
+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView;
+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.part.IPage;
+import org.junit.Assert;
+
+/**
+ * Useful methods for the ModelExplorer view
+ */
+public class ModelExplorerUtils {
+
+ /**
+ * the ID of the ModelExplorerView
+ */
+ private static final String ModelExplorerViewId = "org.eclipse.papyrus.views.modelexplorer.modelexplorer"; //$NON-NLS-1$
+
+ private ModelExplorerUtils() {
+ // to prevent instanciation
+ }
+
+ /**
+ *
+ * @return
+ * the opened modelexplorer. Warning, it should be better that Papyrus was opened yet
+ * @throws PartInitException
+ */
+ public static ModelExplorerView openModelExplorerView() throws PartInitException {
+ IViewPart modelexplorer = null;
+ modelexplorer = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(ModelExplorerViewId);
+ final ModelExplorerPageBookView view = (ModelExplorerPageBookView)modelexplorer;
+ final IPage currentPage = view.getCurrentPage();
+ final ModelExplorerPage page = (ModelExplorerPage)currentPage;
+ final IViewPart viewer = page.getViewer();
+ Assert.assertNotNull(viewer);
+ viewer.setFocus();
+ return (ModelExplorerView)viewer;
+ }
+
+ /**
+ *
+ * @param view
+ * the modelexplorer to manipulate
+ * @param elements
+ * the elements to select
+ */
+ public static void setSelectionInTheModelexplorer(final ModelExplorerView view, List<?> elements) {
+ view.revealSemanticElement(elements);
+ final List<?> currentSelection = getCurrentSelectionInTheModelExplorer();
+ Assert.assertTrue("The current selection is not the wanted selection", elements.containsAll(currentSelection)); //$NON-NLS-1$
+ Assert.assertTrue("The current selection is not the wanted selection", currentSelection.containsAll(elements)); //$NON-NLS-1$
+ }
+
+ /**
+ *
+ * @return
+ * the object selected in the ModelExplorer
+ * //TODO : should be moved in the ModelExplorer
+ */
+ public static List<?> getCurrentSelectionInTheModelExplorer() {
+ final List<Object> selection = new ArrayList<Object>();
+ IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ if (activeWorkbenchWindow!=null){
+ final IStructuredSelection currentSelection = (IStructuredSelection)activeWorkbenchWindow.getSelectionService().getSelection(ModelExplorerViewId);
+ final Iterator<?> iter = currentSelection.iterator();
+ while(iter.hasNext()) {
+ final Object current = iter.next();
+ EObject eObject = EMFHelper.getEObject(current);
+ if(eObject != null) {
+ selection.add(eObject);
+ } else {
+ selection.add(current);
+ }
+ }
+ }
+ return selection;
+ }
+
+ /**
+ *
+ * @param view
+ * the ModelExplorerView
+ * @return
+ * the root of the Model
+ * //TODO : should be moved in the ModelExplorer
+ */
+ public static final EObject getRootInModelExplorer(final ModelExplorerView view) {
+ view.getCommonViewer().expandToLevel(2);
+
+ // store the root of the model
+ final Object[] visibleElement = view.getCommonViewer().getVisibleExpandedElements();
+ EObject modelRoot = null;
+ if(visibleElement.length > 0) {
+ modelRoot = EMFHelper.getEObject(visibleElement[0]);
+ }
+ Assert.assertNotNull(modelRoot);
+ while(modelRoot.eContainer() != null) {
+ modelRoot = modelRoot.eContainer();
+ }
+ return modelRoot;
+ }
+
+ /**
+ *
+ * @param actionContext
+ * the creation context
+ * @param wantedResult
+ * the wanted result
+ */
+ public static final void testHandlerStatusInModelExplorer(final ModelExplorerView view, final String commandToTest, final EObject actionContext, boolean wantedResult) {
+ setSelectionInTheModelexplorer(view, Collections.singletonList(actionContext));
+ ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
+ Command cmd = commandService.getCommand(commandToTest);
+ IHandler handler = cmd.getHandler();
+ if(handler instanceof AbstractHandler) {
+ ((AbstractHandler)handler).setEnabled(commandToTest);
+ }
+ boolean res = handler.isEnabled();
+ Assert.assertEquals(wantedResult, res);
+ }
+
+ /**
+ * Execute an editor command creation and returns the current papyrus nested editor (you must verify that it is the correct editor to be sure of
+ * the command execution)
+ *
+ * @param currentPapyrusEditor
+ * the current PapyrusEditor
+ * @param view
+ * the model explorer view
+ * @param commandToExecute
+ * the command to execute
+ * @param actionContext
+ * the context used for the commadn (the selected elements)
+ * @param bundelID
+ * the bundle id
+ *
+ * @return
+ * the current papyrus nested editor (you must verify that it is the correct editor to be sure of
+ * the command execution)
+ */
+ public static final Object executeCreateNestedEditorHandlerInModelExplorer(final IMultiDiagramEditor currentPapyrusEditor, final ModelExplorerView view, final String commandToExecute, final EObject actionContext, final String bundelID) {
+ setSelectionInTheModelexplorer(view, Collections.singletonList(actionContext));
+ ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
+ final Command cmd = commandService.getCommand(commandToExecute);
+ final IHandler handler = cmd.getHandler();
+ if(handler instanceof AbstractHandler) {
+ ((AbstractHandler)handler).setEnabled(commandToExecute);
+ }
+ final RunnableWithResult<?> runnableWithResult = new RunnableWithResult.Impl<Object>() {
+
+ public void run() {
+ try {
+ handler.execute(new ExecutionEvent(cmd, Collections.emptyMap(), null, null));
+ } catch (ExecutionException e) {
+ setStatus(new Status(IStatus.ERROR, bundelID, e.getMessage()));
+ }
+
+ IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IEditorPart activeEditor = activePage.getActiveEditor();
+ if(currentPapyrusEditor != activeEditor) {
+ setStatus(new Status(IStatus.ERROR, bundelID, "The current active editor is not the wanted Papyrus Editor")); //$NON-NLS-1$
+ }
+
+ setResult(currentPapyrusEditor.getActiveEditor());
+ setStatus(Status.OK_STATUS);
+ }
+ };
+ Display.getDefault().syncExec(runnableWithResult);
+ Assert.assertEquals(runnableWithResult.getStatus().getMessage(), IStatus.OK, runnableWithResult.getStatus().getSeverity());
+ Object result = runnableWithResult.getResult();
+ Assert.assertNotNull(result);
+ return result;
+ }
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/PackageExplorerUtils.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/PackageExplorerUtils.java
index d6ef585d17e..cb3e3f1b8c6 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/PackageExplorerUtils.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/PackageExplorerUtils.java
@@ -1,91 +1,91 @@
-/*****************************************************************************
- * 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:
- * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.junit.utils;
-
-import java.util.List;
-
-import org.eclipse.jdt.ui.IPackagesViewPart;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.junit.Assert;
-
-/**
- *
- * Utils Methods for the Package Explorer
- *
- */
-public class PackageExplorerUtils {
-
- /** ID of the Package Explorer View */
- private static final String PACKAGE_EXPLORER_VIEW_ID = "org.eclipse.jdt.ui.PackageExplorer";
-
- /**
- * This methods opens the PackageExplorerView, and give it the focus
- *
- * @throws PartInitException
- */
- public static final IPackagesViewPart openPackageExplorerView() throws PartInitException {
- final IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IPackagesViewPart pack = null;
- IViewPart packageExplorer = activeWorkbenchWindow.getActivePage().showView(PACKAGE_EXPLORER_VIEW_ID);
- pack = (IPackagesViewPart)packageExplorer;
- Assert.assertNotNull(pack);
- pack.setFocus();
- return pack;
-
- }
-
- /**
- * Set the selection in the PackageExplorer
- *
- * @param packageExplorer
- * the package explorer
- * @param newSelection
- * the new selection
- */
- public static final void setSelectionInPackageExplorerView(final IPackagesViewPart packageExplorer, final IStructuredSelection newSelection) {
- packageExplorer.getTreeViewer().expandAll();
- packageExplorer.getTreeViewer().setSelection(newSelection);
- //we verify that the current selection is correct in the PackageExplorer
- IStructuredSelection currentSelection = (IStructuredSelection)packageExplorer.getTreeViewer().getSelection();
- Assert.assertEquals("Package Explorer: The current selection is not the same as the wanted selection", currentSelection.toList(), newSelection.toList());
-
- //we verify that the current selection is correct using the selection service
- currentSelection = getCurrentSelectionInPackageExplorerView();
- Assert.assertEquals("Package Explorer: The SelectionService doesn't return the wanted selection", currentSelection.toList(), newSelection.toList());
- }
-
- /**
- *
- * @return
- * the current selection in the PackageExplorer
- */
- public static final IStructuredSelection getCurrentSelectionInPackageExplorerView() {
- return (IStructuredSelection)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection(PACKAGE_EXPLORER_VIEW_ID);
- }
-
- /**
- *
- * @return
- * the current selection in the PackageExplorer as List
- */
- public static final List<?> getCurrentSelectionAsListInPackageExplorerView() {
- final IStructuredSelection selection = (IStructuredSelection)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection(PACKAGE_EXPLORER_VIEW_ID);
- final List<?> list = selection.toList();
- return list;
- }
-}
+/*****************************************************************************
+ * 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:
+ * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.utils;
+
+import java.util.List;
+
+import org.eclipse.jdt.ui.IPackagesViewPart;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.junit.Assert;
+
+/**
+ *
+ * Utils Methods for the Package Explorer
+ *
+ */
+public class PackageExplorerUtils {
+
+ /** ID of the Package Explorer View */
+ private static final String PACKAGE_EXPLORER_VIEW_ID = "org.eclipse.jdt.ui.PackageExplorer"; //$NON-NLS-1$
+
+ /**
+ * This methods opens the PackageExplorerView, and give it the focus
+ *
+ * @throws PartInitException
+ */
+ public static final IPackagesViewPart openPackageExplorerView() throws PartInitException {
+ final IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ IPackagesViewPart pack = null;
+ IViewPart packageExplorer = activeWorkbenchWindow.getActivePage().showView(PACKAGE_EXPLORER_VIEW_ID);
+ pack = (IPackagesViewPart)packageExplorer;
+ Assert.assertNotNull(pack);
+ pack.setFocus();
+ return pack;
+
+ }
+
+ /**
+ * Set the selection in the PackageExplorer
+ *
+ * @param packageExplorer
+ * the package explorer
+ * @param newSelection
+ * the new selection
+ */
+ public static final void setSelectionInPackageExplorerView(final IPackagesViewPart packageExplorer, final IStructuredSelection newSelection) {
+ packageExplorer.getTreeViewer().expandAll();
+ packageExplorer.getTreeViewer().setSelection(newSelection);
+ //we verify that the current selection is correct in the PackageExplorer
+ IStructuredSelection currentSelection = (IStructuredSelection)packageExplorer.getTreeViewer().getSelection();
+ Assert.assertEquals("Package Explorer: The current selection is not the same as the wanted selection", currentSelection.toList(), newSelection.toList()); //$NON-NLS-1$
+
+ //we verify that the current selection is correct using the selection service
+ currentSelection = getCurrentSelectionInPackageExplorerView();
+ Assert.assertEquals("Package Explorer: The SelectionService doesn't return the wanted selection", currentSelection.toList(), newSelection.toList()); //$NON-NLS-1$
+ }
+
+ /**
+ *
+ * @return
+ * the current selection in the PackageExplorer
+ */
+ public static final IStructuredSelection getCurrentSelectionInPackageExplorerView() {
+ return (IStructuredSelection)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection(PACKAGE_EXPLORER_VIEW_ID);
+ }
+
+ /**
+ *
+ * @return
+ * the current selection in the PackageExplorer as List
+ */
+ public static final List<?> getCurrentSelectionAsListInPackageExplorerView() {
+ final IStructuredSelection selection = (IStructuredSelection)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection(PACKAGE_EXPLORER_VIEW_ID);
+ final List<?> list = selection.toList();
+ return list;
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/common/AbstractModelExplorerTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/common/AbstractModelExplorerTest.java
index 1c386641ccf..dd9d9861e10 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/common/AbstractModelExplorerTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/common/AbstractModelExplorerTest.java
@@ -75,7 +75,7 @@ public abstract class AbstractModelExplorerTest {
public static IEditorPart editor = null;
/** id of the papyrus editor */
- public static String editorID = "org.eclipse.papyrus.infra.core.papyrusEditor";
+ public static String editorID = "org.eclipse.papyrus.infra.core.papyrusEditor";
/** view part: the model explorer */
protected static IViewPart modelExplorerPart;
@@ -172,42 +172,42 @@ public abstract class AbstractModelExplorerTest {
DiagramEditPart diagramEditPart = EditorUtils.getDiagramEditPart();
EObject root = diagramEditPart.getDiagramView().getElement();
- Assert.assertTrue("Impossible to find main model", root instanceof Model);
+ Assert.assertTrue("Impossible to find main model", root instanceof Model); //$NON-NLS-1$
/** generated selectable objects */
model_EObject = (org.eclipse.uml2.uml.Model)root;
b1_EObject = (org.eclipse.uml2.uml.Class)model_EObject.getPackagedElement("B1");
- Assert.assertNotNull("Impossible to find Class B1", b1_EObject);
+ Assert.assertNotNull("Impossible to find Class B1", b1_EObject); //$NON-NLS-1$
pB1P1_B1_EObject = b1_EObject.getAttribute("pB1P1", null);
- Assert.assertNotNull("Impossible to find Property pB1P1", pB1P1_B1_EObject);
+ Assert.assertNotNull("Impossible to find Property pB1P1", pB1P1_B1_EObject); //$NON-NLS-1$
rB2_B1_EObject = b1_EObject.getAttribute("rB2", null);
- Assert.assertNotNull("Impossible to find Property rB2", rB2_B1_EObject);
+ Assert.assertNotNull("Impossible to find Property rB2", rB2_B1_EObject); //$NON-NLS-1$
pB2_B1_EObject = b1_EObject.getAttribute("pB2", null);
- Assert.assertNotNull("Impossible to find Property pB2", pB2_B1_EObject);
+ Assert.assertNotNull("Impossible to find Property pB2", pB2_B1_EObject); //$NON-NLS-1$
b2_EObject = (org.eclipse.uml2.uml.Class)model_EObject.getPackagedElement("B2");
- Assert.assertNotNull("Impossible to find Class B2", b2_EObject);
+ Assert.assertNotNull("Impossible to find Class B2", b2_EObject); //$NON-NLS-1$
p1_EObject = (org.eclipse.uml2.uml.Package)model_EObject.getPackagedElement("P1");
- Assert.assertNotNull("Impossible to find Package P1", p1_EObject);
+ Assert.assertNotNull("Impossible to find Package P1", p1_EObject); //$NON-NLS-1$
b2P1_P1_EObject = (org.eclipse.uml2.uml.Class)p1_EObject.getPackagedElement("B2P1");
- Assert.assertNotNull("Impossible to find Class B2P1", b2P1_P1_EObject);
+ Assert.assertNotNull("Impossible to find Class B2P1", b2P1_P1_EObject); //$NON-NLS-1$
b1P1_P1_EObject = (org.eclipse.uml2.uml.Class)p1_EObject.getPackagedElement("B1P1");
- Assert.assertNotNull("Impossible to find Class B1P1", b1P1_P1_EObject);
+ Assert.assertNotNull("Impossible to find Class B1P1", b1P1_P1_EObject); //$NON-NLS-1$
pB1_B1P1_P1_EObject = b1P1_P1_EObject.getAttribute("pB1", null);
- Assert.assertNotNull("Impossible to find Property pB1", pB1_B1P1_P1_EObject);
+ Assert.assertNotNull("Impossible to find Property pB1", pB1_B1P1_P1_EObject); //$NON-NLS-1$
pB2P1_B1P1_P1_EObject = b1P1_P1_EObject.getAttribute("pB2P1", null);
- Assert.assertNotNull("Impossible to find Property pB2P1", pB2P1_B1P1_P1_EObject);
+ Assert.assertNotNull("Impossible to find Property pB2P1", pB2P1_B1P1_P1_EObject); //$NON-NLS-1$
iBD_B1_Diagram = getDiagram("IBD_B1");
- Assert.assertNotNull("Impossible to find IBD_B1", iBD_B1_Diagram);
+ Assert.assertNotNull("Impossible to find IBD_B1", iBD_B1_Diagram); //$NON-NLS-1$
bDD_Main_Diagram = getDiagram("BDD_Main");
- Assert.assertNotNull("Impossible to find BDD_Main", bDD_Main_Diagram);
+ Assert.assertNotNull("Impossible to find BDD_Main", bDD_Main_Diagram); //$NON-NLS-1$
List<Customization> appliedCustomizations=org.eclipse.papyrus.views.modelexplorer.Activator.getDefault().getCustomizationManager().getManagedCustomizations();
Customization SimpleUML=null;
Iterator<?>iter=appliedCustomizations.iterator();
@@ -217,12 +217,12 @@ public abstract class AbstractModelExplorerTest {
SimpleUML=custo;
}
}
- org.junit.Assert.assertNotNull("Custom SimpleUML not found", SimpleUML);
+ Assert.assertNotNull("Custom SimpleUML not found", SimpleUML); //$NON-NLS-1$
org.eclipse.papyrus.views.modelexplorer.Activator.getDefault().getCustomizationManager().getManagedCustomizations().add(0, SimpleUML);
- org.junit.Assert.assertEquals("bad order of applied Custom", "SimpleUML", appliedCustomizations.get(0).getName());
+ Assert.assertEquals("bad order of applied Custom", "SimpleUML", appliedCustomizations.get(0).getName()); //$NON-NLS-1$
/** end of generated selectable objects */
}
@@ -293,7 +293,7 @@ public abstract class AbstractModelExplorerTest {
semanticElementList.addAll(newElements);
modelExplorerView.revealSemanticElement(semanticElementList);
} else {
- throw new Exception("Impossible to find the model explorer required to select: " + newElements);
+ throw new Exception("Impossible to find the model explorer required to select: " + newElements); //$NON-NLS-1$
}
}
@@ -372,7 +372,7 @@ public abstract class AbstractModelExplorerTest {
modelExplorerView.revealSemanticElement(semanticElementList);
//reveal(semanticElementList, modelExplorerView.getCommonViewer());
} else {
- throw new Exception("Impossible to find the model explorer required to select: " + newDiagrams);
+ throw new Exception("Impossible to find the model explorer required to select: " + newDiagrams); //$NON-NLS-1$
}
}
@@ -476,11 +476,11 @@ public abstract class AbstractModelExplorerTest {
protected EObjectTreeElement findSemanticModelElementItem(EObject objectToFind) throws Exception {
selectAndReveal(objectToFind);
IStructuredSelection selection = (IStructuredSelection)modelExplorerPart.getSite().getSelectionProvider().getSelection();
- Assert.assertEquals("one and only one object should be selected", 1, selection.size());
+ Assert.assertEquals("one and only one object should be selected", 1, selection.size()); //$NON-NLS-1$
Object selectedElement = selection.getFirstElement();
- Assert.assertTrue("selection should be a model item element", selectedElement instanceof EObjectTreeElement);
- Assert.assertTrue("selection should be linked to a EObject", ((EObjectTreeElement)selectedElement).getEObject() instanceof EObject);
- Assert.assertTrue("selection should be linked to the Object: " + objectToFind, ((EObjectTreeElement)selectedElement).getEObject().equals(objectToFind));
+ Assert.assertTrue("selection should be a model item element", selectedElement instanceof EObjectTreeElement); //$NON-NLS-1$
+ Assert.assertTrue("selection should be linked to a EObject", ((EObjectTreeElement)selectedElement).getEObject() instanceof EObject); //$NON-NLS-1$
+ Assert.assertTrue("selection should be linked to the Object: " + objectToFind, ((EObjectTreeElement)selectedElement).getEObject().equals(objectToFind)); //$NON-NLS-1$
return (EObjectTreeElement)selectedElement;
}
@@ -497,11 +497,11 @@ public abstract class AbstractModelExplorerTest {
selectAndRevealDiagram(diagramToFind);
IStructuredSelection selection = (IStructuredSelection)modelExplorerPart.getSite().getSelectionProvider().getSelection();
- Assert.assertEquals("one and only one diagram should be selected", 1, selection.size());
+ Assert.assertEquals("one and only one diagram should be selected", 1, selection.size()); //$NON-NLS-1$
Object selectedElement = selection.getFirstElement();
- Assert.assertTrue("selection should be a model item element", selectedElement instanceof EObjectTreeElement);
- Assert.assertTrue("selection should be linked to a Diagram", ((EObjectTreeElement)selectedElement).getEObject() instanceof Diagram);
- Assert.assertTrue("selection should be linked to the Object: " + diagramToFind, ((EObjectTreeElement)selectedElement).getEObject().equals(diagramToFind));
+ Assert.assertTrue("selection should be a model item element", selectedElement instanceof EObjectTreeElement); //$NON-NLS-1$
+ Assert.assertTrue("selection should be linked to a Diagram", ((EObjectTreeElement)selectedElement).getEObject() instanceof Diagram); //$NON-NLS-1$
+ Assert.assertTrue("selection should be linked to the Object: " + diagramToFind, ((EObjectTreeElement)selectedElement).getEObject().equals(diagramToFind)); //$NON-NLS-1$
return (EObjectTreeElement)selectedElement;
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteBlockTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteBlockTest.java
index 4b28cca05c6..e936af4ae53 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteBlockTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteBlockTest.java
@@ -40,7 +40,8 @@ public abstract class AbstractCopyPasteBlockTest extends AbstractCopyPasteTest {
super.initializeTest(additionalChecks, targetContainer, copiedEObject);
/* pre-copy initialization */
- List<Property> originalParts = new ArrayList<Property>(); for(Property p : ((org.eclipse.uml2.uml.Class)copiedEObject).getAllAttributes()) { if(new org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher().matches(p)) {originalParts.add(p);}} additionalChecks.put("originalParts", originalParts);
+ List<Property> originalParts = new ArrayList<Property>();
+ for(Property p : ((org.eclipse.uml2.uml.Class)copiedEObject).getAllAttributes()) { if(new org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher().matches(p)) {originalParts.add(p);}} additionalChecks.put("originalParts", originalParts);
/* END OF pre-copy initialization */
}
@@ -54,7 +55,12 @@ public abstract class AbstractCopyPasteBlockTest extends AbstractCopyPasteTest {
super.postCopyAdditionalChecks(originalModel, newValues, delta);
/* post copy checks */
- FilteredCollectionView<EObject> newClasses = new FilteredCollectionView<EObject>(delta, new IFilter() { /** * {@inheritDoc} */ public boolean isAllowed(Object object) { return object instanceof org.eclipse.uml2.uml.Class && !(object instanceof org.eclipse.uml2.uml.Association); } }); Assert.assertEquals("New values should contain a Class", 1, newClasses.size()); org.eclipse.uml2.uml.Class newBlock = newClasses.toArray(new org.eclipse.uml2.uml.Class[]{})[0]; Assert.assertNotNull("Block stereotype should be applied", ((org.eclipse.uml2.uml.Class) newBlock) .getAppliedStereotype("SysML::Blocks::Block")); List<Property> originalParts = (List<Property>) originalModel .get("originalParts"); List<Property> newParts = new ArrayList<Property>(); for (Property p : ((org.eclipse.uml2.uml.Class) newBlock) .getAllAttributes()) { if (new org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher().matches(p)) { newParts.add(p); Assert.assertNotNull( "Part should have an associated association.", p.getAssociation()); } } Assert.assertEquals( "Both original and new list of attributes should be quivalent for the blocks", originalParts.size(), newParts.size());
+ FilteredCollectionView<EObject> newClasses = new FilteredCollectionView<EObject>(delta, new IFilter() { /** * {@inheritDoc} */ public boolean isAllowed(Object object) { return object instanceof org.eclipse.uml2.uml.Class && !(object instanceof org.eclipse.uml2.uml.Association); } });
+ Assert.assertEquals("New values should contain a Class", 1, newClasses.size()); //$NON-NLS-1$
+ org.eclipse.uml2.uml.Class newBlock = newClasses.toArray(new org.eclipse.uml2.uml.Class[]{})[0];
+ Assert.assertNotNull("Block stereotype should be applied", ((org.eclipse.uml2.uml.Class) newBlock).getAppliedStereotype("SysML::Blocks::Block")); //$NON-NLS-1$
+ List<Property> originalParts = (List<Property>) originalModel .get("originalParts"); List<Property> newParts = new ArrayList<Property>(); for (Property p : ((org.eclipse.uml2.uml.Class) newBlock) .getAllAttributes()) { if (new org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher().matches(p)) { newParts.add(p); Assert.assertNotNull( "Part should have an associated association.", p.getAssociation()); } }
+ Assert.assertEquals( "Both original and new list of attributes should be quivalent for the blocks", originalParts.size(), newParts.size()); //$NON-NLS-1$
/* END OF post copy checks */
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteReferenceTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteReferenceTest.java
index 1ea66a8dec2..17b6ec3f5e1 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteReferenceTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteReferenceTest.java
@@ -51,7 +51,8 @@ public abstract class AbstractCopyPasteReferenceTest extends AbstractCopyPasteTe
super.postCopyAdditionalChecks(originalModel, newValues, delta);
/* post copy checks */
- Association newAssociation = ((Property)newValues.get(0)).getAssociation(); Assert.assertNotNull("New Reference should have an association", newAssociation);
+ Association newAssociation = ((Property)newValues.get(0)).getAssociation();
+ Assert.assertNotNull("New Reference should have an association", newAssociation); //$NON-NLS-1$
/* END OF post copy checks */
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteTest.java
index cef2d877c86..775705e82d9 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteTest.java
@@ -65,14 +65,14 @@ public abstract class AbstractCopyPasteTest extends AbstractModelExplorerTest {
ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
commandService.refreshElements(IWorkbenchCommandConstants.EDIT_PASTE, null);
org.eclipse.core.commands.Command pasteCommand = commandService.getCommand(IWorkbenchCommandConstants.EDIT_PASTE);
- Assert.assertNotNull("Impossible to find paste command", pasteCommand);
- Assert.assertTrue("command in not enabled", pasteCommand.isEnabled());
- Assert.assertTrue("command in not defined", pasteCommand.isDefined());
+ Assert.assertNotNull("Impossible to find paste command", pasteCommand); //$NON-NLS-1$
+ Assert.assertTrue("command in not enabled", pasteCommand.isEnabled()); //$NON-NLS-1$
+ Assert.assertTrue("command in not defined", pasteCommand.isDefined()); //$NON-NLS-1$
pasteCommand.executeWithChecks(new ExecutionEvent());
// check editor state (should be non dirty)
- Assert.assertTrue("Editor should be dirty after paste command execution", isEditorDirty());
+ Assert.assertTrue("Editor should be dirty after paste command execution", isEditorDirty()); //$NON-NLS-1$
// should retrieve a new Part AND a new association
@@ -86,7 +86,7 @@ public abstract class AbstractCopyPasteTest extends AbstractModelExplorerTest {
}
// size = original size +1
- Assert.assertEquals("Wrong number of attributes after paste", expectedNumberOfAddedElements, delta.size());
+ Assert.assertEquals("Wrong number of attributes after paste", expectedNumberOfAddedElements, delta.size()); //$NON-NLS-1$
// part should be linked to an association
postCopyAdditionalChecks(originalModel, newValues, delta);
@@ -95,22 +95,22 @@ public abstract class AbstractCopyPasteTest extends AbstractModelExplorerTest {
if(getEditingDomain().getCommandStack().canUndo()) {
getEditingDomain().getCommandStack().undo();
} else {
- throw new Exception("Impossible to undo the paste command: " + pasteCommand);
+ throw new Exception("Impossible to undo the paste command: " + pasteCommand); //$NON-NLS-1$
}
// check editor state (should be non dirty)
- Assert.assertFalse("Editor should not be dirty after undo", isEditorDirty());
+ Assert.assertFalse("Editor should not be dirty after undo", isEditorDirty()); //$NON-NLS-1$
// check old values equals the actual values
newValues = (List<EObject>)targetContainer.eGet(feature);
- Assert.assertEquals("Initial and current list feature list should be equivalent", newValues, originalValues);
+ Assert.assertEquals("Initial and current list feature list should be equivalent", newValues, originalValues); //$NON-NLS-1$
// redo
if(getEditingDomain().getCommandStack().canRedo()) {
getEditingDomain().getCommandStack().redo();
} else {
- throw new Exception("Impossible to redo the paste command: " + pasteCommand);
+ throw new Exception("Impossible to redo the paste command: " + pasteCommand); //$NON-NLS-1$
}
// check editor state (should be non dirty)
- Assert.assertTrue("Editor should not dirty after redo", isEditorDirty());
+ Assert.assertTrue("Editor should not dirty after redo", isEditorDirty()); //$NON-NLS-1$
// check as it was the result of the paste command
newValues = (List<EObject>)targetContainer.eGet(feature);
@@ -122,7 +122,7 @@ public abstract class AbstractCopyPasteTest extends AbstractModelExplorerTest {
}
// size = original size + delta
- Assert.assertEquals("Wrong number of attributes after paste", expectedNumberOfAddedElements, delta.size());
+ Assert.assertEquals("Wrong number of attributes after paste", expectedNumberOfAddedElements, delta.size()); //$NON-NLS-1$
// part should be linked to an association
postCopyAdditionalChecks(originalModel, newValues, delta);
@@ -131,10 +131,10 @@ public abstract class AbstractCopyPasteTest extends AbstractModelExplorerTest {
if(getEditingDomain().getCommandStack().canUndo()) {
getEditingDomain().getCommandStack().undo();
} else {
- throw new Exception("Impossible to re-undo the paste command: " + pasteCommand);
+ throw new Exception("Impossible to re-undo the paste command: " + pasteCommand); //$NON-NLS-1$
}
// check editor state (should be non dirty)
- Assert.assertFalse("Editor should not be dirty after undo", isEditorDirty());
+ Assert.assertFalse("Editor should not be dirty after undo", isEditorDirty()); //$NON-NLS-1$
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleBlock2Test.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleBlock2Test.java
index ec838f4f9f9..a3cb4d822bd 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleBlock2Test.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleBlock2Test.java
@@ -57,13 +57,13 @@ public class CopyPasteSimpleBlock2Test extends AbstractCopyPasteBlockTest {
ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
commandService.refreshElements(IWorkbenchCommandConstants.EDIT_COPY, null);
org.eclipse.core.commands.Command copyCommand = commandService.getCommand(IWorkbenchCommandConstants.EDIT_COPY);
- Assert.assertNotNull("Impossible to find copy command", copyCommand);
- Assert.assertTrue("command in not enabled", copyCommand.isEnabled());
- Assert.assertTrue("command in not defined", copyCommand.isDefined());
+ Assert.assertNotNull("Impossible to find copy command", copyCommand); //$NON-NLS-1$
+ Assert.assertTrue("command in not enabled", copyCommand.isEnabled()); //$NON-NLS-1$
+ Assert.assertTrue("command in not defined", copyCommand.isDefined()); //$NON-NLS-1$
copyCommand.executeWithChecks(new ExecutionEvent());
// check editor state (should be non dirty)
- Assert.assertFalse("Editor should not be dirty after copy", isEditorDirty());
+ Assert.assertFalse("Editor should not be dirty after copy", isEditorDirty()); //$NON-NLS-1$
}
@Override
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleBlockTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleBlockTest.java
index e9d9582cd55..36e8f1414bf 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleBlockTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleBlockTest.java
@@ -68,13 +68,13 @@ public class CopyPasteSimpleBlockTest extends AbstractCopyPasteBlockTest {
commandService.refreshElements(IWorkbenchCommandConstants.EDIT_COPY, null);
org.eclipse.core.commands.Command copyCommand = commandService.getCommand(IWorkbenchCommandConstants.EDIT_COPY);
- Assert.assertNotNull("Impossible to find copy command", copyCommand);
- Assert.assertTrue("command in not enabled", copyCommand.isEnabled());
- Assert.assertTrue("command in not defined", copyCommand.isDefined());
+ Assert.assertNotNull("Impossible to find copy command", copyCommand); //$NON-NLS-1$
+ Assert.assertTrue("command in not enabled", copyCommand.isEnabled()); //$NON-NLS-1$
+ Assert.assertTrue("command in not defined", copyCommand.isDefined()); //$NON-NLS-1$
copyCommand.executeWithChecks(new ExecutionEvent());
// check editor state (should be non dirty)
- Assert.assertFalse("Editor should not be dirty after copy", isEditorDirty());
+ Assert.assertFalse("Editor should not be dirty after copy", isEditorDirty()); //$NON-NLS-1$
}
@Override
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimplePartTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimplePartTest.java
index d3c63e210e1..7a1dbc69a03 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimplePartTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimplePartTest.java
@@ -57,13 +57,13 @@ public class CopyPasteSimplePartTest extends AbstractCopyPastePartTest {
ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
commandService.refreshElements(IWorkbenchCommandConstants.EDIT_COPY, null);
org.eclipse.core.commands.Command copyCommand = commandService.getCommand(IWorkbenchCommandConstants.EDIT_COPY);
- Assert.assertNotNull("Impossible to find copy command", copyCommand);
- Assert.assertTrue("command in not enabled", copyCommand.isEnabled());
- Assert.assertTrue("command in not defined", copyCommand.isDefined());
- copyCommand.executeWithChecks(new ExecutionEvent());
+ Assert.assertNotNull("Impossible to find copy command", copyCommand); //$NON-NLS-1$
+ Assert.assertTrue("command in not enabled", copyCommand.isEnabled()); //$NON-NLS-1$
+ Assert.assertTrue("command in not defined", copyCommand.isDefined()); //$NON-NLS-1$
+ copyCommand.executeWithChecks(new ExecutionEvent());
// check editor state (should be non dirty)
- Assert.assertFalse("Editor should not be dirty after copy", isEditorDirty());
+ Assert.assertFalse("Editor should not be dirty after copy", isEditorDirty()); //$NON-NLS-1$
}
@Override
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleReferenceTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleReferenceTest.java
index ebf2450d313..7f2d76c61a3 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleReferenceTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/CopyPasteSimpleReferenceTest.java
@@ -51,7 +51,7 @@ public class CopyPasteSimpleReferenceTest extends AbstractCopyPasteReferenceTest
}
});
- Assert.assertFalse("Editor should not be dirty at initialization", isEditorDirty());
+ Assert.assertFalse("Editor should not be dirty at initialization", isEditorDirty()); //$NON-NLS-1$
// retrieve elements in the model explorer
selectAndReveal(rB2_B1_EObject);
@@ -59,16 +59,16 @@ public class CopyPasteSimpleReferenceTest extends AbstractCopyPasteReferenceTest
ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
commandService.refreshElements(IWorkbenchCommandConstants.EDIT_COPY, null);
org.eclipse.core.commands.Command copyCommand = commandService.getCommand(IWorkbenchCommandConstants.EDIT_COPY);
- Assert.assertNotNull("Impossible to find copy command", copyCommand);
- Assert.assertTrue("command in not enabled", copyCommand.isEnabled());
- Assert.assertTrue("command in not defined", copyCommand.isDefined());
+ Assert.assertNotNull("Impossible to find copy command", copyCommand); //$NON-NLS-1$
+ Assert.assertTrue("command in not enabled", copyCommand.isEnabled()); //$NON-NLS-1$
+ Assert.assertTrue("command in not defined", copyCommand.isDefined()); //$NON-NLS-1$
copyCommand.executeWithChecks(new ExecutionEvent());
// check editor state (should be non dirty)
// Assert.assertFalse("Editor should not be dirty after copy", isEditorDirty());
// NOTE: save editor. The copy command should not dirty the model, the implementation of the copy command or the editor should be modified
- Assert.assertFalse("Copy command is dirtying the model, whereas it should not. This assert is here to remember that the test code should be modified: Isdirty = false after copy...", isEditorDirty());
+ Assert.assertFalse("Copy command is dirtying the model, whereas it should not. This assert is here to remember that the test code should be modified: Isdirty = false after copy...", isEditorDirty()); //$NON-NLS-1$
Display.getDefault().syncExec(new Runnable() {
public void run() {
@@ -76,7 +76,7 @@ public class CopyPasteSimpleReferenceTest extends AbstractCopyPasteReferenceTest
}
});
- Assert.assertFalse("Save command is non-dirtying the model, whereas it should. ", isEditorDirty());
+ Assert.assertFalse("Save command is non-dirtying the model, whereas it should. ", isEditorDirty()); //$NON-NLS-1$
// END NOTE
}
@@ -110,7 +110,7 @@ public class CopyPasteSimpleReferenceTest extends AbstractCopyPasteReferenceTest
*/
@Test
public void testCopyPasteInB1() throws Exception {
- testExecutableCopyPaste(b1_EObject, rB2_B1_EObject, "attribute", 1);
+ testExecutableCopyPaste(b1_EObject, rB2_B1_EObject, "attribute", 1);
}
/**
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/dragdrop/AbstractDragDropTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/dragdrop/AbstractDragDropTest.java
index 82e15f263d6..8bf37088ae6 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/dragdrop/AbstractDragDropTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/dragdrop/AbstractDragDropTest.java
@@ -1,167 +1,167 @@
-/*****************************************************************************
- * Copyright (c) 2011 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.modelexplorer.tests.dragdrop;
-
-import static org.junit.Assert.fail;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ViewerDropAdapter;
-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;
-import org.eclipse.papyrus.sysml.modelexplorer.tests.common.AbstractModelExplorerTest;
-import org.eclipse.papyrus.sysml.modelexplorer.tests.utils.EditorUtils;
-import org.eclipse.papyrus.views.modelexplorer.CustomCommonViewer;
-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView;
-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;
-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.navigator.dnd.NavigatorDnDService;
-import org.eclipse.ui.navigator.CommonDropAdapter;
-import org.eclipse.ui.navigator.CommonDropAdapterAssistant;
-import org.junit.Assert;
-import org.junit.Before;
-
-/**
- * Abstract Class to implement diagram drag and drop tests.
- */
-public class AbstractDragDropTest extends AbstractModelExplorerTest {
-
- /**
- * prepare the copy
- *
- * @throws Exception
- * exception thrown in case of problems
- */
- @Before
- public void testPrepare() throws Exception {
- // check editor state (should be non dirty)
- //FIXME: In Papyrus, the editor may be dirty at initialization. This should not be tested here. We simply save the editor as soon as it is opened.
- Display.getDefault().syncExec(new Runnable() {
-
- public void run() {
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().doSave(new NullProgressMonitor());
- }
- });
-
- Assert.assertFalse("Editor should not be dirty at initialization", isEditorDirty());
- }
-
- public List<CompoundCommand> getListOfDropCommands(EObject sourceElement, EObject targetElement) throws Exception {
- // init source object
- EObjectTreeElement sourceMEI = null;
- if(sourceElement instanceof Diagram) {
- sourceMEI = findSemanticModelElementItem((Diagram)sourceElement);
- } else {
- sourceMEI = findSemanticModelElementItem(sourceElement);
- }
- EObjectTreeElement targetMEI = null;
- if(targetElement instanceof Diagram) {
- targetMEI = findSemanticModelElementItem((Diagram)targetElement);
- } else {
- targetMEI = findSemanticModelElementItem(targetElement);
- }
- if(sourceElement instanceof Diagram) {
- selectAndRevealDiagram((Diagram)sourceElement);
- } else {
- selectAndReveal(sourceElement);
- }
- ModelExplorerView modelExplorerView = null;
- ModelExplorerPageBookView bookViewPart = (ModelExplorerPageBookView)NavigatorUtils.findViewPart(ModelExplorerPageBookView.VIEW_ID);
- if(bookViewPart != null) {
- modelExplorerView = (ModelExplorerView)bookViewPart.getActiveView();
- Assert.assertNotNull("Impossible to find model explorer view", modelExplorerView);
- }
- NavigatorDnDService dndService = (NavigatorDnDService)modelExplorerView.getNavigatorContentService().getDnDService();
- Assert.assertNotNull("Impossible to find dnd service", dndService);
- CommonDropAdapter commonDropAdapter = ((CustomCommonViewer)modelExplorerView.getCommonViewer()).getDropAdapter();
- CommonDropAdapterAssistant[] commonDropAdapterAssistants = dndService.findCommonDropAdapterAssistants(targetMEI, (IStructuredSelection)modelExplorerView.getCommonViewer().getSelection());
- List<CompoundCommand> results = new ArrayList<CompoundCommand>();
- for(CommonDropAdapterAssistant assistant : commonDropAdapterAssistants) {
- // try to adapt to a Papyrus drop assistant. If not, send a warning
- if(!(assistant instanceof org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant)) {
- fail("this test expects that only papyrus drop assistants are provided for papyrus model explorer");
- }
- org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant papyrusAssistant = ((org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant)assistant);
- Field currentOperationField = ViewerDropAdapter.class.getDeclaredField("currentOperation");
- Assert.assertNotNull(currentOperationField);
- currentOperationField.setAccessible(true);
- currentOperationField.set(commonDropAdapter, DND.DROP_MOVE);
- System.err.println(commonDropAdapter.getCurrentOperation()); // should be 2
- Field currentLocationField = ViewerDropAdapter.class.getDeclaredField("currentLocation");
- Assert.assertNotNull(currentLocationField);
- currentLocationField.setAccessible(true);
- currentLocationField.set(commonDropAdapter, ViewerDropAdapter.LOCATION_ON);
- System.err.println(commonDropAdapter.getCurrentLocation()); // should be 3
- LocalSelectionTransfer.getTransfer().setSelection(modelExplorerView.getCommonViewer().getSelection());
- CompoundCommand command = papyrusAssistant.getDrop(targetMEI);
- results.add(command);
- }
- return results;
- }
-
- public void testExecutableDropOfDiagram(Diagram sourceElement, EObject targetElement) throws Exception {
- Assert.assertFalse("Editor should not be dirty at the beginning of the test", EditorUtils.getEditor().isDirty());
- EObject initialDiagramContainer = sourceElement.getElement();
- // find command for the drag / drop (source, target)
- List<CompoundCommand> dropCommands = getListOfDropCommands(sourceElement, targetElement);
- // create only one compound command
- CompoundCommand executableCommand = new CompoundCommand();
- for(CompoundCommand cc : dropCommands) {
- executableCommand.append(cc);
- }
- getEditingDomain().getCommandStack().execute(executableCommand);
- // check results
- Assert.assertEquals("Context of the diagram should be the target: " + printElement(targetElement), targetElement, sourceElement.getElement());
- Assert.assertNotNull("diagram should still be contained in a resource", sourceElement.eResource());
- // try to undo
- getEditingDomain().getCommandStack().undo();
- Assert.assertEquals("Context of the diagram should be the initial value: " + printElement(initialDiagramContainer), initialDiagramContainer, sourceElement.getElement());
- // try to redo
- getEditingDomain().getCommandStack().redo();
- // check results
- Assert.assertEquals("Context of the diagram should be the target: " + printElement(targetElement), targetElement, sourceElement.getElement());
- Assert.assertNotNull("diagram should still be contained in a resource", sourceElement.eResource());
- // undo to go to previous state
- getEditingDomain().getCommandStack().undo();
- Assert.assertEquals("Context of the diagram should be the initial value: " + printElement(initialDiagramContainer), initialDiagramContainer, sourceElement.getElement());
-
- Assert.assertFalse("Editor should not be dirty at the end of the test", EditorUtils.getEditor().isDirty());
- }
-
- public void testUnexecutableDropOfDiagram(Diagram sourceElement, EObject targetElement) throws Exception {
- // find command for the drag / drop (source, target)
- List<CompoundCommand> dropCommands = getListOfDropCommands(sourceElement, targetElement);
- // create only one compound command
- // boolean that indicates that the command can really be not executable
- boolean notexecutable = true;
- for(CompoundCommand cc : dropCommands) {
- if(cc != null && !cc.isEmpty()) {
- if(cc.canExecute()) {
- notexecutable = false;
- }
- }
- }
- Assert.assertTrue("It should be impossible to move " + printElement(sourceElement) + " on " + printElement(targetElement), notexecutable);
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2011 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.modelexplorer.tests.dragdrop;
+
+import static org.junit.Assert.fail;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ViewerDropAdapter;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;
+import org.eclipse.papyrus.sysml.modelexplorer.tests.common.AbstractModelExplorerTest;
+import org.eclipse.papyrus.sysml.modelexplorer.tests.utils.EditorUtils;
+import org.eclipse.papyrus.views.modelexplorer.CustomCommonViewer;
+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView;
+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;
+import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.internal.navigator.dnd.NavigatorDnDService;
+import org.eclipse.ui.navigator.CommonDropAdapter;
+import org.eclipse.ui.navigator.CommonDropAdapterAssistant;
+import org.junit.Assert;
+import org.junit.Before;
+
+/**
+ * Abstract Class to implement diagram drag and drop tests.
+ */
+public class AbstractDragDropTest extends AbstractModelExplorerTest {
+
+ /**
+ * prepare the copy
+ *
+ * @throws Exception
+ * exception thrown in case of problems
+ */
+ @Before
+ public void testPrepare() throws Exception {
+ // check editor state (should be non dirty)
+ //FIXME: In Papyrus, the editor may be dirty at initialization. This should not be tested here. We simply save the editor as soon as it is opened.
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().doSave(new NullProgressMonitor());
+ }
+ });
+
+ Assert.assertFalse("Editor should not be dirty at initialization", isEditorDirty()); //$NON-NLS-1$
+ }
+
+ public List<CompoundCommand> getListOfDropCommands(EObject sourceElement, EObject targetElement) throws Exception {
+ // init source object
+ EObjectTreeElement sourceMEI = null;
+ if(sourceElement instanceof Diagram) {
+ sourceMEI = findSemanticModelElementItem((Diagram)sourceElement);
+ } else {
+ sourceMEI = findSemanticModelElementItem(sourceElement);
+ }
+ EObjectTreeElement targetMEI = null;
+ if(targetElement instanceof Diagram) {
+ targetMEI = findSemanticModelElementItem((Diagram)targetElement);
+ } else {
+ targetMEI = findSemanticModelElementItem(targetElement);
+ }
+ if(sourceElement instanceof Diagram) {
+ selectAndRevealDiagram((Diagram)sourceElement);
+ } else {
+ selectAndReveal(sourceElement);
+ }
+ ModelExplorerView modelExplorerView = null;
+ ModelExplorerPageBookView bookViewPart = (ModelExplorerPageBookView)NavigatorUtils.findViewPart(ModelExplorerPageBookView.VIEW_ID);
+ if(bookViewPart != null) {
+ modelExplorerView = (ModelExplorerView)bookViewPart.getActiveView();
+ Assert.assertNotNull("Impossible to find model explorer view", modelExplorerView); //$NON-NLS-1$
+ }
+ NavigatorDnDService dndService = (NavigatorDnDService)modelExplorerView.getNavigatorContentService().getDnDService();
+ Assert.assertNotNull("Impossible to find dnd service", dndService); //$NON-NLS-1$
+ CommonDropAdapter commonDropAdapter = ((CustomCommonViewer)modelExplorerView.getCommonViewer()).getDropAdapter();
+ CommonDropAdapterAssistant[] commonDropAdapterAssistants = dndService.findCommonDropAdapterAssistants(targetMEI, (IStructuredSelection)modelExplorerView.getCommonViewer().getSelection());
+ List<CompoundCommand> results = new ArrayList<CompoundCommand>();
+ for(CommonDropAdapterAssistant assistant : commonDropAdapterAssistants) {
+ // try to adapt to a Papyrus drop assistant. If not, send a warning
+ if(!(assistant instanceof org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant)) {
+ fail("this test expects that only papyrus drop assistants are provided for papyrus model explorer"); //$NON-NLS-1$
+ }
+ org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant papyrusAssistant = ((org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant)assistant);
+ Field currentOperationField = ViewerDropAdapter.class.getDeclaredField("currentOperation");
+ Assert.assertNotNull(currentOperationField);
+ currentOperationField.setAccessible(true);
+ currentOperationField.set(commonDropAdapter, DND.DROP_MOVE);
+ System.err.println(commonDropAdapter.getCurrentOperation()); // should be 2
+ Field currentLocationField = ViewerDropAdapter.class.getDeclaredField("currentLocation");
+ Assert.assertNotNull(currentLocationField);
+ currentLocationField.setAccessible(true);
+ currentLocationField.set(commonDropAdapter, ViewerDropAdapter.LOCATION_ON);
+ System.err.println(commonDropAdapter.getCurrentLocation()); // should be 3
+ LocalSelectionTransfer.getTransfer().setSelection(modelExplorerView.getCommonViewer().getSelection());
+ CompoundCommand command = papyrusAssistant.getDrop(targetMEI);
+ results.add(command);
+ }
+ return results;
+ }
+
+ public void testExecutableDropOfDiagram(Diagram sourceElement, EObject targetElement) throws Exception {
+ Assert.assertFalse("Editor should not be dirty at the beginning of the test", EditorUtils.getEditor().isDirty()); //$NON-NLS-1$
+ EObject initialDiagramContainer = sourceElement.getElement();
+ // find command for the drag / drop (source, target)
+ List<CompoundCommand> dropCommands = getListOfDropCommands(sourceElement, targetElement);
+ // create only one compound command
+ CompoundCommand executableCommand = new CompoundCommand();
+ for(CompoundCommand cc : dropCommands) {
+ executableCommand.append(cc);
+ }
+ getEditingDomain().getCommandStack().execute(executableCommand);
+ // check results
+ Assert.assertEquals("Context of the diagram should be the target: " + printElement(targetElement), targetElement, sourceElement.getElement()); //$NON-NLS-1$
+ Assert.assertNotNull("diagram should still be contained in a resource", sourceElement.eResource()); //$NON-NLS-1$
+ // try to undo
+ getEditingDomain().getCommandStack().undo();
+ Assert.assertEquals("Context of the diagram should be the initial value: " + printElement(initialDiagramContainer), initialDiagramContainer, sourceElement.getElement()); //$NON-NLS-1$
+ // try to redo
+ getEditingDomain().getCommandStack().redo();
+ // check results
+ Assert.assertEquals("Context of the diagram should be the target: " + printElement(targetElement), targetElement, sourceElement.getElement()); //$NON-NLS-1$
+ Assert.assertNotNull("diagram should still be contained in a resource", sourceElement.eResource()); //$NON-NLS-1$
+ // undo to go to previous state
+ getEditingDomain().getCommandStack().undo();
+ Assert.assertEquals("Context of the diagram should be the initial value: " + printElement(initialDiagramContainer), initialDiagramContainer, sourceElement.getElement()); //$NON-NLS-1$
+
+ Assert.assertFalse("Editor should not be dirty at the end of the test", EditorUtils.getEditor().isDirty()); //$NON-NLS-1$
+ }
+
+ public void testUnexecutableDropOfDiagram(Diagram sourceElement, EObject targetElement) throws Exception {
+ // find command for the drag / drop (source, target)
+ List<CompoundCommand> dropCommands = getListOfDropCommands(sourceElement, targetElement);
+ // create only one compound command
+ // boolean that indicates that the command can really be not executable
+ boolean notexecutable = true;
+ for(CompoundCommand cc : dropCommands) {
+ if(cc != null && !cc.isEmpty()) {
+ if(cc.canExecute()) {
+ notexecutable = false;
+ }
+ }
+ }
+ Assert.assertTrue("It should be impossible to move " + printElement(sourceElement) + " on " + printElement(targetElement), notexecutable); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/utils/EditorUtils.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/utils/EditorUtils.java
index b6ff508f5c3..c026ac2656d 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/utils/EditorUtils.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/utils/EditorUtils.java
@@ -1,75 +1,75 @@
-/*****************************************************************************
- * Copyright (c) 2011 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:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.tests.utils;
-
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * Utility class for tests
- */
-public class EditorUtils {
-
- /**
- * Retrieves current active editor
- *
- * @return current active editor
- * @throws Exception
- * exception thrown in case of issue
- */
- public static IEditorPart getEditor() throws Exception {
- RunnableWithResult<IEditorPart> runnable;
-
- Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<IEditorPart>() {
-
- public void run() {
- IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- setResult(editor);
- }
- });
-
- return runnable.getResult();
- }
-
- public static DiagramEditor getDiagramEditor() throws Exception {
-
- ServicesRegistry serviceRegistry = (ServicesRegistry)getEditor().getAdapter(ServicesRegistry.class);
- try {
- return (DiagramEditor)ServiceUtils.getInstance().getNestedActiveIEditorPart(serviceRegistry);
-
- } catch (ServiceException e) {
- throw new Exception("Unable to retrieve service.", e);
- } catch (ClassCastException e) {
- throw new Exception("Active diagram is not a DiagramEditor." + e.getMessage(), e);
- }
- }
-
- public static DiagramEditPart getDiagramEditPart() throws Exception {
-
- try {
- return getDiagramEditor().getDiagramEditPart();
-
- } catch (NullPointerException e) {
- throw new Exception("Could not find diagram edit part.", e);
- }
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2011 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:
+ * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.modelexplorer.tests.utils;
+
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PlatformUI;
+
+
+/**
+ * Utility class for tests
+ */
+public class EditorUtils {
+
+ /**
+ * Retrieves current active editor
+ *
+ * @return current active editor
+ * @throws Exception
+ * exception thrown in case of issue
+ */
+ public static IEditorPart getEditor() throws Exception {
+ RunnableWithResult<IEditorPart> runnable;
+
+ Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<IEditorPart>() {
+
+ public void run() {
+ IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ setResult(editor);
+ }
+ });
+
+ return runnable.getResult();
+ }
+
+ public static DiagramEditor getDiagramEditor() throws Exception {
+
+ ServicesRegistry serviceRegistry = (ServicesRegistry)getEditor().getAdapter(ServicesRegistry.class);
+ try {
+ return (DiagramEditor)ServiceUtils.getInstance().getNestedActiveIEditorPart(serviceRegistry);
+
+ } catch (ServiceException e) {
+ throw new Exception("Unable to retrieve service.", e); //$NON-NLS-1$
+ } catch (ClassCastException e) {
+ throw new Exception("Active diagram is not a DiagramEditor." + e.getMessage(), e); //$NON-NLS-1$
+ }
+ }
+
+ public static DiagramEditPart getDiagramEditPart() throws Exception {
+
+ try {
+ return getDiagramEditor().getDiagramEditPart();
+
+ } catch (NullPointerException e) {
+ throw new Exception("Could not find diagram edit part.", e); //$NON-NLS-1$
+ }
+ }
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/.classpath
new file mode 100644
index 00000000000..8a8f1668cdc
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/.project b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/.project
new file mode 100644
index 00000000000..e39981d0afa
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.diagram.profile.tests</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f287d53cf45
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..1a7eecd9484
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Profile Tests
+Bundle-SymbolicName: org.eclipse.papyrus.diagram.profile.tests
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.diagram.profile.tests.Activator
+Bundle-Vendor: Eclipse Modeling Project
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
+ org.eclipse.papyrus.editor;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.0.0",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",
+ org.eclipse.papyrus.diagram.tests;bundle-version="1.0.0",
+ org.eclipse.uml2.uml;bundle-version="4.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/build.properties
new file mode 100644
index 00000000000..41eb6ade2b4
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/org.eclipse.papyrus.diagram.profile.tests.launch b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/org.eclipse.papyrus.diagram.profile.tests.launch
new file mode 100644
index 00000000000..8ad61d4455f
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/org.eclipse.papyrus.diagram.profile.tests.launch
@@ -0,0 +1,41 @@
+<?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.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/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.diagram.profile.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.diagram.profile.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.6 -Xms40m -Xmx512m"/>
+<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"/>
+<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/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/Activator.java
new file mode 100644
index 00000000000..7c1779b0f39
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/Activator.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.diagram.profile.tests;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ private static BundleContext context;
+
+ static BundleContext getContext() {
+ return context;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext bundleContext) throws Exception {
+ Activator.context = bundleContext;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext bundleContext) throws Exception {
+ Activator.context = null;
+ }
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/AllTests.java
new file mode 100644
index 00000000000..4acccae20bb
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/AllTests.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.profile.tests;
+
+import org.eclipse.papyrus.diagram.profile.tests.canonical.AllCanonicalTests;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ AllCanonicalTests.class })
+public class AllTests {
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/IProfileDiagramTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/IProfileDiagramTest.java
new file mode 100644
index 00000000000..5d9dec5a963
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/IProfileDiagramTest.java
@@ -0,0 +1,21 @@
+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.profile.tests;
+
+
+
+public abstract interface IProfileDiagramTest {
+
+ public static final String PROJECT_NAME = "ProfileDiagramTestProject";
+
+ public static final String FILE_NAME = "ProfileDiagramTest.profile.di";
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/canonical/AllCanonicalTests.java
new file mode 100644
index 00000000000..5427a25fafe
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/canonical/AllCanonicalTests.java
@@ -0,0 +1,21 @@
+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.profile.tests.canonical;
+
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ TestProfileDiagramTopNode.class, TestProfileDiagramChildNode.class })
+public class AllCanonicalTests {
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/canonical/TestProfileDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/canonical/TestProfileDiagramChildNode.java
new file mode 100644
index 00000000000..857b6e9526a
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/canonical/TestProfileDiagramChildNode.java
@@ -0,0 +1,95 @@
+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.profile.tests.canonical;
+
+
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.diagram.tests.canonical.TestChildNode;
+import org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;
+import org.eclipse.uml2.uml.UMLPackage;
+/**
+ * @author Thibault
+ *
+ */
+import org.junit.Test;
+
+public class TestProfileDiagramChildNode extends TestChildNode {
+
+ protected CreateViewRequest createViewRequestShapeContainer() {
+ return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_2007, getDiagramEditPart().getDiagramPreferencesHint());
+ }
+
+ protected ICreationCommand getDiagramCommandCreation() {
+ return new CreateProfileDiagramCommand();
+ }
+
+ protected String getProjectName() {
+ return "ProfileDiagramTestProject";
+ }
+
+ protected String getFileName() {
+ return "ProfileDiagramTest.profile.di";
+ }
+
+ @Test
+ public void testToManageClassInPackage() {
+ testToManageNode(UMLElementTypes.Class_3010, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Package_2007, false);
+ }
+
+ @Test
+ public void testToManageDatatypeInPackage() {
+ testToManageNode(UMLElementTypes.DataType_3027, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Package_2007, false);
+ }
+
+ @Test
+ public void testToManagePackageInPackage() {
+ testToManageNode(UMLElementTypes.Package_1012, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_2007, false);
+ }
+
+ @Test
+ public void testToManageStereoTypeInPackage() {
+ testToManageNode(UMLElementTypes.Stereotype_1023, UMLPackage.eINSTANCE.getStereotype(), UMLElementTypes.Package_2007, false);
+ }
+
+ @Test
+ public void testToManageProfileInPackage() {
+ testToManageNode(UMLElementTypes.Profile_1024, UMLPackage.eINSTANCE.getProfile(), UMLElementTypes.Package_2007, false);
+ }
+
+ @Test
+ public void testToManageClassInProfile() {
+ testToManageNode(UMLElementTypes.Class_3010, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Profile_1030, false);
+ }
+
+ @Test
+ public void testToManageDatatypeInProfile() {
+ testToManageNode(UMLElementTypes.DataType_3027, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Profile_1030, false);
+ }
+
+ @Test
+ public void testToManagePackageInProfile() {
+ testToManageNode(UMLElementTypes.Package_1012, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Profile_1030, false);
+ }
+
+ @Test
+ public void testToManageStereoTypeInProfile() {
+ testToManageNode(UMLElementTypes.Stereotype_1023, UMLPackage.eINSTANCE.getStereotype(), UMLElementTypes.Profile_1030, false);
+ }
+
+ @Test
+ public void testToManageProfileInProfile() {
+ testToManageNode(UMLElementTypes.Profile_1024, UMLPackage.eINSTANCE.getProfile(), UMLElementTypes.Profile_1030, false);
+ }
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/canonical/TestProfileDiagramTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/canonical/TestProfileDiagramTopNode.java
new file mode 100644
index 00000000000..d01a732bb5e
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/canonical/TestProfileDiagramTopNode.java
@@ -0,0 +1,71 @@
+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.diagram.profile.tests.canonical;
+
+
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.diagram.tests.canonical.TestTopNode;
+import org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Test;
+
+
+public class TestProfileDiagramTopNode extends TestTopNode {
+
+ @Override
+ protected CreateViewRequest createViewRequestShapeContainer() {
+ return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_2007, getDiagramEditPart().getDiagramPreferencesHint());
+ }
+
+ @Override
+ protected ICreationCommand getDiagramCommandCreation() {
+ return (ICreationCommand)new CreateProfileDiagramCommand();
+ }
+
+ @Override
+ protected String getProjectName() {
+ return "ProfileDiagramTestProject";
+ }
+
+ @Override
+ protected String getFileName() {
+ return "ProfileDiagramTest.profile.di";
+ }
+
+ @Test
+ public void testToManageClass() {
+ testToManageNode(UMLElementTypes.Class_2008, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Package_2007, false);
+ }
+
+ @Test
+ public void testToManagePackage() {
+ testToManageNode(UMLElementTypes.Package_2007, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_2007, false);
+ }
+
+ @Test
+ public void testToManageDataType() {
+ testToManageNode(UMLElementTypes.DataType_2010, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_2007, false);
+ }
+
+ @Test
+ public void testToManageStereoType() {
+ testToManageNode(UMLElementTypes.Stereotype_1026, UMLPackage.eINSTANCE.getStereotype(), UMLElementTypes.Package_2007, false);
+ }
+
+ @Test
+ public void testToManageProfile() {
+ testToManageNode(UMLElementTypes.Profile_1030, UMLPackage.eINSTANCE.getProfile(), UMLElementTypes.Package_2007, false);
+ }
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityChildNodeInStructuredActivity.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityChildNodeInStructuredActivity.java
index 5a4fed98c60..434aa6daa27 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityChildNodeInStructuredActivity.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityChildNodeInStructuredActivity.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* 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
@@ -16,13 +16,14 @@ package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.papyrus.junit.utils.classification.FailingTest;
import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;
import org.eclipse.uml2.uml.UMLPackage;
import org.junit.Test;
-public class TestActivityChildNodeInStructuredActivity extends AbstractTestActivityChildNode {
+public class TestActivityChildNodeInStructuredActivity extends AbstractTestActivityChildNode {
@Override
protected String getProjectName() {
@@ -33,17 +34,19 @@ public class TestActivityChildNodeInStructuredActivity extends AbstractTestActi
protected String getFileName() {
return IActivityDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* {@inheritDoc}
*/
+ @Override
protected CreateViewRequest createViewRequestShapeContainer() {
return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.StructuredActivityNode_3065, getDiagramEditPart().getDiagramPreferencesHint());
}
-
+
/**
* Test to manage opaque action.
*/
+ @FailingTest("Bug 425578, 431573")
@Test
public void testToManageOpaqueAction() {
testToManageNode(UMLElementTypes.OpaqueAction_3007, UMLPackage.eINSTANCE.getOpaqueAction(), UMLElementTypes.StructuredActivityNode_3065, false);
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/DeleteHandlerTest.java b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/DeleteHandlerTest.java
index 09c95ab5eab..477b5a4c3aa 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/DeleteHandlerTest.java
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/DeleteHandlerTest.java
@@ -1,205 +1,205 @@
-/*****************************************************************************
- * 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:
- * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.modelexplorer.tests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView;
-import org.eclipse.papyrus.views.modelexplorer.tests.AbstractHandlerTest;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Model;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- *
- * @author VL222926
- *
- * This plugin tests the activation of the correct handler for differents selection in the ModelExplorer
- */
-public class DeleteHandlerTest extends AbstractHandlerTest {
-
- /**
- * the id of the delete command
- */
- private static final String DELETE_COMMAND_ID = "org.eclipse.ui.edit.delete";
-
- /**
- *
- * Constructor.
- *
- */
- public DeleteHandlerTest() {
- super(DELETE_COMMAND_ID, Activator.getDefault().getBundle());
- }
-
- /**
- * We test if we can delete the root of the Model or not
- */
- @Ignore("Currently fails on Hudson and freezes the Test Thread (EMF Facet dialog)")
- @Test
- public void deleteRootOfTheModel() {
- final List<EObject> selectedElement = new ArrayList<EObject>();
- selectedElement.add(getRootOfTheModel());
- getModelExplorerView().revealSemanticElement(selectedElement);
-
- RunnableWithResult<IWorkbenchPart> runnable;
-
- Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<IWorkbenchPart>() {
-
- public void run() {
- final IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- final IWorkbenchPart activePart = activePage.getActivePart();
- setResult(activePart);
- }
- });
-
- IWorkbenchPart activePart = runnable.getResult();
-
- assertTrue("The active part is not the ModelExplorer", activePart instanceof ModelExplorerPageBookView); //$NON-NLS-1$
-
- final IStructuredSelection currentSelection = getCurrentSelection();
- Assert.assertEquals("Only one element should be selected", 1, currentSelection.size()); //$NON-NLS-1$
- Object obj = currentSelection.getFirstElement();
- if(obj instanceof IAdaptable) {
- obj = ((IAdaptable)obj).getAdapter(EObject.class);
- }
- assertEquals(getRootOfTheModel(), obj);
- final IHandler currentHandler = getActiveHandler();
- if(currentHandler == null) {
- // not a problem in this case
- } else {
- Assert.assertFalse("We can delete the root of the model. It is not the wanted behavior", currentHandler.isEnabled()); //$NON-NLS-1$
- }
- }
-
- /**
- * We test if we can delete other uml elements
- */
- @Ignore("Currently fails on Hudson and freezes the Test Thread (EMF Facet dialog)")
- @Test
- public void deleteUMLElementsTest() throws Exception {
- testIsModelExplorerActivePart();
-
- int size = ((Model)getRootOfTheModel()).getPackagedElements().size();
- EObject elementToDelete;
- while(((Model)getRootOfTheModel()).getPackagedElements().size() != 0) {
- //we need to clean the selection
-
- Display.getDefault().syncExec(new Runnable() {
-
- public void run() {
- getCommonViewer().setSelection(new StructuredSelection());
- }
- });
-
- IStructuredSelection currentSelection = getCurrentSelection();
- elementToDelete = ((Model)getRootOfTheModel()).getPackagedElements().get(0);
- List<EObject> selectedElement = new ArrayList<EObject>();
- selectedElement.add(elementToDelete);
- getModelExplorerView().revealSemanticElement(selectedElement);
- currentSelection = getCurrentSelection();
- assertEquals("Only one element should be selected", 1, currentSelection.size());
- Object obj = currentSelection.getFirstElement();
- if(obj instanceof IAdaptable) {
- obj = ((IAdaptable)obj).getAdapter(EObject.class);
- }
- Assert.assertEquals(elementToDelete, obj);
- IHandler currentHandler = getActiveHandler();
- Assert.assertTrue("We can't delete the following element" + elementToDelete, currentHandler.isEnabled());
-
- currentHandler.execute(new ExecutionEvent());
-
- int newSize = ((Model)getRootOfTheModel()).getPackagedElements().size();
- Assert.assertEquals(size - 1, newSize);
- //We test the undo
- Assert.assertTrue(getCommandStack().canUndo());
- getCommandStack().undo();
- newSize = ((Model)getRootOfTheModel()).getPackagedElements().size();
- Assert.assertEquals(size, newSize);
-
- //we test the redo
- Assert.assertTrue(getCommandStack().canRedo());
- getCommandStack().redo();
- newSize = ((Model)getRootOfTheModel()).getPackagedElements().size();
- Assert.assertEquals(size - 1, newSize);
- size = newSize;
- }
-
- int newSize = ((Model)getRootOfTheModel()).getPackagedElements().size();
- Assert.assertEquals(0, newSize);
- undoRedo(10);
- }
-
-
- @Test
- @Ignore("this tests doesn't work because the method revealSemanticElement is not able to reveal imported element")
- public void deleteReadOnlyElementsTest() {
- //TODO this tests doesn't work because the method revealSemanticElement is not able to reveal imported element
- // testIsModelExplorerActivePart();
- //
- // List<PackageImport> packageImports = ((Model)getRootOfTheModel()).getPackageImports();
- // EObject elementToDelete;
- // for(int i = 0; i < packageImports.size(); i++) {
- // //we clean the selection
- // getCommonViewer().setSelection(new StructuredSelection());
- // IStructuredSelection currentSelection = getCurrentSelection();
- // Assert.isTrue(currentSelection.isEmpty());
- //
- // List<EObject> selectedElement = new ArrayList<EObject>();
- // selectedElement.add(packageImports.get(i).getImportedPackage());
- // getModelExplorerView().revealSemanticElement(selectedElement);
- // currentSelection = getCurrentSelection();
- //// IContentProvider contentProvider = getModelExplorerView().getCommonViewer().getContentProvider();
- //// Object[] children = ((ITreeContentProvider)contentProvider).getChildren(currentSelection.getFirstElement());
- //// for(int iter = 0; iter < children.length; iter++) {
- //// Object tcurrent = children[0];
- //// int d = 0;
- //// d++;
- //// }
- //// selectedElement.clear();
- // elementToDelete = packageImports.get(i);
- //// selectedElement.add(elementToDelete);
- //
- // getModelExplorerView().revealSemanticElement(selectedElement);
- //
- //
- // currentSelection = getCurrentSelection();
- // Assert.isTrue(currentSelection.size() == 1, "Only one element should be selected");
- // Object obj = currentSelection.getFirstElement();
- // if(obj instanceof IAdaptable) {
- // obj = ((IAdaptable)obj).getAdapter(EObject.class);
- // }
- // Assert.isTrue(obj == elementToDelete);
- // IHandler currentHandler = getActiveHandler();
- // Assert.isTrue(currentHandler.isEnabled(), "We can't delete the following element" + elementToDelete);
- // }
- }
-}
+/*****************************************************************************
+ * 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:
+ * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.modelexplorer.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView;
+import org.eclipse.papyrus.views.modelexplorer.tests.AbstractHandlerTest;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Model;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ *
+ * @author VL222926
+ *
+ * This plugin tests the activation of the correct handler for differents selection in the ModelExplorer
+ */
+public class DeleteHandlerTest extends AbstractHandlerTest {
+
+ /**
+ * the id of the delete command
+ */
+ private static final String DELETE_COMMAND_ID = "org.eclipse.ui.edit.delete";
+
+ /**
+ *
+ * Constructor.
+ *
+ */
+ public DeleteHandlerTest() {
+ super(DELETE_COMMAND_ID, Activator.getDefault().getBundle());
+ }
+
+ /**
+ * We test if we can delete the root of the Model or not
+ */
+ @Ignore("Currently fails on Hudson and freezes the Test Thread (EMF Facet dialog)")
+ @Test
+ public void deleteRootOfTheModel() {
+ final List<EObject> selectedElement = new ArrayList<EObject>();
+ selectedElement.add(getRootOfTheModel());
+ getModelExplorerView().revealSemanticElement(selectedElement);
+
+ RunnableWithResult<IWorkbenchPart> runnable;
+
+ Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<IWorkbenchPart>() {
+
+ public void run() {
+ final IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ final IWorkbenchPart activePart = activePage.getActivePart();
+ setResult(activePart);
+ }
+ });
+
+ IWorkbenchPart activePart = runnable.getResult();
+
+ assertTrue("The active part is not the ModelExplorer", activePart instanceof ModelExplorerPageBookView); //$NON-NLS-1$
+
+ final IStructuredSelection currentSelection = getCurrentSelection();
+ Assert.assertEquals("Only one element should be selected", 1, currentSelection.size()); //$NON-NLS-1$
+ Object obj = currentSelection.getFirstElement();
+ if(obj instanceof IAdaptable) {
+ obj = ((IAdaptable)obj).getAdapter(EObject.class);
+ }
+ assertEquals(getRootOfTheModel(), obj);
+ final IHandler currentHandler = getActiveHandler();
+ if(currentHandler == null) {
+ // not a problem in this case
+ } else {
+ Assert.assertFalse("We can delete the root of the model. It is not the wanted behavior", currentHandler.isEnabled()); //$NON-NLS-1$
+ }
+ }
+
+ /**
+ * We test if we can delete other uml elements
+ */
+ @Ignore("Currently fails on Hudson and freezes the Test Thread (EMF Facet dialog)")
+ @Test
+ public void deleteUMLElementsTest() throws Exception {
+ testIsModelExplorerActivePart();
+
+ int size = ((Model)getRootOfTheModel()).getPackagedElements().size();
+ EObject elementToDelete;
+ while(((Model)getRootOfTheModel()).getPackagedElements().size() != 0) {
+ //we need to clean the selection
+
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ getCommonViewer().setSelection(new StructuredSelection());
+ }
+ });
+
+ IStructuredSelection currentSelection = getCurrentSelection();
+ elementToDelete = ((Model)getRootOfTheModel()).getPackagedElements().get(0);
+ List<EObject> selectedElement = new ArrayList<EObject>();
+ selectedElement.add(elementToDelete);
+ getModelExplorerView().revealSemanticElement(selectedElement);
+ currentSelection = getCurrentSelection();
+ assertEquals("Only one element should be selected", 1, currentSelection.size()); //$NON-NLS-1$
+ Object obj = currentSelection.getFirstElement();
+ if(obj instanceof IAdaptable) {
+ obj = ((IAdaptable)obj).getAdapter(EObject.class);
+ }
+ Assert.assertEquals(elementToDelete, obj);
+ IHandler currentHandler = getActiveHandler();
+ Assert.assertTrue("We can't delete the following element" + elementToDelete, currentHandler.isEnabled()); //$NON-NLS-1$
+
+ currentHandler.execute(new ExecutionEvent());
+
+ int newSize = ((Model)getRootOfTheModel()).getPackagedElements().size();
+ Assert.assertEquals(size - 1, newSize);
+ //We test the undo
+ Assert.assertTrue(getCommandStack().canUndo());
+ getCommandStack().undo();
+ newSize = ((Model)getRootOfTheModel()).getPackagedElements().size();
+ Assert.assertEquals(size, newSize);
+
+ //we test the redo
+ Assert.assertTrue(getCommandStack().canRedo());
+ getCommandStack().redo();
+ newSize = ((Model)getRootOfTheModel()).getPackagedElements().size();
+ Assert.assertEquals(size - 1, newSize);
+ size = newSize;
+ }
+
+ int newSize = ((Model)getRootOfTheModel()).getPackagedElements().size();
+ Assert.assertEquals(0, newSize);
+ undoRedo(10);
+ }
+
+
+ @Test
+ @Ignore("this tests doesn't work because the method revealSemanticElement is not able to reveal imported element")
+ public void deleteReadOnlyElementsTest() {
+ //TODO this tests doesn't work because the method revealSemanticElement is not able to reveal imported element
+ // testIsModelExplorerActivePart();
+ //
+ // List<PackageImport> packageImports = ((Model)getRootOfTheModel()).getPackageImports();
+ // EObject elementToDelete;
+ // for(int i = 0; i < packageImports.size(); i++) {
+ // //we clean the selection
+ // getCommonViewer().setSelection(new StructuredSelection());
+ // IStructuredSelection currentSelection = getCurrentSelection();
+ // Assert.isTrue(currentSelection.isEmpty());
+ //
+ // List<EObject> selectedElement = new ArrayList<EObject>();
+ // selectedElement.add(packageImports.get(i).getImportedPackage());
+ // getModelExplorerView().revealSemanticElement(selectedElement);
+ // currentSelection = getCurrentSelection();
+ //// IContentProvider contentProvider = getModelExplorerView().getCommonViewer().getContentProvider();
+ //// Object[] children = ((ITreeContentProvider)contentProvider).getChildren(currentSelection.getFirstElement());
+ //// for(int iter = 0; iter < children.length; iter++) {
+ //// Object tcurrent = children[0];
+ //// int d = 0;
+ //// d++;
+ //// }
+ //// selectedElement.clear();
+ // elementToDelete = packageImports.get(i);
+ //// selectedElement.add(elementToDelete);
+ //
+ // getModelExplorerView().revealSemanticElement(selectedElement);
+ //
+ //
+ // currentSelection = getCurrentSelection();
+ // Assert.isTrue(currentSelection.size() == 1, "Only one element should be selected");
+ // Object obj = currentSelection.getFirstElement();
+ // if(obj instanceof IAdaptable) {
+ // obj = ((IAdaptable)obj).getAdapter(EObject.class);
+ // }
+ // Assert.isTrue(obj == elementToDelete);
+ // IHandler currentHandler = getActiveHandler();
+ // Assert.isTrue(currentHandler.isEnabled(), "We can't delete the following element" + elementToDelete);
+ // }
+ }
+}
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/ModelExplorerViewTests.java b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/ModelExplorerViewTests.java
index 94aca47bd96..f2669008604 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/ModelExplorerViewTests.java
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/ModelExplorerViewTests.java
@@ -1,223 +1,223 @@
-/*****************************************************************************
- * 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:
- * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.modelexplorer.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.jface.viewers.IStructuredSelection;
+/*****************************************************************************
+ * 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:
+ * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.modelexplorer.tests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView;
-import org.eclipse.papyrus.views.modelexplorer.tests.AbstractHandlerTest;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.junit.Assert;
-import org.junit.Test;
-
-
-public class ModelExplorerViewTests extends AbstractHandlerTest {
-
- /**
- *
- * Constructor.
- * This plugin test the ModelExplorerView
- */
- public ModelExplorerViewTests() {
- super(Activator.getDefault().getBundle());
- }
-
- /**
- * tests the method reveal semantic element on the root element
- */
- @Test
- public void revealSemanticElement_selectRootTest() {
- final List<EObject> selectedElement = new ArrayList<EObject>();
- selectedElement.add(getRootOfTheModel());
- getModelExplorerView().revealSemanticElement(selectedElement);
- RunnableWithResult<IWorkbenchPart> activePartRunnable;
- Display.getDefault().syncExec(activePartRunnable = new RunnableWithResult.Impl<IWorkbenchPart>() {
-
- public void run() {
- IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IWorkbenchPart activePart = activePage.getActivePart();
- setResult(activePart);
- }
- });
-
- Assert.assertTrue("The active part is not the ModelExplorer", activePartRunnable.getResult() instanceof ModelExplorerPageBookView); //$NON-NLS-1$
- final IStructuredSelection currentSelection = getCurrentSelection();
- Assert.assertEquals("Only one element should be selected", 1, currentSelection.size()); //$NON-NLS-1$
- Object obj = currentSelection.getFirstElement();
- obj =EMFHelper.getEObject(obj);
-
- Assert.assertEquals("The function revealSemanticElement seems doesn't work on the root of the model", getRootOfTheModel(), obj);
- }
-
-
- /**
- * tests the method reveal semantic element selects the correct element
- */
- @Test
- public void revealSemanticElement_selectChildrenTest() {
- final List<EObject> selectedElement = new ArrayList<EObject>();
- final Package pack = (Package)getRootOfTheModel();
- final List<NamedElement> members = pack.getOwnedMembers();
- final int size = members.size();
- Assert.assertTrue(size != 0);//to be sure that the tested model is correct
- for(NamedElement current : members) {
- selectedElement.clear();
- selectedElement.add(current);
-
- RunnableWithResult<IWorkbenchPart> runnable;
- Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<IWorkbenchPart>() {
-
- public void run() {
- getModelExplorerView().revealSemanticElement(selectedElement);
- final IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- final IWorkbenchPart activePart = activePage.getActivePart();
-
- setResult(activePart);
- }
- });
-
- IWorkbenchPart activePart = runnable.getResult();
-
- Assert.assertTrue("The active part is not the ModelExplorer", activePart instanceof ModelExplorerPageBookView); //$NON-NLS-1$
- final IStructuredSelection currentSelection = getCurrentSelection();
- Assert.assertTrue("Only one element should be selected", currentSelection.size() == 1); //$NON-NLS-1$
- Object obj = currentSelection.getFirstElement();
- obj =org.eclipse.papyrus.infra.emf.utils.EMFHelper.getEObject(obj);
- Assert.assertTrue("The function revealSemanticElement seems doesn't work with children", obj == current);
- }
- }
-
- /**
- * tests the method reveal semantic element on the root element
- */
- @Test
- public void revealSemanticElement_selectChildrenTestList() {
- final List<EObject> selectedElement = new ArrayList<EObject>();
- final Package pack = (Package)getRootOfTheModel();
- final List<NamedElement> members = pack.getOwnedMembers();
- final int size = members.size();
- Assert.assertTrue(size != 0);//to be sure that the tested model is correct
- selectedElement.addAll(members);
-
- RunnableWithResult<IWorkbenchPart> runnable;
- Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<IWorkbenchPart>() {
-
- public void run() {
- getModelExplorerView().revealSemanticElement(selectedElement);
- final IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- final IWorkbenchPart activePart = activePage.getActivePart();
-
- setResult(activePart);
- }
- });
-
- IWorkbenchPart activePart = runnable.getResult();
-
-
- Assert.assertTrue("The active part is not the ModelExplorer", activePart instanceof ModelExplorerPageBookView); //$NON-NLS-1$
- final IStructuredSelection currentSelection = getCurrentSelection();
- Assert.assertTrue("Multi selction doesn't work with the method revealSemanticElement", currentSelection.size() == size); //$NON-NLS-1$
- }
-
- /**
- * tests the method reveal semantic element on the root element
- */
- @Test
- public void revealSemanticElement_selectImportedPackage() {
- final List<EObject> selectedElement = new ArrayList<EObject>();
- final Package pack = (Package)getRootOfTheModel();
- final EList<Package> importedPackage = pack.getImportedPackages();
- final int size = importedPackage.size();
- Assert.assertTrue(size != 0);//to be sure that the tested model is correct
- for(NamedElement current : importedPackage) {
-
- waitForPendingMessages();
-
- selectedElement.clear();
- selectedElement.add(current);
- getModelExplorerView().revealSemanticElement(selectedElement);
- RunnableWithResult<IWorkbenchPart> activePartRunnable;
- Display.getDefault().syncExec(activePartRunnable = new RunnableWithResult.Impl<IWorkbenchPart>() {
-
- public void run() {
- IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IWorkbenchPart activePart = activePage.getActivePart();
- setResult(activePart);
- }
- });
-
- Assert.assertTrue("The active part is not the ModelExplorer", activePartRunnable.getResult() instanceof ModelExplorerPageBookView); //$NON-NLS-1$
- final IStructuredSelection currentSelection = getCurrentSelection();
- Assert.assertEquals("I don't get the correct selection", 1, currentSelection.size()); //$NON-NLS-1$
- Object obj = currentSelection.getFirstElement();
- obj =EMFHelper.getEObject(obj);
- Assert.assertEquals("The function revealSemanticElement seems doesn't work with importedPackage", current, obj);
- }
- }
-
- private void waitForPendingMessages() {
- //Run all pending tasks to refresh the ModelExplorer
- if(Display.getCurrent() != null) {
- while(true) {
- try {
- if(!Display.getCurrent().readAndDispatch()) {
- break;
- }
- } catch (Throwable t) {
- Activator.log.error(t);
- }
- }
- }
- }
-
- @Test
- public void revealSemanticElement_selectImportedPackageList() {
- final List<EObject> selectedElement = new ArrayList<EObject>();
- final Package pack = (Package)getRootOfTheModel();
- final EList<Package> importedPackage = pack.getImportedPackages();
- final int size = importedPackage.size();
- Assert.assertNotSame(0, size);//to be sure that the tested model is correct
-
- //Run all pending tasks to refresh the ModelExplorer
- waitForPendingMessages();
-
- selectedElement.addAll(importedPackage);
- getModelExplorerView().revealSemanticElement(selectedElement);
- RunnableWithResult<IWorkbenchPart> activePartRunnable;
- Display.getDefault().syncExec(activePartRunnable = new RunnableWithResult.Impl<IWorkbenchPart>() {
-
- public void run() {
- IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IWorkbenchPart activePart = activePage.getActivePart();
- setResult(activePart);
- }
- });
-
- Assert.assertTrue("The active part is not the ModelExplorer", activePartRunnable.getResult() instanceof ModelExplorerPageBookView); //$NON-NLS-1$
- final IStructuredSelection currentSelection = getCurrentSelection();
- Assert.assertEquals("I don't get the current selection for revealSemanticElement_importedPackageList", 1, currentSelection.size()); //$NON-NLS-1$
- }
-}
+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView;
+import org.eclipse.papyrus.views.modelexplorer.tests.AbstractHandlerTest;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Package;
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class ModelExplorerViewTests extends AbstractHandlerTest {
+
+ /**
+ *
+ * Constructor.
+ * This plugin test the ModelExplorerView
+ */
+ public ModelExplorerViewTests() {
+ super(Activator.getDefault().getBundle());
+ }
+
+ /**
+ * tests the method reveal semantic element on the root element
+ */
+ @Test
+ public void revealSemanticElement_selectRootTest() {
+ final List<EObject> selectedElement = new ArrayList<EObject>();
+ selectedElement.add(getRootOfTheModel());
+ getModelExplorerView().revealSemanticElement(selectedElement);
+ RunnableWithResult<IWorkbenchPart> activePartRunnable;
+ Display.getDefault().syncExec(activePartRunnable = new RunnableWithResult.Impl<IWorkbenchPart>() {
+
+ public void run() {
+ IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IWorkbenchPart activePart = activePage.getActivePart();
+ setResult(activePart);
+ }
+ });
+
+ Assert.assertTrue("The active part is not the ModelExplorer", activePartRunnable.getResult() instanceof ModelExplorerPageBookView); //$NON-NLS-1$
+ final IStructuredSelection currentSelection = getCurrentSelection();
+ Assert.assertEquals("Only one element should be selected", 1, currentSelection.size()); //$NON-NLS-1$
+ Object obj = currentSelection.getFirstElement();
+ obj =EMFHelper.getEObject(obj);
+
+ Assert.assertEquals("The function revealSemanticElement seems doesn't work on the root of the model", getRootOfTheModel(), obj);
+ }
+
+
+ /**
+ * tests the method reveal semantic element selects the correct element
+ */
+ @Test
+ public void revealSemanticElement_selectChildrenTest() {
+ final List<EObject> selectedElement = new ArrayList<EObject>();
+ final Package pack = (Package)getRootOfTheModel();
+ final List<NamedElement> members = pack.getOwnedMembers();
+ final int size = members.size();
+ Assert.assertTrue(size != 0);//to be sure that the tested model is correct
+ for(NamedElement current : members) {
+ selectedElement.clear();
+ selectedElement.add(current);
+
+ RunnableWithResult<IWorkbenchPart> runnable;
+ Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<IWorkbenchPart>() {
+
+ public void run() {
+ getModelExplorerView().revealSemanticElement(selectedElement);
+ final IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ final IWorkbenchPart activePart = activePage.getActivePart();
+
+ setResult(activePart);
+ }
+ });
+
+ IWorkbenchPart activePart = runnable.getResult();
+
+ Assert.assertTrue("The active part is not the ModelExplorer", activePart instanceof ModelExplorerPageBookView); //$NON-NLS-1$
+ final IStructuredSelection currentSelection = getCurrentSelection();
+ Assert.assertTrue("Only one element should be selected", currentSelection.size() == 1); //$NON-NLS-1$
+ Object obj = currentSelection.getFirstElement();
+ obj =org.eclipse.papyrus.infra.emf.utils.EMFHelper.getEObject(obj);
+ Assert.assertTrue("The function revealSemanticElement seems doesn't work with children", obj == current); //$NON-NLS-1$
+ }
+ }
+
+ /**
+ * tests the method reveal semantic element on the root element
+ */
+ @Test
+ public void revealSemanticElement_selectChildrenTestList() {
+ final List<EObject> selectedElement = new ArrayList<EObject>();
+ final Package pack = (Package)getRootOfTheModel();
+ final List<NamedElement> members = pack.getOwnedMembers();
+ final int size = members.size();
+ Assert.assertTrue(size != 0);//to be sure that the tested model is correct
+ selectedElement.addAll(members);
+
+ RunnableWithResult<IWorkbenchPart> runnable;
+ Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<IWorkbenchPart>() {
+
+ public void run() {
+ getModelExplorerView().revealSemanticElement(selectedElement);
+ final IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ final IWorkbenchPart activePart = activePage.getActivePart();
+
+ setResult(activePart);
+ }
+ });
+
+ IWorkbenchPart activePart = runnable.getResult();
+
+
+ Assert.assertTrue("The active part is not the ModelExplorer", activePart instanceof ModelExplorerPageBookView); //$NON-NLS-1$
+ final IStructuredSelection currentSelection = getCurrentSelection();
+ Assert.assertTrue("Multi selction doesn't work with the method revealSemanticElement", currentSelection.size() == size); //$NON-NLS-1$
+ }
+
+ /**
+ * tests the method reveal semantic element on the root element
+ */
+ @Test
+ public void revealSemanticElement_selectImportedPackage() {
+ final List<EObject> selectedElement = new ArrayList<EObject>();
+ final Package pack = (Package)getRootOfTheModel();
+ final EList<Package> importedPackage = pack.getImportedPackages();
+ final int size = importedPackage.size();
+ Assert.assertTrue(size != 0);//to be sure that the tested model is correct
+ for(NamedElement current : importedPackage) {
+
+ waitForPendingMessages();
+
+ selectedElement.clear();
+ selectedElement.add(current);
+ getModelExplorerView().revealSemanticElement(selectedElement);
+ RunnableWithResult<IWorkbenchPart> activePartRunnable;
+ Display.getDefault().syncExec(activePartRunnable = new RunnableWithResult.Impl<IWorkbenchPart>() {
+
+ public void run() {
+ IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IWorkbenchPart activePart = activePage.getActivePart();
+ setResult(activePart);
+ }
+ });
+
+ Assert.assertTrue("The active part is not the ModelExplorer", activePartRunnable.getResult() instanceof ModelExplorerPageBookView); //$NON-NLS-1$
+ final IStructuredSelection currentSelection = getCurrentSelection();
+ Assert.assertEquals("I don't get the correct selection", 1, currentSelection.size()); //$NON-NLS-1$
+ Object obj = currentSelection.getFirstElement();
+ obj =EMFHelper.getEObject(obj);
+ Assert.assertEquals("The function revealSemanticElement seems doesn't work with importedPackage", current, obj); //$NON-NLS-1$
+ }
+ }
+
+ private void waitForPendingMessages() {
+ //Run all pending tasks to refresh the ModelExplorer
+ if(Display.getCurrent() != null) {
+ while(true) {
+ try {
+ if(!Display.getCurrent().readAndDispatch()) {
+ break;
+ }
+ } catch (Throwable t) {
+ Activator.log.error(t);
+ }
+ }
+ }
+ }
+
+ @Test
+ public void revealSemanticElement_selectImportedPackageList() {
+ final List<EObject> selectedElement = new ArrayList<EObject>();
+ final Package pack = (Package)getRootOfTheModel();
+ final EList<Package> importedPackage = pack.getImportedPackages();
+ final int size = importedPackage.size();
+ Assert.assertNotSame(0, size);//to be sure that the tested model is correct
+
+ //Run all pending tasks to refresh the ModelExplorer
+ waitForPendingMessages();
+
+ selectedElement.addAll(importedPackage);
+ getModelExplorerView().revealSemanticElement(selectedElement);
+ RunnableWithResult<IWorkbenchPart> activePartRunnable;
+ Display.getDefault().syncExec(activePartRunnable = new RunnableWithResult.Impl<IWorkbenchPart>() {
+
+ public void run() {
+ IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IWorkbenchPart activePart = activePage.getActivePart();
+ setResult(activePart);
+ }
+ });
+
+ Assert.assertTrue("The active part is not the ModelExplorer", activePartRunnable.getResult() instanceof ModelExplorerPageBookView); //$NON-NLS-1$
+ final IStructuredSelection currentSelection = getCurrentSelection();
+ Assert.assertEquals("I don't get the current selection for revealSemanticElement_importedPackageList", 1, currentSelection.size()); //$NON-NLS-1$
+ }
+}
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/RenameHandlerTest.java b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/RenameHandlerTest.java
index bec108c7d6a..478fecf6145 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/RenameHandlerTest.java
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/RenameHandlerTest.java
@@ -1,62 +1,62 @@
-/*****************************************************************************
- * 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:
- * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.modelexplorer.tests;
-
-import java.util.List;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.papyrus.views.modelexplorer.tests.AbstractHandlerTest;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Model;
-import org.junit.Assert;
-import org.junit.Test;
-
-
-
-public class RenameHandlerTest extends AbstractHandlerTest {
-
- /**
- * the id of the command to rename the element
- */
- private static final String commandId = "org.eclipse.ui.edit.rename";
-
- /**
- *
- * Constructor.
- *
- */
- public RenameHandlerTest() {
- super(commandId, Activator.getDefault().getBundle());
- }
-
- @Test
- public void renameUMLUnnamedElementTest() {
- List<Comment> comments = ((Model)getRootOfTheModel()).getOwnedComments();
- Assert.assertFalse(comments.isEmpty());
- for(int i = 0; i < ((Model)getRootOfTheModel()).getOwnedComments().size(); i++) {
- selectElementInTheModelexplorer(((Model)getRootOfTheModel()).getOwnedComments().get(i));
- IHandler handler = getActiveHandler();
- if(handler != null) {
- Assert.assertFalse("Rename handler is not disabled on UnnamedElement", handler.isEnabled());
- }
- }
- }
-
- @Test
- public void renameUMLNamedElementTest() {
- selectElementInTheModelexplorer(getRootOfTheModel());
- IHandler handler = getActiveHandler();
- Assert.assertTrue(handler.isEnabled());
- }
-}
+/*****************************************************************************
+ * 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:
+ * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.modelexplorer.tests;
+
+import java.util.List;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.papyrus.views.modelexplorer.tests.AbstractHandlerTest;
+import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.Model;
+import org.junit.Assert;
+import org.junit.Test;
+
+
+
+public class RenameHandlerTest extends AbstractHandlerTest {
+
+ /**
+ * the id of the command to rename the element
+ */
+ private static final String commandId = "org.eclipse.ui.edit.rename";
+
+ /**
+ *
+ * Constructor.
+ *
+ */
+ public RenameHandlerTest() {
+ super(commandId, Activator.getDefault().getBundle());
+ }
+
+ @Test
+ public void renameUMLUnnamedElementTest() {
+ List<Comment> comments = ((Model)getRootOfTheModel()).getOwnedComments();
+ Assert.assertFalse(comments.isEmpty());
+ for(int i = 0; i < ((Model)getRootOfTheModel()).getOwnedComments().size(); i++) {
+ selectElementInTheModelexplorer(((Model)getRootOfTheModel()).getOwnedComments().get(i));
+ IHandler handler = getActiveHandler();
+ if(handler != null) {
+ Assert.assertFalse("Rename handler is not disabled on UnnamedElement", handler.isEnabled()); //$NON-NLS-1$
+ }
+ }
+ }
+
+ @Test
+ public void renameUMLNamedElementTest() {
+ selectElementInTheModelexplorer(getRootOfTheModel());
+ IHandler handler = getActiveHandler();
+ Assert.assertTrue(handler.isEnabled());
+ }
+}
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/paste/CopyPasteHandlerTest.java b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/paste/CopyPasteHandlerTest.java
index 7d751062389..582063d820a 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/paste/CopyPasteHandlerTest.java
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/paste/CopyPasteHandlerTest.java
@@ -51,7 +51,7 @@ public class CopyPasteHandlerTest extends AbstractDualHandlerTest {
try {
EObject rootOfTheModel = getRootOfTheModel();
// check that there is Class1
- Assert.assertEquals("Class1 is missing", getCountElementByName(CLASS1), 1);
+ Assert.assertEquals("Class1 is missing", getCountElementByName(CLASS1), 1); //$NON-NLS-1$
EObject class1 = getNameElementByName(CLASS1); // get Class1
// select class1
@@ -71,7 +71,7 @@ public class CopyPasteHandlerTest extends AbstractDualHandlerTest {
pasteHandler.execute(new ExecutionEvent());
// check that there is 2 Class1
- Assert.assertEquals("Class1 copy is missing", getCountElementByName(CLASS1), 2);
+ Assert.assertEquals("Class1 copy is missing", getCountElementByName(CLASS1), 2); //$NON-NLS-1$
} catch (ExecutionException e) {
Assert.fail(e.toString());
@@ -88,8 +88,8 @@ public class CopyPasteHandlerTest extends AbstractDualHandlerTest {
try {
EObject rootOfTheModel = getRootOfTheModel();
// check that there is Class1 and Class2
- Assert.assertEquals("Class1 is missing", getCountElementByName(CLASS1), 1);
- Assert.assertEquals("Class2 is missing", getCountElementByName(CLASS2), 1);
+ Assert.assertEquals("Class1 is missing", getCountElementByName(CLASS1), 1); //$NON-NLS-1$
+ Assert.assertEquals("Class2 is missing", getCountElementByName(CLASS2), 1); //$NON-NLS-1$
EObject class1 = getNameElementByName(CLASS1); // get Class1
EObject class2 = getNameElementByName(CLASS2); // get Class2
@@ -113,8 +113,8 @@ public class CopyPasteHandlerTest extends AbstractDualHandlerTest {
Assert.assertTrue(pasteHandler.isEnabled());
pasteHandler.execute(new ExecutionEvent());
// check that there is 2 Class1 and 2 Class2
- Assert.assertEquals("Class1 copy is missing", getCountElementByName(CLASS1), 2);
- Assert.assertEquals("Class2 copy is missing", getCountElementByName(CLASS2), 2);
+ Assert.assertEquals("Class1 copy is missing", getCountElementByName(CLASS1), 2); //$NON-NLS-1$
+ Assert.assertEquals("Class2 copy is missing", getCountElementByName(CLASS2), 2); //$NON-NLS-1$
} catch (ExecutionException e) {
Assert.fail(e.toString());
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/META-INF/MANIFEST.MF
index 54831811859..2a1600b582c 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/META-INF/MANIFEST.MF
@@ -21,7 +21,8 @@ Require-Bundle: org.eclipse.ui,
org.junit;bundle-version="4.10.0",
org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",
org.eclipse.gmf.runtime.common.core,
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
+ org.eclipse.papyrus.junit.utils;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.diagram.tests.canonical
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractPapyrusTestCase.java
index 88861b279d0..135bade9d71 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractPapyrusTestCase.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractPapyrusTestCase.java
@@ -48,6 +48,7 @@ import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
import org.eclipse.papyrus.junit.utils.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;
import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
+import org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand;
import org.eclipse.papyrus.uml.tools.model.UmlModel;
import org.eclipse.papyrus.uml.tools.model.UmlUtils;
import org.eclipse.swt.widgets.Display;
@@ -172,13 +173,17 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
public void run() {
try {
- papyrusEditor.doSave(new NullProgressMonitor());
+ //if the diagram is a Profile we dont save it because we dont need to define it
+ if(!diagramEditPart.getDiagramView().getType().equals("PapyrusUMLProfileDiagram")) {
+ papyrusEditor.doSave(new NullProgressMonitor());
+ }
+
// diResourceSet.save( new NullProgressMonitor());
// diagramEditor.close(true);
papyrusEditor = null;
diagramEditPart = null;
diagramEditor = null;
- page.closeAllEditors(true);
+ page.closeAllEditors(false);
project.delete(true, new NullProgressMonitor());
setResult(true);
} catch (Exception ex) {
@@ -248,7 +253,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
root = workspace.getRoot();
/*
* final String timestamp = Long.toString(System.currentTimeMillis());
- *
+ *
* project = root.getProject("DiagramTestProject_" + timestamp); file =
* project.getFile("DiagramTest_" + timestamp + ".di"); //$NON-NLS-2$
*/
@@ -269,44 +274,57 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
if(!file.exists()) {
file.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
diResourceSet.createsModels(file);
- new CreateUMLModelCommand().createModel(this.diResourceSet);
- ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);
- try {
- registry.add(ModelSet.class, Integer.MAX_VALUE, diResourceSet); // High priority to override all contributions
- registry.startRegistry();
- } catch (ServiceException ex) {
- // Ignore exceptions
- }
+ if(!file.getName().endsWith(".profile.di")) {
- // Apply the required profiles
- ArrayList<IFile> modifiedFiles = new ArrayList<IFile>();
- modifiedFiles.add(file);
- ICommand commandProfiles = new AbstractTransactionalCommand(diResourceSet.getTransactionalEditingDomain(), "Apply profiles", modifiedFiles) {
-
- @Override
- protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- UmlModel resModel = UmlUtils.getUmlModel(diResourceSet);
- EObject obj;
- try {
- obj = resModel.lookupRoot();
- } catch (NotFoundException e) {
- return CommandResult.newErrorCommandResult(e);
- }
- if(obj instanceof Model) {
- Model model = (Model)obj;
- for(String uri : getRequiredProfiles()) {
- EPackage definition = EPackage.Registry.INSTANCE.getEPackage(uri);
- if(definition != null) {
- Profile profile = UMLUtil.getProfile(definition, model);
- model.applyProfile(profile);
+ new CreateUMLModelCommand().createModel(this.diResourceSet);
+
+ ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);
+ try {
+ registry.add(ModelSet.class, Integer.MAX_VALUE, diResourceSet); // High priority to override all contributions
+ registry.startRegistry();
+ } catch (ServiceException ex) {
+ // Ignore exceptions
+ }
+
+ // Apply the required profiles
+ ArrayList<IFile> modifiedFiles = new ArrayList<IFile>();
+ modifiedFiles.add(file);
+ ICommand commandProfiles = new AbstractTransactionalCommand(diResourceSet.getTransactionalEditingDomain(), "Apply profiles", modifiedFiles) {
+
+ @Override
+ protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ UmlModel resModel = UmlUtils.getUmlModel(diResourceSet);
+ EObject obj;
+ try {
+ obj = resModel.lookupRoot();
+ } catch (NotFoundException e) {
+ return CommandResult.newErrorCommandResult(e);
+ }
+ if(obj instanceof Model) {
+ Model model = (Model)obj;
+ for(String uri : getRequiredProfiles()) {
+ EPackage definition = EPackage.Registry.INSTANCE.getEPackage(uri);
+ if(definition != null) {
+ Profile profile = UMLUtil.getProfile(definition, model);
+ model.applyProfile(profile);
+ }
}
}
+ return CommandResult.newOKCommandResult();
}
- return CommandResult.newOKCommandResult();
- }
- };
- commandProfiles.execute(new NullProgressMonitor(), null);
+ };
+ commandProfiles.execute(new NullProgressMonitor(), null);
+ } else {
+ new CreateProfileModelCommand().createModel(this.diResourceSet);
+ ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);
+ try {
+ registry.add(ModelSet.class, Integer.MAX_VALUE, diResourceSet); // High priority to override all contributions
+ registry.startRegistry();
+ } catch (ServiceException ex) {
+ // Ignore exceptions
+ }
+ }
ICreationCommand command = getDiagramCommandCreation();
command.createDiagram(diResourceSet, null, "DiagramToTest");
diResourceSet.save(new NullProgressMonitor());
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/AllTests.launch b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/AllTests.launch
index 227d0a6efd9..3b6eaf2190b 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/AllTests.launch
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/AllTests.launch
@@ -17,7 +17,7 @@
<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"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-umltools-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/AllTests.java"/>
</listAttribute>
@@ -28,6 +28,7 @@
<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.uml.tools.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.uml.tools.tests"/>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF
index 4f88a6973ef..8ebae0c6e79 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.junit.utils;bundle-version="1.0.0",
org.eclipse.emf.transaction;bundle-version="1.4.0",
org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.0",
org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.uml.tools.tests,
org.eclipse.papyrus.uml.tools.tests.tests
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/DependencyManagementTest.java b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/DependencyManagementTest.java
index f04d68b43f4..1d830f26226 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/DependencyManagementTest.java
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/DependencyManagementTest.java
@@ -13,10 +13,14 @@
*****************************************************************************/
package org.eclipse.papyrus.uml.tools.tests.tests;
+import java.util.HashMap;
+import java.util.Map;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.emf.common.util.BasicDiagnostic;
import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.TreeIterator;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
@@ -32,6 +36,8 @@ import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
import org.eclipse.papyrus.junit.utils.ProjectUtils;
import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
import org.eclipse.papyrus.uml.tools.tests.Activator;
+import org.eclipse.uml2.common.util.UML2Util;
+import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.EnumerationLiteral;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.NamedElement;
@@ -375,6 +381,97 @@ public class DependencyManagementTest extends AbstractEditorTest {
}
}
+ // Verify that stereotype applications that can be retargeted to the new profile retain their identities
+ @Test
+ public void testSwitchProfilesStereotypeIdentities() throws Exception {
+ IProject project = ProjectUtils.createProject("dependencyManagement.switchProfiles");
+ PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/model2");
+ PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p3/profile3.profile");
+ PapyrusProjectUtils.copyPapyrusModel(project, getBundle(), getSourcePath(), "profiles/p4/profile4.profile");
+
+ final URI clientModelDiURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.di", true);
+ final URI clientModelURI = URI.createPlatformResourceURI(project.getName() + "/profiles/model2.uml", true);
+ final URI sourceProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p3/profile3.profile.uml", true);
+ final URI targetProfileURI = URI.createPlatformResourceURI(project.getName() + "/profiles/p4/profile4.profile.uml", true);
+
+ final ModelSet modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+ final TransactionalEditingDomain domain = ModelUtils.getEditingDomain(modelSet);
+ ModelSet newModelSet = null;
+
+ try {
+ // The modelset doesn't have any reference to the target profile
+ Assert.assertNull("The modelset should not have references to the target library", modelSet.getResource(targetProfileURI, false));
+
+ Model rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());
+
+ // Gather the identities of stereotype instances
+ Map<String, EObject> idsToStereotypeInstances = new HashMap<String, EObject>();
+ XMLResource xml = (XMLResource)rootModel.eResource();
+ for(TreeIterator<EObject> iter = xml.getAllContents(); iter.hasNext();) {
+ EObject next = iter.next();
+ if(!(next instanceof Element)) {
+ iter.prune();
+ } else {
+ for(EObject stereo : ((Element)next).getStereotypeApplications()) {
+ idsToStereotypeInstances.put(xml.getID(stereo), stereo);
+ }
+ }
+ }
+
+ // Before the transformation, stereotypes from the source profile must be applied
+ checkAppliedProfileAndStereotypes(modelSet, rootModel, sourceProfileURI);
+
+ // Execute the transformation
+ domain.getCommandStack().execute(new RecordingCommand(domain, "Edit profile applications") {
+
+ @Override
+ protected void doExecute() {
+ new DependencyManager(domain).updateDependencies(sourceProfileURI, targetProfileURI, null, null);
+ }
+
+ });
+
+ // Save, reload, and check IDs
+ modelSet.save(new NullProgressMonitor());
+
+ newModelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+
+ rootModel = UMLUtil.load(modelSet, clientModelURI, UMLPackage.eINSTANCE.getModel());
+
+ // All of the stereotype instances must have existed before
+ xml = (XMLResource)rootModel.eResource();
+ for(TreeIterator<EObject> iter = xml.getAllContents(); iter.hasNext();) {
+ EObject next = iter.next();
+ if(!(next instanceof Element)) {
+ iter.prune();
+ } else {
+ Element element = (Element)next;
+ for(Stereotype stereo : element.getAppliedStereotypes()) {
+ // The required stereotypes were added in the new profile definition, so they couldn't have been applied before
+ if(!element.isStereotypeRequired(stereo)) {
+ EObject application = element.getStereotypeApplication(stereo);
+ EObject original = idsToStereotypeInstances.remove(xml.getID(application));
+ Assert.assertNotNull("Stereotype instance has a new identity", original);
+ Assert.assertEquals("Stereotype instance has wrong identity", UML2Util.getQualifiedName(original.eClass(), "::"), UML2Util.getQualifiedName(application.eClass(), "::"));
+ }
+ }
+ }
+ }
+
+ } finally {
+ // Cleanup
+ domain.dispose();
+ modelSet.unload();
+
+ if (newModelSet != null) {
+ ModelUtils.getEditingDomain(newModelSet).dispose();
+ newModelSet.unload();
+ }
+
+ project.delete(true, null);
+ }
+ }
+
private void checkAppliedProfileAndStereotypeProperties(ModelSet modelSet, Model rootModel, URI expectedProfileURI) throws Exception {
Profile expectedProfile = UMLUtil.load(modelSet, expectedProfileURI, UMLPackage.eINSTANCE.getProfile());
diff --git a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AbstractHandlerTest.java b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AbstractHandlerTest.java
index de229a128f4..c29eaf3b2ba 100644
--- a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AbstractHandlerTest.java
+++ b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AbstractHandlerTest.java
@@ -122,7 +122,7 @@ public abstract class AbstractHandlerTest {
* the id of the command to test
*/
public AbstractHandlerTest(String commandId, Bundle bundle) {
- Assert.assertNotNull("Bundle can't be null to do the test.", bundle);
+ Assert.assertNotNull("Bundle can't be null to do the test.", bundle); //$NON-NLS-1$
this.commandId = commandId;
this.bundle = bundle;
}
@@ -306,7 +306,7 @@ public abstract class AbstractHandlerTest {
SimpleUML=custo;
}
}
- org.junit.Assert.assertNotNull("Custom SimpleUML not found", SimpleUML);
+ Assert.assertNotNull("Custom SimpleUML not found", SimpleUML); //$NON-NLS-1$
org.eclipse.papyrus.views.modelexplorer.Activator.getDefault().getCustomizationManager().getManagedCustomizations().add(0, SimpleUML);
setStatus(Status.OK_STATUS);
}
@@ -352,9 +352,9 @@ public abstract class AbstractHandlerTest {
}
public void undoRedoTest() {
- Assert.assertTrue("I can't undo the command!", getCommandStack().canUndo());
+ Assert.assertTrue("I can't undo the command!", getCommandStack().canUndo()); //$NON-NLS-1$
getCommandStack().undo();
- Assert.assertTrue("I can't Redo the command!", getCommandStack().canRedo());
+ Assert.assertTrue("I can't Redo the command!", getCommandStack().canRedo()); //$NON-NLS-1$
getCommandStack().redo();
}
diff --git a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/OpendiagramTest.java b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/OpendiagramTest.java
index bc0c520100b..70b5b326239 100644
--- a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/OpendiagramTest.java
+++ b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/OpendiagramTest.java
@@ -1,119 +1,119 @@
-
-/*****************************************************************************
- * Copyright (c) 2014 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:
- * Patrick Tessier (CEA LIST) Patrick.Tessier.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.views.modelexplorer.tests;
-
-import java.util.ArrayList;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider;
-import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
-import org.eclipse.papyrus.views.modelexplorer.DecoratingLabelProviderWTooltips;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Model;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class OpendiagramTest extends AbstractEditorTest {
- /**
- * here the purpose is to test the creation of constraint on variable elements.
- */
- @Test
- public void testOpendiagramTest() throws Exception {
-
- //get the rootModel
- Assert.assertNotNull("RootModel is null", getRootUMLModel());
- //get all semantic elment that will handled
- Model model=(Model) getRootUMLModel();
- org.eclipse.uml2.uml.Class class1=(org.eclipse.uml2.uml.Class) model.getPackagedElement("Class1");
- org.eclipse.uml2.uml.Class class2=(org.eclipse.uml2.uml.Class) model.getPackagedElement("Class2");
- Diagram diagram1=(Diagram)getPageManager().allPages().get(0);
- Diagram diagram2=(Diagram)getPageManager().allPages().get(1);
-
- IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- ISelectionService selectionService = activeWorkbenchWindow.getSelectionService();
- modelExplorerView=getModelExplorerView();
- modelExplorerView.setFocus();
- ArrayList<Object>elements= new ArrayList<Object>();
- elements.add(getRootUMLModel());
- modelExplorerView.revealSemanticElement( elements);
-
-
- //getItem for model
- EObject modelTreeObject=(EObject)((IStructuredSelection)selectionService.getSelection()).getFirstElement();
- Assert.assertNotNull("Model TreeElement is null", modelTreeObject);
-
- //get Item for class1
- elements.clear();
- elements.add(class1);
- modelExplorerView.revealSemanticElement( elements);
- EObject class1TreeObject=(EObject)((IStructuredSelection)selectionService.getSelection()).getFirstElement();
- Assert.assertNotNull("Class1 TreeElement is null", class1TreeObject);
-
- //get Item for class2
- elements.clear();
- elements.add(class2);
- modelExplorerView.revealSemanticElement( elements);
- EObject class2TreeObject=(EObject)((IStructuredSelection)selectionService.getSelection()).getFirstElement();
- Assert.assertNotNull("Class2 TreeElement is null", class2TreeObject);
-
- //get Item for diagram1
- elements.clear();
- elements.add(diagram1);
- modelExplorerView.revealSemanticElement( elements);
- EObject diagram1TreeObject=(EObject)((IStructuredSelection)selectionService.getSelection()).getFirstElement();
- Assert.assertNotNull("digram1 TreeElement is null", diagram1TreeObject);
- //get Item for diagram2
- elements.clear();
- elements.add(diagram2);
- modelExplorerView.revealSemanticElement( elements);
- EObject diagram2TreeObject=(EObject)((IStructuredSelection)selectionService.getSelection()).getFirstElement();
- Assert.assertNotNull("digram2 TreeElement is null", diagram2TreeObject);
-
- //test icons of closed diagram
- DecoratingLabelProviderWTooltips labeProvider=(DecoratingLabelProviderWTooltips)modelExplorerView.getCommonViewer().getLabelProvider();
- Assert.assertNotEquals("the label of diagram1 is not good", "Diagram1", labeProvider.getText(diagram1));
- Assert.assertNotEquals("the label of class1 is not good","class1",labeProvider.getText(class1));
-
- //now test image about diagram for open and closed diagram
- //select all Tree element in the common viewer.
- }
- @Before
- public void initOpendiagramTest(){
- try {
- initModel("openDiagramTest", "OpenDiagram", Activator.getDefault().getBundle());
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- @Override
- protected String getSourcePath() {
- // TODO Auto-generated method stub
- return "resources/";
- }
-
-}
+
+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ * Patrick Tessier (CEA LIST) Patrick.Tessier.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.views.modelexplorer.tests;
+
+import java.util.ArrayList;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider;
+import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
+import org.eclipse.papyrus.views.modelexplorer.DecoratingLabelProviderWTooltips;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Model;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class OpendiagramTest extends AbstractEditorTest {
+ /**
+ * here the purpose is to test the creation of constraint on variable elements.
+ */
+ @Test
+ public void testOpendiagramTest() throws Exception {
+
+ //get the rootModel
+ Assert.assertNotNull("RootModel is null", getRootUMLModel()); //$NON-NLS-1$
+ //get all semantic elment that will handled
+ Model model=(Model) getRootUMLModel();
+ org.eclipse.uml2.uml.Class class1=(org.eclipse.uml2.uml.Class) model.getPackagedElement("Class1");
+ org.eclipse.uml2.uml.Class class2=(org.eclipse.uml2.uml.Class) model.getPackagedElement("Class2");
+ Diagram diagram1=(Diagram)getPageManager().allPages().get(0);
+ Diagram diagram2=(Diagram)getPageManager().allPages().get(1);
+
+ IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ ISelectionService selectionService = activeWorkbenchWindow.getSelectionService();
+ modelExplorerView=getModelExplorerView();
+ modelExplorerView.setFocus();
+ ArrayList<Object>elements= new ArrayList<Object>();
+ elements.add(getRootUMLModel());
+ modelExplorerView.revealSemanticElement( elements);
+
+
+ //getItem for model
+ EObject modelTreeObject=(EObject)((IStructuredSelection)selectionService.getSelection()).getFirstElement();
+ Assert.assertNotNull("Model TreeElement is null", modelTreeObject); //$NON-NLS-1$
+
+ //get Item for class1
+ elements.clear();
+ elements.add(class1);
+ modelExplorerView.revealSemanticElement( elements);
+ EObject class1TreeObject=(EObject)((IStructuredSelection)selectionService.getSelection()).getFirstElement();
+ Assert.assertNotNull("Class1 TreeElement is null", class1TreeObject); //$NON-NLS-1$
+
+ //get Item for class2
+ elements.clear();
+ elements.add(class2);
+ modelExplorerView.revealSemanticElement( elements);
+ EObject class2TreeObject=(EObject)((IStructuredSelection)selectionService.getSelection()).getFirstElement();
+ Assert.assertNotNull("Class2 TreeElement is null", class2TreeObject); //$NON-NLS-1$
+
+ //get Item for diagram1
+ elements.clear();
+ elements.add(diagram1);
+ modelExplorerView.revealSemanticElement( elements);
+ EObject diagram1TreeObject=(EObject)((IStructuredSelection)selectionService.getSelection()).getFirstElement();
+ Assert.assertNotNull("digram1 TreeElement is null", diagram1TreeObject); //$NON-NLS-1$
+ //get Item for diagram2
+ elements.clear();
+ elements.add(diagram2);
+ modelExplorerView.revealSemanticElement( elements);
+ EObject diagram2TreeObject=(EObject)((IStructuredSelection)selectionService.getSelection()).getFirstElement();
+ Assert.assertNotNull("digram2 TreeElement is null", diagram2TreeObject); //$NON-NLS-1$
+
+ //test icons of closed diagram
+ DecoratingLabelProviderWTooltips labeProvider=(DecoratingLabelProviderWTooltips)modelExplorerView.getCommonViewer().getLabelProvider();
+ Assert.assertNotEquals("the label of diagram1 is not good", "Diagram1", labeProvider.getText(diagram1)); //$NON-NLS-1$ //$NON-NLS-2$
+ Assert.assertNotEquals("the label of class1 is not good","class1",labeProvider.getText(class1)); //$NON-NLS-1$ //$NON-NLS-2$
+
+ //now test image about diagram for open and closed diagram
+ //select all Tree element in the common viewer.
+ }
+ @Before
+ public void initOpendiagramTest(){
+ try {
+ initModel("openDiagramTest", "OpenDiagram", Activator.getDefault().getBundle());
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ protected String getSourcePath() {
+ // TODO Auto-generated method stub
+ return "resources/";
+ }
+
+}

Back to the top