diff options
author | Quentin Le Menez | 2018-01-09 10:09:46 +0000 |
---|---|---|
committer | Quentin Le Menez | 2018-01-09 13:18:15 +0000 |
commit | d98116b5b376f18b6cf626ba4158a35fe9a4a64e (patch) | |
tree | 4458c9c5ada0a216b385813a56ea9a9b8c7b6509 /tests/junit | |
parent | 453e99bc2dcbd5fabad100f9d0d5f682013c3b19 (diff) | |
download | org.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.tar.gz org.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.tar.xz org.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.zip |
Bug 515367 - [releng] Uniformization of the end of lines to Unix standard
- Format the EOL of all the files matched by: grep -rIUs . | xargs -Ifile dos2unix -k 'file'
Change-Id: I5c41d540a9a67b50de9b912ab35e16cc9a912961
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'tests/junit')
1054 files changed, 84299 insertions, 84299 deletions
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF index ff10d540233..45c63ec3ab4 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF @@ -1,26 +1,26 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.pde.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.pde;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.pde.core;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.update.configurator;bundle-version="[3.3.0,4.0.0)",
- org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.pde.api.tools;bundle-version="[1.0.1,2.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.11.0,4.0.0)"
-Export-Package: org.eclipse.papyrus.bundles.tests
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.bundles.tests.Activator
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.bundles.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.apache.commons.lang3.text.translate;version="3.1.0"
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.pde.runtime;bundle-version="[3.5.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)", + org.eclipse.pde;bundle-version="[3.12.0,4.0.0)", + org.eclipse.pde.core;bundle-version="[3.11.0,4.0.0)", + org.eclipse.update.configurator;bundle-version="[3.3.0,4.0.0)", + org.junit;bundle-version="[4.12.0,5.0.0)", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", + org.eclipse.pde.api.tools;bundle-version="[1.0.1,2.0.0)", + org.eclipse.jdt.core;bundle-version="[3.11.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.11.0,4.0.0)" +Export-Package: org.eclipse.papyrus.bundles.tests +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.bundles.tests.Activator +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.bundles.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: org.apache.commons.lang3.text.translate;version="3.1.0" diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/OSGI-INF/l10n/bundle.properties b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/OSGI-INF/l10n/bundle.properties index 7aac3380448..82564655b18 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/OSGI-INF/l10n/bundle.properties +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/OSGI-INF/l10n/bundle.properties @@ -1,3 +1,3 @@ -#Properties file for org.eclipse.papyrus.bundles.tests
-Bundle-Vendor = Eclipse Modeling Project
+#Properties file for org.eclipse.papyrus.bundles.tests +Bundle-Vendor = Eclipse Modeling Project Bundle-Name = Papyrus Bundles Tests
\ No newline at end of file diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/about.html b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/about.html index 82d49bf5f81..d35d5aed64c 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/about.html +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/about.html @@ -1,28 +1,28 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> + +</body> +</html> diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/build.properties b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/build.properties index 62808b06f2b..966a41640e7 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/build.properties +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/build.properties @@ -1,9 +1,9 @@ -source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/,\
- about.html,\
- build.properties,\
- resources/
-src.includes = about.html
+source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + OSGI-INF/,\ + about.html,\ + build.properties,\ + resources/ +src.includes = about.html diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/Activator.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/Activator.java index ab3930bc6ec..52750eaac8a 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/Activator.java +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/Activator.java @@ -1,56 +1,56 @@ -package org.eclipse.papyrus.bundles.tests;
-
-import org.eclipse.pde.core.target.ITargetPlatformService;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.bundles.tests"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- private ITargetPlatformService tpService;
-
- /**
- * The constructor
- */
- public Activator() {
- super();
- }
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
-
- ServiceReference<? extends ITargetPlatformService> ref = context.getServiceReference(ITargetPlatformService.class);
- tpService = (ref == null) ? null : context.getService(ref);
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- tpService = null;
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- public ITargetPlatformService getTargetPlatformService() {
- return tpService;
- }
-}
+package org.eclipse.papyrus.bundles.tests; + +import org.eclipse.pde.core.target.ITargetPlatformService; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.papyrus.bundles.tests"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + private ITargetPlatformService tpService; + + /** + * The constructor + */ + public Activator() { + super(); + } + + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + + ServiceReference<? extends ITargetPlatformService> ref = context.getServiceReference(ITargetPlatformService.class); + tpService = (ref == null) ? null : context.getService(ref); + } + + @Override + public void stop(BundleContext context) throws Exception { + tpService = null; + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + + public ITargetPlatformService getTargetPlatformService() { + return tpService; + } +} diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/AllTests.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/AllTests.java index 9e681470fff..ae422b7e0be 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/AllTests.java +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/AllTests.java @@ -1,26 +1,26 @@ -/*****************************************************************************
- * Copyright (c) 2012, 2016 CEA LIST , Christian W. Damus, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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 - bug 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.bundles.tests;
-
-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
-import org.eclipse.papyrus.junit.framework.runner.Headless;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
-
-@Headless
-@RunWith(ClassificationSuite.class)
-@SuiteClasses({ BundlesTests.class })
-public class AllTests {
- // JUnit 4 test suite
-}
+/***************************************************************************** + * Copyright (c) 2012, 2016 CEA LIST , Christian W. Damus, and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms 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 - bug 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.bundles.tests; + +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; +import org.eclipse.papyrus.junit.framework.runner.Headless; +import org.junit.runner.RunWith; +import org.junit.runners.Suite.SuiteClasses; + +@Headless +@RunWith(ClassificationSuite.class) +@SuiteClasses({ BundlesTests.class }) +public class AllTests { + // JUnit 4 test suite +} diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/Java8DeltaXMLVisitor.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/Java8DeltaXMLVisitor.java index f9e883f3467..5dd8d844b99 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/Java8DeltaXMLVisitor.java +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/Java8DeltaXMLVisitor.java @@ -1,215 +1,215 @@ -/*****************************************************************************
- * Copyright (c) 2016 Christian W. Damus and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Christian W. Damus - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.bundles.tests.apireport;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.pde.api.tools.internal.IApiXmlConstants;
-import org.eclipse.pde.api.tools.internal.provisional.comparator.IDelta;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-/**
- * A specialized {@link SafeDeltaXmlVisitor} that accounts for new
- * compatibility scenarios in Java8's interface evoluation
- * capabilities (such as default and static methods).
- */
-public class Java8DeltaXMLVisitor extends SafeDeltaXmlVisitor {
- private static final Map<String, Integer> deltaConstantsDecoder = new HashMap<>();
-
- private final Element root;
-
- static {
- try {
- for (Field next : IDelta.class.getFields()) {
- if (next.getType() == int.class) {
- deltaConstantsDecoder.put(next.getName(), next.getInt(null));
- }
- }
- } catch (Exception e) {
- // Won't happen because we iterate known fields of an interface, which
- // are by definition always accessible
- throw new Error(e);
- }
- }
-
- public Java8DeltaXMLVisitor() throws CoreException {
- super();
-
- root = getDocument().getDocumentElement();
- }
-
-
- /**
- * Appends my XML content to a given {@code appendable}.
- *
- * @param appendable
- * the appenable on which to append me
- *
- * @throws IOException
- * on failure to append
- */
- public void appendTo(Appendable appendable) throws IOException {
- try {
- appendable.append(getXML());
- } catch (CoreException e) {
- throw new IOException(e);
- }
- }
-
- @Override
- protected void processLeafDelta(IDelta delta) {
- super.processLeafDelta(delta);
-
- Element deltaElement = getNewElement();
- if (isIncompatible(deltaElement)) {
- amend(deltaElement);
- }
- }
-
- /**
- * Obtains the element most recently added to the delta report.
- *
- * @return the newest delta element
- */
- Element getNewElement() {
- NodeList nodes = root.getChildNodes();
- // We don't append interstitial text
- return (Element) nodes.item(nodes.getLength() - 1);
- }
-
- public boolean isIncompatible(Element delta) {
- String result = getString(delta, IApiXmlConstants.ATTR_NAME_COMPATIBLE);
- return !Boolean.parseBoolean(result);
- }
-
- protected void setCompatible(Element delta, boolean compatible) {
- set(delta, IApiXmlConstants.ATTR_NAME_COMPATIBLE, compatible);
- }
-
- protected String getString(Element element, String attribute) {
- return element.getAttribute(attribute);
- }
-
- protected void set(Element element, String attribute, String value) {
- if (value == null) {
- element.removeAttribute(attribute);
- } else {
- element.setAttribute(attribute, value);
- }
- }
-
- protected boolean getBoolean(Element element, String attribute) {
- String result = getString(element, attribute);
- return Boolean.parseBoolean(result);
- }
-
- protected void set(Element element, String attribute, boolean value) {
- set(element, attribute, Boolean.toString(value));
- }
-
- protected int getInt(Element element, String attribute) {
- String result = getString(element, attribute);
- return (result == null) ? 0 : Integer.parseInt(result);
- }
-
- protected void set(Element element, String attribute, int value) {
- set(element, attribute, Integer.toString(value));
- }
-
- protected void amend(Element delta) {
- Integer elementType = deltaConstantsDecoder.getOrDefault(
- getString(delta, IApiXmlConstants.ATTR_NAME_ELEMENT_TYPE),
- 0);
-
- switch (elementType) {
- case IDelta.INTERFACE_ELEMENT_TYPE:
- amendInterface(delta);
- break;
- }
- }
-
- protected void amendInterface(Element delta) {
- boolean compatible = false;
- Integer kind = deltaConstantsDecoder.getOrDefault(
- getString(delta, IApiXmlConstants.ATTR_KIND),
- 0);
- String newMessage = null;
-
- switch (kind) {
- case IDelta.ADDED:
- // Something was added to the interface
- switch (getInt(delta, IApiXmlConstants.ATTR_FLAGS)) {
- case IDelta.FIELD:
- // Interfaces can only have static fields, so of course this is
- // compatible because the linkage is static
- compatible = isStatic(delta);
- if (compatible) {
- newMessage = getString(delta, IApiXmlConstants.ATTR_MESSAGE);
- if (newMessage != null) {
- newMessage = newMessage.replaceFirst("field", "static field");
- newMessage = newMessage.replaceFirst("in an interface that .*? has", "has");
- }
- }
- break;
- case IDelta.METHOD:
- // Java 8 default and static methods are a compatible addition
- compatible = isDefaultOrStaticMethod(delta);
- if (compatible) {
- newMessage = getString(delta, IApiXmlConstants.ATTR_MESSAGE);
- if (newMessage != null) {
- newMessage = newMessage.replaceFirst("method",
- isStatic(delta) ? "static method" : "default method");
- newMessage = newMessage.replaceFirst("in an interface that .*? has", "has");
- }
- }
- break;
- }
- break;
- }
-
- if (compatible) {
- setCompatible(delta, compatible);
- if (newMessage != null) {
- set(delta, IApiXmlConstants.ATTR_MESSAGE, newMessage);
- }
- }
- }
-
- private boolean isDefaultOrStaticMethod(Element delta) {
- // Assume not if we can't get the method details
- boolean result = false;
-
- int modifiers = getInt(delta, IApiXmlConstants.ATTR_NAME_NEW_MODIFIERS);
- result = Flags.isDefaultMethod(modifiers) || Flags.isStatic(modifiers)
- || !Flags.isAbstract(modifiers); // May not know that it's explicitly default
-
- return result;
- }
-
- private boolean isStatic(Element delta) {
- // Assume not if we can't get the method details
- boolean result = false;
-
- int modifiers = getInt(delta, IApiXmlConstants.ATTR_NAME_NEW_MODIFIERS);
- result = Flags.isStatic(modifiers);
-
- return result;
- }
-}
+/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.bundles.tests.apireport; + +import java.io.IOException; +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.Flags; +import org.eclipse.pde.api.tools.internal.IApiXmlConstants; +import org.eclipse.pde.api.tools.internal.provisional.comparator.IDelta; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +/** + * A specialized {@link SafeDeltaXmlVisitor} that accounts for new + * compatibility scenarios in Java8's interface evoluation + * capabilities (such as default and static methods). + */ +public class Java8DeltaXMLVisitor extends SafeDeltaXmlVisitor { + private static final Map<String, Integer> deltaConstantsDecoder = new HashMap<>(); + + private final Element root; + + static { + try { + for (Field next : IDelta.class.getFields()) { + if (next.getType() == int.class) { + deltaConstantsDecoder.put(next.getName(), next.getInt(null)); + } + } + } catch (Exception e) { + // Won't happen because we iterate known fields of an interface, which + // are by definition always accessible + throw new Error(e); + } + } + + public Java8DeltaXMLVisitor() throws CoreException { + super(); + + root = getDocument().getDocumentElement(); + } + + + /** + * Appends my XML content to a given {@code appendable}. + * + * @param appendable + * the appenable on which to append me + * + * @throws IOException + * on failure to append + */ + public void appendTo(Appendable appendable) throws IOException { + try { + appendable.append(getXML()); + } catch (CoreException e) { + throw new IOException(e); + } + } + + @Override + protected void processLeafDelta(IDelta delta) { + super.processLeafDelta(delta); + + Element deltaElement = getNewElement(); + if (isIncompatible(deltaElement)) { + amend(deltaElement); + } + } + + /** + * Obtains the element most recently added to the delta report. + * + * @return the newest delta element + */ + Element getNewElement() { + NodeList nodes = root.getChildNodes(); + // We don't append interstitial text + return (Element) nodes.item(nodes.getLength() - 1); + } + + public boolean isIncompatible(Element delta) { + String result = getString(delta, IApiXmlConstants.ATTR_NAME_COMPATIBLE); + return !Boolean.parseBoolean(result); + } + + protected void setCompatible(Element delta, boolean compatible) { + set(delta, IApiXmlConstants.ATTR_NAME_COMPATIBLE, compatible); + } + + protected String getString(Element element, String attribute) { + return element.getAttribute(attribute); + } + + protected void set(Element element, String attribute, String value) { + if (value == null) { + element.removeAttribute(attribute); + } else { + element.setAttribute(attribute, value); + } + } + + protected boolean getBoolean(Element element, String attribute) { + String result = getString(element, attribute); + return Boolean.parseBoolean(result); + } + + protected void set(Element element, String attribute, boolean value) { + set(element, attribute, Boolean.toString(value)); + } + + protected int getInt(Element element, String attribute) { + String result = getString(element, attribute); + return (result == null) ? 0 : Integer.parseInt(result); + } + + protected void set(Element element, String attribute, int value) { + set(element, attribute, Integer.toString(value)); + } + + protected void amend(Element delta) { + Integer elementType = deltaConstantsDecoder.getOrDefault( + getString(delta, IApiXmlConstants.ATTR_NAME_ELEMENT_TYPE), + 0); + + switch (elementType) { + case IDelta.INTERFACE_ELEMENT_TYPE: + amendInterface(delta); + break; + } + } + + protected void amendInterface(Element delta) { + boolean compatible = false; + Integer kind = deltaConstantsDecoder.getOrDefault( + getString(delta, IApiXmlConstants.ATTR_KIND), + 0); + String newMessage = null; + + switch (kind) { + case IDelta.ADDED: + // Something was added to the interface + switch (getInt(delta, IApiXmlConstants.ATTR_FLAGS)) { + case IDelta.FIELD: + // Interfaces can only have static fields, so of course this is + // compatible because the linkage is static + compatible = isStatic(delta); + if (compatible) { + newMessage = getString(delta, IApiXmlConstants.ATTR_MESSAGE); + if (newMessage != null) { + newMessage = newMessage.replaceFirst("field", "static field"); + newMessage = newMessage.replaceFirst("in an interface that .*? has", "has"); + } + } + break; + case IDelta.METHOD: + // Java 8 default and static methods are a compatible addition + compatible = isDefaultOrStaticMethod(delta); + if (compatible) { + newMessage = getString(delta, IApiXmlConstants.ATTR_MESSAGE); + if (newMessage != null) { + newMessage = newMessage.replaceFirst("method", + isStatic(delta) ? "static method" : "default method"); + newMessage = newMessage.replaceFirst("in an interface that .*? has", "has"); + } + } + break; + } + break; + } + + if (compatible) { + setCompatible(delta, compatible); + if (newMessage != null) { + set(delta, IApiXmlConstants.ATTR_MESSAGE, newMessage); + } + } + } + + private boolean isDefaultOrStaticMethod(Element delta) { + // Assume not if we can't get the method details + boolean result = false; + + int modifiers = getInt(delta, IApiXmlConstants.ATTR_NAME_NEW_MODIFIERS); + result = Flags.isDefaultMethod(modifiers) || Flags.isStatic(modifiers) + || !Flags.isAbstract(modifiers); // May not know that it's explicitly default + + return result; + } + + private boolean isStatic(Element delta) { + // Assume not if we can't get the method details + boolean result = false; + + int modifiers = getInt(delta, IApiXmlConstants.ATTR_NAME_NEW_MODIFIERS); + result = Flags.isStatic(modifiers); + + return result; + } +} diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF index 648c5d8a1ec..e72074d97e8 100755 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF @@ -1,16 +1,16 @@ -Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.0.1.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.developer.suite.tests.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.developer.suite.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.bundles.tests;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 0.0.1.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.developer.suite.tests.Activator +Bundle-SymbolicName: org.eclipse.papyrus.developer.suite.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.junit;bundle-version="4.10.0", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.bundles.tests;bundle-version="[1.2.0,2.0.0)" diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF index cf15aceb3ac..a24acd8edac 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)"
-Export-Package: org.eclipse.papyrus.eclipse.project.editors.tests
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
-Bundle-Name: Papyrus Project Editor Tests
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.google.common.base;version="21.0.0"
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.papyrus.eclipse.project.editors.tests +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 2.0.0.qualifier +Bundle-Name: Papyrus Project Editor Tests +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: com.google.common.base;version="21.0.0" diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation index 3bfdbc03053..6cd26e5d1c1 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation @@ -1,66 +1,66 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
- <notation:Diagram xmi:id="_b2JjcMjxEeS9XIofcN-grg" type="PapyrusUMLClassDiagram" name="main" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_eDFVEMjxEeS9XIofcN-grg" type="Class_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_eDHKQMjxEeS9XIofcN-grg" type="Class_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_eDHKQcjxEeS9XIofcN-grg" type="Class_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_eDHKQsjxEeS9XIofcN-grg" y="5"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_eDHxUMjxEeS9XIofcN-grg" type="Class_AttributeCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_eDHxUcjxEeS9XIofcN-grg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_eDHxUsjxEeS9XIofcN-grg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_eDHxU8jxEeS9XIofcN-grg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDHxVMjxEeS9XIofcN-grg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_eDHxVcjxEeS9XIofcN-grg" type="Class_OperationCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_eDHxVsjxEeS9XIofcN-grg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_eDHxV8jxEeS9XIofcN-grg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_eDHxWMjxEeS9XIofcN-grg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDHxWcjxEeS9XIofcN-grg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_eDHxWsjxEeS9XIofcN-grg" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_eDHxW8jxEeS9XIofcN-grg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_eDHxXMjxEeS9XIofcN-grg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_eDHxXcjxEeS9XIofcN-grg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDHxXsjxEeS9XIofcN-grg"/>
- </children>
- <element xmi:type="uml:Class" href="css_leaktest.uml#_eC9ZQMjxEeS9XIofcN-grg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDFVEcjxEeS9XIofcN-grg" x="47" y="21"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_ggADcMjxEeS9XIofcN-grg" type="Enumeration_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_ggAqgMjxEeS9XIofcN-grg" type="Enumeration_NameLabel"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_ggAqgcjxEeS9XIofcN-grg" type="Enumeration_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_ggAqgsjxEeS9XIofcN-grg" y="5"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_ggBRkMjxEeS9XIofcN-grg" type="Enumeration_LiteralCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_ggBRkcjxEeS9XIofcN-grg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_ggBRksjxEeS9XIofcN-grg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_ggBRk8jxEeS9XIofcN-grg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ggBRlMjxEeS9XIofcN-grg"/>
- </children>
- <element xmi:type="uml:Enumeration" href="css_leaktest.uml#_gf9nMMjxEeS9XIofcN-grg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ggADccjxEeS9XIofcN-grg" x="252" y="20"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_i5ZjwMjxEeS9XIofcN-grg" type="Package_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_i5aK0MjxEeS9XIofcN-grg" type="Package_NameLabel"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_i5aK0cjxEeS9XIofcN-grg" type="Package_PackagedElementCompartment">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yadd4MjxEeS9XIofcN-grg" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yadd4cjxEeS9XIofcN-grg" key="mutable" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_i5aK0sjxEeS9XIofcN-grg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i5aK08jxEeS9XIofcN-grg"/>
- </children>
- <element xmi:type="uml:Package" href="css_leaktest.uml#_i5XukMjxEeS9XIofcN-grg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i5ZjwcjxEeS9XIofcN-grg" x="29" y="159" width="385" height="300"/>
- </children>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_b2JjccjxEeS9XIofcN-grg" name="diagram_compatibility_version" stringValue="1.3.0"/>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_b2JjcsjxEeS9XIofcN-grg"/>
- <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_b7wrIBMAEeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
- <owner xmi:type="uml:Model" href="css_leaktest.uml#_b0QGAMjxEeS9XIofcN-grg"/>
- </styles>
- <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_yY3icMjxEeS9XIofcN-grg" name="css_stylesheets" eObjectListValue="_yY4wkMjxEeS9XIofcN-grg"/>
- <element xmi:type="uml:Model" href="css_leaktest.uml#_b0QGAMjxEeS9XIofcN-grg"/>
- </notation:Diagram>
- <css:ModelStyleSheets xmi:id="_tfPhEMjxEeS9XIofcN-grg"/>
- <css:EmbeddedStyleSheet xmi:id="_yY4wkMjxEeS9XIofcN-grg" label="canonical" content="Class, Enumeration, Package {
 canonical: true
}"/>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> + <notation:Diagram xmi:id="_b2JjcMjxEeS9XIofcN-grg" type="PapyrusUMLClassDiagram" name="main" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_eDFVEMjxEeS9XIofcN-grg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_eDHKQMjxEeS9XIofcN-grg" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_eDHKQcjxEeS9XIofcN-grg" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_eDHKQsjxEeS9XIofcN-grg" y="5"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_eDHxUMjxEeS9XIofcN-grg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_eDHxUcjxEeS9XIofcN-grg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_eDHxUsjxEeS9XIofcN-grg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_eDHxU8jxEeS9XIofcN-grg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDHxVMjxEeS9XIofcN-grg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_eDHxVcjxEeS9XIofcN-grg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_eDHxVsjxEeS9XIofcN-grg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_eDHxV8jxEeS9XIofcN-grg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_eDHxWMjxEeS9XIofcN-grg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDHxWcjxEeS9XIofcN-grg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_eDHxWsjxEeS9XIofcN-grg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_eDHxW8jxEeS9XIofcN-grg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_eDHxXMjxEeS9XIofcN-grg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_eDHxXcjxEeS9XIofcN-grg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDHxXsjxEeS9XIofcN-grg"/> + </children> + <element xmi:type="uml:Class" href="css_leaktest.uml#_eC9ZQMjxEeS9XIofcN-grg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eDFVEcjxEeS9XIofcN-grg" x="47" y="21"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_ggADcMjxEeS9XIofcN-grg" type="Enumeration_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_ggAqgMjxEeS9XIofcN-grg" type="Enumeration_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_ggAqgcjxEeS9XIofcN-grg" type="Enumeration_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_ggAqgsjxEeS9XIofcN-grg" y="5"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_ggBRkMjxEeS9XIofcN-grg" type="Enumeration_LiteralCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_ggBRkcjxEeS9XIofcN-grg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_ggBRksjxEeS9XIofcN-grg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_ggBRk8jxEeS9XIofcN-grg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ggBRlMjxEeS9XIofcN-grg"/> + </children> + <element xmi:type="uml:Enumeration" href="css_leaktest.uml#_gf9nMMjxEeS9XIofcN-grg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ggADccjxEeS9XIofcN-grg" x="252" y="20"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_i5ZjwMjxEeS9XIofcN-grg" type="Package_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_i5aK0MjxEeS9XIofcN-grg" type="Package_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_i5aK0cjxEeS9XIofcN-grg" type="Package_PackagedElementCompartment"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yadd4MjxEeS9XIofcN-grg" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yadd4cjxEeS9XIofcN-grg" key="mutable" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_i5aK0sjxEeS9XIofcN-grg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i5aK08jxEeS9XIofcN-grg"/> + </children> + <element xmi:type="uml:Package" href="css_leaktest.uml#_i5XukMjxEeS9XIofcN-grg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i5ZjwcjxEeS9XIofcN-grg" x="29" y="159" width="385" height="300"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_b2JjccjxEeS9XIofcN-grg" name="diagram_compatibility_version" stringValue="1.3.0"/> + <styles xmi:type="notation:DiagramStyle" xmi:id="_b2JjcsjxEeS9XIofcN-grg"/> + <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_b7wrIBMAEeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class"> + <owner xmi:type="uml:Model" href="css_leaktest.uml#_b0QGAMjxEeS9XIofcN-grg"/> + </styles> + <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_yY3icMjxEeS9XIofcN-grg" name="css_stylesheets" eObjectListValue="_yY4wkMjxEeS9XIofcN-grg"/> + <element xmi:type="uml:Model" href="css_leaktest.uml#_b0QGAMjxEeS9XIofcN-grg"/> + </notation:Diagram> + <css:ModelStyleSheets xmi:id="_tfPhEMjxEeS9XIofcN-grg"/> + <css:EmbeddedStyleSheet xmi:id="_yY4wkMjxEeS9XIofcN-grg" label="canonical" content="Class, Enumeration, Package {
 canonical: true
}"/> +</xmi:XMI> diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.notation index ecc2551663c..31961186406 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.notation @@ -1,92 +1,92 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_J526gLjVEeOUcroamP8z5w" type="PapyrusUMLClassDiagram" name="classes" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_K0bsYLjVEeOUcroamP8z5w" type="Class_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_K0eIoLjVEeOUcroamP8z5w" type="Class_NameLabel"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_K0gk4LjVEeOUcroamP8z5w" type="Class_AttributeCompartment">
- <children xmi:type="notation:Node" xmi:id="_nMwz4LjVEeOUcroamP8z5w" type="Property_ClassAttributeLabel">
- <element xmi:type="uml:Property" href="model-no-j2ee-constraints.uml#_nMtwkLjVEeOUcroamP8z5w"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nMwz4bjVEeOUcroamP8z5w"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_K0gk4bjVEeOUcroamP8z5w"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_K0gk4rjVEeOUcroamP8z5w"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_K0gk47jVEeOUcroamP8z5w"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0gk5LjVEeOUcroamP8z5w"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL8LjVEeOUcroamP8z5w" type="Class_OperationCompartment">
- <children xmi:type="notation:Node" xmi:id="_mFRAULjVEeOUcroamP8z5w" type="Operation_ClassOperationLabel">
- <element xmi:type="uml:Operation" href="model-no-j2ee-constraints.uml#_mDkXMLjVEeOUcroamP8z5w"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_mFRAUbjVEeOUcroamP8z5w"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL8bjVEeOUcroamP8z5w"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL8rjVEeOUcroamP8z5w"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL87jVEeOUcroamP8z5w"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0hL9LjVEeOUcroamP8z5w"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL9bjVEeOUcroamP8z5w" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL9rjVEeOUcroamP8z5w"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL97jVEeOUcroamP8z5w"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL-LjVEeOUcroamP8z5w"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0hL-bjVEeOUcroamP8z5w"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_nNB9UBL7EeeoPd87eel4nw" type="Class_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nNCkYBL7EeeoPd87eel4nw" y="5"/>
- </children>
- <element xmi:type="uml:Class" href="model-no-j2ee-constraints.uml#_Kzml8LjVEeOUcroamP8z5w"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0bsYbjVEeOUcroamP8z5w" x="35" y="123"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_nNKgMBL7EeeoPd87eel4nw" type="StereotypeComment">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nR6dUBL7EeeoPd87eel4nw" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nR6dURL7EeeoPd87eel4nw" key="visible" value="true"/>
- </eAnnotations>
- <children xmi:type="notation:BasicCompartment" xmi:id="_nNNjgRL7EeeoPd87eel4nw" type="StereotypeCompartment">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nR7EYBL7EeeoPd87eel4nw" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nR7EYRL7EeeoPd87eel4nw" key="visible" value="true"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M8BL7EeeoPd87eel4nw" type="StereotypeProperty">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nR7EYhL7EeeoPd87eel4nw" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nR7EYxL7EeeoPd87eel4nw" key="visible" value="true"/>
- </eAnnotations>
- <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_UkhtYJKJEeOKCcahrNz4pQ"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M8RL7EeeoPd87eel4nw"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M8hL7EeeoPd87eel4nw" visible="false" type="StereotypeProperty">
- <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_bLTv4JNUEeOscpAmdCPVFA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M8xL7EeeoPd87eel4nw"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M9BL7EeeoPd87eel4nw" visible="false" type="StereotypeProperty">
- <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_aXfgwJNpEeOGJZd41BJaSw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M9RL7EeeoPd87eel4nw"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M9hL7EeeoPd87eel4nw" visible="false" type="StereotypeProperty">
- <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_pjxUoJlyEeOYT-OW6x9nfw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M9xL7EeeoPd87eel4nw"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_nNNjghL7EeeoPd87eel4nw"/>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_nNNjgxL7EeeoPd87eel4nw" name="stereotype" stringValue="j2ee::Bean"/>
- <element xmi:type="uml:Stereotype" href="j2ee-no-constraints.profile.uml#_EMn1sJ_NEeOHObuLP75oVQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nNNjhBL7EeeoPd87eel4nw"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_nNKgMRL7EeeoPd87eel4nw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nNMVYBL7EeeoPd87eel4nw" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="model-no-j2ee-constraints.uml#_Kzml8LjVEeOUcroamP8z5w"/>
- </styles>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ef5KYrjVEeOUcroamP8z5w" x="221" y="120"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_J526gbjVEeOUcroamP8z5w"/>
- <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_nNAIIBL7EeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
- <owner xmi:type="uml:Model" href="model-no-j2ee-constraints.uml#_J4wuULjVEeOUcroamP8z5w"/>
- </styles>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_nX5wkBL7EeeoPd87eel4nw" name="diagram_compatibility_version" stringValue="1.3.0"/>
- <element xmi:type="uml:Model" href="model-no-j2ee-constraints.uml#_J4wuULjVEeOUcroamP8z5w"/>
- <edges xmi:type="notation:Connector" xmi:id="_nNM8cBL7EeeoPd87eel4nw" type="StereotypeCommentLink" source="_K0bsYLjVEeOUcroamP8z5w" target="_nNKgMBL7EeeoPd87eel4nw">
- <styles xmi:type="notation:FontStyle" xmi:id="_nNM8cRL7EeeoPd87eel4nw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nNNjgBL7EeeoPd87eel4nw" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="model-no-j2ee-constraints.uml#_Kzml8LjVEeOUcroamP8z5w"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ef6_krjVEeOUcroamP8z5w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_k7jVEeOUcroamP8z5w" id="(1.0,0.4830508474576271)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_lLjVEeOUcroamP8z5w" id="(0.0,0.6166666666666667)"/>
- </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_J526gLjVEeOUcroamP8z5w" type="PapyrusUMLClassDiagram" name="classes" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_K0bsYLjVEeOUcroamP8z5w" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_K0eIoLjVEeOUcroamP8z5w" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_K0gk4LjVEeOUcroamP8z5w" type="Class_AttributeCompartment"> + <children xmi:type="notation:Node" xmi:id="_nMwz4LjVEeOUcroamP8z5w" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="model-no-j2ee-constraints.uml#_nMtwkLjVEeOUcroamP8z5w"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_nMwz4bjVEeOUcroamP8z5w"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_K0gk4bjVEeOUcroamP8z5w"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_K0gk4rjVEeOUcroamP8z5w"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_K0gk47jVEeOUcroamP8z5w"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0gk5LjVEeOUcroamP8z5w"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL8LjVEeOUcroamP8z5w" type="Class_OperationCompartment"> + <children xmi:type="notation:Node" xmi:id="_mFRAULjVEeOUcroamP8z5w" type="Operation_ClassOperationLabel"> + <element xmi:type="uml:Operation" href="model-no-j2ee-constraints.uml#_mDkXMLjVEeOUcroamP8z5w"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_mFRAUbjVEeOUcroamP8z5w"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL8bjVEeOUcroamP8z5w"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL8rjVEeOUcroamP8z5w"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL87jVEeOUcroamP8z5w"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0hL9LjVEeOUcroamP8z5w"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL9bjVEeOUcroamP8z5w" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL9rjVEeOUcroamP8z5w"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL97jVEeOUcroamP8z5w"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL-LjVEeOUcroamP8z5w"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0hL-bjVEeOUcroamP8z5w"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_nNB9UBL7EeeoPd87eel4nw" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_nNCkYBL7EeeoPd87eel4nw" y="5"/> + </children> + <element xmi:type="uml:Class" href="model-no-j2ee-constraints.uml#_Kzml8LjVEeOUcroamP8z5w"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0bsYbjVEeOUcroamP8z5w" x="35" y="123"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_nNKgMBL7EeeoPd87eel4nw" type="StereotypeComment"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nR6dUBL7EeeoPd87eel4nw" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nR6dURL7EeeoPd87eel4nw" key="visible" value="true"/> + </eAnnotations> + <children xmi:type="notation:BasicCompartment" xmi:id="_nNNjgRL7EeeoPd87eel4nw" type="StereotypeCompartment"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nR7EYBL7EeeoPd87eel4nw" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nR7EYRL7EeeoPd87eel4nw" key="visible" value="true"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M8BL7EeeoPd87eel4nw" type="StereotypeProperty"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nR7EYhL7EeeoPd87eel4nw" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nR7EYxL7EeeoPd87eel4nw" key="visible" value="true"/> + </eAnnotations> + <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_UkhtYJKJEeOKCcahrNz4pQ"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M8RL7EeeoPd87eel4nw"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M8hL7EeeoPd87eel4nw" visible="false" type="StereotypeProperty"> + <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_bLTv4JNUEeOscpAmdCPVFA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M8xL7EeeoPd87eel4nw"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M9BL7EeeoPd87eel4nw" visible="false" type="StereotypeProperty"> + <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_aXfgwJNpEeOGJZd41BJaSw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M9RL7EeeoPd87eel4nw"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_nQ8M9hL7EeeoPd87eel4nw" visible="false" type="StereotypeProperty"> + <element xmi:type="uml:Property" href="j2ee-no-constraints.profile.uml#_pjxUoJlyEeOYT-OW6x9nfw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_nQ8M9xL7EeeoPd87eel4nw"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_nNNjghL7EeeoPd87eel4nw"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_nNNjgxL7EeeoPd87eel4nw" name="stereotype" stringValue="j2ee::Bean"/> + <element xmi:type="uml:Stereotype" href="j2ee-no-constraints.profile.uml#_EMn1sJ_NEeOHObuLP75oVQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nNNjhBL7EeeoPd87eel4nw"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_nNKgMRL7EeeoPd87eel4nw"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nNMVYBL7EeeoPd87eel4nw" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="model-no-j2ee-constraints.uml#_Kzml8LjVEeOUcroamP8z5w"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ef5KYrjVEeOUcroamP8z5w" x="221" y="120"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_J526gbjVEeOUcroamP8z5w"/> + <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_nNAIIBL7EeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class"> + <owner xmi:type="uml:Model" href="model-no-j2ee-constraints.uml#_J4wuULjVEeOUcroamP8z5w"/> + </styles> + <styles xmi:type="notation:StringValueStyle" xmi:id="_nX5wkBL7EeeoPd87eel4nw" name="diagram_compatibility_version" stringValue="1.3.0"/> + <element xmi:type="uml:Model" href="model-no-j2ee-constraints.uml#_J4wuULjVEeOUcroamP8z5w"/> + <edges xmi:type="notation:Connector" xmi:id="_nNM8cBL7EeeoPd87eel4nw" type="StereotypeCommentLink" source="_K0bsYLjVEeOUcroamP8z5w" target="_nNKgMBL7EeeoPd87eel4nw"> + <styles xmi:type="notation:FontStyle" xmi:id="_nNM8cRL7EeeoPd87eel4nw"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nNNjgBL7EeeoPd87eel4nw" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="model-no-j2ee-constraints.uml#_Kzml8LjVEeOUcroamP8z5w"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ef6_krjVEeOUcroamP8z5w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_k7jVEeOUcroamP8z5w" id="(1.0,0.4830508474576271)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_lLjVEeOUcroamP8z5w" id="(0.0,0.6166666666666667)"/> + </edges> +</notation:Diagram> diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.notation index 14fb3cb60ca..0f2126ceb31 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.notation @@ -1,92 +1,92 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_J526gLjVEeOUcroamP8z5w" type="PapyrusUMLClassDiagram" name="classes" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_K0bsYLjVEeOUcroamP8z5w" type="Class_Shape">
- <children xmi:type="notation:DecorationNode" xmi:id="_K0eIoLjVEeOUcroamP8z5w" type="Class_NameLabel"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_K0gk4LjVEeOUcroamP8z5w" type="Class_AttributeCompartment">
- <children xmi:type="notation:Node" xmi:id="_nMwz4LjVEeOUcroamP8z5w" type="Property_ClassAttributeLabel">
- <element xmi:type="uml:Property" href="model.uml#_nMtwkLjVEeOUcroamP8z5w"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nMwz4bjVEeOUcroamP8z5w"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_K0gk4bjVEeOUcroamP8z5w"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_K0gk4rjVEeOUcroamP8z5w"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_K0gk47jVEeOUcroamP8z5w"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0gk5LjVEeOUcroamP8z5w"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL8LjVEeOUcroamP8z5w" type="Class_OperationCompartment">
- <children xmi:type="notation:Node" xmi:id="_mFRAULjVEeOUcroamP8z5w" type="Operation_ClassOperationLabel">
- <element xmi:type="uml:Operation" href="model.uml#_mDkXMLjVEeOUcroamP8z5w"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_mFRAUbjVEeOUcroamP8z5w"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL8bjVEeOUcroamP8z5w"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL8rjVEeOUcroamP8z5w"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL87jVEeOUcroamP8z5w"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0hL9LjVEeOUcroamP8z5w"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL9bjVEeOUcroamP8z5w" type="Class_NestedClassifierCompartment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL9rjVEeOUcroamP8z5w"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL97jVEeOUcroamP8z5w"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL-LjVEeOUcroamP8z5w"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0hL-bjVEeOUcroamP8z5w"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_HXCp4RMAEeeoPd87eel4nw" type="Class_FloatingNameLabel">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HXCp4hMAEeeoPd87eel4nw" y="5"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#_Kzml8LjVEeOUcroamP8z5w"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0bsYbjVEeOUcroamP8z5w" x="35" y="123"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_HXEfExMAEeeoPd87eel4nw" type="StereotypeComment">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HXKlsBMAEeeoPd87eel4nw" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HXKlsRMAEeeoPd87eel4nw" key="visible" value="true"/>
- </eAnnotations>
- <children xmi:type="notation:BasicCompartment" xmi:id="_HXFGJhMAEeeoPd87eel4nw" type="StereotypeCompartment">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HXKlshMAEeeoPd87eel4nw" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HXKlsxMAEeeoPd87eel4nw" key="visible" value="true"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_HXGUQBMAEeeoPd87eel4nw" type="StereotypeProperty">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HXKltBMAEeeoPd87eel4nw" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HXKltRMAEeeoPd87eel4nw" key="visible" value="true"/>
- </eAnnotations>
- <element xmi:type="uml:Property" href="j2ee.profile.uml#_UkhtYJKJEeOKCcahrNz4pQ"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGUQRMAEeeoPd87eel4nw"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_HXGUQhMAEeeoPd87eel4nw" visible="false" type="StereotypeProperty">
- <element xmi:type="uml:Property" href="j2ee.profile.uml#_bLTv4JNUEeOscpAmdCPVFA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGUQxMAEeeoPd87eel4nw"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_HXGURBMAEeeoPd87eel4nw" visible="false" type="StereotypeProperty">
- <element xmi:type="uml:Property" href="j2ee.profile.uml#_aXfgwJNpEeOGJZd41BJaSw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGURRMAEeeoPd87eel4nw"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_HXGURhMAEeeoPd87eel4nw" visible="false" type="StereotypeProperty">
- <element xmi:type="uml:Property" href="j2ee.profile.uml#_pjxUoJlyEeOYT-OW6x9nfw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGURxMAEeeoPd87eel4nw"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_HXFGJxMAEeeoPd87eel4nw"/>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_HXFGKBMAEeeoPd87eel4nw" name="stereotype" stringValue="j2ee::Bean"/>
- <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_EMn1sJ_NEeOHObuLP75oVQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HXFGKRMAEeeoPd87eel4nw"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_HXEfFBMAEeeoPd87eel4nw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HXEfFhMAEeeoPd87eel4nw" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="model.uml#_Kzml8LjVEeOUcroamP8z5w"/>
- </styles>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ef5KYrjVEeOUcroamP8z5w" x="221" y="120"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_J526gbjVEeOUcroamP8z5w"/>
- <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_HXCp4BMAEeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
- <owner xmi:type="uml:Model" href="model.uml#_J4wuULjVEeOUcroamP8z5w"/>
- </styles>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_HaFW0BMAEeeoPd87eel4nw" name="diagram_compatibility_version" stringValue="1.3.0"/>
- <element xmi:type="uml:Model" href="model.uml#_J4wuULjVEeOUcroamP8z5w"/>
- <edges xmi:type="notation:Connector" xmi:id="_HXFGIBMAEeeoPd87eel4nw" type="StereotypeCommentLink" source="_K0bsYLjVEeOUcroamP8z5w" target="_HXEfExMAEeeoPd87eel4nw">
- <styles xmi:type="notation:FontStyle" xmi:id="_HXFGIRMAEeeoPd87eel4nw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HXFGJRMAEeeoPd87eel4nw" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="model.uml#_Kzml8LjVEeOUcroamP8z5w"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ef6_krjVEeOUcroamP8z5w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_k7jVEeOUcroamP8z5w" id="(1.0,0.4830508474576271)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_lLjVEeOUcroamP8z5w" id="(0.0,0.6166666666666667)"/>
- </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_J526gLjVEeOUcroamP8z5w" type="PapyrusUMLClassDiagram" name="classes" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_K0bsYLjVEeOUcroamP8z5w" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_K0eIoLjVEeOUcroamP8z5w" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_K0gk4LjVEeOUcroamP8z5w" type="Class_AttributeCompartment"> + <children xmi:type="notation:Node" xmi:id="_nMwz4LjVEeOUcroamP8z5w" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="model.uml#_nMtwkLjVEeOUcroamP8z5w"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_nMwz4bjVEeOUcroamP8z5w"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_K0gk4bjVEeOUcroamP8z5w"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_K0gk4rjVEeOUcroamP8z5w"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_K0gk47jVEeOUcroamP8z5w"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0gk5LjVEeOUcroamP8z5w"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL8LjVEeOUcroamP8z5w" type="Class_OperationCompartment"> + <children xmi:type="notation:Node" xmi:id="_mFRAULjVEeOUcroamP8z5w" type="Operation_ClassOperationLabel"> + <element xmi:type="uml:Operation" href="model.uml#_mDkXMLjVEeOUcroamP8z5w"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_mFRAUbjVEeOUcroamP8z5w"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL8bjVEeOUcroamP8z5w"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL8rjVEeOUcroamP8z5w"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL87jVEeOUcroamP8z5w"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0hL9LjVEeOUcroamP8z5w"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_K0hL9bjVEeOUcroamP8z5w" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_K0hL9rjVEeOUcroamP8z5w"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_K0hL97jVEeOUcroamP8z5w"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_K0hL-LjVEeOUcroamP8z5w"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0hL-bjVEeOUcroamP8z5w"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_HXCp4RMAEeeoPd87eel4nw" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_HXCp4hMAEeeoPd87eel4nw" y="5"/> + </children> + <element xmi:type="uml:Class" href="model.uml#_Kzml8LjVEeOUcroamP8z5w"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K0bsYbjVEeOUcroamP8z5w" x="35" y="123"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_HXEfExMAEeeoPd87eel4nw" type="StereotypeComment"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HXKlsBMAEeeoPd87eel4nw" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HXKlsRMAEeeoPd87eel4nw" key="visible" value="true"/> + </eAnnotations> + <children xmi:type="notation:BasicCompartment" xmi:id="_HXFGJhMAEeeoPd87eel4nw" type="StereotypeCompartment"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HXKlshMAEeeoPd87eel4nw" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HXKlsxMAEeeoPd87eel4nw" key="visible" value="true"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_HXGUQBMAEeeoPd87eel4nw" type="StereotypeProperty"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HXKltBMAEeeoPd87eel4nw" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HXKltRMAEeeoPd87eel4nw" key="visible" value="true"/> + </eAnnotations> + <element xmi:type="uml:Property" href="j2ee.profile.uml#_UkhtYJKJEeOKCcahrNz4pQ"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGUQRMAEeeoPd87eel4nw"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_HXGUQhMAEeeoPd87eel4nw" visible="false" type="StereotypeProperty"> + <element xmi:type="uml:Property" href="j2ee.profile.uml#_bLTv4JNUEeOscpAmdCPVFA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGUQxMAEeeoPd87eel4nw"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_HXGURBMAEeeoPd87eel4nw" visible="false" type="StereotypeProperty"> + <element xmi:type="uml:Property" href="j2ee.profile.uml#_aXfgwJNpEeOGJZd41BJaSw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGURRMAEeeoPd87eel4nw"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_HXGURhMAEeeoPd87eel4nw" visible="false" type="StereotypeProperty"> + <element xmi:type="uml:Property" href="j2ee.profile.uml#_pjxUoJlyEeOYT-OW6x9nfw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGURxMAEeeoPd87eel4nw"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_HXFGJxMAEeeoPd87eel4nw"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_HXFGKBMAEeeoPd87eel4nw" name="stereotype" stringValue="j2ee::Bean"/> + <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_EMn1sJ_NEeOHObuLP75oVQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HXFGKRMAEeeoPd87eel4nw"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_HXEfFBMAEeeoPd87eel4nw"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HXEfFhMAEeeoPd87eel4nw" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="model.uml#_Kzml8LjVEeOUcroamP8z5w"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ef5KYrjVEeOUcroamP8z5w" x="221" y="120"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_J526gbjVEeOUcroamP8z5w"/> + <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_HXCp4BMAEeeoPd87eel4nw" diagramKindId="org.eclipse.papyrus.uml.diagram.class"> + <owner xmi:type="uml:Model" href="model.uml#_J4wuULjVEeOUcroamP8z5w"/> + </styles> + <styles xmi:type="notation:StringValueStyle" xmi:id="_HaFW0BMAEeeoPd87eel4nw" name="diagram_compatibility_version" stringValue="1.3.0"/> + <element xmi:type="uml:Model" href="model.uml#_J4wuULjVEeOUcroamP8z5w"/> + <edges xmi:type="notation:Connector" xmi:id="_HXFGIBMAEeeoPd87eel4nw" type="StereotypeCommentLink" source="_K0bsYLjVEeOUcroamP8z5w" target="_HXEfExMAEeeoPd87eel4nw"> + <styles xmi:type="notation:FontStyle" xmi:id="_HXFGIRMAEeeoPd87eel4nw"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HXFGJRMAEeeoPd87eel4nw" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="model.uml#_Kzml8LjVEeOUcroamP8z5w"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ef6_krjVEeOUcroamP8z5w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_k7jVEeOUcroamP8z5w" id="(1.0,0.4830508474576271)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ef6_lLjVEeOUcroamP8z5w" id="(0.0,0.6166666666666667)"/> + </edges> +</notation:Diagram> diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/META-INF/MANIFEST.MF index cbb6da51fbb..df48c200998 100755 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/META-INF/MANIFEST.MF @@ -1,17 +1,17 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.core.runtime;bundle-version="3.11.0",
- org.junit,
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)"
-Export-Package: org.eclipse.papyrus.infra.core.clipboard.tests
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.3.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.core.clipboard.tests.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.clipboard.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="3.107.0", + org.eclipse.core.runtime;bundle-version="3.11.0", + org.junit, + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)" +Export-Package: org.eclipse.papyrus.infra.core.clipboard.tests +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.3.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.core.clipboard.tests.Activator +Bundle-SymbolicName: org.eclipse.papyrus.infra.core.clipboard.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF index febc461d04c..b0ee1184e8a 100644 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF @@ -1,16 +1,16 @@ -Manifest-Version: 1.0
-Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="[1.2.0,2.0.0)"
-Export-Package: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider,
- org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal,
- org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query,
- org.eclipse.papyrus.infra.core.sasheditor.di.tests
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.junit;bundle-version="4.10.0", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)", + org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider, + org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal, + org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query, + org.eclipse.papyrus.infra.core.sasheditor.di.tests +Bundle-Vendor: %Bundle-Vendor +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF index 8b2634ac1b5..032bec92b58 100644 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF @@ -1,31 +1,31 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui.editors;bundle-version="3.8.0",
- org.eclipse.jface.text;bundle-version="3.8.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.core.resources;bundle-version="3.8.0",
- org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.ui;bundle-version="3.106.0",
- org.eclipse.ui.workbench.texteditor;bundle-version="3.9.0",
- org.eclipse.core.runtime;bundle-version="3.10.0",
- org.eclipse.emf.ecore;bundle-version="2.11.0",
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)"
-Export-Package: org.eclipse.papyrus.infra.core.sasheditor.contentprovider,
- org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple,
- org.eclipse.papyrus.infra.core.sasheditor.editor,
- org.eclipse.papyrus.infra.core.sasheditor.internal,
- org.eclipse.papyrus.infra.core.sasheditor.pagesmodel,
- org.eclipse.papyrus.infra.core.sasheditor.tests,
- org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor,
- org.eclipse.papyrus.infra.core.sasheditor.tests.utils,
- org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak,
- org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace,
- org.eclipse.papyrus.infra.core.sasheditor.utils
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui.editors;bundle-version="3.8.0", + org.eclipse.jface.text;bundle-version="3.8.0", + org.eclipse.ui.ide;bundle-version="3.8.0", + org.eclipse.core.resources;bundle-version="3.8.0", + org.junit;bundle-version="4.10.0", + org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)", + org.eclipse.ui;bundle-version="3.106.0", + org.eclipse.ui.workbench.texteditor;bundle-version="3.9.0", + org.eclipse.core.runtime;bundle-version="3.10.0", + org.eclipse.emf.ecore;bundle-version="2.11.0", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.papyrus.infra.core.sasheditor.contentprovider, + org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple, + org.eclipse.papyrus.infra.core.sasheditor.editor, + org.eclipse.papyrus.infra.core.sasheditor.internal, + org.eclipse.papyrus.infra.core.sasheditor.pagesmodel, + org.eclipse.papyrus.infra.core.sasheditor.tests, + org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor, + org.eclipse.papyrus.infra.core.sasheditor.tests.utils, + org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak, + org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace, + org.eclipse.papyrus.infra.core.sasheditor.utils +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF index 72f72d4c543..e66cbb025aa 100755 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF @@ -1,19 +1,19 @@ -Manifest-Version: 1.0
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.0.1.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.core.suite.tests.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.suite.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.tests;bundle-version="[3.0.1,4.0.0)",
- org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.core.sasheditor.di.tests;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.core.clipboard.tests;bundle-version="[1.3.0,2.0.0)"
+Manifest-Version: 1.0 +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 0.0.1.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.core.suite.tests.Activator +Bundle-SymbolicName: org.eclipse.papyrus.infra.core.suite.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.junit;bundle-version="4.10.0", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.tests;bundle-version="[3.0.1,4.0.0)", + org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.core.sasheditor.di.tests;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.core.clipboard.tests;bundle-version="[1.3.0,2.0.0)" diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF index e6a1c7cc0a0..1c94cef06a8 100644 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF @@ -1,18 +1,18 @@ -Manifest-Version: 1.0
-Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.100,4.0.0)"
-Export-Package: org.eclipse.papyrus.infra.core.resource,
- org.eclipse.papyrus.infra.core.services,
- org.eclipse.papyrus.infra.core.tests
-Bundle-Vendor: %providerName
-Bundle-Version: 3.0.100.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Require-Bundle: org.junit;bundle-version="4.10.0", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core;bundle-version="[3.0.100,4.0.0)" +Export-Package: org.eclipse.papyrus.infra.core.resource, + org.eclipse.papyrus.infra.core.services, + org.eclipse.papyrus.infra.core.tests +Bundle-Vendor: %providerName +Bundle-Version: 3.0.100.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.core.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.common.base;version="21.0.0", com.google.common.collect;version="21.0.0", com.google.common.util.concurrent;version="21.0.0" diff --git a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF index 82f3b5ca1c9..69ab93f3a51 100644 --- a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF @@ -1,29 +1,29 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.editor.welcome.tests
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.editor.welcome;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="2.8.0";visibility:=reexport,
- org.junit;bundle-version="4.12.0";visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.core.databinding;bundle-version="1.6.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-ClassPath: .
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.editor.welcome.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.editor.welcome.tests +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.papyrus.infra.editor.welcome;visibility:=reexport;bundle-version="[2.0.0,3.0.0)", + org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="2.8.0";visibility:=reexport, + org.junit;bundle-version="4.12.0";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)", + org.eclipse.core.databinding;bundle-version="1.6.0", + org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0", + org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)" +Bundle-ActivationPolicy: lazy +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-ClassPath: . +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.editor.welcome.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/META-INF/MANIFEST.MF index 022f5d99867..ed2123cb8d5 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/META-INF/MANIFEST.MF @@ -1,14 +1,14 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.emf.gmf.tests,
- org.eclipse.papyrus.infra.emf.gmf.util.tests
-Require-Bundle: org.junit;bundle-version="4.12.0",
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.100.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.gmf.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.emf.gmf.tests, + org.eclipse.papyrus.infra.emf.gmf.util.tests +Require-Bundle: org.junit;bundle-version="4.12.0", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.100.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.gmf.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF index 2d9d4852326..f102d4b1a8e 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF @@ -1,20 +1,20 @@ -Manifest-Version: 1.0
-Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)"
-Export-Package: org.eclipse.papyrus.infra.emf.readonly,
- org.eclipse.papyrus.infra.emf.readonly.tests
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.junit;bundle-version="4.10.0", + org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)", + org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)", + org.eclipse.gmf.runtime.notation;bundle-version="1.7.0", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0", + org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)" +Export-Package: org.eclipse.papyrus.infra.emf.readonly, + org.eclipse.papyrus.infra.emf.readonly.tests +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.google.common.base;version="21.0.0", com.google.common.collect;version="21.0.0" diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.project b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.project index c45d0ac7154..c9b3afc9717 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.project +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.project @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.emf.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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.emf.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/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF index 0e131ec5114..044a80f861e 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF @@ -1,25 +1,25 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.emf.advice,
- org.eclipse.papyrus.infra.emf.resource,
- org.eclipse.papyrus.infra.emf.resource.index,
- org.eclipse.papyrus.infra.emf.tests,
- org.eclipse.papyrus.infra.emf.utils
-Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",
- org.junit;bundle-version="4.10.0",
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.4.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: fragment
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.google.common.base;version="21.0.0",
- com.google.common.collect;version="21.0.0",
- com.google.common.io;version="21.0.0",
- com.google.common.util.concurrent;version="21.0.0"
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.emf.advice, + org.eclipse.papyrus.infra.emf.resource, + org.eclipse.papyrus.infra.emf.resource.index, + org.eclipse.papyrus.infra.emf.tests, + org.eclipse.papyrus.infra.emf.utils +Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.8.0", + org.junit;bundle-version="4.10.0", + org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.4.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: fragment +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: com.google.common.base;version="21.0.0", + com.google.common.collect;version="21.0.0", + com.google.common.io;version="21.0.0", + com.google.common.util.concurrent;version="21.0.0" diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/about.html b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/about.html index 82d49bf5f81..d35d5aed64c 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/about.html +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/about.html @@ -1,28 +1,28 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> + +</body> +</html> diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/build.properties b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/build.properties index 0e0445f2f37..4c51b14e84e 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/build.properties +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/build.properties @@ -1,9 +1,9 @@ -source.. = tests/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- fragment.properties,\
- resources/
-src.includes = about.html,\
- org.eclipse.papyrus.infra.emf.tests.launch
+source.. = tests/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + about.html,\ + fragment.properties,\ + resources/ +src.includes = about.html,\ + org.eclipse.papyrus.infra.emf.tests.launch diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/fragment.properties b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/fragment.properties index 438acf1e574..81b6a3aa629 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/fragment.properties +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/fragment.properties @@ -1,12 +1,12 @@ -#################################################################################
-# Copyright (c) 2012 Cedric Dumoulin.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
-##################################################################################
-pluginName=Papyrus EMF Tests
-providerName=Eclipse Modeling Project
+################################################################################# +# Copyright (c) 2012 Cedric Dumoulin. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation +################################################################################## +pluginName=Papyrus EMF Tests +providerName=Eclipse Modeling Project diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceTest.java b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceTest.java index 9ad33a07c70..1d0bf36e3ba 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceTest.java +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceTest.java @@ -1,107 +1,107 @@ -/*****************************************************************************
- * Copyright (c) 2012, 2014 LIFL, CEA, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * LIFL - Initial API and implementation
- * Christian W. Damus (CEA) - bug 431953 (fix start-up of selective services to require only their dependencies)
- */
-package org.eclipse.papyrus.infra.emf.utils;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-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.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @author dumoulin
- *
- */
-public class ServiceUtilsForResourceTest {
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource#getInstance()}.
- */
- @Test
- public void testGetInstance() {
-
- assertNotNull("Instance ready", ServiceUtilsForResource.getInstance());
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource#getServiceRegistry(org.eclipse.emf.ecore.resource.Resource)}.
- * @throws ServiceException
- */
- @Test
- public void testGetServiceRegistryResource() throws ServiceException {
-
-
- // Create services
- ServicesRegistry servicesRegistry = new ServicesRegistry();
-
- ModelSet modelSet = new ModelSet();
- URI uri = URI.createURI("temp.ecore");
-
- // Register the default resource factory -- only needed for stand-alone!
- modelSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(
- Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
-
- Resource resource = modelSet.createResource(uri);
- assertNotNull("resource created", resource);
-
- EClass obj1 = EcoreFactory.eINSTANCE.createEClass();
- EPackage pack2 = EcoreFactory.eINSTANCE.createEPackage();
- EClass obj2 = EcoreFactory.eINSTANCE.createEClass();
- pack2.getEClassifiers().add(obj2);
- resource.getContents().add(obj1);
- resource.getContents().add(pack2);
-
- servicesRegistry.add(ModelSet.class, 10, modelSet);
-
- servicesRegistry.startServicesByClassKeys(ModelSet.class);
-
- // Check registry
- assertNotNull("service ModelSet", servicesRegistry.getService(ModelSet.class) );
- assertNotNull("ModelSet service not correctly initialized", ServiceUtils.getInstance().getModelSet(servicesRegistry) );
-
- // Do tests
- ServicesRegistry r2 = ServiceUtilsForResource.getInstance().getServiceRegistry(obj1.eResource());
- assertNotNull("found from obj1", r2);
-
- r2 = ServiceUtilsForResource.getInstance().getServiceRegistry(obj2.eResource());
- assertNotNull("found from obj2", r2);
-
- r2 = ServiceUtilsForResource.getInstance().getServiceRegistry(pack2.eResource());
- assertNotNull("found from pack2", r2);
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2012, 2014 LIFL, CEA, and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * LIFL - Initial API and implementation + * Christian W. Damus (CEA) - bug 431953 (fix start-up of selective services to require only their dependencies) + */ +package org.eclipse.papyrus.infra.emf.utils; + +import static org.junit.Assert.assertNotNull; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EcoreFactory; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; +import org.eclipse.papyrus.infra.core.resource.ModelSet; +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.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * @author dumoulin + * + */ +public class ServiceUtilsForResourceTest { + + /** + * @throws java.lang.Exception + */ + @Before + public void setUp() throws Exception { + } + + /** + * @throws java.lang.Exception + */ + @After + public void tearDown() throws Exception { + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource#getInstance()}. + */ + @Test + public void testGetInstance() { + + assertNotNull("Instance ready", ServiceUtilsForResource.getInstance()); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource#getServiceRegistry(org.eclipse.emf.ecore.resource.Resource)}. + * @throws ServiceException + */ + @Test + public void testGetServiceRegistryResource() throws ServiceException { + + + // Create services + ServicesRegistry servicesRegistry = new ServicesRegistry(); + + ModelSet modelSet = new ModelSet(); + URI uri = URI.createURI("temp.ecore"); + + // Register the default resource factory -- only needed for stand-alone! + modelSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put( + Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl()); + + Resource resource = modelSet.createResource(uri); + assertNotNull("resource created", resource); + + EClass obj1 = EcoreFactory.eINSTANCE.createEClass(); + EPackage pack2 = EcoreFactory.eINSTANCE.createEPackage(); + EClass obj2 = EcoreFactory.eINSTANCE.createEClass(); + pack2.getEClassifiers().add(obj2); + resource.getContents().add(obj1); + resource.getContents().add(pack2); + + servicesRegistry.add(ModelSet.class, 10, modelSet); + + servicesRegistry.startServicesByClassKeys(ModelSet.class); + + // Check registry + assertNotNull("service ModelSet", servicesRegistry.getService(ModelSet.class) ); + assertNotNull("ModelSet service not correctly initialized", ServiceUtils.getInstance().getModelSet(servicesRegistry) ); + + // Do tests + ServicesRegistry r2 = ServiceUtilsForResource.getInstance().getServiceRegistry(obj1.eResource()); + assertNotNull("found from obj1", r2); + + r2 = ServiceUtilsForResource.getInstance().getServiceRegistry(obj2.eResource()); + assertNotNull("found from obj2", r2); + + r2 = ServiceUtilsForResource.getInstance().getServiceRegistry(pack2.eResource()); + assertNotNull("found from pack2", r2); + } + +} diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF index 76b46800267..915859e373c 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF @@ -1,21 +1,21 @@ -Manifest-Version: 1.0
-Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)"
-Export-Package: org.eclipse.papyrus.infra.ui.emf.tests,
- org.eclipse.papyrus.infra.ui.internal.emf.readonly.handlers
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.emf.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Require-Bundle: org.junit;bundle-version="4.10.0", + org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)", + org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)", + org.eclipse.gmf.runtime.notation;bundle-version="1.7.0", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0", + org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)" +Export-Package: org.eclipse.papyrus.infra.ui.emf.tests, + org.eclipse.papyrus.infra.ui.internal.emf.readonly.handlers +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.emf.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.common.base;version="21.0.0", com.google.common.collect;version="21.0.0" diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF index 16b32d0d291..d66d5885548 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF @@ -1,34 +1,34 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.tests
-Require-Bundle: org.eclipse.core.runtime,
- org.junit;visibility:=reexport,
- org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore;bundle-version="2.11.0";visibility:=reexport,
- org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.ui;bundle-version="1.7.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.gef;bundle-version="3.10.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: com.google.common.base;version="21.0.0",
- com.google.common.collect;version="21.0.0"
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.tests +Require-Bundle: org.eclipse.core.runtime, + org.junit;visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.3.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="2.11.0";visibility:=reexport, + org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport, + org.eclipse.gmf.runtime.emf.ui;bundle-version="1.7.0", + org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.gef;bundle-version="3.10.0", + org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0", + org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Import-Package: com.google.common.base;version="21.0.0", + com.google.common.collect;version="21.0.0" diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations index 90182790064..42f4de7b071 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations @@ -1,99 +1,99 @@ -<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_JHkF8Jg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" name="j2ee" metamodelNsURI="j2ee">
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Bean" identifier="org.eclipse.papyrus.example.j2ee.Bean" name="Bean">
- <iconEntry xmi:id="_JHkF8pg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF85g0EeSrbqbUdG1DAA">
- <stereotypesQualifiedNames>j2ee::Bean</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Finder" identifier="org.eclipse.papyrus.example.j2ee.Finder" name="Finder">
- <iconEntry xmi:id="_JHkF9Zg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF9pg0EeSrbqbUdG1DAA">
- <stereotypesQualifiedNames>j2ee::Finder</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Operation"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Import" identifier="org.eclipse.papyrus.example.j2ee.Import" name="Import">
- <iconEntry xmi:id="_JHkF-Jg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF-Zg0EeSrbqbUdG1DAA">
- <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Web" identifier="org.eclipse.papyrus.example.j2ee.Web" name="Web">
- <iconEntry xmi:id="_JHkF-5g0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF_Jg0EeSrbqbUdG1DAA">
- <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Association"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User" identifier="org.eclipse.papyrus.example.j2ee.User" name="User">
- <iconEntry xmi:id="_JHkF_pg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF_5g0EeSrbqbUdG1DAA">
- <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser" identifier="org.eclipse.papyrus.example.j2ee.Browser" name="Browser">
- <iconEntry xmi:id="_JHkGAZg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkGApg0EeSrbqbUdG1DAA">
- <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.BranchPoint" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint" name="BranchPoint">
- <iconEntry xmi:id="_JHkGBJg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkGBZg0EeSrbqbUdG1DAA">
- <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionPoint"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario" identifier="org.eclipse.papyrus.example.j2ee.WebScenario" name="WebScenario">
- <iconEntry xmi:id="_JHkGB5g0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkGCJg0EeSrbqbUdG1DAA">
- <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
- </elementTypeConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGCZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.bean" target="org.eclipse.papyrus.example.j2ee.Bean">
- <stereotypesToApply xmi:id="_JHkGCpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Bean" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGC5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.finder" target="org.eclipse.papyrus.example.j2ee.Finder">
- <stereotypesToApply xmi:id="_JHkGDJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Finder" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGDZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.import" target="org.eclipse.papyrus.example.j2ee.Import">
- <stereotypesToApply xmi:id="_JHkGDpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Import" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGD5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.web" target="org.eclipse.papyrus.example.j2ee.Web">
- <stereotypesToApply xmi:id="_JHkGEJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Web" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGEZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.user" target="org.eclipse.papyrus.example.j2ee.User">
- <stereotypesToApply xmi:id="_JHkGEpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::User" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGE5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.browser" target="org.eclipse.papyrus.example.j2ee.Browser">
- <stereotypesToApply xmi:id="_JHkGFJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Browser" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGFZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.branchPoint" target="org.eclipse.papyrus.example.j2ee.BranchPoint">
- <stereotypesToApply xmi:id="_JHkGFpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGF5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.webScenario" target="org.eclipse.papyrus.example.j2ee.WebScenario">
- <stereotypesToApply xmi:id="_JHkGGJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII"?> +<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_JHkF8Jg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" name="j2ee" metamodelNsURI="j2ee"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Bean" identifier="org.eclipse.papyrus.example.j2ee.Bean" name="Bean"> + <iconEntry xmi:id="_JHkF8pg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF85g0EeSrbqbUdG1DAA"> + <stereotypesQualifiedNames>j2ee::Bean</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Finder" identifier="org.eclipse.papyrus.example.j2ee.Finder" name="Finder"> + <iconEntry xmi:id="_JHkF9Zg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF9pg0EeSrbqbUdG1DAA"> + <stereotypesQualifiedNames>j2ee::Finder</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Operation"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Import" identifier="org.eclipse.papyrus.example.j2ee.Import" name="Import"> + <iconEntry xmi:id="_JHkF-Jg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF-Zg0EeSrbqbUdG1DAA"> + <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Web" identifier="org.eclipse.papyrus.example.j2ee.Web" name="Web"> + <iconEntry xmi:id="_JHkF-5g0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF_Jg0EeSrbqbUdG1DAA"> + <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Association"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User" identifier="org.eclipse.papyrus.example.j2ee.User" name="User"> + <iconEntry xmi:id="_JHkF_pg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkF_5g0EeSrbqbUdG1DAA"> + <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser" identifier="org.eclipse.papyrus.example.j2ee.Browser" name="Browser"> + <iconEntry xmi:id="_JHkGAZg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkGApg0EeSrbqbUdG1DAA"> + <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.BranchPoint" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint" name="BranchPoint"> + <iconEntry xmi:id="_JHkGBJg0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkGBZg0EeSrbqbUdG1DAA"> + <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionPoint"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario" identifier="org.eclipse.papyrus.example.j2ee.WebScenario" name="WebScenario"> + <iconEntry xmi:id="_JHkGB5g0EeSrbqbUdG1DAA" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_JHkGCJg0EeSrbqbUdG1DAA"> + <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/> + </elementTypeConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGCZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.bean" target="org.eclipse.papyrus.example.j2ee.Bean"> + <stereotypesToApply xmi:id="_JHkGCpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Bean" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGC5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.finder" target="org.eclipse.papyrus.example.j2ee.Finder"> + <stereotypesToApply xmi:id="_JHkGDJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Finder" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGDZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.import" target="org.eclipse.papyrus.example.j2ee.Import"> + <stereotypesToApply xmi:id="_JHkGDpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Import" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGD5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.web" target="org.eclipse.papyrus.example.j2ee.Web"> + <stereotypesToApply xmi:id="_JHkGEJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Web" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGEZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.user" target="org.eclipse.papyrus.example.j2ee.User"> + <stereotypesToApply xmi:id="_JHkGEpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::User" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGE5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.browser" target="org.eclipse.papyrus.example.j2ee.Browser"> + <stereotypesToApply xmi:id="_JHkGFJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::Browser" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGFZg0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.branchPoint" target="org.eclipse.papyrus.example.j2ee.BranchPoint"> + <stereotypesToApply xmi:id="_JHkGFpg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_JHkGF5g0EeSrbqbUdG1DAA" identifier="org.eclipse.papyrus.example.j2ee.webScenario" target="org.eclipse.papyrus.example.j2ee.WebScenario"> + <stereotypesToApply xmi:id="_JHkGGJg0EeSrbqbUdG1DAA" stereotypeQualifiedName="j2ee::WebScenario" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> +</elementtypesconfigurations:ElementTypeSetConfiguration> diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations index 639353533e1..568cc26a27f 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations @@ -1,183 +1,183 @@ -<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_PDKksJgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" name="j2ee" metamodelNsURI="j2ee">
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Import_4013" identifier="org.eclipse.papyrus.example.j2ee.Import_4013" name="Import" hint="4013">
- <iconEntry xmi:id="_PDKkspgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKks5gTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Web_4011" identifier="org.eclipse.papyrus.example.j2ee.Web_4011" name="Web" hint="4011">
- <iconEntry xmi:id="_PDKktZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKktpgTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Association_Edge"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_3018" identifier="org.eclipse.papyrus.example.j2ee.User_3018" name="User (3018)" hint="3018">
- <iconEntry xmi:id="_PDKkuJgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkuZgTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CCN"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_3011" identifier="org.eclipse.papyrus.example.j2ee.User_3011" name="User (3011)" hint="3011">
- <iconEntry xmi:id="_PDKku5gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkvJgTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CN"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_2011" identifier="org.eclipse.papyrus.example.j2ee.User_2011" name="User (2011)" hint="2011">
- <iconEntry xmi:id="_PDKkvpgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkv5gTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_2012" identifier="org.eclipse.papyrus.example.j2ee.User_2012" name="User (2012)" hint="2012">
- <iconEntry xmi:id="_PDKkwZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkwpgTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_ClassifierShape"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_3018" identifier="org.eclipse.papyrus.example.j2ee.Browser_3018" name="Browser (3018)" hint="3018">
- <iconEntry xmi:id="_PDKkxJgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkxZgTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CCN"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_3011" identifier="org.eclipse.papyrus.example.j2ee.Browser_3011" name="Browser (3011)" hint="3011">
- <iconEntry xmi:id="_PDKkx5gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkyJgTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CN"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_2011" identifier="org.eclipse.papyrus.example.j2ee.Browser_2011" name="Browser (2011)" hint="2011">
- <iconEntry xmi:id="_PDKkypgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKky5gTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_2012" identifier="org.eclipse.papyrus.example.j2ee.Browser_2012" name="Browser (2012)" hint="2012">
- <iconEntry xmi:id="_PDKkzZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkzpgTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_ClassifierShape"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" name="BranchPoint (3007)" hint="3007">
- <iconEntry xmi:id="_PDKk0JgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk0ZgTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" name="BranchPoint (3008)" hint="3008">
- <iconEntry xmi:id="_PDKk05gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk1JgTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionPoint_ClassifierExtensionPointLabel"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario_3012" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_3012" name="WebScenario (3012)" hint="3012">
- <iconEntry xmi:id="_PDKk1pgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk15gTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_Shape_CN"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario_2013" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2013" name="WebScenario (2013)" hint="2013">
- <iconEntry xmi:id="_PDKk2ZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk2pgTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_Shape"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario_2014" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2014" name="WebScenario (2014)" hint="2014">
- <iconEntry xmi:id="_PDKk3JgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk3ZgTEeSXtOdwR_uKBQ">
- <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
- </matcherConfiguration>
- <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_ClassifierShape"/>
- </elementTypeConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk3pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.import_4013" target="org.eclipse.papyrus.example.j2ee.Import_4013">
- <stereotypesToApply xmi:id="_PDKk35gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Import" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk4JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.web_4011" target="org.eclipse.papyrus.example.j2ee.Web_4011">
- <stereotypesToApply xmi:id="_PDKk4ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Web" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk4pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_3018" target="org.eclipse.papyrus.example.j2ee.User_3018">
- <stereotypesToApply xmi:id="_PDKk45gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk5JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_3011" target="org.eclipse.papyrus.example.j2ee.User_3011">
- <stereotypesToApply xmi:id="_PDKk5ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk5pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_2011" target="org.eclipse.papyrus.example.j2ee.User_2011">
- <stereotypesToApply xmi:id="_PDKk55gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk6JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_2012" target="org.eclipse.papyrus.example.j2ee.User_2012">
- <stereotypesToApply xmi:id="_PDKk6ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk6pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_3018" target="org.eclipse.papyrus.example.j2ee.Browser_3018">
- <stereotypesToApply xmi:id="_PDKk65gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk7JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_3011" target="org.eclipse.papyrus.example.j2ee.Browser_3011">
- <stereotypesToApply xmi:id="_PDKk7ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk7pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_2011" target="org.eclipse.papyrus.example.j2ee.Browser_2011">
- <stereotypesToApply xmi:id="_PDKk75gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk8JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_2012" target="org.eclipse.papyrus.example.j2ee.Browser_2012">
- <stereotypesToApply xmi:id="_PDKk8ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk8pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3007" target="org.eclipse.papyrus.example.j2ee.BranchPoint_3007">
- <stereotypesToApply xmi:id="_PDKk85gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk9JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3008" target="org.eclipse.papyrus.example.j2ee.BranchPoint_3008">
- <stereotypesToApply xmi:id="_PDKk9ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk9pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_3012" target="org.eclipse.papyrus.example.j2ee.WebScenario_3012">
- <stereotypesToApply xmi:id="_PDKk95gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk-JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_2013" target="org.eclipse.papyrus.example.j2ee.WebScenario_2013">
- <stereotypesToApply xmi:id="_PDKk-ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk-pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_2014" target="org.eclipse.papyrus.example.j2ee.WebScenario_2014">
- <stereotypesToApply xmi:id="_PDKk-5gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII"?> +<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_PDKksJgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" name="j2ee" metamodelNsURI="j2ee"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Import_4013" identifier="org.eclipse.papyrus.example.j2ee.Import_4013" name="Import" hint="4013"> + <iconEntry xmi:id="_PDKkspgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKks5gTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Web_4011" identifier="org.eclipse.papyrus.example.j2ee.Web_4011" name="Web" hint="4011"> + <iconEntry xmi:id="_PDKktZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKktpgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Association_Edge"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_3018" identifier="org.eclipse.papyrus.example.j2ee.User_3018" name="User (3018)" hint="3018"> + <iconEntry xmi:id="_PDKkuJgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkuZgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CCN"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_3011" identifier="org.eclipse.papyrus.example.j2ee.User_3011" name="User (3011)" hint="3011"> + <iconEntry xmi:id="_PDKku5gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkvJgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CN"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_2011" identifier="org.eclipse.papyrus.example.j2ee.User_2011" name="User (2011)" hint="2011"> + <iconEntry xmi:id="_PDKkvpgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkv5gTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.User_2012" identifier="org.eclipse.papyrus.example.j2ee.User_2012" name="User (2012)" hint="2012"> + <iconEntry xmi:id="_PDKkwZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkwpgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_ClassifierShape"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_3018" identifier="org.eclipse.papyrus.example.j2ee.Browser_3018" name="Browser (3018)" hint="3018"> + <iconEntry xmi:id="_PDKkxJgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkxZgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CCN"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_3011" identifier="org.eclipse.papyrus.example.j2ee.Browser_3011" name="Browser (3011)" hint="3011"> + <iconEntry xmi:id="_PDKkx5gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkyJgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CN"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_2011" identifier="org.eclipse.papyrus.example.j2ee.Browser_2011" name="Browser (2011)" hint="2011"> + <iconEntry xmi:id="_PDKkypgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKky5gTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.Browser_2012" identifier="org.eclipse.papyrus.example.j2ee.Browser_2012" name="Browser (2012)" hint="2012"> + <iconEntry xmi:id="_PDKkzZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkzpgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_ClassifierShape"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" name="BranchPoint (3007)" hint="3007"> + <iconEntry xmi:id="_PDKk0JgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk0ZgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" name="BranchPoint (3008)" hint="3008"> + <iconEntry xmi:id="_PDKk05gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk1JgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionPoint_ClassifierExtensionPointLabel"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario_3012" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_3012" name="WebScenario (3012)" hint="3012"> + <iconEntry xmi:id="_PDKk1pgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk15gTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_Shape_CN"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario_2013" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2013" name="WebScenario (2013)" hint="2013"> + <iconEntry xmi:id="_PDKk2ZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk2pgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_Shape"/> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.example.j2ee.WebScenario_2014" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2014" name="WebScenario (2014)" hint="2014"> + <iconEntry xmi:id="_PDKk3JgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk3ZgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames> + </matcherConfiguration> + <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_ClassifierShape"/> + </elementTypeConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk3pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.import_4013" target="org.eclipse.papyrus.example.j2ee.Import_4013"> + <stereotypesToApply xmi:id="_PDKk35gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Import" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk4JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.web_4011" target="org.eclipse.papyrus.example.j2ee.Web_4011"> + <stereotypesToApply xmi:id="_PDKk4ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Web" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk4pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_3018" target="org.eclipse.papyrus.example.j2ee.User_3018"> + <stereotypesToApply xmi:id="_PDKk45gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk5JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_3011" target="org.eclipse.papyrus.example.j2ee.User_3011"> + <stereotypesToApply xmi:id="_PDKk5ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk5pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_2011" target="org.eclipse.papyrus.example.j2ee.User_2011"> + <stereotypesToApply xmi:id="_PDKk55gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk6JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_2012" target="org.eclipse.papyrus.example.j2ee.User_2012"> + <stereotypesToApply xmi:id="_PDKk6ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk6pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_3018" target="org.eclipse.papyrus.example.j2ee.Browser_3018"> + <stereotypesToApply xmi:id="_PDKk65gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk7JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_3011" target="org.eclipse.papyrus.example.j2ee.Browser_3011"> + <stereotypesToApply xmi:id="_PDKk7ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk7pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_2011" target="org.eclipse.papyrus.example.j2ee.Browser_2011"> + <stereotypesToApply xmi:id="_PDKk75gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk8JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_2012" target="org.eclipse.papyrus.example.j2ee.Browser_2012"> + <stereotypesToApply xmi:id="_PDKk8ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk8pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3007" target="org.eclipse.papyrus.example.j2ee.BranchPoint_3007"> + <stereotypesToApply xmi:id="_PDKk85gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk9JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3008" target="org.eclipse.papyrus.example.j2ee.BranchPoint_3008"> + <stereotypesToApply xmi:id="_PDKk9ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk9pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_3012" target="org.eclipse.papyrus.example.j2ee.WebScenario_3012"> + <stereotypesToApply xmi:id="_PDKk95gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk-JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_2013" target="org.eclipse.papyrus.example.j2ee.WebScenario_2013"> + <stereotypesToApply xmi:id="_PDKk-ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk-pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_2014" target="org.eclipse.papyrus.example.j2ee.WebScenario_2014"> + <stereotypesToApply xmi:id="_PDKk-5gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> +</elementtypesconfigurations:ElementTypeSetConfiguration> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.project b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.project index 718e1d52780..5556bd51a0b 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.project +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.project @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.canonical.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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.canonical.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/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF index 931efc1c74c..20f104961e1 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF @@ -1,35 +1,35 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.junit;bundle-version="4.11.0",
- org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.codegen;bundle-version="2.11.0",
- org.eclipse.papyrus.gmfgenextension;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)"
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.tests,
- org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.google.common.base;version="21.0.0",
- com.google.common.collect;version="21.0.0",
- com.google.common.util.concurrent;version="21.0.0"
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.junit;bundle-version="4.11.0", + org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[2.0.0,3.0.0)", + org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0", + org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)", + org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.codegen;bundle-version="2.11.0", + org.eclipse.papyrus.gmfgenextension;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.tests, + org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal;x-internal:=true +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal.Activator +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: com.google.common.base;version="21.0.0", + com.google.common.collect;version="21.0.0", + com.google.common.util.concurrent;version="21.0.0" diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/about.html b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/about.html index 82d49bf5f81..d35d5aed64c 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/about.html +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/about.html @@ -1,28 +1,28 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> + +</body> +</html> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/build.properties b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/build.properties index 54e8f43992d..a14417e24e9 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/build.properties +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/build.properties @@ -1,8 +1,8 @@ -source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties,\
- models/
-src.includes = about.html
+source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + about.html,\ + plugin.properties,\ + models/ +src.includes = about.html diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCSSCanonicalTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCSSCanonicalTest.java index 2f6445c29bf..68ced01d33c 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCSSCanonicalTest.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCSSCanonicalTest.java @@ -1,183 +1,183 @@ -/*****************************************************************************
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Christian W. Damus - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.gmfdiag.canonical.tests;
-
-import java.io.InputStream;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.AddCustomStyleListValueCommand;
-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
-import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles;
-import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.AddCSSStyleSheetCommand;
-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;
-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;
-import org.eclipse.papyrus.junit.utils.JUnitUtils;
-import org.junit.Rule;
-import org.junit.rules.TestRule;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
-import org.osgi.framework.FrameworkUtil;
-
-import com.google.common.collect.Iterables;
-
-/**
- * Common implementation of canonical test cases for CSS.
- */
-public class AbstractCSSCanonicalTest extends AbstractCanonicalTest {
- @Rule
- public final TestRule stylesheetRule = new StylesheetRule();
-
- protected IFile cssFile;
-
- public AbstractCSSCanonicalTest() {
- super();
- }
-
- protected EmbeddedStyleSheet getStylesheet(String name) {
- EmbeddedStyleSheet result = null;
-
- for (EmbeddedStyleSheet next : Iterables.filter(getDiagramEditPart().getNotationView().eResource().getContents(), EmbeddedStyleSheet.class)) {
- if (name.equals(next.getLabel())) {
- result = next;
- break;
- }
- }
-
- return result;
- }
-
- protected void referenceEmbeddedStylesheet(String name) {
- referenceEmbeddedStylesheet(name, false);
- }
-
- private void referenceEmbeddedStylesheet(String name, boolean unsafe) {
- TransactionalEditingDomain domain = editor.getEditingDomain();
- View targetView = getDiagramEditPart().getNotationView();
- EmbeddedStyleSheet css = getStylesheet(name);
-
- Command command = new AddCSSStyleSheetCommand(domain, targetView,
- CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY,
- NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE, NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE,
- css);
-
- if (unsafe) {
- command = GMFUnsafe.wrap(editor.getEditingDomain(), command);
- command.execute();
- domain.getCommandStack().flush(); // Just in case
- } else {
- domain.getCommandStack().execute(command);
- }
-
- waitForUIEvents();
- }
-
- protected void referenceExternalStylesheet(String path) {
- referenceExternalStylesheet(path, false);
- }
-
- private void referenceExternalStylesheet(String path, boolean unsafe) {
- TransactionalEditingDomain domain = editor.getEditingDomain();
- View targetView = getDiagramEditPart().getNotationView();
- StyleSheetReference css = StylesheetsFactory.eINSTANCE.createStyleSheetReference();
- css.setPath(path);
-
- Command command = new AddCSSStyleSheetCommand(domain, targetView,
- CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY,
- NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE, NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE,
- css);
-
- if (unsafe) {
- command = GMFUnsafe.wrap(editor.getEditingDomain(), command);
- command.execute();
- domain.getCommandStack().flush(); // Just in case
- } else {
- domain.getCommandStack().execute(command);
- }
-
- waitForUIEvents();
- }
-
- protected void addStyleClass(View view, String name) {
- TransactionalEditingDomain domain = editor.getEditingDomain();
-
- Command command = new AddCustomStyleListValueCommand(domain, view,
- CSSStyles.CSS_GMF_CLASS_KEY,
- NotationPackage.Literals.STRING_LIST_VALUE_STYLE, NotationPackage.Literals.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE,
- name);
-
- domain.getCommandStack().execute(command);
-
- waitForUIEvents();
- }
-
- protected void refreshDiagram() {
- Diagram diagram = editor.getActiveDiagramEditor().getDiagram();
- ((CSSDiagram) diagram).getEngine().reset();
- DiagramHelper.forceRefresh(editor.getActiveDiagramEditor().getDiagramEditPart());
- }
-
- //
- // Nested types
- //
-
- @Retention(RetentionPolicy.RUNTIME)
- @Target({ ElementType.TYPE, ElementType.METHOD })
- protected @interface StylesheetRef {
- String value();
- }
-
- @Retention(RetentionPolicy.RUNTIME)
- @Target({ ElementType.TYPE, ElementType.METHOD })
- protected @interface CSSResource {
- String value();
- }
-
- private class StylesheetRule extends TestWatcher {
- @Override
- protected void starting(Description description) {
- StylesheetRef ref = JUnitUtils.getAnnotation(description, StylesheetRef.class);
- if (ref != null) {
- referenceEmbeddedStylesheet(ref.value(), true);
- }
-
- CSSResource css = JUnitUtils.getAnnotation(description, CSSResource.class);
- if (css != null) {
- URL url = FrameworkUtil.getBundle(AbstractCSSCanonicalTest.this.getClass()).getEntry(css.value());
- try (InputStream contents = url.openStream()) {
- cssFile = editor.getProject().getProject().getFile(URI.createURI(url.toExternalForm()).lastSegment());
- cssFile.create(contents, false, null);
- } catch (Exception e) {
- throw new WrappedException(e);
- }
- referenceExternalStylesheet(cssFile.getFullPath().toString(), true);
- }
- }
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2015 Christian W. Damus and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.gmfdiag.canonical.tests; + +import java.io.InputStream; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.net.URL; + +import org.eclipse.core.resources.IFile; +import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.common.util.WrappedException; +import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.gmf.runtime.notation.Diagram; +import org.eclipse.gmf.runtime.notation.NotationPackage; +import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.AddCustomStyleListValueCommand; +import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper; +import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe; +import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram; +import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles; +import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.AddCSSStyleSheetCommand; +import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet; +import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference; +import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory; +import org.eclipse.papyrus.junit.utils.JUnitUtils; +import org.junit.Rule; +import org.junit.rules.TestRule; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; +import org.osgi.framework.FrameworkUtil; + +import com.google.common.collect.Iterables; + +/** + * Common implementation of canonical test cases for CSS. + */ +public class AbstractCSSCanonicalTest extends AbstractCanonicalTest { + @Rule + public final TestRule stylesheetRule = new StylesheetRule(); + + protected IFile cssFile; + + public AbstractCSSCanonicalTest() { + super(); + } + + protected EmbeddedStyleSheet getStylesheet(String name) { + EmbeddedStyleSheet result = null; + + for (EmbeddedStyleSheet next : Iterables.filter(getDiagramEditPart().getNotationView().eResource().getContents(), EmbeddedStyleSheet.class)) { + if (name.equals(next.getLabel())) { + result = next; + break; + } + } + + return result; + } + + protected void referenceEmbeddedStylesheet(String name) { + referenceEmbeddedStylesheet(name, false); + } + + private void referenceEmbeddedStylesheet(String name, boolean unsafe) { + TransactionalEditingDomain domain = editor.getEditingDomain(); + View targetView = getDiagramEditPart().getNotationView(); + EmbeddedStyleSheet css = getStylesheet(name); + + Command command = new AddCSSStyleSheetCommand(domain, targetView, + CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY, + NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE, NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE, + css); + + if (unsafe) { + command = GMFUnsafe.wrap(editor.getEditingDomain(), command); + command.execute(); + domain.getCommandStack().flush(); // Just in case + } else { + domain.getCommandStack().execute(command); + } + + waitForUIEvents(); + } + + protected void referenceExternalStylesheet(String path) { + referenceExternalStylesheet(path, false); + } + + private void referenceExternalStylesheet(String path, boolean unsafe) { + TransactionalEditingDomain domain = editor.getEditingDomain(); + View targetView = getDiagramEditPart().getNotationView(); + StyleSheetReference css = StylesheetsFactory.eINSTANCE.createStyleSheetReference(); + css.setPath(path); + + Command command = new AddCSSStyleSheetCommand(domain, targetView, + CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY, + NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE, NotationPackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE, + css); + + if (unsafe) { + command = GMFUnsafe.wrap(editor.getEditingDomain(), command); + command.execute(); + domain.getCommandStack().flush(); // Just in case + } else { + domain.getCommandStack().execute(command); + } + + waitForUIEvents(); + } + + protected void addStyleClass(View view, String name) { + TransactionalEditingDomain domain = editor.getEditingDomain(); + + Command command = new AddCustomStyleListValueCommand(domain, view, + CSSStyles.CSS_GMF_CLASS_KEY, + NotationPackage.Literals.STRING_LIST_VALUE_STYLE, NotationPackage.Literals.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE, + name); + + domain.getCommandStack().execute(command); + + waitForUIEvents(); + } + + protected void refreshDiagram() { + Diagram diagram = editor.getActiveDiagramEditor().getDiagram(); + ((CSSDiagram) diagram).getEngine().reset(); + DiagramHelper.forceRefresh(editor.getActiveDiagramEditor().getDiagramEditPart()); + } + + // + // Nested types + // + + @Retention(RetentionPolicy.RUNTIME) + @Target({ ElementType.TYPE, ElementType.METHOD }) + protected @interface StylesheetRef { + String value(); + } + + @Retention(RetentionPolicy.RUNTIME) + @Target({ ElementType.TYPE, ElementType.METHOD }) + protected @interface CSSResource { + String value(); + } + + private class StylesheetRule extends TestWatcher { + @Override + protected void starting(Description description) { + StylesheetRef ref = JUnitUtils.getAnnotation(description, StylesheetRef.class); + if (ref != null) { + referenceEmbeddedStylesheet(ref.value(), true); + } + + CSSResource css = JUnitUtils.getAnnotation(description, CSSResource.class); + if (css != null) { + URL url = FrameworkUtil.getBundle(AbstractCSSCanonicalTest.this.getClass()).getEntry(css.value()); + try (InputStream contents = url.openStream()) { + cssFile = editor.getProject().getProject().getFile(URI.createURI(url.toExternalForm()).lastSegment()); + cssFile.create(contents, false, null); + } catch (Exception e) { + throw new WrappedException(e); + } + referenceExternalStylesheet(cssFile.getFullPath().toString(), true); + } + } + } + +} diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/internal/Activator.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/internal/Activator.java index a7a6a3c9e4f..3083aa43e00 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/internal/Activator.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/internal/Activator.java @@ -1,44 +1,44 @@ -package org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.canonical.tests"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
+package org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.canonical.tests"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + @Override + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF index da21ce31126..c1f71e4a5de 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF @@ -1,18 +1,18 @@ -Manifest-Version: 1.0
-Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)"
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.commands.tests
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.commands.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Require-Bundle: org.junit;bundle-version="4.10.0", + org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)" +Export-Package: org.eclipse.papyrus.infra.gmfdiag.commands.tests +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.commands.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.common.base;version="21.0.0", com.google.common.collect;version="21.0.0" diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/NotifyingWorkspaceCommandStackTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/NotifyingWorkspaceCommandStackTest.java index 7c05b0425d6..aa083d38a1a 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/NotifyingWorkspaceCommandStackTest.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/NotifyingWorkspaceCommandStackTest.java @@ -1,227 +1,227 @@ -/*****************************************************************************
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Christian W. Damus - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.commands;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.transaction.TransactionalCommandStack;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
-import org.eclipse.papyrus.infra.emf.gmf.command.NotifyingWorkspaceCommandStack;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Regression tests for the {@link NotifyingWorkspaceCommandStack} class.
- */
-public class NotifyingWorkspaceCommandStackTest extends AbstractPapyrusTest {
-
- private TransactionalEditingDomain domain;
- private NotifyingWorkspaceCommandStack fixture;
-
- @Test
- public void dirtyAfterExecute() {
- assertNotDirty();
- execute(new TestCommand());
- assertDirty();
- }
-
- @Test
- public void notDirtyAfterExecuteNonDirtying() {
- assertNotDirty();
- execute(new NonDirtyingCommand());
- assertNotDirty();
- }
-
- @Test
- public void notDirtyAfterExecute_undo() {
- assertNotDirty();
- execute(new TestCommand());
- undo();
- assertNotDirty();
- }
-
- @Test
- public void notDirtyAfterExecuteNonDirtying_undo() {
- assertNotDirty();
- execute(new NonDirtyingCommand());
- undo();
- assertNotDirty();
- }
-
- @Test
- public void notDirtyAfterExecute_save() {
- assertNotDirty();
- execute(new TestCommand());
- save();
- assertNotDirty();
- }
-
- @Test
- public void dirtyAfterExecute_save_undo() {
- assertNotDirty();
- execute(new TestCommand());
- save();
- undo();
- assertDirty();
- }
-
- @Test
- public void notDirtyAfterExecute_save_undo_save() {
- assertNotDirty();
- execute(new TestCommand());
- save();
- undo();
- save();
- assertNotDirty();
- }
-
- @Test
- public void dirtyAfterExecute_save_undo_save_redo() {
- assertNotDirty();
- execute(new TestCommand());
- save();
- undo();
- save();
- redo();
- assertDirty();
- }
-
- @Test
- public void notDirtyAfterExecute_save_executeNonDirtying_undo_undo_redo_redo() {
- assertNotDirty();
- execute(new TestCommand());
- save();
- execute(new NonDirtyingCommand());
- undo();
- undo();
- redo();
- redo();
- assertNotDirty();
- }
-
- @Test
- public void notDirtyAfterExecute_save_execute_undo_undo_redo() {
- assertNotDirty();
- execute(new TestCommand());
- save();
- execute(new TestCommand());
- undo();
- undo();
- redo();
- assertNotDirty();
- }
-
- @Test
- public void dirtyAfterExecute_save_execute_undo_undo_save_redo() {
- assertNotDirty();
- execute(new TestCommand());
- save();
- execute(new TestCommand());
- undo();
- undo();
- save();
- redo();
- assertDirty();
- }
-
- //
- // Test framework
- //
-
- @Before
- public void createFixture() {
- fixture = new NotifyingWorkspaceCommandStack(CheckedOperationHistory.getInstance());
- AdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
- domain = new TransactionalEditingDomainImpl(adapterFactory, (TransactionalCommandStack) fixture);
- }
-
- @After
- public void destroyFixture() {
- // This disposes the command stack for us
- domain.dispose();
- domain = null;
- fixture = null;
- }
-
- void execute(Command command) {
- assertThat("Cannot execute", command.canExecute(), is(true));
- fixture.execute(command);
- }
-
- void undo() {
- assertThat("Cannot undo", fixture.canUndo(), is(true));
- fixture.undo();
- }
-
- void redo() {
- assertThat("Cannot redo", fixture.canRedo(), is(true));
- fixture.redo();
- }
-
- void save() {
- assertDirty();
- fixture.saveIsDone();
- }
-
- void assertDirty() {
- assertThat("Stack is not dirty", fixture.isSaveNeeded(), is(true));
- }
-
- void assertNotDirty() {
- assertThat("Stack is dirty", fixture.isSaveNeeded(), is(false));
- }
-
- static class TestCommand extends AbstractCommand {
- TestCommand() {
- super();
- }
-
- @Override
- public boolean canExecute() {
- return true;
- }
-
- public void execute() {
- // Pass
- }
-
- @Override
- public boolean canUndo() {
- return true;
- }
-
- @Override
- public void undo() {
- // Pass
- }
-
- public void redo() {
- // Pass
- }
- }
-
- static class NonDirtyingCommand extends TestCommand implements AbstractCommand.NonDirtying {
- NonDirtyingCommand() {
- super();
- }
- }
-}
+/***************************************************************************** + * Copyright (c) 2015 Christian W. Damus and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.commands; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + +import org.eclipse.emf.common.command.AbstractCommand; +import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.transaction.TransactionalCommandStack; +import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl; +import org.eclipse.papyrus.infra.emf.gmf.command.NotifyingWorkspaceCommandStack; +import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * Regression tests for the {@link NotifyingWorkspaceCommandStack} class. + */ +public class NotifyingWorkspaceCommandStackTest extends AbstractPapyrusTest { + + private TransactionalEditingDomain domain; + private NotifyingWorkspaceCommandStack fixture; + + @Test + public void dirtyAfterExecute() { + assertNotDirty(); + execute(new TestCommand()); + assertDirty(); + } + + @Test + public void notDirtyAfterExecuteNonDirtying() { + assertNotDirty(); + execute(new NonDirtyingCommand()); + assertNotDirty(); + } + + @Test + public void notDirtyAfterExecute_undo() { + assertNotDirty(); + execute(new TestCommand()); + undo(); + assertNotDirty(); + } + + @Test + public void notDirtyAfterExecuteNonDirtying_undo() { + assertNotDirty(); + execute(new NonDirtyingCommand()); + undo(); + assertNotDirty(); + } + + @Test + public void notDirtyAfterExecute_save() { + assertNotDirty(); + execute(new TestCommand()); + save(); + assertNotDirty(); + } + + @Test + public void dirtyAfterExecute_save_undo() { + assertNotDirty(); + execute(new TestCommand()); + save(); + undo(); + assertDirty(); + } + + @Test + public void notDirtyAfterExecute_save_undo_save() { + assertNotDirty(); + execute(new TestCommand()); + save(); + undo(); + save(); + assertNotDirty(); + } + + @Test + public void dirtyAfterExecute_save_undo_save_redo() { + assertNotDirty(); + execute(new TestCommand()); + save(); + undo(); + save(); + redo(); + assertDirty(); + } + + @Test + public void notDirtyAfterExecute_save_executeNonDirtying_undo_undo_redo_redo() { + assertNotDirty(); + execute(new TestCommand()); + save(); + execute(new NonDirtyingCommand()); + undo(); + undo(); + redo(); + redo(); + assertNotDirty(); + } + + @Test + public void notDirtyAfterExecute_save_execute_undo_undo_redo() { + assertNotDirty(); + execute(new TestCommand()); + save(); + execute(new TestCommand()); + undo(); + undo(); + redo(); + assertNotDirty(); + } + + @Test + public void dirtyAfterExecute_save_execute_undo_undo_save_redo() { + assertNotDirty(); + execute(new TestCommand()); + save(); + execute(new TestCommand()); + undo(); + undo(); + save(); + redo(); + assertDirty(); + } + + // + // Test framework + // + + @Before + public void createFixture() { + fixture = new NotifyingWorkspaceCommandStack(CheckedOperationHistory.getInstance()); + AdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); + domain = new TransactionalEditingDomainImpl(adapterFactory, (TransactionalCommandStack) fixture); + } + + @After + public void destroyFixture() { + // This disposes the command stack for us + domain.dispose(); + domain = null; + fixture = null; + } + + void execute(Command command) { + assertThat("Cannot execute", command.canExecute(), is(true)); + fixture.execute(command); + } + + void undo() { + assertThat("Cannot undo", fixture.canUndo(), is(true)); + fixture.undo(); + } + + void redo() { + assertThat("Cannot redo", fixture.canRedo(), is(true)); + fixture.redo(); + } + + void save() { + assertDirty(); + fixture.saveIsDone(); + } + + void assertDirty() { + assertThat("Stack is not dirty", fixture.isSaveNeeded(), is(true)); + } + + void assertNotDirty() { + assertThat("Stack is dirty", fixture.isSaveNeeded(), is(false)); + } + + static class TestCommand extends AbstractCommand { + TestCommand() { + super(); + } + + @Override + public boolean canExecute() { + return true; + } + + public void execute() { + // Pass + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + // Pass + } + + public void redo() { + // Pass + } + } + + static class NonDirtyingCommand extends TestCommand implements AbstractCommand.NonDirtying { + NonDirtyingCommand() { + super(); + } + } +} diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/util/CommandTreeIteratorTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/util/CommandTreeIteratorTest.java index 3ab07ce6d2c..750a2cb74e1 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/util/CommandTreeIteratorTest.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/commands/util/CommandTreeIteratorTest.java @@ -1,194 +1,194 @@ -/*****************************************************************************
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Christian W. Damus - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.commands.util;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.papyrus.commands.wrappers.EMFtoGEFCommandWrapper;
-import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.common.collect.Sets;
-
-/**
- * Test suite for the {@link CommandTreeIterator} class.
- */
-public class CommandTreeIteratorTest extends AbstractPapyrusTest {
-
- private Object fixture;
-
- private int gefCount;
-
- private int emfCount;
-
- private int gmfCount;
-
- public CommandTreeIteratorTest() {
- super();
- }
-
- @Test
- public void gefCompoundsAndWrappers() {
- assertThat(collectAll(fixture, Command.class).size(), is(gefCount));
- }
-
- @Test
- public void emfCompoundsAndWrappers() {
- assertThat(collectAll(fixture, org.eclipse.emf.common.command.Command.class).size(), is(emfCount));
- }
-
- @Test
- public void gmfCompoundsAndWrappers() {
- assertThat(collectAll(fixture, ICommand.class).size(), is(gmfCount));
- }
-
- @Test
- public void genericCompoundsAndWrappers() {
- assertThat(collectAll(fixture).size(), is(gef |