diff options
| author | Quentin Le Menez | 2017-01-13 15:40:01 +0000 |
|---|---|---|
| committer | Quentin Le Menez | 2017-01-29 19:48:16 +0000 |
| commit | 548e94c993a9180b7ec2456d6315fb97826e4eb8 (patch) | |
| tree | 1d3172250965cebd472e9f33db13da0b199ea1bb | |
| parent | 3d13a24f0e87042701a231444ea135ec0cc614b3 (diff) | |
| download | org.eclipse.papyrus-548e94c993a9180b7ec2456d6315fb97826e4eb8.tar.gz org.eclipse.papyrus-548e94c993a9180b7ec2456d6315fb97826e4eb8.tar.xz org.eclipse.papyrus-548e94c993a9180b7ec2456d6315fb97826e4eb8.zip | |
Bug 510937 - [TEST] [REFACTOR] [OXYGEN] The tests for Papyrus' main plugins should be clearer to visualize during execution on the server and segmented to respect the plugin's architecture
Change-Id: I5125c9ae1552ef8144aff12881e0ba2cfb1be102
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
556 files changed, 27559 insertions, 22799 deletions
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml index de4a85c057c..22224549dce 100644 --- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml +++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml @@ -71,12 +71,12 @@ http://www.eclipse.org/legal/epl-v10.html id="org.eclipse.papyrus.tests.uml.assistants.feature" version="0.0.0"/> - <plugin +<!-- <plugin id="org.eclipse.papyrus.tests" download-size="0" install-size="0" version="0.0.0" - unpack="false"/> + unpack="false"/> --> <plugin id="org.eclipse.papyrus.bundles.tests" @@ -113,13 +113,6 @@ http://www.eclipse.org/legal/epl-v10.html unpack="false"/> <plugin - id="org.eclipse.papyrus.tests.diagramassistants" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.papyrus.infra.core.clipboard.tests" download-size="0" install-size="0" diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature/feature.xml index b09f07a39e9..cb1feacb9d4 100644 --- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature/feature.xml +++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature/feature.xml @@ -20,8 +20,6 @@ http://www.eclipse.org/legal/epl-v10.html <plugin download-size="0" id="org.eclipse.papyrus.uml.modelexplorer.tests" install-size="0" unpack="false" version="0.0.0"/> - <plugin download-size="0" id="org.eclipse.papyrus.search.tests" install-size="0" unpack="false" version="0.0.0"/> - <plugin download-size="0" id="org.eclipse.papyrus.uml.modelrepair.tests" install-size="0" unpack="false" version="0.0.0"/> <plugin download-size="0" id="org.eclipse.papyrus.uml.service.types.tests" install-size="0" unpack="false" version="0.0.0"/> diff --git a/releng/main-tests/pom.xml b/releng/main-tests/pom.xml index c0fde6dd475..4cf3e988f09 100644 --- a/releng/main-tests/pom.xml +++ b/releng/main-tests/pom.xml @@ -1,18 +1,25 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> - <version>1.2.0-SNAPSHOT</version> - <packaging>pom</packaging> <parent> <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.all.releng</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>pom</packaging> + <properties> + <testConfig>CI_TESTS_CONFIG</testConfig> <!-- See org.eclipse.papyrus.junit.framework.classification.ClassificationConfig --> + <testSuiteClass>org.eclipse.papyrus.tests.AllTests</testSuiteClass> + <jacoco.version>0.7.4.201502262128</jacoco.version> + <!-- Separate property for test argLine seems to be required when running Jacoco + Surefire --> + <test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100</test.argLine> + <target.platform>org.eclipse.papyrus.main.tests.${target.suffix}.target</target.platform> + </properties> <modules> - <module>../../tests/junit/plugins/core/org.eclipse.papyrus.tests</module> - <module>../../tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants</module> + <!-- Features --> <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.feature</module> <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature</module> <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature</module> @@ -27,90 +34,17 @@ <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.views.feature</module> <module>../../features/papyrus-tests-features/org.eclipse.papyrus.uml.textedit.tests.feature</module> <module>../../features/papyrus-tests-features/org.eclipse.papyrus.uml.alf.tests.feature</module> - <module>../../tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests</module> - <module>../../tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests</module> - <module>../../tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests</module> - <module>../../tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests</module> - <module>../../tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests</module> - <module>../../tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests</module> - <module>../../tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests</module> - <module>../../tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests</module> - <module>../../tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests</module> - <module>../../tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests</module> - <module>../../tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests</module> - <module>../../tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests</module> - <module>../../tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests</module> - <module>../../tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests</module> - <module>../../tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests</module> - <module>../../tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests</module> - <module>../../tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests</module> - <module>../../tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests</module> - <module>../../tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests</module> - <module>../../tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests</module> - <module>../../tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests</module> - <module>../../tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests</module> - <module>../../tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests</module> - <module>../../tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests</module> - <module>../../tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests</module> - <module>../../tests/junit/plugins/infra/nattable</module> - <module>../../tests/junit/plugins/infra/internationalization</module> - <module>../../tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests</module> - <module>../../tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests</module> - <module>../../tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests</module> - <module>../../tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests</module> - <module>../../tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests</module> - <module>../../tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests</module> - <module>../../tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests</module> - <module>../../tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests</module> - <module>../../tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests</module> - <module>../../tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests</module> - <module>../../tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests</module> - <module>../../tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests</module> - <module>../../tests/junit/plugins/uml/diagram</module> - <module>../../tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests</module> - <module>../../tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests</module> - <module>../../tests/junit/plugins/uml/nattable</module> - <module>../../tests/junit/plugins/uml/internationalization</module> - <module>../../tests/junit/plugins/uml/org.eclipse.papyrus.search.tests</module> - <module>../../tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests</module> - <module>../../tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests</module> - <module>../../tests/junit/plugins/uml/org.eclipse.papyrus.uml.profile.tests</module> - <module>../../tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests</module> - <module>../../tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests</module> - <module>../../tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests</module> - <module>../../tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests</module> - <module>../../tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests</module> - <module>../../tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests</module> - <module>../../tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests</module> - <module>../../tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests</module> - <module>../../tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests</module> - <module>../../tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests</module> - <module>../../tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests</module> - <module>../../tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests</module> - <module>../../tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests</module> - <module>../../tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests</module> - <module>../../tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation</module> - <module>../../tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile</module> + + <!-- Plugins --> + <module>../../tests/junit/plugins</module> + <module>targetPlatform</module> </modules> - <properties> - <testConfig>CI_TESTS_CONFIG</testConfig> <!-- See org.eclipse.papyrus.junit.framework.classification.ClassificationConfig --> - <testSuiteClass>org.eclipse.papyrus.tests.AllTests</testSuiteClass> - <jacoco.version>0.7.4.201502262128</jacoco.version> - <!-- Separate property for test argLine seems to be required when running Jacoco + Surefire --> - <test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100</test.argLine> - <target.platform>org.eclipse.papyrus.main.tests.${target.suffix}.target</target.platform> - </properties> <build> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>2.6</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.2</version> <configuration> @@ -119,11 +53,6 @@ </configuration> </plugin> <plugin> - <groupId>org.eclipse.xtend</groupId> - <artifactId>xtend-maven-plugin</artifactId> - <version>${xtext.version}</version> - </plugin> - <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-compiler-plugin</artifactId> <version>${tycho-version}</version> @@ -135,12 +64,6 @@ </configuration> </plugin> <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-maven-plugin</artifactId> - <version>${tycho-version}</version> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <version>1.4.0</version> diff --git a/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF b/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF deleted file mode 100644 index 1db4c5cb885..00000000000 --- a/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF +++ /dev/null @@ -1,30 +0,0 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.ui.workbench,
- org.eclipse.ui.ide,
- org.eclipse.emf.ecore;bundle-version="2.9.1",
- org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.emftree;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.2.0",
- org.eclipse.core.commands;bundle-version="3.6.100",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.integrationtests.editor
-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.integrationtests.editor.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.integrationtests.editor
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/AllTestsWithMemoryDump.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/AllTestsWithMemoryDump.launch deleted file mode 100644 index 028d768c36a..00000000000 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/AllTestsWithMemoryDump.launch +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> -<booleanAttribute key="append.args" value="true"/> -<booleanAttribute key="askclear" value="false"/> -<booleanAttribute key="automaticAdd" value="true"/> -<booleanAttribute key="automaticValidate" value="false"/> -<stringAttribute key="bootstrap" value=""/> -<stringAttribute key="checked" value="[NONE]"/> -<booleanAttribute key="clearConfig" value="true"/> -<booleanAttribute key="clearws" value="true"/> -<booleanAttribute key="clearwslog" value="false"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> -<booleanAttribute key="default" value="true"/> -<booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> -<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="true"/> -<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> -<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> -<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllTests"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms1024m -Xmx2048m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=1024M"/> -<stringAttribute key="pde.version" value="3.3"/> -<stringAttribute key="product" value="org.eclipse.sdk.ide"/> -<booleanAttribute key="run_in_ui_thread" value="true"/> -<booleanAttribute key="show_selected_only" value="false"/> -<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/> -<booleanAttribute key="tracing" value="false"/> -<booleanAttribute key="useCustomFeatures" value="false"/> -<booleanAttribute key="useDefaultConfig" value="true"/> -<booleanAttribute key="useDefaultConfigArea" value="false"/> -<booleanAttribute key="useProduct" value="true"/> -</launchConfiguration> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests - Failures.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests - Failures.launch deleted file mode 100644 index 4be2d26a2b4..00000000000 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests - Failures.launch +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus ALL tests - Failures"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-failures-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="skip.long.junit.tests" value="false"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -testConfig=FAILING_TESTS_CONFIG"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms512m -Xmx2048m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=512M -XX:SoftRefLRUPolicyMSPerMB=100"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="true"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/>
-</launchConfiguration>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests With Coverage.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests With Coverage.launch deleted file mode 100644 index c7141af8016..00000000000 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests With Coverage.launch +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus ALL tests With Coverage"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace-coverage"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="skip.long.junit.tests" value="false"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms1024m -Xmx4096m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=712M"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="true"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests With Coverage.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests With Coverage.launch deleted file mode 100644 index ff63daad3d6..00000000000 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests With Coverage.launch +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus SysML tests With Coverage"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace-sysml-coverage"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.tests.extra/src/org/eclipse/papyrus/tests/extra/AllSysMLTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="skip.long.junit.tests" value="false"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.extra.AllSysMLTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests.extra"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms1024m -Xmx4096m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=712M"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="true"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests.launch deleted file mode 100644 index b7cf559b075..00000000000 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests.launch +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus SysML tests"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-sysml-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.tests.extra/src/org/eclipse/papyrus/tests/extra/AllSysMLTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="skip.long.junit.tests" value="false"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.extra.AllSysMLTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests.extra"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms512m -Xmx768m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=512M -XX:SoftRefLRUPolicyMSPerMB=100"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="true"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/about.html b/tests/junit/plugins/core/org.eclipse.papyrus.tests/about.html deleted file mode 100644 index 82d49bf5f81..00000000000 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/about.html +++ /dev/null @@ -1,28 +0,0 @@ -<!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/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllGenTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllGenTests.java deleted file mode 100644 index 03199776f3c..00000000000 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllGenTests.java +++ /dev/null @@ -1,95 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2010, 2015 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: - * Juan Cadavid - juan.cadavid@cea.fr - * Christian W. Damus - bug 464647 - * - *****************************************************************************/ -package org.eclipse.papyrus.tests; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner; -import org.eclipse.papyrus.junit.framework.runner.FragmentTestSuiteClass; -import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass; -import org.eclipse.papyrus.junit.framework.runner.SuiteSpot; -import org.junit.runner.RunWith; - -import com.google.common.collect.ImmutableList; - - -/** - * Tests generated with the Papyrus Test Generation Framework - */ -@RunWith(AllTestsRunner.class) -public class AllGenTests { - - @SuiteSpot - public static final List<ITestSuiteClass> suiteClasses; - - /** list of classes to launch */ - static { - suiteClasses = new ArrayList<ITestSuiteClass>(); - - /* **************** Dynamically loaded from the host plug-ins *********************** */ - - suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.activity.tests", "org.eclipse.papyrus.uml.diagram.activity.test.AllGenTests")); - suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.clazz.tests", "org.eclipse.papyrus.uml.diagram.clazz.test.AllGenTests")); - suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.communication.tests", "org.eclipse.papyrus.uml.diagram.communication.test.AllGenTests")); - suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.component.tests", "org.eclipse.papyrus.uml.diagram.component.test.AllGenTests")); - suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.composite.tests", "org.eclipse.papyrus.uml.diagram.composite.test.AllGenTests")); - suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.deployment.tests", "org.eclipse.papyrus.uml.diagram.deployment.test.AllGenTests")); - suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.profile.tests", "org.eclipse.papyrus.uml.diagram.profile.tests.AllGenTests")); - suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.statemachine.tests", "org.eclipse.papyrus.uml.diagram.statemachine.test.AllGenTests")); - suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.sequence.tests", "org.eclipse.papyrus.uml.diagram.sequence.test.AllGenTests")); - suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.timing.tests", "org.eclipse.papyrus.uml.diagram.timing.test.AllGenTests")); - suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.usecase.tests", "org.eclipse.papyrus.uml.diagram.usecase.test.AllGenTests")); - // end - } - - // - // The tests broken out into sub-suites for serial execution, to avoid OOMEs - // - - @RunWith(AllTestsRunner.class) - public static class Suite1 { - @SuiteSpot - public static final List<? extends ITestSuiteClass> suiteClasses = ImmutableList.of( // - new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.clazz.tests", "org.eclipse.papyrus.uml.diagram.clazz.test.AllGenTests"), - new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.profile.tests", "org.eclipse.papyrus.uml.diagram.profile.tests.AllGenTests"), - new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.usecase.tests", "org.eclipse.papyrus.uml.diagram.usecase.test.AllGenTests")); - } - - @RunWith(AllTestsRunner.class) - public static class Suite2 { - @SuiteSpot - public static final List<? extends ITestSuiteClass> suiteClasses = ImmutableList.of( // - new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.component.tests", "org.eclipse.papyrus.uml.diagram.component.test.AllGenTests"), - new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.composite.tests", "org.eclipse.papyrus.uml.diagram.composite.test.AllGenTests"), - new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.deployment.tests", "org.eclipse.papyrus.uml.diagram.deployment.test.AllGenTests")); - } - - @RunWith(AllTestsRunner.class) - public static class Suite3 { - @SuiteSpot - public static final List<? extends ITestSuiteClass> suiteClasses = ImmutableList.of( // - new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.activity.tests", "org.eclipse.papyrus.uml.diagram.activity.test.AllGenTests"), - new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.statemachine.tests", "org.eclipse.papyrus.uml.diagram.statemachine.test.AllGenTests")); - } - - @RunWith(AllTestsRunner.class) - public static class Suite4 { - @SuiteSpot - public static final List<? extends ITestSuiteClass> suiteClasses = ImmutableList.of( // - new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.communication.tests", "org.eclipse.papyrus.uml.diagram.communication.test.AllGenTests"), - new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.sequence.tests", "org.eclipse.papyrus.uml.diagram.sequence.test.AllGenTests"), - new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.timing.tests", "org.eclipse.papyrus.uml.diagram.timing.test.AllGenTests")); - } -} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java deleted file mode 100644 index 46039d91691..00000000000 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java +++ /dev/null @@ -1,162 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2010, 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: - * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation - * Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993 - * Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220, 488791, 496598, 508629 - * - *****************************************************************************/ -package org.eclipse.papyrus.tests; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner; -import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass; -import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass; -import org.eclipse.papyrus.junit.framework.runner.SuiteSpot; -import org.junit.runner.RunWith; - - -/** - * Test class for all tests for Papyrus - */ -@RunWith(AllTestsRunner.class) -public class AllTests { - - @SuiteSpot - public static final List<ITestSuiteClass> suiteClasses; - - /** list of classes to launch */ - static { - suiteClasses = new ArrayList<>(); - - /* **************** plugins *********************** */ - /* developper */ - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.bundles.tests.AllTests.class)); - - /* core */ - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.clipboard.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.sasheditor.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.sasheditor.di.tests.AllTests.class)); - - /* infra */ - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.tools.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.ui.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.edit.tests.suites.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.edit.ui.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.labelprovider.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.semantic.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.emf.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.emf.gmf.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.ui.emf.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.types.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.types.ui.tests.AllTests.class)); - // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.openelement.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.commands.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.common.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.canonical.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.emf.readonly.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.viewpoints.configuration.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.editor.welcome.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.welcome.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.properties.ui.tests.AllTests.class)); - - /* customization */ - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.eclipse.project.editors.tests.AllTests.class)); - - /* views */ - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.views.modelexplorer.tests.AllTests.class)); - - /* integration */ - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.editor.integration.tests.AllTests.class)); - - // FIXME: Workaround for Bug 441246: Move the ResourceLoading tests after EditorReloadTest, since they are currently conflicting - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.resourceloading.tests.AllTests.class)); - - /* search */ - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.search.tests.suites.AllTests.class)); - - /* css */ - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.css.tests.tests.AllTests.class)); - - /* menu */ - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.menu.tests.tests.AllTests.class)); - - /* control mode */ - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.controlmode.tests.AllTests.class)); - - /* Diagram Assistants test suite */ - org.eclipse.papyrus.tests.diagramassistants.AllTests.appendTo(suiteClasses); - - /* Profile Drafter */ - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.drafter.tests.AllTests.class)); - - /* uml */ - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.service.types.tests.suites.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.service.types.ui.tests.suites.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.modelexplorer.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.dnd.tests.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.tools.tests.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.tools.utils.tests.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.stereotypeproperty.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.wizards.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.modelrepair.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.decoratormodel.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.decoratormodel.controlmode.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.validation.tests.AllTests.class)); - - /* uml diagrams */ - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.common.tests.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.clazz.test.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.activity.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.deployment.test.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.component.test.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.timing.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.usecase.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.composite.test.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.statemachine.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.communication.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.profile.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.sequence.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.interactionoverview.tests.AllTests.class)); - // - - // nattable tests - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.views.tests.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.common.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.model.editor.tests.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.model.tests.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.tests.tests.AllTests.class)); - - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.tests.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.generic.tests.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.clazz.config.tests.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.stereotype.display.tests.tests.AllTests.class)); - - // uml textedit tests - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.port.tests.suites.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.property.tests.suites.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.parameter.tests.suites.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.valuespecification.tests.suites.AllTests.class)); - - // Alf - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.alf.tests.AllTests.class)); - - // Internationalization - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.internationalization.tests.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.internationalization.tests.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.internationalization.controlmode.tests.tests.AllTests.class)); - - // end - } - -} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllUITests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllUITests.java deleted file mode 100644 index ed028a380e5..00000000000 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllUITests.java +++ /dev/null @@ -1,45 +0,0 @@ -/***************************************************************************** - * 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.tests; - -import java.util.List; -import java.util.stream.Collectors; - -import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner; -import org.eclipse.papyrus.junit.framework.runner.Headless; -import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass; -import org.eclipse.papyrus.junit.framework.runner.SuiteSpot; -import org.junit.runner.RunWith; - -/** - * A test suite that automatically selects all non-{@linkplain Headless headless} tests - * from the {@link AllTests} suite. - */ -@RunWith(AllTestsRunner.class) -public class AllUITests { - - @SuiteSpot - public static final List<ITestSuiteClass> suiteClasses; - - static { - suiteClasses = AllTests.suiteClasses.stream() - .filter(ITestSuiteClass::isUI) - .collect(Collectors.toList()); - } - - public AllUITests() { - super(); - } - -} diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml index ea4673403dd..9fbbd9b4971 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml @@ -8,7 +8,7 @@ <version>3.0.0-SNAPSHOT</version> <relativePath>../../../../../releng/dev</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.bundles.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.classpath b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.classpath index 83be1d9f78c..83be1d9f78c 100644..100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.classpath +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.classpath diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/.project b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.project index b09b5eeb546..ad10bda06c6 100644..100755 --- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/.project +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.papyrus.tests.diagramassistants</name> + <name>org.eclipse.papyrus.developer.suite.tests</name> <comment></comment> <projects> </projects> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.settings/org.eclipse.jdt.core.prefs index b3aa6d60f94..b3aa6d60f94 100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.settings/org.eclipse.jdt.ui.prefs index 954281dbc31..954281dbc31 100644..100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.ui.prefs +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.settings/org.eclipse.jdt.ui.prefs 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 new file mode 100755 index 00000000000..684ae63ac2b --- /dev/null +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF @@ -0,0 +1,17 @@ +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 +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", + org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", + org.eclipse.papyrus.bundles.tests;bundle-version="1.2.0" + diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/Papyrus Developer ALL tests.launch b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/Papyrus Developer ALL tests.launch new file mode 100755 index 00000000000..93ff3712582 --- /dev/null +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/Papyrus Developer ALL tests.launch @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus Developer ALL tests"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-all-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.papyrus.developer.suite.tests/test/org/eclipse/papyrus/developer/suite/tests/AllTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="skip.long.junit.tests" value="false"/> +</mapAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/><stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.developer.suite.tests.AllTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.developer.suite.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:SoftRefLRUPolicyMSPerMB=100 -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="true"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="true"/> +<booleanAttribute key="useProduct" value="true"/> +<stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/> +</launchConfiguration> diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/about.html b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/about.html index d35d5aed64c..d35d5aed64c 100644..100755 --- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/about.html +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/about.html diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/build.properties b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/build.properties new file mode 100755 index 00000000000..9a313f187de --- /dev/null +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/build.properties @@ -0,0 +1,7 @@ +source.. = test/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties,\ + about.html,\ + Papyrus Developer ALL tests.launch diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/plugin.properties b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/plugin.properties new file mode 100755 index 00000000000..5375243083c --- /dev/null +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/plugin.properties @@ -0,0 +1,12 @@ +################################################################################# +# Copyright (c) 2008 CEA LIST. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation +################################################################################## +pluginName=Developer tests for Papyrus +providerName=Eclipse Modeling Project diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/pom.xml b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/pom.xml new file mode 100755 index 00000000000..f826205f6fe --- /dev/null +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/pom.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> + <version>1.2.0-SNAPSHOT</version> + <relativePath>../../../../../releng/main-tests/pom.xml</relativePath> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.developer.suite.tests</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> + <testFailureIgnore>true</testFailureIgnore> + <product>org.eclipse.sdk.ide</product> + <!-- If a specific <argLine> is required here, make sure to include JaCoCo parameters (See parent pom, Bug 478170) --> + <skipTests>${skipAllTests}</skipTests> + <testClass>org.eclipse.papyrus.developer.suite.tests.AllTests</testClass> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>p2-installable-unit</type> + <id>org.eclipse.sdk.feature.group</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.papyrus.sdk.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/test/org/eclipse/papyrus/developer/suite/tests/Activator.java b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/test/org/eclipse/papyrus/developer/suite/tests/Activator.java new file mode 100755 index 00000000000..c6126df82bc --- /dev/null +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/test/org/eclipse/papyrus/developer/suite/tests/Activator.java @@ -0,0 +1,54 @@ +package org.eclipse.papyrus.developer.suite.tests; + +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.developer.suite.tests"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @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/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllHeadlessTests.java b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/test/org/eclipse/papyrus/developer/suite/tests/AllTests.java index 22fb7e6ae1f..683a98ac26d 100644..100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllHeadlessTests.java +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/test/org/eclipse/papyrus/developer/suite/tests/AllTests.java @@ -1,45 +1,47 @@ /***************************************************************************** - * Copyright (c) 2016 Christian W. Damus and others. - * + * Copyright (c) 2010, 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: - * Christian W. Damus - Initial API and implementation - * + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993 + * Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220, 488791, 496598, 508629 + * *****************************************************************************/ +package org.eclipse.papyrus.developer.suite.tests; -package org.eclipse.papyrus.tests; - +import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner; -import org.eclipse.papyrus.junit.framework.runner.Headless; import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass; import org.eclipse.papyrus.junit.framework.runner.SuiteSpot; import org.junit.runner.RunWith; + /** - * A test suite that automatically selects all {@linkplain Headless headless tests} - * from the {@link AllTests} suite. + * Test class for all tests for Papyrus */ @RunWith(AllTestsRunner.class) -public class AllHeadlessTests { +public class AllTests { @SuiteSpot public static final List<ITestSuiteClass> suiteClasses; + /** list of classes to launch */ static { - suiteClasses = AllTests.suiteClasses.stream() - .filter(ITestSuiteClass::isHeadless) - .collect(Collectors.toList()); - } + suiteClasses = new ArrayList<>(); + + /* **************** plugins *********************** */ + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.bundles.tests.AllTests.class)); + - public AllHeadlessTests() { - super(); + // end } } diff --git a/tests/junit/plugins/developer/pom.xml b/tests/junit/plugins/developer/pom.xml new file mode 100755 index 00000000000..9380df3f9de --- /dev/null +++ b/tests/junit/plugins/developer/pom.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.plugins.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.developer.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Developer tests for Papyrus</description> + + <modules> + <!-- Suites --> + <module>org.eclipse.papyrus.developer.suite.tests</module> + + <!-- Plugins --> + <!-- <module>org.eclipse.papyrus.bundles.tests</module> --> + + </modules> + +</project> diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml index 1adc7c826d0..d8ea91e7494 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.eclipse.project.editors.tests</artifactId> <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/.classpath b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.classpath index 2d1a4302f04..64c5e31b7a2 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/.classpath +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.classpath @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/.project b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.project index 7c626a1bed6..b462121a6c6 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/.project +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.project @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.editor.integration.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.editor.integration.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/suites/org.eclipse.papyrus.tests.diagramassistants/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.core.prefs index f08be2b06c4..c585cc455ae 100644 --- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.ui.prefs index 954281dbc31..954281dbc31 100755..100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.ui.prefs +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.ui.prefs diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF index b5cfb384cf8..b5cfb384cf8 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/about.html b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/about.html index 82d49bf5f81..d35d5aed64c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/about.html +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.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/core/org.eclipse.papyrus.editor.integration.tests/build.properties b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/build.properties index 946edb23c31..6b8634c222f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/build.properties +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/build.properties @@ -1,7 +1,7 @@ -source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- model/
-src.includes = about.html
+source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + about.html,\ + model/ +src.includes = about.html diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.di index c25cf0e5223..8148e9633e1 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.di @@ -1,237 +1,237 @@ -<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2">
- <di:SashWindowsMngr>
- <pageList>
- <availablePage>
- <emfPageIdentifier href="complex_multipage_model.notation#_zyAt8XqTEeK9jI2Tc6HWsA"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="complex_multipage_model.notation#_zyAt83qTEeK9jI2Tc6HWsA"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="complex_multipage_model.notation#_1B5ogHqTEeK9jI2Tc6HWsA"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="complex_multipage_model.notation#_1PIzQHqTEeK9jI2Tc6HWsA"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="complex_multipage_model.notation#_1pLD4HqTEeK9jI2Tc6HWsA"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="complex_multipage_model.notation#_12a1sHqTEeK9jI2Tc6HWsA"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="complex_multipage_model.notation#_1_fSIHqTEeK9jI2Tc6HWsA"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="complex_multipage_model.notation#_B_L-UHqUEeK9jI2Tc6HWsA"/>
- </availablePage>
- <availablePage emfPageIdentifier="/1"/>
- </pageList>
- <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0/@children.0/@children.1">
- <windows>
- <children xsi:type="di:SashPanel" direction="256">
- <children xsi:type="di:SashPanel" direction="512">
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="complex_multipage_model.notation#_1B5ogHqTEeK9jI2Tc6HWsA"/>
- </children>
- <children>
- <emfPageIdentifier href="complex_multipage_model.notation#_B_L-UHqUEeK9jI2Tc6HWsA"/>
- </children>
- </children>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="complex_multipage_model.notation#_1_fSIHqTEeK9jI2Tc6HWsA"/>
- </children>
- <children emfPageIdentifier="/1"/>
- <children>
- <emfPageIdentifier href="complex_multipage_model.notation#_zyAt8XqTEeK9jI2Tc6HWsA"/>
- </children>
- </children>
- </children>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="complex_multipage_model.notation#_12a1sHqTEeK9jI2Tc6HWsA"/>
- </children>
- </children>
- </children>
- </windows>
- </sashModel>
- </di:SashWindowsMngr>
- <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/>
- <tableinstance2:TableInstance2 description="Table Description">
- <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>
- <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>
- <customizations href="#/2/@localCustomizations.1"/>
- <customizations href="#/2/@localCustomizations.0"/>
- <context href="complex_multipage_model.uml#_BYzTwHqUEeK9jI2Tc6HWsA"/>
- <columns xsi:type="tableinstance:DefaultLabelColumn"/>
- <columns xsi:type="tableinstance:MetaClassColumn"/>
- <columns xsi:type="tableinstance:EContainerColumn"/>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>
- </columns>
- <rows>
- <element href="complex_multipage_model.uml#_CeRuEHqUEeK9jI2Tc6HWsA"/>
- </rows>
- <rows>
- <element href="complex_multipage_model.uml#_CkYWEHqUEeK9jI2Tc6HWsA"/>
- </rows>
- <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>
- <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>
- </tableinstance2:TableInstance2>
-</xmi:XMI>
+<?xml version="1.0" encoding="ASCII"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"> + <di:SashWindowsMngr> + <pageList> + <availablePage> + <emfPageIdentifier href="complex_multipage_model.notation#_zyAt8XqTEeK9jI2Tc6HWsA"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="complex_multipage_model.notation#_zyAt83qTEeK9jI2Tc6HWsA"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="complex_multipage_model.notation#_1B5ogHqTEeK9jI2Tc6HWsA"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="complex_multipage_model.notation#_1PIzQHqTEeK9jI2Tc6HWsA"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="complex_multipage_model.notation#_1pLD4HqTEeK9jI2Tc6HWsA"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="complex_multipage_model.notation#_12a1sHqTEeK9jI2Tc6HWsA"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="complex_multipage_model.notation#_1_fSIHqTEeK9jI2Tc6HWsA"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="complex_multipage_model.notation#_B_L-UHqUEeK9jI2Tc6HWsA"/> + </availablePage> + <availablePage emfPageIdentifier="/1"/> + </pageList> + <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0/@children.0/@children.1"> + <windows> + <children xsi:type="di:SashPanel" direction="256"> + <children xsi:type="di:SashPanel" direction="512"> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="complex_multipage_model.notation#_1B5ogHqTEeK9jI2Tc6HWsA"/> + </children> + <children> + <emfPageIdentifier href="complex_multipage_model.notation#_B_L-UHqUEeK9jI2Tc6HWsA"/> + </children> + </children> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="complex_multipage_model.notation#_1_fSIHqTEeK9jI2Tc6HWsA"/> + </children> + <children emfPageIdentifier="/1"/> + <children> + <emfPageIdentifier href="complex_multipage_model.notation#_zyAt8XqTEeK9jI2Tc6HWsA"/> + </children> + </children> + </children> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="complex_multipage_model.notation#_12a1sHqTEeK9jI2Tc6HWsA"/> + </children> + </children> + </children> + </windows> + </sashModel> + </di:SashWindowsMngr> + <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/> + <tableinstance2:TableInstance2 description="Table Description"> + <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/> + <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/> + <customizations href="#/2/@localCustomizations.1"/> + <customizations href="#/2/@localCustomizations.0"/> + <context href="complex_multipage_model.uml#_BYzTwHqUEeK9jI2Tc6HWsA"/> + <columns xsi:type="tableinstance:DefaultLabelColumn"/> + <columns xsi:type="tableinstance:MetaClassColumn"/> + <columns xsi:type="tableinstance:EContainerColumn"/> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/> + </columns> + <rows> + <element href="complex_multipage_model.uml#_CeRuEHqUEeK9jI2Tc6HWsA"/> + </rows> + <rows> + <element href="complex_multipage_model.uml#_CkYWEHqUEeK9jI2Tc6HWsA"/> + </rows> + <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/> + <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/> + </tableinstance2:TableInstance2> +</xmi:XMI> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.notation index 8a856b7d0aa..226c64a89fd 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.notation @@ -1,578 +1,578 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
- <notation:Diagram xmi:id="_zyAt8XqTEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_D1nUcHqUEeK9jI2Tc6HWsA" type="2012">
- <children xmi:type="notation:DecorationNode" xmi:id="_D1nUcnqUEeK9jI2Tc6HWsA" type="5038"/>
- <element xmi:type="uml:Comment" href="complex_multipage_model.uml#_D1TycHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1nUcXqUEeK9jI2Tc6HWsA" x="60" y="65" width="291" height="131"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_zyAt8nqTEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>
- </notation:Diagram>
- <notation:Diagram xmi:id="_zyAt83qTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="NewDiagram" measurementUnit="Pixel">
- <styles xmi:type="notation:DiagramStyle" xmi:id="_zyAt9HqTEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>
- </notation:Diagram>
- <notation:Diagram xmi:id="_1B5ogHqTEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="__d6UYHqTEeK9jI2Tc6HWsA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="__eEFYHqTEeK9jI2Tc6HWsA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="__eEFYXqTEeK9jI2Tc6HWsA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__eEFcHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__eEFcXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="__eEFYnqTEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__eEFY3qTEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__eEFZHqTEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eEFZXqTEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__eEFZnqTEeK9jI2Tc6HWsA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__eEFcnqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__eEFc3qTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="__eEFZ3qTEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__eEFaHqTEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__eEFaXqTEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eEFanqTEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__eEFa3qTEeK9jI2Tc6HWsA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__eEFdHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__eEFdXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="__eEFbHqTEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__eEFbXqTEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__eEFbnqTEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eEFb3qTEeK9jI2Tc6HWsA"/>
- </children>
- <element xmi:type="uml:Class" href="complex_multipage_model.uml#__dxKcHqTEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__d6UYXqTEeK9jI2Tc6HWsA" x="70" y="74"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="__pOMgHqTEeK9jI2Tc6HWsA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="__pOMgnqTEeK9jI2Tc6HWsA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="__pOMg3qTEeK9jI2Tc6HWsA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__pX9gHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__pX9gXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="__pOMhHqTEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__pOMhXqTEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__pOMhnqTEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMh3qTEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__pOMiHqTEeK9jI2Tc6HWsA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__pX9gnqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__pX9g3qTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="__pOMiXqTEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__pOMinqTEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__pOMi3qTEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMjHqTEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__pOMjXqTEeK9jI2Tc6HWsA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__pX9hHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__pX9hXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="__pOMjnqTEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__pOMj3qTEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__pOMkHqTEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMkXqTEeK9jI2Tc6HWsA"/>
- </children>
- <element xmi:type="uml:Class" href="complex_multipage_model.uml#__o7RkHqTEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMgXqTEeK9jI2Tc6HWsA" x="445" y="74"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_BZP_sHqUEeK9jI2Tc6HWsA" type="2007">
- <children xmi:type="notation:DecorationNode" xmi:id="_BZP_snqUEeK9jI2Tc6HWsA" type="5026"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_BZP_s3qUEeK9jI2Tc6HWsA" type="7016">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BZ11kHqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BZ11kXqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_BZP_tHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZP_tXqUEeK9jI2Tc6HWsA"/>
- </children>
- <element xmi:type="uml:Package" href="complex_multipage_model.uml#_BYzTwHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZP_sXqUEeK9jI2Tc6HWsA" x="215" y="215" width="246" height="126"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_1B5ogXqTEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>
- <edges xmi:type="notation:Connector" xmi:id="__8HTUHqTEeK9jI2Tc6HWsA" type="4001" source="__d6UYHqTEeK9jI2Tc6HWsA" target="__pOMgHqTEeK9jI2Tc6HWsA">
- <children xmi:type="notation:DecorationNode" xmi:id="__8REUHqTEeK9jI2Tc6HWsA" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__8REUXqTEeK9jI2Tc6HWsA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="__8REUnqTEeK9jI2Tc6HWsA" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__8REU3qTEeK9jI2Tc6HWsA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="__8REVHqTEeK9jI2Tc6HWsA" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__8REVXqTEeK9jI2Tc6HWsA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="__8REVnqTEeK9jI2Tc6HWsA" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__8REV3qTEeK9jI2Tc6HWsA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="__8REWHqTEeK9jI2Tc6HWsA" type="6033">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__8REWXqTEeK9jI2Tc6HWsA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="__8REWnqTEeK9jI2Tc6HWsA" type="6034">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__8REW3qTEeK9jI2Tc6HWsA" y="-20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="__8HTUXqTEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Association" href="complex_multipage_model.uml#__70YYHqTEeK9jI2Tc6HWsA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__8HTUnqTEeK9jI2Tc6HWsA" points="[50, 1, -325, 1]$[325, 46, -50, 46]"/>
- </edges>
- </notation:Diagram>
- <notation:Diagram xmi:id="_1PIzQHqTEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
- <styles xmi:type="notation:DiagramStyle" xmi:id="_1PIzQXqTEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>
- </notation:Diagram>
- <notation:Diagram xmi:id="_1pLD4HqTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="TimingDiagram" measurementUnit="Pixel">
- <styles xmi:type="notation:DiagramStyle" xmi:id="_1pLD4XqTEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>
- </notation:Diagram>
- <notation:Diagram xmi:id="_12a1sHqTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="TimingDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_My-4EHqUEeK9jI2Tc6HWsA" type="2">
- <children xmi:type="notation:DecorationNode" xmi:id="_My-4EnqUEeK9jI2Tc6HWsA" type="37"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_My-4E3qUEeK9jI2Tc6HWsA" type="5">
- <children xmi:type="notation:Shape" xmi:id="_OjB5YHqUEeK9jI2Tc6HWsA" type="19">
- <children xmi:type="notation:DecorationNode" xmi:id="_OjB5YnqUEeK9jI2Tc6HWsA" type="21"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_OjB5Y3qUEeK9jI2Tc6HWsA" type="7">
- <children xmi:type="notation:Shape" xmi:id="_R3OOAHqUEeK9jI2Tc6HWsA" type="9">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5v9kXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5v9knqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_R5v9kHqUEeK9jI2Tc6HWsA"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R6C4gHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 1"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_R3OOAnqUEeK9jI2Tc6HWsA" type="38">
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_R3XX8HqUEeK9jI2Tc6HWsA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R3OOAXqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_SOvWIHqUEeK9jI2Tc6HWsA" type="9">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SO4gEXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SO4gEnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_SO4gEHqUEeK9jI2Tc6HWsA"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SPCREHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 2"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_SOvWInqUEeK9jI2Tc6HWsA" type="38">
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_SOvWI3qUEeK9jI2Tc6HWsA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SOvWIXqUEeK9jI2Tc6HWsA"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_OjB5ZHqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_OjB5ZXqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5ZnqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_OjB5Z3qUEeK9jI2Tc6HWsA" type="8">
- <children xmi:type="notation:Shape" xmi:id="_R6fkcHqUEeK9jI2Tc6HWsA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_R6fkcnqUEeK9jI2Tc6HWsA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_R6fkc3qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_R6C4gXqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R6fkcXqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_TEAKMHqUEeK9jI2Tc6HWsA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_TEAKNHqUEeK9jI2Tc6HWsA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_TEAKNXqUEeK9jI2Tc6HWsA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_TEAKNnqUEeK9jI2Tc6HWsA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_TEAKN3qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_TEAKMXqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_TEAKMnqUEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_TDtPQHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_TaxrcHqUEeK9jI2Tc6HWsA" x="114" y="71"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_TEAKOXqUEeK9jI2Tc6HWsA" type="39">
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEAKOnqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_TEmnIHqUEeK9jI2Tc6HWsA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_TEmnInqUEeK9jI2Tc6HWsA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_TEmnI3qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_TEAKO3qUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEmnIXqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_UCqK0HqUEeK9jI2Tc6HWsA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_UCqK1HqUEeK9jI2Tc6HWsA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UCqK1XqUEeK9jI2Tc6HWsA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_UCqK1nqUEeK9jI2Tc6HWsA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UCqK13qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_UCqK0XqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_UCqK0nqUEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_UCXP4HqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UCqK2HqUEeK9jI2Tc6HWsA" x="334" y="140"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_UCqK2XqUEeK9jI2Tc6HWsA" type="39">
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UCqK2nqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_UDQAsHqUEeK9jI2Tc6HWsA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_UDQAsnqUEeK9jI2Tc6HWsA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UDQAs3qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_UCqK23qUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UDQAsXqUEeK9jI2Tc6HWsA"/>
- </children>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5aHqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_OjB5aXqUEeK9jI2Tc6HWsA" visible="false" type="82">
- <children xmi:type="notation:Shape" xmi:id="_OqUNIHqUEeK9jI2Tc6HWsA" type="24">
- <children xmi:type="notation:DecorationNode" xmi:id="_OqUNInqUEeK9jI2Tc6HWsA" type="80">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OqUNI3qUEeK9jI2Tc6HWsA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OqUNIXqUEeK9jI2Tc6HWsA"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_OjB5anqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_OjB5a3qUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5bHqUEeK9jI2Tc6HWsA"/>
- </children>
- <element xmi:type="uml:Lifeline" href="complex_multipage_model.uml#_Of5s4HqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5YXqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_PNl5UHqUEeK9jI2Tc6HWsA" type="20">
- <children xmi:type="notation:DecorationNode" xmi:id="_PNl5UnqUEeK9jI2Tc6HWsA" type="22"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_PNl5U3qUEeK9jI2Tc6HWsA" type="23">
- <children xmi:type="notation:Shape" xmi:id="_PSfncHqUEeK9jI2Tc6HWsA" type="28">
- <children xmi:type="notation:DecorationNode" xmi:id="_PSfncnqUEeK9jI2Tc6HWsA" type="31"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_PSfnc3qUEeK9jI2Tc6HWsA" type="64">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_PSfndHqUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_PSMsgHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSfncXqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Ugum4HqUEeK9jI2Tc6HWsA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_Ugum5HqUEeK9jI2Tc6HWsA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Ugum5XqUEeK9jI2Tc6HWsA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_Ugum5nqUEeK9jI2Tc6HWsA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Ugum53qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ugum4XqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Ugum4nqUEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Uglc8HqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Ugum6HqUEeK9jI2Tc6HWsA" x="181" y="52"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_UhBh0HqUEeK9jI2Tc6HWsA" type="28">
- <children xmi:type="notation:DecorationNode" xmi:id="_UhBh0nqUEeK9jI2Tc6HWsA" type="31"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_UhBh03qUEeK9jI2Tc6HWsA" type="64">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UhBh1HqUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_Ugum6XqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UhBh0XqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Z0BFcHqUEeK9jI2Tc6HWsA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_Z0BFdHqUEeK9jI2Tc6HWsA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0BFdXqUEeK9jI2Tc6HWsA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_Z0BFdnqUEeK9jI2Tc6HWsA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0BFd3qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_Z0BFcXqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Z0BFcnqUEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Zz37gHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0BFeHqUEeK9jI2Tc6HWsA" x="294" y="46"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Z0UncHqUEeK9jI2Tc6HWsA" type="28">
- <children xmi:type="notation:DecorationNode" xmi:id="_Z0UncnqUEeK9jI2Tc6HWsA" type="31"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_Z0Unc3qUEeK9jI2Tc6HWsA" type="64">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0UndHqUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_Z0BFeXqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z0UncXqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_UuIJsHqUEeK9jI2Tc6HWsA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_UuIJtHqUEeK9jI2Tc6HWsA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UuIJtXqUEeK9jI2Tc6HWsA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_UuIJtnqUEeK9jI2Tc6HWsA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UuIJt3qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_UuIJsXqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_UuIJsnqUEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Ut-_wHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UuIJuHqUEeK9jI2Tc6HWsA" x="388" y="45"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_UubEoHqUEeK9jI2Tc6HWsA" type="28">
- <children xmi:type="notation:DecorationNode" xmi:id="_UubEonqUEeK9jI2Tc6HWsA" type="31"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_UubEo3qUEeK9jI2Tc6HWsA" type="64">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UubEpHqUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_UuIJuXqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UubEoXqUEeK9jI2Tc6HWsA"/>
- </children>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PNl5VHqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PNl5VXqUEeK9jI2Tc6HWsA" visible="false" type="83">
- <children xmi:type="notation:Shape" xmi:id="_PXs3kHqUEeK9jI2Tc6HWsA" type="24">
- <children xmi:type="notation:DecorationNode" xmi:id="_PXs3knqUEeK9jI2Tc6HWsA" type="80">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PXs3k3qUEeK9jI2Tc6HWsA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PXs3kXqUEeK9jI2Tc6HWsA"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_PNl5VnqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_PNl5V3qUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PNl5WHqUEeK9jI2Tc6HWsA"/>
- </children>
- <element xmi:type="uml:Lifeline" href="complex_multipage_model.uml#_PM_cYHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PNl5UXqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_WUWgoHqUEeK9jI2Tc6HWsA" type="19">
- <children xmi:type="notation:DecorationNode" xmi:id="_WUWgonqUEeK9jI2Tc6HWsA" type="21"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_WUWgo3qUEeK9jI2Tc6HWsA" type="7">
- <children xmi:type="notation:Shape" xmi:id="_WtNFgHqUEeK9jI2Tc6HWsA" type="9">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WtWPcXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WtWPcnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_WtWPcHqUEeK9jI2Tc6HWsA"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WtpxcHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 1"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_WtNFgnqUEeK9jI2Tc6HWsA" type="38">
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_WtNFg3qUEeK9jI2Tc6HWsA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WtNFgXqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_W1GdQHqUEeK9jI2Tc6HWsA" type="9">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_W1PnMXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_W1PnMnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_W1PnMHqUEeK9jI2Tc6HWsA"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_W1ZYMHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 2"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_W1GdQnqUEeK9jI2Tc6HWsA" type="38">
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_W1GdQ3qUEeK9jI2Tc6HWsA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W1GdQXqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_YUVbYHqUEeK9jI2Tc6HWsA" type="9">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YUelUXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YUelUnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_YUelUHqUEeK9jI2Tc6HWsA"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YUoWUHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 3"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_YUVbYnqUEeK9jI2Tc6HWsA" type="38">
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_YUVbY3qUEeK9jI2Tc6HWsA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YUVbYXqUEeK9jI2Tc6HWsA"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_WUWgpHqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_WUWgpXqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgpnqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_WUWgp3qUEeK9jI2Tc6HWsA" type="8">
- <children xmi:type="notation:Shape" xmi:id="_WuF2UHqUEeK9jI2Tc6HWsA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_WuF2UnqUEeK9jI2Tc6HWsA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_WuF2U3qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_WtpxcXqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WuF2UXqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Xj9uYHqUEeK9jI2Tc6HWsA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_Xj9uZHqUEeK9jI2Tc6HWsA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Xj9uZXqUEeK9jI2Tc6HWsA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_Xj9uZnqUEeK9jI2Tc6HWsA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Xj9uZ3qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_Xj9uYXqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Xj9uYnqUEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Xjz9YHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Xj9uaHqUEeK9jI2Tc6HWsA" x="83" y="67"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Xj9uaXqUEeK9jI2Tc6HWsA" type="39">
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xj9uanqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_XkjkQHqUEeK9jI2Tc6HWsA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_XkjkQnqUEeK9jI2Tc6HWsA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XkjkQ3qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_Xj9ua3qUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XkjkQXqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_XraaMHqUEeK9jI2Tc6HWsA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_XraaNHqUEeK9jI2Tc6HWsA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XraaNXqUEeK9jI2Tc6HWsA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_XraaNnqUEeK9jI2Tc6HWsA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XraaN3qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_XraaMXqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_XraaMnqUEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_XrQpMHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XraaOHqUEeK9jI2Tc6HWsA" x="152" y="70"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_XraaOXqUEeK9jI2Tc6HWsA" type="39">
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XraaOnqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_XsAQEHqUEeK9jI2Tc6HWsA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_XsAQEnqUEeK9jI2Tc6HWsA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XsAQE3qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_XraaO3qUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XsAQEXqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_XzJZ4HqUEeK9jI2Tc6HWsA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_XzJZ5HqUEeK9jI2Tc6HWsA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XzJZ5XqUEeK9jI2Tc6HWsA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_XzJZ5nqUEeK9jI2Tc6HWsA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XzJZ53qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_XzJZ4XqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_XzJZ4nqUEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Xy_o4HqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XzJZ6HqUEeK9jI2Tc6HWsA" x="265" y="72"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_XzJZ6XqUEeK9jI2Tc6HWsA" type="39">
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XzJZ6nqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_XzvPwHqUEeK9jI2Tc6HWsA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_XzvPwnqUEeK9jI2Tc6HWsA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XzvPw3qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_XzJZ63qUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XzvPwXqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_X8FTcHqUEeK9jI2Tc6HWsA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_X8FTdHqUEeK9jI2Tc6HWsA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_X8FTdXqUEeK9jI2Tc6HWsA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_X8FTdnqUEeK9jI2Tc6HWsA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_X8FTd3qUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_X8FTcXqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_X8FTcnqUEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_X7yYgHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_X8FTeHqUEeK9jI2Tc6HWsA" x="338" y="66"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_X8FTeXqUEeK9jI2Tc6HWsA" type="39">
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X8FTenqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_X8h_YHqUEeK9jI2Tc6HWsA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_X8rJUXqUEeK9jI2Tc6HWsA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_X8rJUnqUEeK9jI2Tc6HWsA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_X8FTe3qUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X8rJUHqUEeK9jI2Tc6HWsA"/>
- </children>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgqHqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_WUWgqXqUEeK9jI2Tc6HWsA" visible="false" type="82">
- <children xmi:type="notation:Shape" xmi:id="_WUpbkHqUEeK9jI2Tc6HWsA" type="24">
- <children xmi:type="notation:DecorationNode" xmi:id="_WUpbknqUEeK9jI2Tc6HWsA" type="80">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUpbk3qUEeK9jI2Tc6HWsA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUpbkXqUEeK9jI2Tc6HWsA"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_WUWgqnqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_WUWgq3qUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgrHqUEeK9jI2Tc6HWsA"/>
- </children>
- <element xmi:type="uml:Lifeline" href="complex_multipage_model.uml#_WT50sHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgoXqUEeK9jI2Tc6HWsA"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_My-4FHqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_My-4FXqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_My-4FnqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_My-4F3qUEeK9jI2Tc6HWsA" type="29">
- <children xmi:type="notation:Shape" xmi:id="_NFchEHqUEeK9jI2Tc6HWsA" type="24">
- <children xmi:type="notation:DecorationNode" xmi:id="_NFchEnqUEeK9jI2Tc6HWsA" type="80">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NFchE3qUEeK9jI2Tc6HWsA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NFchEXqUEeK9jI2Tc6HWsA"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_My-4GHqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_My-4GXqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_My-4GnqUEeK9jI2Tc6HWsA"/>
- </children>
- <element xmi:type="uml:Interaction" href="complex_multipage_model.uml#_MyiMIHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_My-4EXqUEeK9jI2Tc6HWsA" x="80" y="125" height="605"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_12a1sXqTEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>
- </notation:Diagram>
- <notation:Diagram xmi:id="_1_fSIHqTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="TimingDiagram" measurementUnit="Pixel">
- <styles xmi:type="notation:DiagramStyle" xmi:id="_1_fSIXqTEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>
- </notation:Diagram>
- <notation:Diagram xmi:id="_B_L-UHqUEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_CeuaAHqUEeK9jI2Tc6HWsA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_CeuaAnqUEeK9jI2Tc6HWsA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_CeuaA3qUEeK9jI2Tc6HWsA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CeuaEnqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CeuaE3qUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_CeuaBHqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_CeuaBXqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_CeuaBnqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaB3qUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_CeuaCHqUEeK9jI2Tc6HWsA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CeuaFHqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CeuaFXqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_CeuaCXqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_CeuaCnqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_CeuaC3qUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaDHqUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_CeuaDXqUEeK9jI2Tc6HWsA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CeuaFnqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CeuaF3qUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_CeuaDnqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_CeuaD3qUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_CeuaEHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaEXqUEeK9jI2Tc6HWsA"/>
- </children>
- <element xmi:type="uml:Class" href="complex_multipage_model.uml#_CeRuEHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaAXqUEeK9jI2Tc6HWsA" x="104" y="95"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_CkrRAHqUEeK9jI2Tc6HWsA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_CkrRAnqUEeK9jI2Tc6HWsA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_CkrRA3qUEeK9jI2Tc6HWsA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ck1CCXqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ck1CCnqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_CkrRBHqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_CkrRBXqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_CkrRBnqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkrRB3qUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_CkrRCHqUEeK9jI2Tc6HWsA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ck1CC3qUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ck1CDHqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_Ck1CAHqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Ck1CAXqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_Ck1CAnqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ck1CA3qUEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_Ck1CBHqUEeK9jI2Tc6HWsA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ck1CDXqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ck1CDnqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_Ck1CBXqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Ck1CBnqUEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_Ck1CB3qUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ck1CCHqUEeK9jI2Tc6HWsA"/>
- </children>
- <element xmi:type="uml:Class" href="complex_multipage_model.uml#_CkYWEHqUEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkrRAXqUEeK9jI2Tc6HWsA" x="393" y="94"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_B_L-UXqUEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Package" href="complex_multipage_model.uml#_BYzTwHqUEeK9jI2Tc6HWsA"/>
- <edges xmi:type="notation:Connector" xmi:id="_DTPnMHqUEeK9jI2Tc6HWsA" type="4002" source="_CeuaAHqUEeK9jI2Tc6HWsA" target="_CkrRAHqUEeK9jI2Tc6HWsA">
- <children xmi:type="notation:DecorationNode" xmi:id="_DTPnM3qUEeK9jI2Tc6HWsA" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_DTPnNHqUEeK9jI2Tc6HWsA" y="40"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_DTPnMXqUEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Generalization" href="complex_multipage_model.uml#_DS8sQHqUEeK9jI2Tc6HWsA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DTPnMnqUEeK9jI2Tc6HWsA" points="[50, 9, -239, 10]$[298, 49, 9, 50]"/>
- </edges>
- </notation:Diagram>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> + <notation:Diagram xmi:id="_zyAt8XqTEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_D1nUcHqUEeK9jI2Tc6HWsA" type="2012"> + <children xmi:type="notation:DecorationNode" xmi:id="_D1nUcnqUEeK9jI2Tc6HWsA" type="5038"/> + <element xmi:type="uml:Comment" href="complex_multipage_model.uml#_D1TycHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1nUcXqUEeK9jI2Tc6HWsA" x="60" y="65" width="291" height="131"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_zyAt8nqTEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/> + </notation:Diagram> + <notation:Diagram xmi:id="_zyAt83qTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="NewDiagram" measurementUnit="Pixel"> + <styles xmi:type="notation:DiagramStyle" xmi:id="_zyAt9HqTEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/> + </notation:Diagram> + <notation:Diagram xmi:id="_1B5ogHqTEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="__d6UYHqTEeK9jI2Tc6HWsA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="__eEFYHqTEeK9jI2Tc6HWsA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="__eEFYXqTEeK9jI2Tc6HWsA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__eEFcHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__eEFcXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="__eEFYnqTEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__eEFY3qTEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__eEFZHqTEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eEFZXqTEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__eEFZnqTEeK9jI2Tc6HWsA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__eEFcnqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__eEFc3qTEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="__eEFZ3qTEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__eEFaHqTEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__eEFaXqTEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eEFanqTEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__eEFa3qTEeK9jI2Tc6HWsA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__eEFdHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__eEFdXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="__eEFbHqTEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__eEFbXqTEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__eEFbnqTEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eEFb3qTEeK9jI2Tc6HWsA"/> + </children> + <element xmi:type="uml:Class" href="complex_multipage_model.uml#__dxKcHqTEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__d6UYXqTEeK9jI2Tc6HWsA" x="70" y="74"/> + </children> + <children xmi:type="notation:Shape" xmi:id="__pOMgHqTEeK9jI2Tc6HWsA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="__pOMgnqTEeK9jI2Tc6HWsA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="__pOMg3qTEeK9jI2Tc6HWsA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__pX9gHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__pX9gXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="__pOMhHqTEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__pOMhXqTEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__pOMhnqTEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMh3qTEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__pOMiHqTEeK9jI2Tc6HWsA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__pX9gnqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__pX9g3qTEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="__pOMiXqTEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__pOMinqTEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__pOMi3qTEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMjHqTEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__pOMjXqTEeK9jI2Tc6HWsA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__pX9hHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__pX9hXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="__pOMjnqTEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__pOMj3qTEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__pOMkHqTEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMkXqTEeK9jI2Tc6HWsA"/> + </children> + <element xmi:type="uml:Class" href="complex_multipage_model.uml#__o7RkHqTEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMgXqTEeK9jI2Tc6HWsA" x="445" y="74"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_BZP_sHqUEeK9jI2Tc6HWsA" type="2007"> + <children xmi:type="notation:DecorationNode" xmi:id="_BZP_snqUEeK9jI2Tc6HWsA" type="5026"/> + <children xmi:type="notation:DecorationNode" xmi:id="_BZP_s3qUEeK9jI2Tc6HWsA" type="7016"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BZ11kHqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BZ11kXqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_BZP_tHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZP_tXqUEeK9jI2Tc6HWsA"/> + </children> + <element xmi:type="uml:Package" href="complex_multipage_model.uml#_BYzTwHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZP_sXqUEeK9jI2Tc6HWsA" x="215" y="215" width="246" height="126"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_1B5ogXqTEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/> + <edges xmi:type="notation:Connector" xmi:id="__8HTUHqTEeK9jI2Tc6HWsA" type="4001" source="__d6UYHqTEeK9jI2Tc6HWsA" target="__pOMgHqTEeK9jI2Tc6HWsA"> + <children xmi:type="notation:DecorationNode" xmi:id="__8REUHqTEeK9jI2Tc6HWsA" type="6001"> + <layoutConstraint xmi:type="notation:Location" xmi:id="__8REUXqTEeK9jI2Tc6HWsA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="__8REUnqTEeK9jI2Tc6HWsA" type="6002"> + <layoutConstraint xmi:type="notation:Location" xmi:id="__8REU3qTEeK9jI2Tc6HWsA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="__8REVHqTEeK9jI2Tc6HWsA" type="6003"> + <layoutConstraint xmi:type="notation:Location" xmi:id="__8REVXqTEeK9jI2Tc6HWsA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="__8REVnqTEeK9jI2Tc6HWsA" type="6005"> + <layoutConstraint xmi:type="notation:Location" xmi:id="__8REV3qTEeK9jI2Tc6HWsA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="__8REWHqTEeK9jI2Tc6HWsA" type="6033"> + <layoutConstraint xmi:type="notation:Location" xmi:id="__8REWXqTEeK9jI2Tc6HWsA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="__8REWnqTEeK9jI2Tc6HWsA" type="6034"> + <layoutConstraint xmi:type="notation:Location" xmi:id="__8REW3qTEeK9jI2Tc6HWsA" y="-20"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="__8HTUXqTEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Association" href="complex_multipage_model.uml#__70YYHqTEeK9jI2Tc6HWsA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__8HTUnqTEeK9jI2Tc6HWsA" points="[50, 1, -325, 1]$[325, 46, -50, 46]"/> + </edges> + </notation:Diagram> + <notation:Diagram xmi:id="_1PIzQHqTEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel"> + <styles xmi:type="notation:DiagramStyle" xmi:id="_1PIzQXqTEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/> + </notation:Diagram> + <notation:Diagram xmi:id="_1pLD4HqTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="TimingDiagram" measurementUnit="Pixel"> + <styles xmi:type="notation:DiagramStyle" xmi:id="_1pLD4XqTEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/> + </notation:Diagram> + <notation:Diagram xmi:id="_12a1sHqTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="TimingDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_My-4EHqUEeK9jI2Tc6HWsA" type="2"> + <children xmi:type="notation:DecorationNode" xmi:id="_My-4EnqUEeK9jI2Tc6HWsA" type="37"/> + <children xmi:type="notation:DecorationNode" xmi:id="_My-4E3qUEeK9jI2Tc6HWsA" type="5"> + <children xmi:type="notation:Shape" xmi:id="_OjB5YHqUEeK9jI2Tc6HWsA" type="19"> + <children xmi:type="notation:DecorationNode" xmi:id="_OjB5YnqUEeK9jI2Tc6HWsA" type="21"/> + <children xmi:type="notation:DecorationNode" xmi:id="_OjB5Y3qUEeK9jI2Tc6HWsA" type="7"> + <children xmi:type="notation:Shape" xmi:id="_R3OOAHqUEeK9jI2Tc6HWsA" type="9"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5v9kXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5v9knqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_R5v9kHqUEeK9jI2Tc6HWsA"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R6C4gHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 1"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_R3OOAnqUEeK9jI2Tc6HWsA" type="38"> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_R3XX8HqUEeK9jI2Tc6HWsA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R3OOAXqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_SOvWIHqUEeK9jI2Tc6HWsA" type="9"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SO4gEXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SO4gEnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_SO4gEHqUEeK9jI2Tc6HWsA"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SPCREHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 2"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_SOvWInqUEeK9jI2Tc6HWsA" type="38"> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_SOvWI3qUEeK9jI2Tc6HWsA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SOvWIXqUEeK9jI2Tc6HWsA"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_OjB5ZHqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_OjB5ZXqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5ZnqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_OjB5Z3qUEeK9jI2Tc6HWsA" type="8"> + <children xmi:type="notation:Shape" xmi:id="_R6fkcHqUEeK9jI2Tc6HWsA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_R6fkcnqUEeK9jI2Tc6HWsA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_R6fkc3qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_R6C4gXqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R6fkcXqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_TEAKMHqUEeK9jI2Tc6HWsA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_TEAKNHqUEeK9jI2Tc6HWsA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_TEAKNXqUEeK9jI2Tc6HWsA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_TEAKNnqUEeK9jI2Tc6HWsA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_TEAKN3qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_TEAKMXqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_TEAKMnqUEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_TDtPQHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_TaxrcHqUEeK9jI2Tc6HWsA" x="114" y="71"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_TEAKOXqUEeK9jI2Tc6HWsA" type="39"> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEAKOnqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_TEmnIHqUEeK9jI2Tc6HWsA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_TEmnInqUEeK9jI2Tc6HWsA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_TEmnI3qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_TEAKO3qUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEmnIXqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_UCqK0HqUEeK9jI2Tc6HWsA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_UCqK1HqUEeK9jI2Tc6HWsA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UCqK1XqUEeK9jI2Tc6HWsA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_UCqK1nqUEeK9jI2Tc6HWsA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UCqK13qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_UCqK0XqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_UCqK0nqUEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_UCXP4HqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UCqK2HqUEeK9jI2Tc6HWsA" x="334" y="140"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_UCqK2XqUEeK9jI2Tc6HWsA" type="39"> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UCqK2nqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_UDQAsHqUEeK9jI2Tc6HWsA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_UDQAsnqUEeK9jI2Tc6HWsA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UDQAs3qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_UCqK23qUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UDQAsXqUEeK9jI2Tc6HWsA"/> + </children> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5aHqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_OjB5aXqUEeK9jI2Tc6HWsA" visible="false" type="82"> + <children xmi:type="notation:Shape" xmi:id="_OqUNIHqUEeK9jI2Tc6HWsA" type="24"> + <children xmi:type="notation:DecorationNode" xmi:id="_OqUNInqUEeK9jI2Tc6HWsA" type="80"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OqUNI3qUEeK9jI2Tc6HWsA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OqUNIXqUEeK9jI2Tc6HWsA"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_OjB5anqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_OjB5a3qUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5bHqUEeK9jI2Tc6HWsA"/> + </children> + <element xmi:type="uml:Lifeline" href="complex_multipage_model.uml#_Of5s4HqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5YXqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_PNl5UHqUEeK9jI2Tc6HWsA" type="20"> + <children xmi:type="notation:DecorationNode" xmi:id="_PNl5UnqUEeK9jI2Tc6HWsA" type="22"/> + <children xmi:type="notation:DecorationNode" xmi:id="_PNl5U3qUEeK9jI2Tc6HWsA" type="23"> + <children xmi:type="notation:Shape" xmi:id="_PSfncHqUEeK9jI2Tc6HWsA" type="28"> + <children xmi:type="notation:DecorationNode" xmi:id="_PSfncnqUEeK9jI2Tc6HWsA" type="31"/> + <children xmi:type="notation:DecorationNode" xmi:id="_PSfnc3qUEeK9jI2Tc6HWsA" type="64"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_PSfndHqUEeK9jI2Tc6HWsA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_PSMsgHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSfncXqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_Ugum4HqUEeK9jI2Tc6HWsA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_Ugum5HqUEeK9jI2Tc6HWsA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Ugum5XqUEeK9jI2Tc6HWsA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_Ugum5nqUEeK9jI2Tc6HWsA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Ugum53qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ugum4XqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_Ugum4nqUEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Uglc8HqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Ugum6HqUEeK9jI2Tc6HWsA" x="181" y="52"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_UhBh0HqUEeK9jI2Tc6HWsA" type="28"> + <children xmi:type="notation:DecorationNode" xmi:id="_UhBh0nqUEeK9jI2Tc6HWsA" type="31"/> + <children xmi:type="notation:DecorationNode" xmi:id="_UhBh03qUEeK9jI2Tc6HWsA" type="64"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UhBh1HqUEeK9jI2Tc6HWsA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_Ugum6XqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UhBh0XqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_Z0BFcHqUEeK9jI2Tc6HWsA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_Z0BFdHqUEeK9jI2Tc6HWsA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0BFdXqUEeK9jI2Tc6HWsA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_Z0BFdnqUEeK9jI2Tc6HWsA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0BFd3qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_Z0BFcXqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_Z0BFcnqUEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Zz37gHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0BFeHqUEeK9jI2Tc6HWsA" x="294" y="46"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_Z0UncHqUEeK9jI2Tc6HWsA" type="28"> + <children xmi:type="notation:DecorationNode" xmi:id="_Z0UncnqUEeK9jI2Tc6HWsA" type="31"/> + <children xmi:type="notation:DecorationNode" xmi:id="_Z0Unc3qUEeK9jI2Tc6HWsA" type="64"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0UndHqUEeK9jI2Tc6HWsA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_Z0BFeXqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z0UncXqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_UuIJsHqUEeK9jI2Tc6HWsA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_UuIJtHqUEeK9jI2Tc6HWsA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UuIJtXqUEeK9jI2Tc6HWsA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_UuIJtnqUEeK9jI2Tc6HWsA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UuIJt3qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_UuIJsXqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_UuIJsnqUEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Ut-_wHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UuIJuHqUEeK9jI2Tc6HWsA" x="388" y="45"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_UubEoHqUEeK9jI2Tc6HWsA" type="28"> + <children xmi:type="notation:DecorationNode" xmi:id="_UubEonqUEeK9jI2Tc6HWsA" type="31"/> + <children xmi:type="notation:DecorationNode" xmi:id="_UubEo3qUEeK9jI2Tc6HWsA" type="64"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UubEpHqUEeK9jI2Tc6HWsA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_UuIJuXqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UubEoXqUEeK9jI2Tc6HWsA"/> + </children> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PNl5VHqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_PNl5VXqUEeK9jI2Tc6HWsA" visible="false" type="83"> + <children xmi:type="notation:Shape" xmi:id="_PXs3kHqUEeK9jI2Tc6HWsA" type="24"> + <children xmi:type="notation:DecorationNode" xmi:id="_PXs3knqUEeK9jI2Tc6HWsA" type="80"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PXs3k3qUEeK9jI2Tc6HWsA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PXs3kXqUEeK9jI2Tc6HWsA"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_PNl5VnqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_PNl5V3qUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PNl5WHqUEeK9jI2Tc6HWsA"/> + </children> + <element xmi:type="uml:Lifeline" href="complex_multipage_model.uml#_PM_cYHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PNl5UXqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_WUWgoHqUEeK9jI2Tc6HWsA" type="19"> + <children xmi:type="notation:DecorationNode" xmi:id="_WUWgonqUEeK9jI2Tc6HWsA" type="21"/> + <children xmi:type="notation:DecorationNode" xmi:id="_WUWgo3qUEeK9jI2Tc6HWsA" type="7"> + <children xmi:type="notation:Shape" xmi:id="_WtNFgHqUEeK9jI2Tc6HWsA" type="9"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WtWPcXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WtWPcnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_WtWPcHqUEeK9jI2Tc6HWsA"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WtpxcHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 1"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_WtNFgnqUEeK9jI2Tc6HWsA" type="38"> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_WtNFg3qUEeK9jI2Tc6HWsA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WtNFgXqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_W1GdQHqUEeK9jI2Tc6HWsA" type="9"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_W1PnMXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_W1PnMnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_W1PnMHqUEeK9jI2Tc6HWsA"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_W1ZYMHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 2"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_W1GdQnqUEeK9jI2Tc6HWsA" type="38"> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_W1GdQ3qUEeK9jI2Tc6HWsA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W1GdQXqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_YUVbYHqUEeK9jI2Tc6HWsA" type="9"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YUelUXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YUelUnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_YUelUHqUEeK9jI2Tc6HWsA"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YUoWUHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 3"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_YUVbYnqUEeK9jI2Tc6HWsA" type="38"> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_YUVbY3qUEeK9jI2Tc6HWsA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YUVbYXqUEeK9jI2Tc6HWsA"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_WUWgpHqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_WUWgpXqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgpnqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_WUWgp3qUEeK9jI2Tc6HWsA" type="8"> + <children xmi:type="notation:Shape" xmi:id="_WuF2UHqUEeK9jI2Tc6HWsA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_WuF2UnqUEeK9jI2Tc6HWsA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_WuF2U3qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_WtpxcXqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WuF2UXqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_Xj9uYHqUEeK9jI2Tc6HWsA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_Xj9uZHqUEeK9jI2Tc6HWsA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Xj9uZXqUEeK9jI2Tc6HWsA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_Xj9uZnqUEeK9jI2Tc6HWsA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Xj9uZ3qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_Xj9uYXqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_Xj9uYnqUEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Xjz9YHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Xj9uaHqUEeK9jI2Tc6HWsA" x="83" y="67"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_Xj9uaXqUEeK9jI2Tc6HWsA" type="39"> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xj9uanqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_XkjkQHqUEeK9jI2Tc6HWsA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_XkjkQnqUEeK9jI2Tc6HWsA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_XkjkQ3qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_Xj9ua3qUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XkjkQXqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_XraaMHqUEeK9jI2Tc6HWsA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_XraaNHqUEeK9jI2Tc6HWsA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_XraaNXqUEeK9jI2Tc6HWsA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_XraaNnqUEeK9jI2Tc6HWsA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_XraaN3qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_XraaMXqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_XraaMnqUEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_XrQpMHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_XraaOHqUEeK9jI2Tc6HWsA" x="152" y="70"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_XraaOXqUEeK9jI2Tc6HWsA" type="39"> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XraaOnqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_XsAQEHqUEeK9jI2Tc6HWsA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_XsAQEnqUEeK9jI2Tc6HWsA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_XsAQE3qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_XraaO3qUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XsAQEXqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_XzJZ4HqUEeK9jI2Tc6HWsA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_XzJZ5HqUEeK9jI2Tc6HWsA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_XzJZ5XqUEeK9jI2Tc6HWsA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_XzJZ5nqUEeK9jI2Tc6HWsA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_XzJZ53qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_XzJZ4XqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_XzJZ4nqUEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Xy_o4HqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_XzJZ6HqUEeK9jI2Tc6HWsA" x="265" y="72"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_XzJZ6XqUEeK9jI2Tc6HWsA" type="39"> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XzJZ6nqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_XzvPwHqUEeK9jI2Tc6HWsA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_XzvPwnqUEeK9jI2Tc6HWsA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_XzvPw3qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_XzJZ63qUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XzvPwXqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_X8FTcHqUEeK9jI2Tc6HWsA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_X8FTdHqUEeK9jI2Tc6HWsA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_X8FTdXqUEeK9jI2Tc6HWsA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_X8FTdnqUEeK9jI2Tc6HWsA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_X8FTd3qUEeK9jI2Tc6HWsA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_X8FTcXqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_X8FTcnqUEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_X7yYgHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_X8FTeHqUEeK9jI2Tc6HWsA" x="338" y="66"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_X8FTeXqUEeK9jI2Tc6HWsA" type="39"> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X8FTenqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_X8h_YHqUEeK9jI2Tc6HWsA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_X8rJUXqUEeK9jI2Tc6HWsA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_X8rJUnqUEeK9jI2Tc6HWsA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_X8FTe3qUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X8rJUHqUEeK9jI2Tc6HWsA"/> + </children> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgqHqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_WUWgqXqUEeK9jI2Tc6HWsA" visible="false" type="82"> + <children xmi:type="notation:Shape" xmi:id="_WUpbkHqUEeK9jI2Tc6HWsA" type="24"> + <children xmi:type="notation:DecorationNode" xmi:id="_WUpbknqUEeK9jI2Tc6HWsA" type="80"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUpbk3qUEeK9jI2Tc6HWsA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUpbkXqUEeK9jI2Tc6HWsA"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_WUWgqnqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_WUWgq3qUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgrHqUEeK9jI2Tc6HWsA"/> + </children> + <element xmi:type="uml:Lifeline" href="complex_multipage_model.uml#_WT50sHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgoXqUEeK9jI2Tc6HWsA"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_My-4FHqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_My-4FXqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_My-4FnqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_My-4F3qUEeK9jI2Tc6HWsA" type="29"> + <children xmi:type="notation:Shape" xmi:id="_NFchEHqUEeK9jI2Tc6HWsA" type="24"> + <children xmi:type="notation:DecorationNode" xmi:id="_NFchEnqUEeK9jI2Tc6HWsA" type="80"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NFchE3qUEeK9jI2Tc6HWsA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NFchEXqUEeK9jI2Tc6HWsA"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_My-4GHqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_My-4GXqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_My-4GnqUEeK9jI2Tc6HWsA"/> + </children> + <element xmi:type="uml:Interaction" href="complex_multipage_model.uml#_MyiMIHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_My-4EXqUEeK9jI2Tc6HWsA" x="80" y="125" height="605"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_12a1sXqTEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/> + </notation:Diagram> + <notation:Diagram xmi:id="_1_fSIHqTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="TimingDiagram" measurementUnit="Pixel"> + <styles xmi:type="notation:DiagramStyle" xmi:id="_1_fSIXqTEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/> + </notation:Diagram> + <notation:Diagram xmi:id="_B_L-UHqUEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_CeuaAHqUEeK9jI2Tc6HWsA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_CeuaAnqUEeK9jI2Tc6HWsA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_CeuaA3qUEeK9jI2Tc6HWsA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CeuaEnqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CeuaE3qUEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_CeuaBHqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_CeuaBXqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_CeuaBnqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaB3qUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_CeuaCHqUEeK9jI2Tc6HWsA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CeuaFHqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CeuaFXqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_CeuaCXqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_CeuaCnqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_CeuaC3qUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaDHqUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_CeuaDXqUEeK9jI2Tc6HWsA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CeuaFnqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CeuaF3qUEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_CeuaDnqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_CeuaD3qUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_CeuaEHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaEXqUEeK9jI2Tc6HWsA"/> + </children> + <element xmi:type="uml:Class" href="complex_multipage_model.uml#_CeRuEHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaAXqUEeK9jI2Tc6HWsA" x="104" y="95"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_CkrRAHqUEeK9jI2Tc6HWsA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_CkrRAnqUEeK9jI2Tc6HWsA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_CkrRA3qUEeK9jI2Tc6HWsA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ck1CCXqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ck1CCnqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_CkrRBHqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_CkrRBXqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_CkrRBnqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkrRB3qUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_CkrRCHqUEeK9jI2Tc6HWsA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ck1CC3qUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ck1CDHqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_Ck1CAHqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_Ck1CAXqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_Ck1CAnqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ck1CA3qUEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Ck1CBHqUEeK9jI2Tc6HWsA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ck1CDXqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ck1CDnqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_Ck1CBXqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_Ck1CBnqUEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_Ck1CB3qUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ck1CCHqUEeK9jI2Tc6HWsA"/> + </children> + <element xmi:type="uml:Class" href="complex_multipage_model.uml#_CkYWEHqUEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkrRAXqUEeK9jI2Tc6HWsA" x="393" y="94"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_B_L-UXqUEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Package" href="complex_multipage_model.uml#_BYzTwHqUEeK9jI2Tc6HWsA"/> + <edges xmi:type="notation:Connector" xmi:id="_DTPnMHqUEeK9jI2Tc6HWsA" type="4002" source="_CeuaAHqUEeK9jI2Tc6HWsA" target="_CkrRAHqUEeK9jI2Tc6HWsA"> + <children xmi:type="notation:DecorationNode" xmi:id="_DTPnM3qUEeK9jI2Tc6HWsA" type="6007"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_DTPnNHqUEeK9jI2Tc6HWsA" y="40"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_DTPnMXqUEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Generalization" href="complex_multipage_model.uml#_DS8sQHqUEeK9jI2Tc6HWsA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DTPnMnqUEeK9jI2Tc6HWsA" points="[50, 9, -239, 10]$[298, 49, 9, 50]"/> + </edges> + </notation:Diagram> +</xmi:XMI> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.uml index 0c842d67110..951eaa9cc2c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.uml @@ -1,178 +1,178 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_zyAt8HqTEeK9jI2Tc6HWsA" name="model">
- <ownedComment xmi:id="_D1TycHqUEeK9jI2Tc6HWsA">
- <body>Complex model with many pages and a specific layout </body>
- </ownedComment>
- <packagedElement xmi:type="uml:Class" xmi:id="__dxKcHqTEeK9jI2Tc6HWsA" name="Class1">
- <ownedAttribute xmi:id="__7qnYHqTEeK9jI2Tc6HWsA" name="class2" type="__o7RkHqTEeK9jI2Tc6HWsA" association="__70YYHqTEeK9jI2Tc6HWsA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__7qnYXqTEeK9jI2Tc6HWsA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__7qnYnqTEeK9jI2Tc6HWsA" value="1"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="__o7RkHqTEeK9jI2Tc6HWsA" name="Class2"/>
- <packagedElement xmi:type="uml:Association" xmi:id="__70YYHqTEeK9jI2Tc6HWsA" name="class1_class2_1" memberEnd="__70YYXqTEeK9jI2Tc6HWsA __7qnYHqTEeK9jI2Tc6HWsA">
- <ownedEnd xmi:id="__70YYXqTEeK9jI2Tc6HWsA" name="class1" type="__dxKcHqTEeK9jI2Tc6HWsA" association="__70YYHqTEeK9jI2Tc6HWsA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__70YYnqTEeK9jI2Tc6HWsA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__70YY3qTEeK9jI2Tc6HWsA" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Package" xmi:id="_BYzTwHqUEeK9jI2Tc6HWsA" name="Package1">
- <packagedElement xmi:type="uml:Class" xmi:id="_CeRuEHqUEeK9jI2Tc6HWsA" name="Class1">
- <generalization xmi:id="_DS8sQHqUEeK9jI2Tc6HWsA" general="_CkYWEHqUEeK9jI2Tc6HWsA"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_CkYWEHqUEeK9jI2Tc6HWsA" name="Class2"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Interaction" xmi:id="_MyiMIHqUEeK9jI2Tc6HWsA">
- <fragment xmi:type="uml:StateInvariant" xmi:id="_PSMsgHqUEeK9jI2Tc6HWsA" name="S1" covered="_PM_cYHqUEeK9jI2Tc6HWsA">
- <invariant xmi:id="_PSMsgXqUEeK9jI2Tc6HWsA">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_PSMsgnqUEeK9jI2Tc6HWsA"/>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_R6C4gXqUEeK9jI2Tc6HWsA" name="State 1_1" covered="_Of5s4HqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_R6MpgHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_R6VzcHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_R5v9kHqUEeK9jI2Tc6HWsA"/>
- </eAnnotations>
- <invariant xmi:id="_R6C4gnqUEeK9jI2Tc6HWsA" name="InState_State 1">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6C4g3qUEeK9jI2Tc6HWsA">
- <body>State 1</body>
- </specification>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_TDtPQHqUEeK9jI2Tc6HWsA" name="State 1_1_To_State 2_1" covered="_Of5s4HqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_TDtPQXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_TEAKO3qUEeK9jI2Tc6HWsA" name="State 2_1" covered="_Of5s4HqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_TEJ7MHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_TETsMHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_SO4gEHqUEeK9jI2Tc6HWsA"/>
- </eAnnotations>
- <invariant xmi:id="_TEAKPHqUEeK9jI2Tc6HWsA" name="InState_State 2">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_TEAKPXqUEeK9jI2Tc6HWsA">
- <body>State 2</body>
- </specification>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_UCXP4HqUEeK9jI2Tc6HWsA" name="State 2_1_To_State 1_2" covered="_Of5s4HqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_UCXP4XqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_UCqK23qUEeK9jI2Tc6HWsA" name="State 1_2" covered="_Of5s4HqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_UC9FwHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_UC9FwXqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_R5v9kHqUEeK9jI2Tc6HWsA"/>
- </eAnnotations>
- <invariant xmi:id="_UCqK3HqUEeK9jI2Tc6HWsA" name="InState_State 1">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_UCqK3XqUEeK9jI2Tc6HWsA">
- <body>State 1</body>
- </specification>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Uglc8HqUEeK9jI2Tc6HWsA" name="<unnamed>_To_<unnamed>" covered="_PM_cYHqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_Uglc8XqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_Ugum6XqUEeK9jI2Tc6HWsA" name="S2" covered="_PM_cYHqUEeK9jI2Tc6HWsA">
- <invariant xmi:id="_Ugum6nqUEeK9jI2Tc6HWsA">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ugum63qUEeK9jI2Tc6HWsA"/>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Zz37gHqUEeK9jI2Tc6HWsA" name="<unnamed>_To_<unnamed>" covered="_PM_cYHqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_Zz37gXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_Z0BFeXqUEeK9jI2Tc6HWsA" name="S3" covered="_PM_cYHqUEeK9jI2Tc6HWsA">
- <invariant xmi:id="_Z0BFenqUEeK9jI2Tc6HWsA">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_Z0BFe3qUEeK9jI2Tc6HWsA"/>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Ut-_wHqUEeK9jI2Tc6HWsA" name="<unnamed>_To_<unnamed>" covered="_PM_cYHqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_Ut-_wXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_UuIJuXqUEeK9jI2Tc6HWsA" name="S4" covered="_PM_cYHqUEeK9jI2Tc6HWsA">
- <invariant xmi:id="_UuIJunqUEeK9jI2Tc6HWsA">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_UuIJu3qUEeK9jI2Tc6HWsA"/>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_WtpxcXqUEeK9jI2Tc6HWsA" name="State 1_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_Wty7YHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_Wt8sYHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_WtWPcHqUEeK9jI2Tc6HWsA"/>
- </eAnnotations>
- <invariant xmi:id="_WtpxcnqUEeK9jI2Tc6HWsA" name="InState_State 1">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_Wtpxc3qUEeK9jI2Tc6HWsA">
- <body>State 1</body>
- </specification>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Xjz9YHqUEeK9jI2Tc6HWsA" name="State 1_1_To_State 3_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_Xjz9YXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_Xj9ua3qUEeK9jI2Tc6HWsA" name="State 3_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_XkQpUHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_XkQpUXqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_YUelUHqUEeK9jI2Tc6HWsA"/>
- </eAnnotations>
- <invariant xmi:id="_Xj9ubHqUEeK9jI2Tc6HWsA" name="InState_State 3">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_Xj9ubXqUEeK9jI2Tc6HWsA">
- <body>State 3</body>
- </specification>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_XrQpMHqUEeK9jI2Tc6HWsA" name="State 3_1_To_State 2_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_XrQpMXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_XraaO3qUEeK9jI2Tc6HWsA" name="State 2_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_XrtVIHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_XrtVIXqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_W1PnMHqUEeK9jI2Tc6HWsA"/>
- </eAnnotations>
- <invariant xmi:id="_XraaPHqUEeK9jI2Tc6HWsA" name="InState_State 2">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_XraaPXqUEeK9jI2Tc6HWsA">
- <body>State 2</body>
- </specification>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Xy_o4HqUEeK9jI2Tc6HWsA" name="State 2_1_To_State 1_2" covered="_WT50sHqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_Xy_o4XqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_XzJZ63qUEeK9jI2Tc6HWsA" name="State 1_2" covered="_WT50sHqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_XzSj0HqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_XzcU0HqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_WtWPcHqUEeK9jI2Tc6HWsA"/>
- </eAnnotations>
- <invariant xmi:id="_XzJZ7HqUEeK9jI2Tc6HWsA" name="InState_State 1">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_XzJZ7XqUEeK9jI2Tc6HWsA">
- <body>State 1</body>
- </specification>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_X7yYgHqUEeK9jI2Tc6HWsA" name="State 1_2_To_State 3_2" covered="_WT50sHqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_X7yYgXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_X8FTe3qUEeK9jI2Tc6HWsA" name="State 3_2" covered="_WT50sHqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_X8OdYHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_X8YOYHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_YUelUHqUEeK9jI2Tc6HWsA"/>
- </eAnnotations>
- <invariant xmi:id="_X8FTfHqUEeK9jI2Tc6HWsA" name="InState_State 3">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_X8FTfXqUEeK9jI2Tc6HWsA">
- <body>State 3</body>
- </specification>
- </invariant>
- </fragment>
- <lifeline xmi:id="_Of5s4HqUEeK9jI2Tc6HWsA" coveredBy="_R6C4gXqUEeK9jI2Tc6HWsA _TDtPQHqUEeK9jI2Tc6HWsA _TEAKO3qUEeK9jI2Tc6HWsA _UCXP4HqUEeK9jI2Tc6HWsA _UCqK23qUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_OgWY0HqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline">
- <details xmi:id="_OggJ0HqUEeK9jI2Tc6HWsA" key="type" value="full"/>
- </eAnnotations>
- <eAnnotations xmi:id="_R5v9k3qUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.LifelineStateDefinitions">
- <details xmi:id="_R55ukHqUEeK9jI2Tc6HWsA" key="_R5v9kHqUEeK9jI2Tc6HWsA" value="State 1"/>
- <details xmi:id="_SO4gE3qUEeK9jI2Tc6HWsA" key="_SO4gEHqUEeK9jI2Tc6HWsA" value="State 2"/>
- </eAnnotations>
- </lifeline>
- <lifeline xmi:id="_PM_cYHqUEeK9jI2Tc6HWsA" coveredBy="_PSMsgHqUEeK9jI2Tc6HWsA _Uglc8HqUEeK9jI2Tc6HWsA _Ugum6XqUEeK9jI2Tc6HWsA _Zz37gHqUEeK9jI2Tc6HWsA _Z0BFeXqUEeK9jI2Tc6HWsA _Ut-_wHqUEeK9jI2Tc6HWsA _UuIJuXqUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_PNSXUHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline">
- <details xmi:id="_PNSXUXqUEeK9jI2Tc6HWsA" key="type" value="compact"/>
- </eAnnotations>
- </lifeline>
- <lifeline xmi:id="_WT50sHqUEeK9jI2Tc6HWsA" coveredBy="_WtpxcXqUEeK9jI2Tc6HWsA _Xjz9YHqUEeK9jI2Tc6HWsA _Xj9ua3qUEeK9jI2Tc6HWsA _XrQpMHqUEeK9jI2Tc6HWsA _XraaO3qUEeK9jI2Tc6HWsA _Xy_o4HqUEeK9jI2Tc6HWsA _XzJZ63qUEeK9jI2Tc6HWsA _X7yYgHqUEeK9jI2Tc6HWsA _X8FTe3qUEeK9jI2Tc6HWsA">
- <eAnnotations xmi:id="_WUC-oHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline">
- <details xmi:id="_WUMvoHqUEeK9jI2Tc6HWsA" key="type" value="full"/>
- </eAnnotations>
- <eAnnotations xmi:id="_WtWPc3qUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.LifelineStateDefinitions">
- <details xmi:id="_WtgAcHqUEeK9jI2Tc6HWsA" key="_WtWPcHqUEeK9jI2Tc6HWsA" value="State 1"/>
- <details xmi:id="_W1PnM3qUEeK9jI2Tc6HWsA" key="_W1PnMHqUEeK9jI2Tc6HWsA" value="State 2"/>
- <details xmi:id="_YUelU3qUEeK9jI2Tc6HWsA" key="_YUelUHqUEeK9jI2Tc6HWsA" value="State 3"/>
- </eAnnotations>
- </lifeline>
- </packagedElement>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_zyAt8HqTEeK9jI2Tc6HWsA" name="model"> + <ownedComment xmi:id="_D1TycHqUEeK9jI2Tc6HWsA"> + <body>Complex model with many pages and a specific layout </body> + </ownedComment> + <packagedElement xmi:type="uml:Class" xmi:id="__dxKcHqTEeK9jI2Tc6HWsA" name="Class1"> + <ownedAttribute xmi:id="__7qnYHqTEeK9jI2Tc6HWsA" name="class2" type="__o7RkHqTEeK9jI2Tc6HWsA" association="__70YYHqTEeK9jI2Tc6HWsA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__7qnYXqTEeK9jI2Tc6HWsA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__7qnYnqTEeK9jI2Tc6HWsA" value="1"/> + </ownedAttribute> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="__o7RkHqTEeK9jI2Tc6HWsA" name="Class2"/> + <packagedElement xmi:type="uml:Association" xmi:id="__70YYHqTEeK9jI2Tc6HWsA" name="class1_class2_1" memberEnd="__70YYXqTEeK9jI2Tc6HWsA __7qnYHqTEeK9jI2Tc6HWsA"> + <ownedEnd xmi:id="__70YYXqTEeK9jI2Tc6HWsA" name="class1" type="__dxKcHqTEeK9jI2Tc6HWsA" association="__70YYHqTEeK9jI2Tc6HWsA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__70YYnqTEeK9jI2Tc6HWsA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__70YY3qTEeK9jI2Tc6HWsA" value="1"/> + </ownedEnd> + </packagedElement> + <packagedElement xmi:type="uml:Package" xmi:id="_BYzTwHqUEeK9jI2Tc6HWsA" name="Package1"> + <packagedElement xmi:type="uml:Class" xmi:id="_CeRuEHqUEeK9jI2Tc6HWsA" name="Class1"> + <generalization xmi:id="_DS8sQHqUEeK9jI2Tc6HWsA" general="_CkYWEHqUEeK9jI2Tc6HWsA"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_CkYWEHqUEeK9jI2Tc6HWsA" name="Class2"/> + </packagedElement> + <packagedElement xmi:type="uml:Interaction" xmi:id="_MyiMIHqUEeK9jI2Tc6HWsA"> + <fragment xmi:type="uml:StateInvariant" xmi:id="_PSMsgHqUEeK9jI2Tc6HWsA" name="S1" covered="_PM_cYHqUEeK9jI2Tc6HWsA"> + <invariant xmi:id="_PSMsgXqUEeK9jI2Tc6HWsA"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_PSMsgnqUEeK9jI2Tc6HWsA"/> + </invariant> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_R6C4gXqUEeK9jI2Tc6HWsA" name="State 1_1" covered="_Of5s4HqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_R6MpgHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_R6VzcHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_R5v9kHqUEeK9jI2Tc6HWsA"/> + </eAnnotations> + <invariant xmi:id="_R6C4gnqUEeK9jI2Tc6HWsA" name="InState_State 1"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6C4g3qUEeK9jI2Tc6HWsA"> + <body>State 1</body> + </specification> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_TDtPQHqUEeK9jI2Tc6HWsA" name="State 1_1_To_State 2_1" covered="_Of5s4HqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_TDtPQXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_TEAKO3qUEeK9jI2Tc6HWsA" name="State 2_1" covered="_Of5s4HqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_TEJ7MHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_TETsMHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_SO4gEHqUEeK9jI2Tc6HWsA"/> + </eAnnotations> + <invariant xmi:id="_TEAKPHqUEeK9jI2Tc6HWsA" name="InState_State 2"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_TEAKPXqUEeK9jI2Tc6HWsA"> + <body>State 2</body> + </specification> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_UCXP4HqUEeK9jI2Tc6HWsA" name="State 2_1_To_State 1_2" covered="_Of5s4HqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_UCXP4XqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_UCqK23qUEeK9jI2Tc6HWsA" name="State 1_2" covered="_Of5s4HqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_UC9FwHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_UC9FwXqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_R5v9kHqUEeK9jI2Tc6HWsA"/> + </eAnnotations> + <invariant xmi:id="_UCqK3HqUEeK9jI2Tc6HWsA" name="InState_State 1"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_UCqK3XqUEeK9jI2Tc6HWsA"> + <body>State 1</body> + </specification> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Uglc8HqUEeK9jI2Tc6HWsA" name="<unnamed>_To_<unnamed>" covered="_PM_cYHqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_Uglc8XqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_Ugum6XqUEeK9jI2Tc6HWsA" name="S2" covered="_PM_cYHqUEeK9jI2Tc6HWsA"> + <invariant xmi:id="_Ugum6nqUEeK9jI2Tc6HWsA"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ugum63qUEeK9jI2Tc6HWsA"/> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Zz37gHqUEeK9jI2Tc6HWsA" name="<unnamed>_To_<unnamed>" covered="_PM_cYHqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_Zz37gXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_Z0BFeXqUEeK9jI2Tc6HWsA" name="S3" covered="_PM_cYHqUEeK9jI2Tc6HWsA"> + <invariant xmi:id="_Z0BFenqUEeK9jI2Tc6HWsA"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_Z0BFe3qUEeK9jI2Tc6HWsA"/> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Ut-_wHqUEeK9jI2Tc6HWsA" name="<unnamed>_To_<unnamed>" covered="_PM_cYHqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_Ut-_wXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_UuIJuXqUEeK9jI2Tc6HWsA" name="S4" covered="_PM_cYHqUEeK9jI2Tc6HWsA"> + <invariant xmi:id="_UuIJunqUEeK9jI2Tc6HWsA"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_UuIJu3qUEeK9jI2Tc6HWsA"/> + </invariant> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_WtpxcXqUEeK9jI2Tc6HWsA" name="State 1_1" covered="_WT50sHqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_Wty7YHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_Wt8sYHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_WtWPcHqUEeK9jI2Tc6HWsA"/> + </eAnnotations> + <invariant xmi:id="_WtpxcnqUEeK9jI2Tc6HWsA" name="InState_State 1"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_Wtpxc3qUEeK9jI2Tc6HWsA"> + <body>State 1</body> + </specification> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Xjz9YHqUEeK9jI2Tc6HWsA" name="State 1_1_To_State 3_1" covered="_WT50sHqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_Xjz9YXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_Xj9ua3qUEeK9jI2Tc6HWsA" name="State 3_1" covered="_WT50sHqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_XkQpUHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_XkQpUXqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_YUelUHqUEeK9jI2Tc6HWsA"/> + </eAnnotations> + <invariant xmi:id="_Xj9ubHqUEeK9jI2Tc6HWsA" name="InState_State 3"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_Xj9ubXqUEeK9jI2Tc6HWsA"> + <body>State 3</body> + </specification> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_XrQpMHqUEeK9jI2Tc6HWsA" name="State 3_1_To_State 2_1" covered="_WT50sHqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_XrQpMXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_XraaO3qUEeK9jI2Tc6HWsA" name="State 2_1" covered="_WT50sHqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_XrtVIHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_XrtVIXqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_W1PnMHqUEeK9jI2Tc6HWsA"/> + </eAnnotations> + <invariant xmi:id="_XraaPHqUEeK9jI2Tc6HWsA" name="InState_State 2"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_XraaPXqUEeK9jI2Tc6HWsA"> + <body>State 2</body> + </specification> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Xy_o4HqUEeK9jI2Tc6HWsA" name="State 2_1_To_State 1_2" covered="_WT50sHqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_Xy_o4XqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_XzJZ63qUEeK9jI2Tc6HWsA" name="State 1_2" covered="_WT50sHqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_XzSj0HqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_XzcU0HqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_WtWPcHqUEeK9jI2Tc6HWsA"/> + </eAnnotations> + <invariant xmi:id="_XzJZ7HqUEeK9jI2Tc6HWsA" name="InState_State 1"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_XzJZ7XqUEeK9jI2Tc6HWsA"> + <body>State 1</body> + </specification> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_X7yYgHqUEeK9jI2Tc6HWsA" name="State 1_2_To_State 3_2" covered="_WT50sHqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_X7yYgXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_X8FTe3qUEeK9jI2Tc6HWsA" name="State 3_2" covered="_WT50sHqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_X8OdYHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_X8YOYHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_YUelUHqUEeK9jI2Tc6HWsA"/> + </eAnnotations> + <invariant xmi:id="_X8FTfHqUEeK9jI2Tc6HWsA" name="InState_State 3"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_X8FTfXqUEeK9jI2Tc6HWsA"> + <body>State 3</body> + </specification> + </invariant> + </fragment> + <lifeline xmi:id="_Of5s4HqUEeK9jI2Tc6HWsA" coveredBy="_R6C4gXqUEeK9jI2Tc6HWsA _TDtPQHqUEeK9jI2Tc6HWsA _TEAKO3qUEeK9jI2Tc6HWsA _UCXP4HqUEeK9jI2Tc6HWsA _UCqK23qUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_OgWY0HqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline"> + <details xmi:id="_OggJ0HqUEeK9jI2Tc6HWsA" key="type" value="full"/> + </eAnnotations> + <eAnnotations xmi:id="_R5v9k3qUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.LifelineStateDefinitions"> + <details xmi:id="_R55ukHqUEeK9jI2Tc6HWsA" key="_R5v9kHqUEeK9jI2Tc6HWsA" value="State 1"/> + <details xmi:id="_SO4gE3qUEeK9jI2Tc6HWsA" key="_SO4gEHqUEeK9jI2Tc6HWsA" value="State 2"/> + </eAnnotations> + </lifeline> + <lifeline xmi:id="_PM_cYHqUEeK9jI2Tc6HWsA" coveredBy="_PSMsgHqUEeK9jI2Tc6HWsA _Uglc8HqUEeK9jI2Tc6HWsA _Ugum6XqUEeK9jI2Tc6HWsA _Zz37gHqUEeK9jI2Tc6HWsA _Z0BFeXqUEeK9jI2Tc6HWsA _Ut-_wHqUEeK9jI2Tc6HWsA _UuIJuXqUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_PNSXUHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline"> + <details xmi:id="_PNSXUXqUEeK9jI2Tc6HWsA" key="type" value="compact"/> + </eAnnotations> + </lifeline> + <lifeline xmi:id="_WT50sHqUEeK9jI2Tc6HWsA" coveredBy="_WtpxcXqUEeK9jI2Tc6HWsA _Xjz9YHqUEeK9jI2Tc6HWsA _Xj9ua3qUEeK9jI2Tc6HWsA _XrQpMHqUEeK9jI2Tc6HWsA _XraaO3qUEeK9jI2Tc6HWsA _Xy_o4HqUEeK9jI2Tc6HWsA _XzJZ63qUEeK9jI2Tc6HWsA _X7yYgHqUEeK9jI2Tc6HWsA _X8FTe3qUEeK9jI2Tc6HWsA"> + <eAnnotations xmi:id="_WUC-oHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline"> + <details xmi:id="_WUMvoHqUEeK9jI2Tc6HWsA" key="type" value="full"/> + </eAnnotations> + <eAnnotations xmi:id="_WtWPc3qUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.LifelineStateDefinitions"> + <details xmi:id="_WtgAcHqUEeK9jI2Tc6HWsA" key="_WtWPcHqUEeK9jI2Tc6HWsA" value="State 1"/> + <details xmi:id="_W1PnM3qUEeK9jI2Tc6HWsA" key="_W1PnMHqUEeK9jI2Tc6HWsA" value="State 2"/> + <details xmi:id="_YUelU3qUEeK9jI2Tc6HWsA" key="_YUelUHqUEeK9jI2Tc6HWsA" value="State 3"/> + </eAnnotations> + </lifeline> + </packagedElement> +</uml:Model> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.di index f1f92bb0083..8ae13a19f1e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.di @@ -1,35 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage>
- <emfPageIdentifier href="delete_contained_diagram.notation#_7KiAcHxQEeKD0tnoPLkh-A"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="delete_contained_diagram.notation#_45GUoH9WEeKg8Ob6i-v52w"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="delete_contained_diagram.notation#_GeJbwH9cEeKUSOg4DHoPwA"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="delete_contained_diagram.notation#_HGUPAH9cEeKUSOg4DHoPwA"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="delete_contained_diagram.notation#_a0DxsH9sEeKFzdr7iEywzg"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="delete_contained_diagram.notation#_45GUoH9WEeKg8Ob6i-v52w"/>
- </children>
- <children>
- <emfPageIdentifier href="delete_contained_diagram.notation#_GeJbwH9cEeKUSOg4DHoPwA"/>
- </children>
- <children>
- <emfPageIdentifier href="delete_contained_diagram.notation#_7KiAcHxQEeKD0tnoPLkh-A"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="UTF-8"?> +<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> + <pageList> + <availablePage> + <emfPageIdentifier href="delete_contained_diagram.notation#_7KiAcHxQEeKD0tnoPLkh-A"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="delete_contained_diagram.notation#_45GUoH9WEeKg8Ob6i-v52w"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="delete_contained_diagram.notation#_GeJbwH9cEeKUSOg4DHoPwA"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="delete_contained_diagram.notation#_HGUPAH9cEeKUSOg4DHoPwA"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="delete_contained_diagram.notation#_a0DxsH9sEeKFzdr7iEywzg"/> + </availablePage> + </pageList> + <sashModel currentSelection="//@sashModel/@windows.0/@children.0"> + <windows> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="delete_contained_diagram.notation#_45GUoH9WEeKg8Ob6i-v52w"/> + </children> + <children> + <emfPageIdentifier href="delete_contained_diagram.notation#_GeJbwH9cEeKUSOg4DHoPwA"/> + </children> + <children> + <emfPageIdentifier href="delete_contained_diagram.notation#_7KiAcHxQEeKD0tnoPLkh-A"/> + </children> + </children> + </windows> + </sashModel> +</di:SashWindowsMngr> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.notation index 09c604d50e0..660b276d194 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.notation @@ -1,282 +1,282 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
- <notation:Diagram xmi:id="_7KiAcHxQEeKD0tnoPLkh-A" type="PapyrusUMLActivityDiagram" name="ActivityDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_7KiAcXxQEeKD0tnoPLkh-A" type="2001" fontName="Segoe UI" lineColor="0">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAcnxQEeKD0tnoPLkh-A" source="ShadowFigure">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAc3xQEeKD0tnoPLkh-A" key="ShadowFigure_Value" value="false"/>
- </eAnnotations>
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAdHxQEeKD0tnoPLkh-A" source="displayNameLabelIcon">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAdXxQEeKD0tnoPLkh-A" key="displayNameLabelIcon_value" value="false"/>
- </eAnnotations>
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAdnxQEeKD0tnoPLkh-A" source="QualifiedName">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAd3xQEeKD0tnoPLkh-A" key="QualifiedNameDepth" value="1000"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_7KiAeHxQEeKD0tnoPLkh-A" type="5001"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_7KiAenxQEeKD0tnoPLkh-A" type="7001">
- <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAe3xQEeKD0tnoPLkh-A"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAfHxQEeKD0tnoPLkh-A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAfXxQEeKD0tnoPLkh-A"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_7KiAfnxQEeKD0tnoPLkh-A" type="7002">
- <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAf3xQEeKD0tnoPLkh-A"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAgHxQEeKD0tnoPLkh-A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAgXxQEeKD0tnoPLkh-A"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_7KiAgnxQEeKD0tnoPLkh-A" type="7003">
- <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAg3xQEeKD0tnoPLkh-A"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAhHxQEeKD0tnoPLkh-A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAhXxQEeKD0tnoPLkh-A"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_7KiAhnxQEeKD0tnoPLkh-A" type="7004">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAh3xQEeKD0tnoPLkh-A"/>
- </children>
- <element xmi:type="uml:Activity" href="delete_contained_diagram.uml#_7Hjk8HxQEeKD0tnoPLkh-A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAiHxQEeKD0tnoPLkh-A"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_7KiAiXxQEeKD0tnoPLkh-A"/>
- <element xmi:type="uml:Activity" href="delete_contained_diagram.uml#_7Hjk8HxQEeKD0tnoPLkh-A"/>
- </notation:Diagram>
- <notation:Diagram xmi:id="_45GUoH9WEeKg8Ob6i-v52w" type="PapyrusUMLClassDiagram" name="ClassDiagram3" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_Itj5oH9cEeKUSOg4DHoPwA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_IttqoH9cEeKUSOg4DHoPwA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_IttqoX9cEeKUSOg4DHoPwA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IttqsH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IttqsX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
- </eAnnotations>
- <children xmi:type="notation:Shape" xmi:id="_nL9LIIAfEeKTe7ZOi8nJaA" type="3012">
- <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nDxfgIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nL9LIYAfEeKTe7ZOi8nJaA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_nWEwcIAfEeKTe7ZOi8nJaA" type="3012">
- <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nVx1gIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nWEwcYAfEeKTe7ZOi8nJaA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_ondf0IAfEeKTe7ZOi8nJaA" type="3012">
- <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_onKk4IAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_ondf0YAfEeKTe7ZOi8nJaA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_pUtAUIAfEeKTe7ZOi8nJaA" type="3012">
- <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pUQUYIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_pUtAUYAfEeKTe7ZOi8nJaA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_pcviAIAfEeKTe7ZOi8nJaA" type="3012">
- <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pcmYEIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_pcviAYAfEeKTe7ZOi8nJaA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_pozBAIAfEeKTe7ZOi8nJaA" type="3012">
- <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_poWVEIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_pozBAYAfEeKTe7ZOi8nJaA"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_Ittqon9cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Ittqo39cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_IttqpH9cEeKUSOg4DHoPwA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IttqpX9cEeKUSOg4DHoPwA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_Ittqpn9cEeKUSOg4DHoPwA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ittqsn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ittqs39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_Ittqp39cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_IttqqH9cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_IttqqX9cEeKUSOg4DHoPwA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ittqqn9cEeKUSOg4DHoPwA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_Ittqq39cEeKUSOg4DHoPwA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_It3boH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_It3boX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_IttqrH9cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_IttqrX9cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_Ittqrn9cEeKUSOg4DHoPwA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ittqr39cEeKUSOg4DHoPwA"/>
- </children>
- <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_8UYvwH9WEeKg8Ob6i-v52w"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Itj5oX9cEeKUSOg4DHoPwA" x="150" y="205"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_IuwMcH9cEeKUSOg4DHoPwA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_IuwMcn9cEeKUSOg4DHoPwA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMc39cEeKUSOg4DHoPwA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IuwMgn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IuwMg39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
- </eAnnotations>
- <children xmi:type="notation:Shape" xmi:id="_AfaMYIAgEeKTe7ZOi8nJaA" type="3012">
- <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nDxfgIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMYYAgEeKTe7ZOi8nJaA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_AfaMYoAgEeKTe7ZOi8nJaA" type="3012">
- <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nVx1gIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMY4AgEeKTe7ZOi8nJaA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_AfaMZIAgEeKTe7ZOi8nJaA" type="3012">
- <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pcmYEIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMZYAgEeKTe7ZOi8nJaA"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMdH9cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMdX9cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMdn9cEeKUSOg4DHoPwA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMd39cEeKUSOg4DHoPwA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMeH9cEeKUSOg4DHoPwA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IuwMhH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IuwMhX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
- </eAnnotations>
- <children xmi:type="notation:Shape" xmi:id="_raBuEIAfEeKTe7ZOi8nJaA" type="3013">
- <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rZlCIIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_raBuEYAfEeKTe7ZOi8nJaA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_reL1UIAfEeKTe7ZOi8nJaA" type="3013">
- <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rd46YIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_reL1UYAfEeKTe7ZOi8nJaA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_rizPkIAfEeKTe7ZOi8nJaA" type="3013">
- <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rigUoIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_rizPkYAfEeKTe7ZOi8nJaA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_roTaoIAfEeKTe7ZOi8nJaA" type="3013">
- <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_roAfsIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_roTaoYAfEeKTe7ZOi8nJaA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_rtNv0IAfEeKTe7ZOi8nJaA" type="3013">
- <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rs604IAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_rtNv0YAfEeKTe7ZOi8nJaA"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMeX9cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMen9cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMe39cEeKUSOg4DHoPwA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMfH9cEeKUSOg4DHoPwA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMfX9cEeKUSOg4DHoPwA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Iu59cH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Iu59cX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMfn9cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMf39cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMgH9cEeKUSOg4DHoPwA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMgX9cEeKUSOg4DHoPwA"/>
- </children>
- <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_9c2MoH9WEeKg8Ob6i-v52w"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMcX9cEeKUSOg4DHoPwA" x="490" y="530" width="336"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_IvWpYH9cEeKUSOg4DHoPwA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_IvWpYn9cEeKUSOg4DHoPwA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpY39cEeKUSOg4DHoPwA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpcn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpc39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpZH9cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpZX9cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpZn9cEeKUSOg4DHoPwA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpZ39cEeKUSOg4DHoPwA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpaH9cEeKUSOg4DHoPwA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpdH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpdX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
- </eAnnotations>
- <children xmi:type="notation:Shape" xmi:id="_qycwsIAfEeKTe7ZOi8nJaA" type="3013">
- <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_qyAEwIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_qycwsYAfEeKTe7ZOi8nJaA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_rDHC4IAfEeKTe7ZOi8nJaA" type="3013">
- <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rC0H8IAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_rDHC4YAfEeKTe7ZOi8nJaA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_rILJEIAfEeKTe7ZOi8nJaA" type="3013">
- <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rHudIIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_rILJEYAfEeKTe7ZOi8nJaA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_rNE3MIAfEeKTe7ZOi8nJaA" type="3013">
- <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rMx8QIAfEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_rNE3MYAfEeKTe7ZOi8nJaA"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpaX9cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpan9cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpa39cEeKUSOg4DHoPwA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpbH9cEeKUSOg4DHoPwA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpbX9cEeKUSOg4DHoPwA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpdn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpd39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpbn9cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpb39cEeKUSOg4DHoPwA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpcH9cEeKUSOg4DHoPwA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpcX9cEeKUSOg4DHoPwA"/>
- </children>
- <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_9q0-QH9WEeKg8Ob6i-v52w"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpYX9cEeKUSOg4DHoPwA" x="905" y="220"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_njLtcIAhEeKTe7ZOi8nJaA" type="2015">
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_njLtcYAhEeKTe7ZOi8nJaA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_njLtcoAhEeKTe7ZOi8nJaA"/>
- <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_njLtdIAhEeKTe7ZOi8nJaA" x="645" y="285"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_45GUoX9WEeKg8Ob6i-v52w"/>
- <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_4gjRwH9WEeKg8Ob6i-v52w"/>
- <edges xmi:type="notation:Connector" xmi:id="_6tQAgIAfEeKTe7ZOi8nJaA" type="4002" source="_IuwMcH9cEeKUSOg4DHoPwA" target="_Itj5oH9cEeKUSOg4DHoPwA">
- <children xmi:type="notation:DecorationNode" xmi:id="_6tQAg4AfEeKTe7ZOi8nJaA" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6tQAhIAfEeKTe7ZOi8nJaA" y="40"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_6tQAgYAfEeKTe7ZOi8nJaA"/>
- <element xmi:type="uml:Generalization" href="delete_contained_diagram.uml#_6sgZoIAfEeKTe7ZOi8nJaA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6tQAgoAfEeKTe7ZOi8nJaA" points="[-131, 0, 271, 215]$[-402, 0, 0, 215]$[-402, -192, 0, 23]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6wYNAIAfEeKTe7ZOi8nJaA" id="(0.3898809523809524,0.21875)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6wYNAYAfEeKTe7ZOi8nJaA" id="(0.3894736842105263,0.8693181818181818)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_nlQxEIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_Itj5oH9cEeKUSOg4DHoPwA">
- <children xmi:type="notation:DecorationNode" xmi:id="_nlQxE4AhEeKTe7ZOi8nJaA" type="6024">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nlQxFIAhEeKTe7ZOi8nJaA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_nlQxFYAhEeKTe7ZOi8nJaA" type="6035">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nlQxFoAhEeKTe7ZOi8nJaA" y="20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_nlQxEYAhEeKTe7ZOi8nJaA"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nmv-0IAhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style">
- <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_mxWA1IAhEeKTe7ZOi8nJaA"/>
- </styles>
- <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nlQxEoAhEeKTe7ZOi8nJaA" points="[0, 0, -245, -293]$[171, 205, -74, -88]"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_noY9kIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_IvWpYH9cEeKUSOg4DHoPwA">
- <children xmi:type="notation:DecorationNode" xmi:id="_noY9k4AhEeKTe7ZOi8nJaA" type="6024">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_noY9lIAhEeKTe7ZOi8nJaA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_noY9lYAhEeKTe7ZOi8nJaA" type="6035">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_noY9loAhEeKTe7ZOi8nJaA" y="20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_noY9kYAhEeKTe7ZOi8nJaA"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_noY9l4AhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style">
- <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_mxWA0IAhEeKTe7ZOi8nJaA"/>
- </styles>
- <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_noY9koAhEeKTe7ZOi8nJaA" points="[7, -3, -258, 85]$[210, -70, -55, 18]"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_nor4gIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_IuwMcH9cEeKUSOg4DHoPwA">
- <children xmi:type="notation:DecorationNode" xmi:id="_nor4g4AhEeKTe7ZOi8nJaA" type="6024">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nor4hIAhEeKTe7ZOi8nJaA" x="-19" y="29"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_nor4hYAhEeKTe7ZOi8nJaA" type="6035">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nor4hoAhEeKTe7ZOi8nJaA" x="-4" y="22"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_nor4gYAhEeKTe7ZOi8nJaA"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nor4h4AhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style">
- <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_nicGkIAhEeKTe7ZOi8nJaA"/>
- </styles>
- <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nor4goAhEeKTe7ZOi8nJaA" points="[0, 0, -663, -629]$[558, 530, -105, -99]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4osc4IAhEeKTe7ZOi8nJaA" id="(0.35,0.8)"/>
- </edges>
- </notation:Diagram>
- <notation:Diagram xmi:id="_GeJbwH9cEeKUSOg4DHoPwA" type="PapyrusUMLClassDiagram" name="ClassDiagram2" measurementUnit="Pixel">
- <styles xmi:type="notation:DiagramStyle" xmi:id="_GeJbwX9cEeKUSOg4DHoPwA"/>
- <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3wyowH9WEeKg8Ob6i-v52w"/>
- </notation:Diagram>
- <notation:Diagram xmi:id="_HGUPAH9cEeKUSOg4DHoPwA" type="PapyrusUMLClassDiagram" name="ClassDiagram1" measurementUnit="Pixel">
- <styles xmi:type="notation:DiagramStyle" xmi:id="_HGUPAX9cEeKUSOg4DHoPwA"/>
- <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3AS_8H9WEeKg8Ob6i-v52w"/>
- </notation:Diagram>
- <notation:Diagram xmi:id="_a0DxsH9sEeKFzdr7iEywzg" type="PapyrusUMLDeploymentDiagram" name="NewDeploymentDiagram" measurementUnit="Pixel">
- <styles xmi:type="notation:DiagramStyle" xmi:id="_a0DxsX9sEeKFzdr7iEywzg"/>
- <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3AS_8H9WEeKg8Ob6i-v52w"/>
- </notation:Diagram>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> + <notation:Diagram xmi:id="_7KiAcHxQEeKD0tnoPLkh-A" type="PapyrusUMLActivityDiagram" name="ActivityDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_7KiAcXxQEeKD0tnoPLkh-A" type="2001" fontName="Segoe UI" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAcnxQEeKD0tnoPLkh-A" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAc3xQEeKD0tnoPLkh-A" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAdHxQEeKD0tnoPLkh-A" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAdXxQEeKD0tnoPLkh-A" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAdnxQEeKD0tnoPLkh-A" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAd3xQEeKD0tnoPLkh-A" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_7KiAeHxQEeKD0tnoPLkh-A" type="5001"/> + <children xmi:type="notation:DecorationNode" xmi:id="_7KiAenxQEeKD0tnoPLkh-A" type="7001"> + <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAe3xQEeKD0tnoPLkh-A"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAfHxQEeKD0tnoPLkh-A"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAfXxQEeKD0tnoPLkh-A"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_7KiAfnxQEeKD0tnoPLkh-A" type="7002"> + <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAf3xQEeKD0tnoPLkh-A"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAgHxQEeKD0tnoPLkh-A"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAgXxQEeKD0tnoPLkh-A"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_7KiAgnxQEeKD0tnoPLkh-A" type="7003"> + <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAg3xQEeKD0tnoPLkh-A"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAhHxQEeKD0tnoPLkh-A"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAhXxQEeKD0tnoPLkh-A"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_7KiAhnxQEeKD0tnoPLkh-A" type="7004"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAh3xQEeKD0tnoPLkh-A"/> + </children> + <element xmi:type="uml:Activity" href="delete_contained_diagram.uml#_7Hjk8HxQEeKD0tnoPLkh-A"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAiHxQEeKD0tnoPLkh-A"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_7KiAiXxQEeKD0tnoPLkh-A"/> + <element xmi:type="uml:Activity" href="delete_contained_diagram.uml#_7Hjk8HxQEeKD0tnoPLkh-A"/> + </notation:Diagram> + <notation:Diagram xmi:id="_45GUoH9WEeKg8Ob6i-v52w" type="PapyrusUMLClassDiagram" name="ClassDiagram3" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_Itj5oH9cEeKUSOg4DHoPwA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_IttqoH9cEeKUSOg4DHoPwA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_IttqoX9cEeKUSOg4DHoPwA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IttqsH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IttqsX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/> + </eAnnotations> + <children xmi:type="notation:Shape" xmi:id="_nL9LIIAfEeKTe7ZOi8nJaA" type="3012"> + <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nDxfgIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_nL9LIYAfEeKTe7ZOi8nJaA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_nWEwcIAfEeKTe7ZOi8nJaA" type="3012"> + <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nVx1gIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_nWEwcYAfEeKTe7ZOi8nJaA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_ondf0IAfEeKTe7ZOi8nJaA" type="3012"> + <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_onKk4IAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_ondf0YAfEeKTe7ZOi8nJaA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_pUtAUIAfEeKTe7ZOi8nJaA" type="3012"> + <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pUQUYIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_pUtAUYAfEeKTe7ZOi8nJaA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_pcviAIAfEeKTe7ZOi8nJaA" type="3012"> + <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pcmYEIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_pcviAYAfEeKTe7ZOi8nJaA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_pozBAIAfEeKTe7ZOi8nJaA" type="3012"> + <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_poWVEIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_pozBAYAfEeKTe7ZOi8nJaA"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_Ittqon9cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_Ittqo39cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_IttqpH9cEeKUSOg4DHoPwA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IttqpX9cEeKUSOg4DHoPwA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Ittqpn9cEeKUSOg4DHoPwA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ittqsn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ittqs39cEeKUSOg4DHoPwA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_Ittqp39cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_IttqqH9cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_IttqqX9cEeKUSOg4DHoPwA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ittqqn9cEeKUSOg4DHoPwA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Ittqq39cEeKUSOg4DHoPwA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_It3boH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_It3boX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_IttqrH9cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_IttqrX9cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_Ittqrn9cEeKUSOg4DHoPwA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ittqr39cEeKUSOg4DHoPwA"/> + </children> + <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_8UYvwH9WEeKg8Ob6i-v52w"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Itj5oX9cEeKUSOg4DHoPwA" x="150" y="205"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_IuwMcH9cEeKUSOg4DHoPwA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_IuwMcn9cEeKUSOg4DHoPwA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMc39cEeKUSOg4DHoPwA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IuwMgn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IuwMg39cEeKUSOg4DHoPwA" key="showTitle" value="true"/> + </eAnnotations> + <children xmi:type="notation:Shape" xmi:id="_AfaMYIAgEeKTe7ZOi8nJaA" type="3012"> + <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nDxfgIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMYYAgEeKTe7ZOi8nJaA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_AfaMYoAgEeKTe7ZOi8nJaA" type="3012"> + <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nVx1gIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMY4AgEeKTe7ZOi8nJaA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_AfaMZIAgEeKTe7ZOi8nJaA" type="3012"> + <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pcmYEIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMZYAgEeKTe7ZOi8nJaA"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMdH9cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMdX9cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMdn9cEeKUSOg4DHoPwA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMd39cEeKUSOg4DHoPwA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMeH9cEeKUSOg4DHoPwA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IuwMhH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IuwMhX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/> + </eAnnotations> + <children xmi:type="notation:Shape" xmi:id="_raBuEIAfEeKTe7ZOi8nJaA" type="3013"> + <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rZlCIIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_raBuEYAfEeKTe7ZOi8nJaA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_reL1UIAfEeKTe7ZOi8nJaA" type="3013"> + <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rd46YIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_reL1UYAfEeKTe7ZOi8nJaA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_rizPkIAfEeKTe7ZOi8nJaA" type="3013"> + <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rigUoIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_rizPkYAfEeKTe7ZOi8nJaA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_roTaoIAfEeKTe7ZOi8nJaA" type="3013"> + <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_roAfsIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_roTaoYAfEeKTe7ZOi8nJaA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_rtNv0IAfEeKTe7ZOi8nJaA" type="3013"> + <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rs604IAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_rtNv0YAfEeKTe7ZOi8nJaA"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMeX9cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMen9cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMe39cEeKUSOg4DHoPwA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMfH9cEeKUSOg4DHoPwA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMfX9cEeKUSOg4DHoPwA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Iu59cH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Iu59cX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMfn9cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMf39cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMgH9cEeKUSOg4DHoPwA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMgX9cEeKUSOg4DHoPwA"/> + </children> + <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_9c2MoH9WEeKg8Ob6i-v52w"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMcX9cEeKUSOg4DHoPwA" x="490" y="530" width="336"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_IvWpYH9cEeKUSOg4DHoPwA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_IvWpYn9cEeKUSOg4DHoPwA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpY39cEeKUSOg4DHoPwA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpcn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpc39cEeKUSOg4DHoPwA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpZH9cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpZX9cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpZn9cEeKUSOg4DHoPwA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpZ39cEeKUSOg4DHoPwA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpaH9cEeKUSOg4DHoPwA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpdH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpdX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/> + </eAnnotations> + <children xmi:type="notation:Shape" xmi:id="_qycwsIAfEeKTe7ZOi8nJaA" type="3013"> + <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_qyAEwIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_qycwsYAfEeKTe7ZOi8nJaA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_rDHC4IAfEeKTe7ZOi8nJaA" type="3013"> + <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rC0H8IAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_rDHC4YAfEeKTe7ZOi8nJaA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_rILJEIAfEeKTe7ZOi8nJaA" type="3013"> + <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rHudIIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_rILJEYAfEeKTe7ZOi8nJaA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_rNE3MIAfEeKTe7ZOi8nJaA" type="3013"> + <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rMx8QIAfEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_rNE3MYAfEeKTe7ZOi8nJaA"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpaX9cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpan9cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpa39cEeKUSOg4DHoPwA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpbH9cEeKUSOg4DHoPwA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpbX9cEeKUSOg4DHoPwA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpdn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpd39cEeKUSOg4DHoPwA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpbn9cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpb39cEeKUSOg4DHoPwA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpcH9cEeKUSOg4DHoPwA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpcX9cEeKUSOg4DHoPwA"/> + </children> + <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_9q0-QH9WEeKg8Ob6i-v52w"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpYX9cEeKUSOg4DHoPwA" x="905" y="220"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_njLtcIAhEeKTe7ZOi8nJaA" type="2015"> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_njLtcYAhEeKTe7ZOi8nJaA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_njLtcoAhEeKTe7ZOi8nJaA"/> + <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_njLtdIAhEeKTe7ZOi8nJaA" x="645" y="285"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_45GUoX9WEeKg8Ob6i-v52w"/> + <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_4gjRwH9WEeKg8Ob6i-v52w"/> + <edges xmi:type="notation:Connector" xmi:id="_6tQAgIAfEeKTe7ZOi8nJaA" type="4002" source="_IuwMcH9cEeKUSOg4DHoPwA" target="_Itj5oH9cEeKUSOg4DHoPwA"> + <children xmi:type="notation:DecorationNode" xmi:id="_6tQAg4AfEeKTe7ZOi8nJaA" type="6007"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_6tQAhIAfEeKTe7ZOi8nJaA" y="40"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_6tQAgYAfEeKTe7ZOi8nJaA"/> + <element xmi:type="uml:Generalization" href="delete_contained_diagram.uml#_6sgZoIAfEeKTe7ZOi8nJaA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6tQAgoAfEeKTe7ZOi8nJaA" points="[-131, 0, 271, 215]$[-402, 0, 0, 215]$[-402, -192, 0, 23]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6wYNAIAfEeKTe7ZOi8nJaA" id="(0.3898809523809524,0.21875)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6wYNAYAfEeKTe7ZOi8nJaA" id="(0.3894736842105263,0.8693181818181818)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_nlQxEIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_Itj5oH9cEeKUSOg4DHoPwA"> + <children xmi:type="notation:DecorationNode" xmi:id="_nlQxE4AhEeKTe7ZOi8nJaA" type="6024"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_nlQxFIAhEeKTe7ZOi8nJaA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_nlQxFYAhEeKTe7ZOi8nJaA" type="6035"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_nlQxFoAhEeKTe7ZOi8nJaA" y="20"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_nlQxEYAhEeKTe7ZOi8nJaA"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nmv-0IAhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style"> + <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_mxWA1IAhEeKTe7ZOi8nJaA"/> + </styles> + <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nlQxEoAhEeKTe7ZOi8nJaA" points="[0, 0, -245, -293]$[171, 205, -74, -88]"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_noY9kIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_IvWpYH9cEeKUSOg4DHoPwA"> + <children xmi:type="notation:DecorationNode" xmi:id="_noY9k4AhEeKTe7ZOi8nJaA" type="6024"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_noY9lIAhEeKTe7ZOi8nJaA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_noY9lYAhEeKTe7ZOi8nJaA" type="6035"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_noY9loAhEeKTe7ZOi8nJaA" y="20"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_noY9kYAhEeKTe7ZOi8nJaA"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_noY9l4AhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style"> + <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_mxWA0IAhEeKTe7ZOi8nJaA"/> + </styles> + <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_noY9koAhEeKTe7ZOi8nJaA" points="[7, -3, -258, 85]$[210, -70, -55, 18]"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_nor4gIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_IuwMcH9cEeKUSOg4DHoPwA"> + <children xmi:type="notation:DecorationNode" xmi:id="_nor4g4AhEeKTe7ZOi8nJaA" type="6024"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_nor4hIAhEeKTe7ZOi8nJaA" x="-19" y="29"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_nor4hYAhEeKTe7ZOi8nJaA" type="6035"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_nor4hoAhEeKTe7ZOi8nJaA" x="-4" y="22"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_nor4gYAhEeKTe7ZOi8nJaA"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nor4h4AhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style"> + <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_nicGkIAhEeKTe7ZOi8nJaA"/> + </styles> + <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nor4goAhEeKTe7ZOi8nJaA" points="[0, 0, -663, -629]$[558, 530, -105, -99]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4osc4IAhEeKTe7ZOi8nJaA" id="(0.35,0.8)"/> + </edges> + </notation:Diagram> + <notation:Diagram xmi:id="_GeJbwH9cEeKUSOg4DHoPwA" type="PapyrusUMLClassDiagram" name="ClassDiagram2" measurementUnit="Pixel"> + <styles xmi:type="notation:DiagramStyle" xmi:id="_GeJbwX9cEeKUSOg4DHoPwA"/> + <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3wyowH9WEeKg8Ob6i-v52w"/> + </notation:Diagram> + <notation:Diagram xmi:id="_HGUPAH9cEeKUSOg4DHoPwA" type="PapyrusUMLClassDiagram" name="ClassDiagram1" measurementUnit="Pixel"> + <styles xmi:type="notation:DiagramStyle" xmi:id="_HGUPAX9cEeKUSOg4DHoPwA"/> + <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3AS_8H9WEeKg8Ob6i-v52w"/> + </notation:Diagram> + <notation:Diagram xmi:id="_a0DxsH9sEeKFzdr7iEywzg" type="PapyrusUMLDeploymentDiagram" name="NewDeploymentDiagram" measurementUnit="Pixel"> + <styles xmi:type="notation:DiagramStyle" xmi:id="_a0DxsX9sEeKFzdr7iEywzg"/> + <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3AS_8H9WEeKg8Ob6i-v52w"/> + </notation:Diagram> +</xmi:XMI> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.uml index b535fe817da..41d2a331cba 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.uml @@ -1,49 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_0VtdsHxQEeKD0tnoPLkh-A" name="model">
- <packagedElement xmi:type="uml:Activity" xmi:id="_7Hjk8HxQEeKD0tnoPLkh-A" name="Activity1"/>
- <packagedElement xmi:type="uml:Package" xmi:id="_3AS_8H9WEeKg8Ob6i-v52w" name="Package1">
- <packagedElement xmi:type="uml:Package" xmi:id="_3wyowH9WEeKg8Ob6i-v52w" name="Package2">
- <packagedElement xmi:type="uml:Package" xmi:id="_4gjRwH9WEeKg8Ob6i-v52w" name="Package3">
- <packagedElement xmi:type="uml:Class" xmi:id="_8UYvwH9WEeKg8Ob6i-v52w" name="Class1">
- <ownedAttribute xmi:type="uml:Property" xmi:id="_nDxfgIAfEeKTe7ZOi8nJaA" name="Attribute1"/>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_nVx1gIAfEeKTe7ZOi8nJaA" name="Attribute2"/>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_onKk4IAfEeKTe7ZOi8nJaA" name="Attribute3"/>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_pUQUYIAfEeKTe7ZOi8nJaA" name="Attribute4"/>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_pcmYEIAfEeKTe7ZOi8nJaA" name="Attribute5"/>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_poWVEIAfEeKTe7ZOi8nJaA" name="Attribute6"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_8cIWgH9WEeKg8Ob6i-v52w" name="Class2"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_9c2MoH9WEeKg8Ob6i-v52w" name="Class3">
- <generalization xmi:type="uml:Generalization" xmi:id="_6sgZoIAfEeKTe7ZOi8nJaA" general="_8UYvwH9WEeKg8Ob6i-v52w"/>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_rZlCIIAfEeKTe7ZOi8nJaA" name="Operation1"/>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_rd46YIAfEeKTe7ZOi8nJaA" name="Operation2"/>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_rigUoIAfEeKTe7ZOi8nJaA" name="Operation3"/>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_roAfsIAfEeKTe7ZOi8nJaA" name="Operation4"/>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_rs604IAfEeKTe7ZOi8nJaA" name="Operation5"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_9d4ucH9WEeKg8Ob6i-v52w" name="Class4"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_9exfQH9WEeKg8Ob6i-v52w" name="Class5"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_9q0-QH9WEeKg8Ob6i-v52w" name="Class6">
- <ownedOperation xmi:type="uml:Operation" xmi:id="_qyAEwIAfEeKTe7ZOi8nJaA" name="Operation1"/>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_rC0H8IAfEeKTe7ZOi8nJaA" name="Operation2"/>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_rHudIIAfEeKTe7ZOi8nJaA" name="Operation3"/>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_rMx8QIAfEeKTe7ZOi8nJaA" name="Operation4"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_mxWA04AhEeKTe7ZOi8nJaA" name="class1_class6_1" memberEnd="_mxWA1IAhEeKTe7ZOi8nJaA _mxWA0IAhEeKTe7ZOi8nJaA _nicGkIAhEeKTe7ZOi8nJaA">
- <ownedEnd xmi:type="uml:Property" xmi:id="_mxWA1IAhEeKTe7ZOi8nJaA" name="class1" type="_8UYvwH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mxWA1YAhEeKTe7ZOi8nJaA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mxWA1oAhEeKTe7ZOi8nJaA" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:type="uml:Property" xmi:id="_mxWA0IAhEeKTe7ZOi8nJaA" name="class6" type="_9q0-QH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mxWA0YAhEeKTe7ZOi8nJaA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mxWA0oAhEeKTe7ZOi8nJaA" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:type="uml:Property" xmi:id="_nicGkIAhEeKTe7ZOi8nJaA" name="Class3" type="_9c2MoH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nilQgIAhEeKTe7ZOi8nJaA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nivBgIAhEeKTe7ZOi8nJaA" value="1"/>
- </ownedEnd>
- </packagedElement>
- </packagedElement>
- </packagedElement>
- </packagedElement>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_0VtdsHxQEeKD0tnoPLkh-A" name="model"> + <packagedElement xmi:type="uml:Activity" xmi:id="_7Hjk8HxQEeKD0tnoPLkh-A" name="Activity1"/> + <packagedElement xmi:type="uml:Package" xmi:id="_3AS_8H9WEeKg8Ob6i-v52w" name="Package1"> + <packagedElement xmi:type="uml:Package" xmi:id="_3wyowH9WEeKg8Ob6i-v52w" name="Package2"> + <packagedElement xmi:type="uml:Package" xmi:id="_4gjRwH9WEeKg8Ob6i-v52w" name="Package3"> + <packagedElement xmi:type="uml:Class" xmi:id="_8UYvwH9WEeKg8Ob6i-v52w" name="Class1"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_nDxfgIAfEeKTe7ZOi8nJaA" name="Attribute1"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_nVx1gIAfEeKTe7ZOi8nJaA" name="Attribute2"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_onKk4IAfEeKTe7ZOi8nJaA" name="Attribute3"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_pUQUYIAfEeKTe7ZOi8nJaA" name="Attribute4"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_pcmYEIAfEeKTe7ZOi8nJaA" name="Attribute5"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_poWVEIAfEeKTe7ZOi8nJaA" name="Attribute6"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_8cIWgH9WEeKg8Ob6i-v52w" name="Class2"/> + <packagedElement xmi:type="uml:Class" xmi:id="_9c2MoH9WEeKg8Ob6i-v52w" name="Class3"> + <generalization xmi:type="uml:Generalization" xmi:id="_6sgZoIAfEeKTe7ZOi8nJaA" general="_8UYvwH9WEeKg8Ob6i-v52w"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_rZlCIIAfEeKTe7ZOi8nJaA" name="Operation1"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_rd46YIAfEeKTe7ZOi8nJaA" name="Operation2"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_rigUoIAfEeKTe7ZOi8nJaA" name="Operation3"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_roAfsIAfEeKTe7ZOi8nJaA" name="Operation4"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_rs604IAfEeKTe7ZOi8nJaA" name="Operation5"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_9d4ucH9WEeKg8Ob6i-v52w" name="Class4"/> + <packagedElement xmi:type="uml:Class" xmi:id="_9exfQH9WEeKg8Ob6i-v52w" name="Class5"/> + <packagedElement xmi:type="uml:Class" xmi:id="_9q0-QH9WEeKg8Ob6i-v52w" name="Class6"> + <ownedOperation xmi:type="uml:Operation" xmi:id="_qyAEwIAfEeKTe7ZOi8nJaA" name="Operation1"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_rC0H8IAfEeKTe7ZOi8nJaA" name="Operation2"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_rHudIIAfEeKTe7ZOi8nJaA" name="Operation3"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_rMx8QIAfEeKTe7ZOi8nJaA" name="Operation4"/> + </packagedElement> + <packagedElement xmi:type="uml:Association" xmi:id="_mxWA04AhEeKTe7ZOi8nJaA" name="class1_class6_1" memberEnd="_mxWA1IAhEeKTe7ZOi8nJaA _mxWA0IAhEeKTe7ZOi8nJaA _nicGkIAhEeKTe7ZOi8nJaA"> + <ownedEnd xmi:type="uml:Property" xmi:id="_mxWA1IAhEeKTe7ZOi8nJaA" name="class1" type="_8UYvwH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mxWA1YAhEeKTe7ZOi8nJaA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mxWA1oAhEeKTe7ZOi8nJaA" value="1"/> + </ownedEnd> + <ownedEnd xmi:type="uml:Property" xmi:id="_mxWA0IAhEeKTe7ZOi8nJaA" name="class6" type="_9q0-QH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mxWA0YAhEeKTe7ZOi8nJaA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mxWA0oAhEeKTe7ZOi8nJaA" value="1"/> + </ownedEnd> + <ownedEnd xmi:type="uml:Property" xmi:id="_nicGkIAhEeKTe7ZOi8nJaA" name="Class3" type="_9c2MoH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nilQgIAhEeKTe7ZOi8nJaA"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nivBgIAhEeKTe7ZOi8nJaA" value="1"/> + </ownedEnd> + </packagedElement> + </packagedElement> + </packagedElement> + </packagedElement> +</uml:Model> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.di index 2c53cfcf529..2c53cfcf529 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.di diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.notation index 8e19ab5e0ce..8e19ab5e0ce 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.notation diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.uml index ca30b5e89de..ca30b5e89de 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.uml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.di index 1fcb63b602c..ec515781fcd 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.di @@ -1,15 +1,15 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <sashModel>
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="delete_sash_page.notation#_simUYNVWEeOoXOFyw97Vng"/>
- </children>
- <children>
- <emfPageIdentifier href="delete_sash_page.notation#_yjT5oNVWEeOoXOFyw97Vng"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="UTF-8"?> +<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> + <sashModel> + <windows> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="delete_sash_page.notation#_simUYNVWEeOoXOFyw97Vng"/> + </children> + <children> + <emfPageIdentifier href="delete_sash_page.notation#_yjT5oNVWEeOoXOFyw97Vng"/> + </children> + </children> + </windows> + </sashModel> +</di:SashWindowsMngr> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.notation index f69e268e509..f69e268e509 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.notation diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.uml index 7aa02902acd..7aa02902acd 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.uml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.di index 67cd21c0e77..9bddb6f752a 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.di @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="ASCII"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList/>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder"/>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="ASCII"?> +<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> + <pageList/> + <sashModel currentSelection="//@sashModel/@windows.0/@children.0"> + <windows> + <children xsi:type="di:TabFolder"/> + </windows> + </sashModel> +</di:SashWindowsMngr> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.notation index bf9abab340f..bf9abab340f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.notation diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.uml index 5ec8003b419..9cda1ff90d3 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.uml @@ -1,2 +1,2 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_uTjBgHqQEeK9jI2Tc6HWsA" name="model"/>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_uTjBgHqQEeK9jI2Tc6HWsA" name="model"/> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.di index f3567829b33..a0c464641d4 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.di @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="ASCII"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage>
- <emfPageIdentifier href="simple_class_model.notation#_1xkSQHqQEeK9jI2Tc6HWsA"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="simple_class_model.notation#_1xkSQHqQEeK9jI2Tc6HWsA"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="ASCII"?> +<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> + <pageList> + <availablePage> + <emfPageIdentifier href="simple_class_model.notation#_1xkSQHqQEeK9jI2Tc6HWsA"/> + </availablePage> + </pageList> + <sashModel currentSelection="//@sashModel/@windows.0/@children.0"> + <windows> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="simple_class_model.notation#_1xkSQHqQEeK9jI2Tc6HWsA"/> + </children> + </children> + </windows> + </sashModel> +</di:SashWindowsMngr> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.notation index ecef23e3362..e6d14315d3f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.notation @@ -1,93 +1,93 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_1xkSQHqQEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_2WT-EHqQEeK9jI2Tc6HWsA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_2WdvEHqQEeK9jI2Tc6HWsA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvEXqQEeK9jI2Tc6HWsA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvIHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvIXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvEnqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvE3qQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvFHqQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvFXqQEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvFnqQEeK9jI2Tc6HWsA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvInqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvI3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvF3qQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvGHqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvGXqQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvGnqQEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvG3qQEeK9jI2Tc6HWsA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvJHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvJXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvHHqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvHXqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvHnqQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvH3qQEeK9jI2Tc6HWsA"/>
- </children>
- <element xmi:type="uml:Class" href="simple_class_model.uml#_2O35UHqQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WT-EXqQEeK9jI2Tc6HWsA" x="290" y="270"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_3N8wsHqQEeK9jI2Tc6HWsA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_3N8wsnqQEeK9jI2Tc6HWsA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_3N8ws3qQEeK9jI2Tc6HWsA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wwnqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8ww3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wtHqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wtXqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wtnqQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wt3qQEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_3N8wuHqQEeK9jI2Tc6HWsA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wxHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8wxXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wuXqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wunqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wu3qQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wvHqQEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_3N8wvXqQEeK9jI2Tc6HWsA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wxnqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8wx3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wvnqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wv3qQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wwHqQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wwXqQEeK9jI2Tc6HWsA"/>
- </children>
- <element xmi:type="uml:Class" href="simple_class_model.uml#_3Np1wHqQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wsXqQEeK9jI2Tc6HWsA" x="840" y="270"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_1xkSQXqQEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Model" href="simple_class_model.uml#_1w91UHqQEeK9jI2Tc6HWsA"/>
- <edges xmi:type="notation:Connector" xmi:id="_4hkUsHqQEeK9jI2Tc6HWsA" type="4001" source="_2WT-EHqQEeK9jI2Tc6HWsA" target="_3N8wsHqQEeK9jI2Tc6HWsA">
- <children xmi:type="notation:DecorationNode" xmi:id="_4hkUs3qQEeK9jI2Tc6HWsA" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUtHqQEeK9jI2Tc6HWsA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_4hkUtXqQEeK9jI2Tc6HWsA" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUtnqQEeK9jI2Tc6HWsA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_4hkUt3qQEeK9jI2Tc6HWsA" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUuHqQEeK9jI2Tc6HWsA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_4hkUuXqQEeK9jI2Tc6HWsA" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUunqQEeK9jI2Tc6HWsA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_4hkUu3qQEeK9jI2Tc6HWsA" type="6033">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUvHqQEeK9jI2Tc6HWsA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_4hkUvXqQEeK9jI2Tc6HWsA" type="6034">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUvnqQEeK9jI2Tc6HWsA" y="-20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_4hkUsXqQEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Association" href="simple_class_model.uml#_4hHowHqQEeK9jI2Tc6HWsA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4hkUsnqQEeK9jI2Tc6HWsA" points="[77, -1, -567, -9]$[645, -42, 1, -50]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4nEfwHqQEeK9jI2Tc6HWsA" id="(0.23,0.45)"/>
- </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_1xkSQHqQEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_2WT-EHqQEeK9jI2Tc6HWsA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_2WdvEHqQEeK9jI2Tc6HWsA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvEXqQEeK9jI2Tc6HWsA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvIHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvIXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvEnqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvE3qQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvFHqQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvFXqQEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvFnqQEeK9jI2Tc6HWsA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvInqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvI3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvF3qQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvGHqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvGXqQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvGnqQEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvG3qQEeK9jI2Tc6HWsA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvJHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvJXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvHHqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvHXqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvHnqQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvH3qQEeK9jI2Tc6HWsA"/> + </children> + <element xmi:type="uml:Class" href="simple_class_model.uml#_2O35UHqQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WT-EXqQEeK9jI2Tc6HWsA" x="290" y="270"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_3N8wsHqQEeK9jI2Tc6HWsA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_3N8wsnqQEeK9jI2Tc6HWsA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_3N8ws3qQEeK9jI2Tc6HWsA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wwnqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8ww3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wtHqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wtXqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wtnqQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wt3qQEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_3N8wuHqQEeK9jI2Tc6HWsA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wxHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8wxXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wuXqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wunqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wu3qQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wvHqQEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_3N8wvXqQEeK9jI2Tc6HWsA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wxnqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8wx3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wvnqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wv3qQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wwHqQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wwXqQEeK9jI2Tc6HWsA"/> + </children> + <element xmi:type="uml:Class" href="simple_class_model.uml#_3Np1wHqQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wsXqQEeK9jI2Tc6HWsA" x="840" y="270"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_1xkSQXqQEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Model" href="simple_class_model.uml#_1w91UHqQEeK9jI2Tc6HWsA"/> + <edges xmi:type="notation:Connector" xmi:id="_4hkUsHqQEeK9jI2Tc6HWsA" type="4001" source="_2WT-EHqQEeK9jI2Tc6HWsA" target="_3N8wsHqQEeK9jI2Tc6HWsA"> + <children xmi:type="notation:DecorationNode" xmi:id="_4hkUs3qQEeK9jI2Tc6HWsA" type="6001"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUtHqQEeK9jI2Tc6HWsA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_4hkUtXqQEeK9jI2Tc6HWsA" type="6002"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUtnqQEeK9jI2Tc6HWsA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_4hkUt3qQEeK9jI2Tc6HWsA" type="6003"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUuHqQEeK9jI2Tc6HWsA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_4hkUuXqQEeK9jI2Tc6HWsA" type="6005"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUunqQEeK9jI2Tc6HWsA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_4hkUu3qQEeK9jI2Tc6HWsA" type="6033"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUvHqQEeK9jI2Tc6HWsA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_4hkUvXqQEeK9jI2Tc6HWsA" type="6034"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUvnqQEeK9jI2Tc6HWsA" y="-20"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_4hkUsXqQEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Association" href="simple_class_model.uml#_4hHowHqQEeK9jI2Tc6HWsA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4hkUsnqQEeK9jI2Tc6HWsA" points="[77, -1, -567, -9]$[645, -42, 1, -50]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4nEfwHqQEeK9jI2Tc6HWsA" id="(0.23,0.45)"/> + </edges> +</notation:Diagram> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.uml index 6df52ae038f..dd30e382016 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.uml @@ -1,16 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_1w91UHqQEeK9jI2Tc6HWsA" name="Model">
- <packagedElement xmi:type="uml:Class" xmi:id="_2O35UHqQEeK9jI2Tc6HWsA" name="Class1">
- <ownedAttribute xmi:id="_4g93wHqQEeK9jI2Tc6HWsA" name="class2" type="_3Np1wHqQEeK9jI2Tc6HWsA" association="_4hHowHqQEeK9jI2Tc6HWsA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4g93wXqQEeK9jI2Tc6HWsA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4g93wnqQEeK9jI2Tc6HWsA" value="1"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_3Np1wHqQEeK9jI2Tc6HWsA" name="Class2"/>
- <packagedElement xmi:type="uml:Association" xmi:id="_4hHowHqQEeK9jI2Tc6HWsA" name="class1_class2_1" memberEnd="_4hHowXqQEeK9jI2Tc6HWsA _4g93wHqQEeK9jI2Tc6HWsA">
- <ownedEnd xmi:id="_4hHowXqQEeK9jI2Tc6HWsA" name="class1" type="_2O35UHqQEeK9jI2Tc6HWsA" association="_4hHowHqQEeK9jI2Tc6HWsA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4hHownqQEeK9jI2Tc6HWsA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4hHow3qQEeK9jI2Tc6HWsA" value="1"/>
- </ownedEnd>
- </packagedElement>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_1w91UHqQEeK9jI2Tc6HWsA" name="Model"> + <packagedElement xmi:type="uml:Class" xmi:id="_2O35UHqQEeK9jI2Tc6HWsA" name="Class1"> + <ownedAttribute xmi:id="_4g93wHqQEeK9jI2Tc6HWsA" name="class2" type="_3Np1wHqQEeK9jI2Tc6HWsA" association="_4hHowHqQEeK9jI2Tc6HWsA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4g93wXqQEeK9jI2Tc6HWsA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4g93wnqQEeK9jI2Tc6HWsA" value="1"/> + </ownedAttribute> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_3Np1wHqQEeK9jI2Tc6HWsA" name="Class2"/> + <packagedElement xmi:type="uml:Association" xmi:id="_4hHowHqQEeK9jI2Tc6HWsA" name="class1_class2_1" memberEnd="_4hHowXqQEeK9jI2Tc6HWsA _4g93wHqQEeK9jI2Tc6HWsA"> + <ownedEnd xmi:id="_4hHowXqQEeK9jI2Tc6HWsA" name="class1" type="_2O35UHqQEeK9jI2Tc6HWsA" association="_4hHowHqQEeK9jI2Tc6HWsA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4hHownqQEeK9jI2Tc6HWsA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4hHow3qQEeK9jI2Tc6HWsA" value="1"/> + </ownedEnd> + </packagedElement> +</uml:Model> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.di index 0dd660346e0..f984b86c331 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.di @@ -1,193 +1,193 @@ -<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2">
- <di:SashWindowsMngr>
- <pageList>
- <availablePage emfPageIdentifier="/1"/>
- </pageList>
- <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children emfPageIdentifier="/1"/>
- </children>
- </windows>
- </sashModel>
- </di:SashWindowsMngr>
- <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/>
- <tableinstance2:TableInstance2 description="Table Description">
- <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>
- <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>
- <customizations href="#/2/@localCustomizations.1"/>
- <customizations href="#/2/@localCustomizations.0"/>
- <context href="simple_table_model.uml#_a4aMkHqSEeK9jI2Tc6HWsA"/>
- <columns xsi:type="tableinstance:DefaultLabelColumn"/>
- <columns xsi:type="tableinstance:MetaClassColumn"/>
- <columns xsi:type="tableinstance:EContainerColumn"/>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>
- </columns>
- <rows>
- <element href="simple_table_model.uml#_exmrsHqSEeK9jI2Tc6HWsA"/>
- </rows>
- <rows>
- <element href="simple_table_model.uml#_f9eo8HqSEeK9jI2Tc6HWsA"/>
- </rows>
- <rows>
- <element href="simple_table_model.uml#_ge8-UHqSEeK9jI2Tc6HWsA"/>
- </rows>
- <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>
- <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>
- </tableinstance2:TableInstance2>
-</xmi:XMI>
+<?xml version="1.0" encoding="ASCII"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"> + <di:SashWindowsMngr> + <pageList> + <availablePage emfPageIdentifier="/1"/> + </pageList> + <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0"> + <windows> + <children xsi:type="di:TabFolder"> + <children emfPageIdentifier="/1"/> + </children> + </windows> + </sashModel> + </di:SashWindowsMngr> + <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/> + <tableinstance2:TableInstance2 description="Table Description"> + <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/> + <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/> + <customizations href="#/2/@localCustomizations.1"/> + <customizations href="#/2/@localCustomizations.0"/> + <context href="simple_table_model.uml#_a4aMkHqSEeK9jI2Tc6HWsA"/> + <columns xsi:type="tableinstance:DefaultLabelColumn"/> + <columns xsi:type="tableinstance:MetaClassColumn"/> + <columns xsi:type="tableinstance:EContainerColumn"/> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/> + </columns> + <rows> + <element href="simple_table_model.uml#_exmrsHqSEeK9jI2Tc6HWsA"/> + </rows> + <rows> + <element href="simple_table_model.uml#_f9eo8HqSEeK9jI2Tc6HWsA"/> + </rows> + <rows> + <element href="simple_table_model.uml#_ge8-UHqSEeK9jI2Tc6HWsA"/> + </rows> + <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/> + <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/> + </tableinstance2:TableInstance2> +</xmi:XMI> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.notation index 8634d4c00e0..bf9abab340f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.notation @@ -1,2 +1,2 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.uml index 81b5d6837d8..89a192bff5a 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.uml @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_a4aMkHqSEeK9jI2Tc6HWsA" name="model">
- <packagedElement xmi:type="uml:Class" xmi:id="_exmrsHqSEeK9jI2Tc6HWsA" name="Class1" visibility="private"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_f9eo8HqSEeK9jI2Tc6HWsA" name="Class2" isActive="true"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_ge8-UHqSEeK9jI2Tc6HWsA" name="Class3" isAbstract="true"/>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_a4aMkHqSEeK9jI2Tc6HWsA" name="model"> + <packagedElement xmi:type="uml:Class" xmi:id="_exmrsHqSEeK9jI2Tc6HWsA" name="Class1" visibility="private"/> + <packagedElement xmi:type="uml:Class" xmi:id="_f9eo8HqSEeK9jI2Tc6HWsA" name="Class2" isActive="true"/> + <packagedElement xmi:type="uml:Class" xmi:id="_ge8-UHqSEeK9jI2Tc6HWsA" name="Class3" isAbstract="true"/> +</uml:Model> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.di index 3db5ff676fa..4ce4e686639 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.di @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage>
- <emfPageIdentifier href="simple_uml_generic_table_model.notation#_5NSlgNm3EeKhMIaB2_NRKQ"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="simple_uml_generic_table_model.notation#_5NSlgNm3EeKhMIaB2_NRKQ"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="UTF-8"?> +<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> + <pageList> + <availablePage> + <emfPageIdentifier href="simple_uml_generic_table_model.notation#_5NSlgNm3EeKhMIaB2_NRKQ"/> + </availablePage> + </pageList> + <sashModel currentSelection="//@sashModel/@windows.0/@children.0"> + <windows> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="simple_uml_generic_table_model.notation#_5NSlgNm3EeKhMIaB2_NRKQ"/> + </children> + </children> + </windows> + </sashModel> +</di:SashWindowsMngr> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.notation index 2b17a5a95b8..f9ff8f7b201 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.notation @@ -1,125 +1,125 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<nattable:Table 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:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_5NSlgNm3EeKhMIaB2_NRKQ" name="GenericTable0" currentRowAxisProvider="_5NSlgtm3EeKhMIaB2_NRKQ" currentColumnAxisProvider="_5NSlgdm3EeKhMIaB2_NRKQ">
- <context xmi:type="uml:Model" href="simple_uml_generic_table_model.uml#_4fBKQNm3EeKhMIaB2_NRKQ"/>
- <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
- <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_5NSlgdm3EeKhMIaB2_NRKQ" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI8dm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI8tm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI89m3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/nestedPackage"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI9Nm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI9dm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/packageMerge"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI9tm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI99m3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-Nm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-dm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/ownedStereotype"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-tm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-9m3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_Nm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_dm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Model/viewpoint"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_tm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_9m3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJANm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJAdm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/profileApplication"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJAtm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/nestingPackage"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJA9m3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/ownedType"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJBNm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJBdm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJBtm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJB9m3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJCNm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJCdm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJCtm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/packagedElement"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJC9m3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJDNm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
- </axis>
- </columnAxisProvidersHistory>
- <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_5NSlgtm3EeKhMIaB2_NRKQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">
- <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_5ohI8Nm3EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="uml:Model" href="simple_uml_generic_table_model.uml#_4fBKQNm3EeKhMIaB2_NRKQ"/>
- </axis>
- </rowAxisProvidersHistory>
-</nattable:Table>
+<?xml version="1.0" encoding="UTF-8"?> +<nattable:Table 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:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_5NSlgNm3EeKhMIaB2_NRKQ" name="GenericTable0" currentRowAxisProvider="_5NSlgtm3EeKhMIaB2_NRKQ" currentColumnAxisProvider="_5NSlgdm3EeKhMIaB2_NRKQ"> + <context xmi:type="uml:Model" href="simple_uml_generic_table_model.uml#_4fBKQNm3EeKhMIaB2_NRKQ"/> + <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/> + <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_5NSlgdm3EeKhMIaB2_NRKQ" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider"> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI8dm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI8tm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI89m3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/nestedPackage"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI9Nm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI9dm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/packageMerge"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI9tm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI99m3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-Nm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-dm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/ownedStereotype"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-tm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-9m3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_Nm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_dm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Model/viewpoint"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_tm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_9m3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJANm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJAdm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/profileApplication"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJAtm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/nestingPackage"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJA9m3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/ownedType"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJBNm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJBdm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJBtm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJB9m3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJCNm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJCdm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJCtm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/packagedElement"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJC9m3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJDNm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/> + </axis> + </columnAxisProvidersHistory> + <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_5NSlgtm3EeKhMIaB2_NRKQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider"> + <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_5ohI8Nm3EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="uml:Model" href="simple_uml_generic_table_model.uml#_4fBKQNm3EeKhMIaB2_NRKQ"/> + </axis> + </rowAxisProvidersHistory> +</nattable:Table> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.uml index 7e87e564867..195a0e80b5f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.uml @@ -1,2 +1,2 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_4fBKQNm3EeKhMIaB2_NRKQ" name="model"/>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_4fBKQNm3EeKhMIaB2_NRKQ" name="model"/> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/table.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/table.di index 0eab39cbb9c..0eab39cbb9c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/table.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/table.di diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/table.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/table.notation index 8ce107d34ff..8ce107d34ff 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/table.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/table.notation diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/table.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/table.uml index 715500c8abc..715500c8abc 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/table.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/table.uml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.di index 9df9758558f..cf4c7e491ce 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.di @@ -1,20 +1,20 @@ -<?xml version="1.0" encoding="ASCII"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage>
- <emfPageIdentifier href="two_diagrams_model.notation#_-qtdMXqQEeK9jI2Tc6HWsA"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="two_diagrams_model.notation#_-q3OMHqQEeK9jI2Tc6HWsA"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="two_diagrams_model.notation#_-qtdMXqQEeK9jI2Tc6HWsA"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="ASCII"?> +<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> + <pageList> + <availablePage> + <emfPageIdentifier href="two_diagrams_model.notation#_-qtdMXqQEeK9jI2Tc6HWsA"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="two_diagrams_model.notation#_-q3OMHqQEeK9jI2Tc6HWsA"/> + </availablePage> + </pageList> + <sashModel currentSelection="//@sashModel/@windows.0/@children.0"> + <windows> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="two_diagrams_model.notation#_-qtdMXqQEeK9jI2Tc6HWsA"/> + </children> + </children> + </windows> + </sashModel> +</di:SashWindowsMngr> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.notation index bae83b041b3..447b1891da3 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.notation @@ -1,16 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
- <notation:Diagram xmi:id="_-qtdMXqQEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_AR9H0HqREeK9jI2Tc6HWsA" type="2012">
- <children xmi:type="notation:DecorationNode" xmi:id="_AR9H0nqREeK9jI2Tc6HWsA" type="5038"/>
- <element xmi:type="uml:Comment" href="two_diagrams_model.uml#_ARNg8HqREeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AR9H0XqREeK9jI2Tc6HWsA" x="200" y="105" width="446" height="141"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_-qtdMnqQEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Model" href="two_diagrams_model.uml#_-qtdMHqQEeK9jI2Tc6HWsA"/>
- </notation:Diagram>
- <notation:Diagram xmi:id="_-q3OMHqQEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="NewDiagram" measurementUnit="Pixel">
- <styles xmi:type="notation:DiagramStyle" xmi:id="_-q3OMXqQEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Model" href="two_diagrams_model.uml#_-qtdMHqQEeK9jI2Tc6HWsA"/>
- </notation:Diagram>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> + <notation:Diagram xmi:id="_-qtdMXqQEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_AR9H0HqREeK9jI2Tc6HWsA" type="2012"> + <children xmi:type="notation:DecorationNode" xmi:id="_AR9H0nqREeK9jI2Tc6HWsA" type="5038"/> + <element xmi:type="uml:Comment" href="two_diagrams_model.uml#_ARNg8HqREeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AR9H0XqREeK9jI2Tc6HWsA" x="200" y="105" width="446" height="141"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_-qtdMnqQEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Model" href="two_diagrams_model.uml#_-qtdMHqQEeK9jI2Tc6HWsA"/> + </notation:Diagram> + <notation:Diagram xmi:id="_-q3OMHqQEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="NewDiagram" measurementUnit="Pixel"> + <styles xmi:type="notation:DiagramStyle" xmi:id="_-q3OMXqQEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Model" href="two_diagrams_model.uml#_-qtdMHqQEeK9jI2Tc6HWsA"/> + </notation:Diagram> +</xmi:XMI> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.uml index bddffd2337e..7b08dbe5e96 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.uml @@ -1,12 +1,12 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_-qtdMHqQEeK9jI2Tc6HWsA" name="model">
- <ownedComment xmi:id="_ARNg8HqREeK9jI2Tc6HWsA" annotatedElement="_-qtdMHqQEeK9jI2Tc6HWsA">
- <body>This model contains two diagrams. The Class Diagram is opened, while the timing diagram is closed.
-
-Expected behavior:
-
- - allPages() contains two entries
- - activeEditor is a UML Class Diagram Editor
- - activePage() is a Class Diagram</body>
- </ownedComment>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_-qtdMHqQEeK9jI2Tc6HWsA" name="model"> + <ownedComment xmi:id="_ARNg8HqREeK9jI2Tc6HWsA" annotatedElement="_-qtdMHqQEeK9jI2Tc6HWsA"> + <body>This model contains two diagrams. The Class Diagram is opened, while the timing diagram is closed.
 +
 +Expected behavior:
 +
 + - allPages() contains two entries
 + - activeEditor is a UML Class Diagram Editor
 + - activePage() is a Class Diagram</body> + </ownedComment> +</uml:Model> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.di index 90a18ab0720..47afbb32acf 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.di @@ -1,20 +1,20 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage>
- <emfPageIdentifier href="two_tables_model.notation#_uNjMYNm1EeKhMIaB2_NRKQ"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="two_tables_model.notation#_usfyMNm1EeKhMIaB2_NRKQ"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="two_tables_model.notation#_uNjMYNm1EeKhMIaB2_NRKQ"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="UTF-8"?> +<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> + <pageList> + <availablePage> + <emfPageIdentifier href="two_tables_model.notation#_uNjMYNm1EeKhMIaB2_NRKQ"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="two_tables_model.notation#_usfyMNm1EeKhMIaB2_NRKQ"/> + </availablePage> + </pageList> + <sashModel currentSelection="//@sashModel/@windows.0/@children.0"> + <windows> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="two_tables_model.notation#_uNjMYNm1EeKhMIaB2_NRKQ"/> + </children> + </children> + </windows> + </sashModel> +</di:SashWindowsMngr> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.notation index 1edb6f4bc90..044d61cfeaf 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.notation @@ -1,54 +1,54 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration">
- <nattable:Table xmi:id="_uNjMYNm1EeKhMIaB2_NRKQ" name="GenericTable0" currentRowAxisProvider="_uNjMYtm1EeKhMIaB2_NRKQ" currentColumnAxisProvider="_uNjMYdm1EeKhMIaB2_NRKQ">
- <context xmi:type="uml:Model" href="two_tables_model.uml#_WYKr5Nm1EeKhMIaB2_NRKQ"/>
- <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
- <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_uNjMYdm1EeKhMIaB2_NRKQ" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BYdm2EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BYtm2EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BY9m2EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment/body"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BZNm2EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment/annotatedElement"/>
- </axis>
- <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BZdm2EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
- </axis>
- </columnAxisProvidersHistory>
- <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_uNjMYtm1EeKhMIaB2_NRKQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">
- <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_sU7BYNm2EeKhMIaB2_NRKQ">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
- <element xmi:type="uml:Comment" href="two_tables_model.uml#_YWxtYNm1EeKhMIaB2_NRKQ"/>
- </axis>
- </rowAxisProvidersHistory>
- </nattable:Table>
- <nattable:Table xmi:id="_usfyMNm1EeKhMIaB2_NRKQ" name="TableOfViews0" currentRowAxisProvider="_usfyNtm1EeKhMIaB2_NRKQ" currentColumnAxisProvider="_usfyMdm1EeKhMIaB2_NRKQ">
- <context xmi:type="uml:Model" href="two_tables_model.uml#_WYKr5Nm1EeKhMIaB2_NRKQ"/>
- <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>
- <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_usfyMdm1EeKhMIaB2_NRKQ" description="Provides the features of the views" name="Papyrus Views feature provider">
- <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyMtm1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/name">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- </axis>
- <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyM9m1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/context">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- </axis>
- <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyNNm1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/isOpen">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- </axis>
- <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyNdm1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/type">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- </axis>
- </columnAxisProvidersHistory>
- <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_usfyNtm1EeKhMIaB2_NRKQ"/>
- </nattable:Table>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration"> + <nattable:Table xmi:id="_uNjMYNm1EeKhMIaB2_NRKQ" name="GenericTable0" currentRowAxisProvider="_uNjMYtm1EeKhMIaB2_NRKQ" currentColumnAxisProvider="_uNjMYdm1EeKhMIaB2_NRKQ"> + <context xmi:type="uml:Model" href="two_tables_model.uml#_WYKr5Nm1EeKhMIaB2_NRKQ"/> + <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/> + <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_uNjMYdm1EeKhMIaB2_NRKQ" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider"> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BYdm2EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BYtm2EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BY9m2EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment/body"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BZNm2EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment/annotatedElement"/> + </axis> + <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BZdm2EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/> + </axis> + </columnAxisProvidersHistory> + <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_uNjMYtm1EeKhMIaB2_NRKQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider"> + <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_sU7BYNm2EeKhMIaB2_NRKQ"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/> + <element xmi:type="uml:Comment" href="two_tables_model.uml#_YWxtYNm1EeKhMIaB2_NRKQ"/> + </axis> + </rowAxisProvidersHistory> + </nattable:Table> + <nattable:Table xmi:id="_usfyMNm1EeKhMIaB2_NRKQ" name="TableOfViews0" currentRowAxisProvider="_usfyNtm1EeKhMIaB2_NRKQ" currentColumnAxisProvider="_usfyMdm1EeKhMIaB2_NRKQ"> + <context xmi:type="uml:Model" href="two_tables_model.uml#_WYKr5Nm1EeKhMIaB2_NRKQ"/> + <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/> + <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_usfyMdm1EeKhMIaB2_NRKQ" description="Provides the features of the views" name="Papyrus Views feature provider"> + <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyMtm1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/name"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + </axis> + <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyM9m1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/context"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + </axis> + <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyNNm1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/isOpen"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + </axis> + <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyNdm1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/type"> + <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/> + </axis> + </columnAxisProvidersHistory> + <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_usfyNtm1EeKhMIaB2_NRKQ"/> + </nattable:Table> +</xmi:XMI> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.uml index 10dab39ad2c..182886efd40 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.uml @@ -1,13 +1,13 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_WYKr5Nm1EeKhMIaB2_NRKQ" name="model">
- <ownedComment xmi:type="uml:Comment" xmi:id="_YWxtYNm1EeKhMIaB2_NRKQ">
- <body>This model contains two tables. The Generic Table is opened, while the table of views is closed.
-Expected behavior:
-- allPages() contains two entries
-- activeEditor is a UML Generic Table Editor Editor
-- activePage() is a Generic Table</body>
- </ownedComment>
- <packageImport xmi:type="uml:PackageImport" xmi:id="_WYKr5dm1EeKhMIaB2_NRKQ">
- <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
- </packageImport>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_WYKr5Nm1EeKhMIaB2_NRKQ" name="model"> + <ownedComment xmi:type="uml:Comment" xmi:id="_YWxtYNm1EeKhMIaB2_NRKQ"> + <body>This model contains two tables. The Generic Table is opened, while the table of views is closed.
 +Expected behavior:
 +- allPages() contains two entries
 +- activeEditor is a UML Generic Table Editor Editor
 +- activePage() is a Generic Table</body> + </ownedComment> + <packageImport xmi:type="uml:PackageImport" xmi:id="_WYKr5dm1EeKhMIaB2_NRKQ"> + <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> + </packageImport> +</uml:Model> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.di index 6973c8a48a6..6973c8a48a6 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.di diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.notation index d8bec030baf..d8bec030baf 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.notation diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.uml index cac8a57cf98..cac8a57cf98 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.uml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.di index 8634d4c00e0..bf9abab340f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.di @@ -1,2 +1,2 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/> diff --git a/tests/junit/plugins/core/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 50f74c0a930..50f74c0a930 100644 --- a/tests/junit/plugins/core/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 diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.uml index c4c95eda8ff..c4c95eda8ff 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.uml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.di index 7911915cf04..641e1446fd0 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.di @@ -1,205 +1,205 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2">
- <di:SashWindowsMngr>
- <pageList>
- <availablePage>
- <emfPageIdentifier href="%5E&_&%5E.notation#_3Q0W8XzfEeKVBdbqCJSLPg"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="%5E&_&%5E.notation#_3Q-H8HzfEeKVBdbqCJSLPg"/>
- </availablePage>
- <availablePage emfPageIdentifier="/1"/>
- </pageList>
- <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="%5E&_&%5E.notation#_3Q0W8XzfEeKVBdbqCJSLPg"/>
- </children>
- <children>
- <emfPageIdentifier href="%5E&_&%5E.notation#_3Q-H8HzfEeKVBdbqCJSLPg"/>
- </children>
- <children emfPageIdentifier="/1"/>
- </children>
- </windows>
- </sashModel>
- </di:SashWindowsMngr>
- <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/>
- <tableinstance2:TableInstance2 description="Table Description">
- <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>
- <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>
- <customizations href="#/2/@localCustomizations.1"/>
- <customizations href="#/2/@localCustomizations.0"/>
- <context href="%5E&_&%5E.uml#_3Q0W8HzfEeKVBdbqCJSLPg"/>
- <columns xsi:type="tableinstance:DefaultLabelColumn"/>
- <columns xsi:type="tableinstance:MetaClassColumn"/>
- <columns xsi:type="tableinstance:EContainerColumn"/>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>
- </columns>
- <rows>
- <element href="%5E&_&%5E.uml#_5xWaAHzfEeKVBdbqCJSLPg"/>
- </rows>
- <rows>
- <element href="%5E&_&%5E.uml#_56RsgHzfEeKVBdbqCJSLPg"/>
- </rows>
- <rows>
- <element href="%5E&_&%5E.uml#_59194HzfEeKVBdbqCJSLPg"/>
- </rows>
- <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>
- <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>
- </tableinstance2:TableInstance2>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"> + <di:SashWindowsMngr> + <pageList> + <availablePage> + <emfPageIdentifier href="%5E&_&%5E.notation#_3Q0W8XzfEeKVBdbqCJSLPg"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="%5E&_&%5E.notation#_3Q-H8HzfEeKVBdbqCJSLPg"/> + </availablePage> + <availablePage emfPageIdentifier="/1"/> + </pageList> + <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0"> + <windows> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="%5E&_&%5E.notation#_3Q0W8XzfEeKVBdbqCJSLPg"/> + </children> + <children> + <emfPageIdentifier href="%5E&_&%5E.notation#_3Q-H8HzfEeKVBdbqCJSLPg"/> + </children> + <children emfPageIdentifier="/1"/> + </children> + </windows> + </sashModel> + </di:SashWindowsMngr> + <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/> + <tableinstance2:TableInstance2 description="Table Description"> + <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/> + <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/> + <customizations href="#/2/@localCustomizations.1"/> + <customizations href="#/2/@localCustomizations.0"/> + <context href="%5E&_&%5E.uml#_3Q0W8HzfEeKVBdbqCJSLPg"/> + <columns xsi:type="tableinstance:DefaultLabelColumn"/> + <columns xsi:type="tableinstance:MetaClassColumn"/> + <columns xsi:type="tableinstance:EContainerColumn"/> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/> + </columns> + <rows> + <element href="%5E&_&%5E.uml#_5xWaAHzfEeKVBdbqCJSLPg"/> + </rows> + <rows> + <element href="%5E&_&%5E.uml#_56RsgHzfEeKVBdbqCJSLPg"/> + </rows> + <rows> + <element href="%5E&_&%5E.uml#_59194HzfEeKVBdbqCJSLPg"/> + </rows> + <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/> + <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/> + </tableinstance2:TableInstance2> +</xmi:XMI> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.notation index 6c0abe64f07..dba85c8bdfd 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.notation @@ -1,107 +1,107 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
- <notation:Diagram xmi:id="_3Q0W8XzfEeKVBdbqCJSLPg" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_5xfj8HzfEeKVBdbqCJSLPg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_5xfj8nzfEeKVBdbqCJSLPg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_5xfj83zfEeKVBdbqCJSLPg" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5xfkAnzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5xfkA3zfEeKVBdbqCJSLPg" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_5xfj9HzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_5xfj9XzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_5xfj9nzfEeKVBdbqCJSLPg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5xfj93zfEeKVBdbqCJSLPg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_5xfj-HzfEeKVBdbqCJSLPg" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5xfkBHzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5xfkBXzfEeKVBdbqCJSLPg" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_5xfj-XzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_5xfj-nzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_5xfj-3zfEeKVBdbqCJSLPg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5xfj_HzfEeKVBdbqCJSLPg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_5xfj_XzfEeKVBdbqCJSLPg" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5xfkBnzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5xfkB3zfEeKVBdbqCJSLPg" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_5xfj_nzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_5xfj_3zfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_5xfkAHzfEeKVBdbqCJSLPg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5xfkAXzfEeKVBdbqCJSLPg"/>
- </children>
- <element xmi:type="uml:Class" href="%5E&_&%5E.uml#_5xWaAHzfEeKVBdbqCJSLPg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5xfj8XzfEeKVBdbqCJSLPg" x="727" y="222"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_56kncHzfEeKVBdbqCJSLPg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_56kncnzfEeKVBdbqCJSLPg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_56knc3zfEeKVBdbqCJSLPg" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_56kngnzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_56kng3zfEeKVBdbqCJSLPg" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_56kndHzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_56kndXzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_56kndnzfEeKVBdbqCJSLPg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_56knd3zfEeKVBdbqCJSLPg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_56kneHzfEeKVBdbqCJSLPg" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_56knhHzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_56knhXzfEeKVBdbqCJSLPg" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_56kneXzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_56knenzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_56kne3zfEeKVBdbqCJSLPg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_56knfHzfEeKVBdbqCJSLPg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_56knfXzfEeKVBdbqCJSLPg" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_56knhnzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_56knh3zfEeKVBdbqCJSLPg" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_56knfnzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_56knf3zfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_56kngHzfEeKVBdbqCJSLPg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_56kngXzfEeKVBdbqCJSLPg"/>
- </children>
- <element xmi:type="uml:Class" href="%5E&_&%5E.uml#_56RsgHzfEeKVBdbqCJSLPg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_56kncXzfEeKVBdbqCJSLPg" x="1215" y="469"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_5-I40HzfEeKVBdbqCJSLPg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_5-I40nzfEeKVBdbqCJSLPg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_5-I403zfEeKVBdbqCJSLPg" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5-I44nzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5-I443zfEeKVBdbqCJSLPg" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_5-I41HzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_5-I41XzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_5-I41nzfEeKVBdbqCJSLPg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5-I413zfEeKVBdbqCJSLPg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_5-I42HzfEeKVBdbqCJSLPg" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5-I45HzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5-I45XzfEeKVBdbqCJSLPg" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_5-I42XzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_5-I42nzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_5-I423zfEeKVBdbqCJSLPg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5-I43HzfEeKVBdbqCJSLPg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_5-I43XzfEeKVBdbqCJSLPg" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5-I45nzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5-I453zfEeKVBdbqCJSLPg" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_5-I43nzfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_5-I433zfEeKVBdbqCJSLPg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_5-I44HzfEeKVBdbqCJSLPg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5-I44XzfEeKVBdbqCJSLPg"/>
- </children>
- <element xmi:type="uml:Class" href="%5E&_&%5E.uml#_59194HzfEeKVBdbqCJSLPg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5-I40XzfEeKVBdbqCJSLPg" x="536" y="516"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_3Q0W8nzfEeKVBdbqCJSLPg"/>
- <element xmi:type="uml:Model" href="%5E&_&%5E.uml#_3Q0W8HzfEeKVBdbqCJSLPg"/>
- </notation:Diagram>
- <notation:Diagram xmi:id="_3Q-H8HzfEeKVBdbqCJSLPg" type="PapyrusUMLTimingDiagram" name="NewDiagram" measurementUnit="Pixel">
- <styles xmi:type="notation:DiagramStyle" xmi:id="_3Q-H8XzfEeKVBdbqCJSLPg"/>
- <element xmi:type="uml:Model" href="%5E&_&%5E.uml#_3Q0W8HzfEeKVBdbqCJSLPg"/>
- </notation:Diagram>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> + <notation:Diagram xmi:id="_3Q0W8XzfEeKVBdbqCJSLPg" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_5xfj8HzfEeKVBdbqCJSLPg" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_5xfj8nzfEeKVBdbqCJSLPg" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_5xfj83zfEeKVBdbqCJSLPg" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5xfkAnzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5xfkA3zfEeKVBdbqCJSLPg" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_5xfj9HzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_5xfj9XzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_5xfj9nzfEeKVBdbqCJSLPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5xfj93zfEeKVBdbqCJSLPg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_5xfj-HzfEeKVBdbqCJSLPg" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5xfkBHzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5xfkBXzfEeKVBdbqCJSLPg" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_5xfj-XzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_5xfj-nzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_5xfj-3zfEeKVBdbqCJSLPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5xfj_HzfEeKVBdbqCJSLPg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_5xfj_XzfEeKVBdbqCJSLPg" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5xfkBnzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5xfkB3zfEeKVBdbqCJSLPg" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_5xfj_nzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_5xfj_3zfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_5xfkAHzfEeKVBdbqCJSLPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5xfkAXzfEeKVBdbqCJSLPg"/> + </children> + <element xmi:type="uml:Class" href="%5E&_&%5E.uml#_5xWaAHzfEeKVBdbqCJSLPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5xfj8XzfEeKVBdbqCJSLPg" x="727" y="222"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_56kncHzfEeKVBdbqCJSLPg" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_56kncnzfEeKVBdbqCJSLPg" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_56knc3zfEeKVBdbqCJSLPg" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_56kngnzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_56kng3zfEeKVBdbqCJSLPg" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_56kndHzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_56kndXzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_56kndnzfEeKVBdbqCJSLPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_56knd3zfEeKVBdbqCJSLPg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_56kneHzfEeKVBdbqCJSLPg" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_56knhHzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_56knhXzfEeKVBdbqCJSLPg" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_56kneXzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_56knenzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_56kne3zfEeKVBdbqCJSLPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_56knfHzfEeKVBdbqCJSLPg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_56knfXzfEeKVBdbqCJSLPg" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_56knhnzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_56knh3zfEeKVBdbqCJSLPg" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_56knfnzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_56knf3zfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_56kngHzfEeKVBdbqCJSLPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_56kngXzfEeKVBdbqCJSLPg"/> + </children> + <element xmi:type="uml:Class" href="%5E&_&%5E.uml#_56RsgHzfEeKVBdbqCJSLPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_56kncXzfEeKVBdbqCJSLPg" x="1215" y="469"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_5-I40HzfEeKVBdbqCJSLPg" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_5-I40nzfEeKVBdbqCJSLPg" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_5-I403zfEeKVBdbqCJSLPg" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5-I44nzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5-I443zfEeKVBdbqCJSLPg" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_5-I41HzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_5-I41XzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_5-I41nzfEeKVBdbqCJSLPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5-I413zfEeKVBdbqCJSLPg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_5-I42HzfEeKVBdbqCJSLPg" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5-I45HzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5-I45XzfEeKVBdbqCJSLPg" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_5-I42XzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_5-I42nzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_5-I423zfEeKVBdbqCJSLPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5-I43HzfEeKVBdbqCJSLPg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_5-I43XzfEeKVBdbqCJSLPg" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5-I45nzfEeKVBdbqCJSLPg" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5-I453zfEeKVBdbqCJSLPg" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_5-I43nzfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_5-I433zfEeKVBdbqCJSLPg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_5-I44HzfEeKVBdbqCJSLPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5-I44XzfEeKVBdbqCJSLPg"/> + </children> + <element xmi:type="uml:Class" href="%5E&_&%5E.uml#_59194HzfEeKVBdbqCJSLPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5-I40XzfEeKVBdbqCJSLPg" x="536" y="516"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_3Q0W8nzfEeKVBdbqCJSLPg"/> + <element xmi:type="uml:Model" href="%5E&_&%5E.uml#_3Q0W8HzfEeKVBdbqCJSLPg"/> + </notation:Diagram> + <notation:Diagram xmi:id="_3Q-H8HzfEeKVBdbqCJSLPg" type="PapyrusUMLTimingDiagram" name="NewDiagram" measurementUnit="Pixel"> + <styles xmi:type="notation:DiagramStyle" xmi:id="_3Q-H8XzfEeKVBdbqCJSLPg"/> + <element xmi:type="uml:Model" href="%5E&_&%5E.uml#_3Q0W8HzfEeKVBdbqCJSLPg"/> + </notation:Diagram> +</xmi:XMI> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.uml index 63f2a148ad3..10080eb029d 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.uml @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_3Q0W8HzfEeKVBdbqCJSLPg" name="model">
- <packagedElement xmi:type="uml:Class" xmi:id="_5xWaAHzfEeKVBdbqCJSLPg" name="Class1"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_56RsgHzfEeKVBdbqCJSLPg" name="Class2"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_59194HzfEeKVBdbqCJSLPg" name="Class3"/>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_3Q0W8HzfEeKVBdbqCJSLPg" name="model"> + <packagedElement xmi:type="uml:Class" xmi:id="_5xWaAHzfEeKVBdbqCJSLPg" name="Class1"/> + <packagedElement xmi:type="uml:Class" xmi:id="_56RsgHzfEeKVBdbqCJSLPg" name="Class2"/> + <packagedElement xmi:type="uml:Class" xmi:id="_59194HzfEeKVBdbqCJSLPg" name="Class3"/> +</uml:Model> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/profile/j2ee-no-constraints.profile.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/j2ee-no-constraints.profile.uml index ba4a69ee274..ba4a69ee274 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/profile/j2ee-no-constraints.profile.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/j2ee-no-constraints.profile.uml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/profile/j2ee.profile.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/j2ee.profile.uml index 2ecfb621eb5..2ecfb621eb5 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/profile/j2ee.profile.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/j2ee.profile.uml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.di index 571f53ee13f..571f53ee13f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.di diff --git a/tests/junit/plugins/core/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 d98e9c7cb2f..d98e9c7cb2f 100644 --- a/tests/junit/plugins/core/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 diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.uml index 9891f8006a8..9891f8006a8 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model-no-j2ee-constraints.uml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/profile/model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.di index 3f8c9b9d256..3f8c9b9d256 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/profile/model.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.di diff --git a/tests/junit/plugins/core/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 9482a3e63b3..9482a3e63b3 100644 --- a/tests/junit/plugins/core/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 diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/profile/model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.uml index 42136560022..42136560022 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/profile/model.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/profile/model.uml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.di index 393779dd390..5930bed8a28 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.di @@ -1,407 +1,407 @@ -<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2">
- <di:SashWindowsMngr>
- <pageList>
- <availablePage>
- <emfPageIdentifier />
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="complex_invalid_model.notation#_yEbw0HqeEeK5vdodFAvPrA"/>
- </availablePage>
- <availablePage />
- <availablePage>
- <emfPageIdentifier href="complex_invalid_model.notation#_A_vSgHqfEeK5vdodFAvPrA"/>
- </availablePage>
- <availablePage emfPageIdentifier="/3"/>
- </pageList>
- <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0/@children.1">
- <windows>
- <children xsi:type="di:SashPanel" direction="256">
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="complex_invalid_model.notation#_yER_0XqeEeK5vdodFAvPrA"/>
- </children>
- <children emfPageIdentifier="/1"/>
- <children />
- </children>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier />
- </children>
- <children>
- <emfPageIdentifier href="complex_invalid_model.notation#_A_vSgHqfEeK5vdodFAvPrA"/>
- </children>
- </children>
- </children>
- </windows>
- </sashModel>
- </di:SashWindowsMngr>
- <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/>
- <tableinstance2:TableInstance2 description="Table Description">
- <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>
- <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>
- <customizations href="#/2/@localCustomizations.1"/>
- <customizations href="#/2/@localCustomizations.0"/>
- <context href="complex_invalid_model.uml#_yER_0HqeEeK5vdodFAvPrA"/>
- <columns xsi:type="tableinstance:DefaultLabelColumn"/>
- <columns xsi:type="tableinstance:MetaClassColumn"/>
- <columns xsi:type="tableinstance:EContainerColumn"/>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>
- </columns>
- <rows>
- <element href="complex_invalid_model.uml#_4Iu1kHqeEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_4QBwYHqeEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_4QnmQHqeEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_4T48sHqeEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_4WasQHqeEeK5vdodFAvPrA"/>
- </rows>
- <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>
- <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>
- </tableinstance2:TableInstance2>
- <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/4"/>
- <tableinstance2:TableInstance2 description="Table Description">
- <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>
- <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>
- <customizations href="#/4/@localCustomizations.1"/>
- <customizations href="#/4/@localCustomizations.0"/>
- <context href="complex_invalid_model.uml#_yER_0HqeEeK5vdodFAvPrA"/>
- <columns xsi:type="tableinstance:DefaultLabelColumn"/>
- <columns xsi:type="tableinstance:MetaClassColumn"/>
- <columns xsi:type="tableinstance:EContainerColumn"/>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>
- </columns>
- <rows>
- <element href="complex_invalid_model.uml#_4WasQHqeEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_BkzHYHqfEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_BqKIgHqfEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_Bv0EkHqfEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="complex_invalid_model.uml#_B0cF4HqfEeK5vdodFAvPrA"/>
- </rows>
- <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>
- <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>
- </tableinstance2:TableInstance2>
-</xmi:XMI>
+<?xml version="1.0" encoding="ASCII"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"> + <di:SashWindowsMngr> + <pageList> + <availablePage> + <emfPageIdentifier /> + </availablePage> + <availablePage> + <emfPageIdentifier href="complex_invalid_model.notation#_yEbw0HqeEeK5vdodFAvPrA"/> + </availablePage> + <availablePage /> + <availablePage> + <emfPageIdentifier href="complex_invalid_model.notation#_A_vSgHqfEeK5vdodFAvPrA"/> + </availablePage> + <availablePage emfPageIdentifier="/3"/> + </pageList> + <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0/@children.1"> + <windows> + <children xsi:type="di:SashPanel" direction="256"> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="complex_invalid_model.notation#_yER_0XqeEeK5vdodFAvPrA"/> + </children> + <children emfPageIdentifier="/1"/> + <children /> + </children> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier /> + </children> + <children> + <emfPageIdentifier href="complex_invalid_model.notation#_A_vSgHqfEeK5vdodFAvPrA"/> + </children> + </children> + </children> + </windows> + </sashModel> + </di:SashWindowsMngr> + <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/> + <tableinstance2:TableInstance2 description="Table Description"> + <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/> + <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/> + <customizations href="#/2/@localCustomizations.1"/> + <customizations href="#/2/@localCustomizations.0"/> + <context href="complex_invalid_model.uml#_yER_0HqeEeK5vdodFAvPrA"/> + <columns xsi:type="tableinstance:DefaultLabelColumn"/> + <columns xsi:type="tableinstance:MetaClassColumn"/> + <columns xsi:type="tableinstance:EContainerColumn"/> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/> + </columns> + <rows> + <element href="complex_invalid_model.uml#_4Iu1kHqeEeK5vdodFAvPrA"/> + </rows> + <rows> + <element href="complex_invalid_model.uml#_4QBwYHqeEeK5vdodFAvPrA"/> + </rows> + <rows> + <element href="complex_invalid_model.uml#_4QnmQHqeEeK5vdodFAvPrA"/> + </rows> + <rows> + <element href="complex_invalid_model.uml#_4T48sHqeEeK5vdodFAvPrA"/> + </rows> + <rows> + <element href="complex_invalid_model.uml#_4WasQHqeEeK5vdodFAvPrA"/> + </rows> + <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/> + <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/> + </tableinstance2:TableInstance2> + <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/4"/> + <tableinstance2:TableInstance2 description="Table Description"> + <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/> + <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/> + <customizations href="#/4/@localCustomizations.1"/> + <customizations href="#/4/@localCustomizations.0"/> + <context href="complex_invalid_model.uml#_yER_0HqeEeK5vdodFAvPrA"/> + <columns xsi:type="tableinstance:DefaultLabelColumn"/> + <columns xsi:type="tableinstance:MetaClassColumn"/> + <columns xsi:type="tableinstance:EContainerColumn"/> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/> + </columns> + <rows> + <element href="complex_invalid_model.uml#_4WasQHqeEeK5vdodFAvPrA"/> + </rows> + <rows> + <element href="complex_invalid_model.uml#_BkzHYHqfEeK5vdodFAvPrA"/> + </rows> + <rows> + <element href="complex_invalid_model.uml#_BqKIgHqfEeK5vdodFAvPrA"/> + </rows> + <rows> + <element href="complex_invalid_model.uml#_Bv0EkHqfEeK5vdodFAvPrA"/> + </rows> + <rows> + <element href="complex_invalid_model.uml#_B0cF4HqfEeK5vdodFAvPrA"/> + </rows> + <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/> + <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/> + </tableinstance2:TableInstance2> +</xmi:XMI> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.notation index 5d4522a3554..f5507da16d2 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.notation @@ -1,560 +1,560 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
- <notation:Diagram xmi:id="_yER_0XqeEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_4JBwgHqeEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_4JBwgnqeEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4JBwg3qeEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4JBwknqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4JBwk3qeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4JBwhHqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4JBwhXqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4JBwhnqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4JBwh3qeEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4JBwiHqeEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4JBwlHqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4JBwlXqeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4JBwiXqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4JBwinqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4JBwi3qeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4JBwjHqeEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4JBwjXqeEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4JBwlnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4JBwl3qeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4JBwjnqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4JBwj3qeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4JBwkHqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4JBwkXqeEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="complex_invalid_model.uml#_4Iu1kHqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4JBwgXqeEeK5vdodFAvPrA" x="346" y="179"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_4QUrUHqeEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_4QUrUnqeEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4QUrU3qeEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4QUrYnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4QUrY3qeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4QUrVHqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4QUrVXqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4QUrVnqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4QUrV3qeEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4QUrWHqeEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4QUrZHqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4QUrZXqeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4QUrWXqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4QUrWnqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4QUrW3qeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4QUrXHqeEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4QUrXXqeEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4QUrZnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4QUrZ3qeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4QUrXnqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4QUrX3qeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4QUrYHqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4QUrYXqeEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="complex_invalid_model.uml#_4QBwYHqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4QUrUXqeEeK5vdodFAvPrA" x="895" y="169"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_4Q6hMHqeEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_4Q6hMnqeEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4Q6hM3qeEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4Q6hQnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4Q6hQ3qeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4Q6hNHqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4Q6hNXqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4Q6hNnqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Q6hN3qeEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4Q6hOHqeEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4Q6hRHqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4Q6hRXqeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4Q6hOXqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4Q6hOnqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4Q6hO3qeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Q6hPHqeEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4Q6hPXqeEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4Q6hRnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4Q6hR3qeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4Q6hPnqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4Q6hP3qeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4Q6hQHqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Q6hQXqeEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="complex_invalid_model.uml#_4QnmQHqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Q6hMXqeEeK5vdodFAvPrA" x="993" y="438"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_4UL3oHqeEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_4UL3onqeEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4UL3o3qeEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4UL3snqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4UL3s3qeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4UL3pHqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4UL3pXqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4UL3pnqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4UL3p3qeEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4UL3qHqeEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4UL3tHqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4UL3tXqeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4UL3qXqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4UL3qnqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4UL3q3qeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4UL3rHqeEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4UL3rXqeEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4UL3tnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4UL3t3qeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4UL3rnqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4UL3r3qeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4UL3sHqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4UL3sXqeEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="complex_invalid_model.uml#_4T48sHqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4UL3oXqeEeK5vdodFAvPrA" x="443" y="461"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_4W3YMHqeEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_4W3YMnqeEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4W3YM3qeEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4W3YQnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4W3YQ3qeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4W3YNHqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4W3YNXqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4W3YNnqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4W3YN3qeEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4W3YOHqeEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4W3YRHqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4W3YRXqeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4W3YOXqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4W3YOnqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4W3YO3qeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4W3YPHqeEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_4W3YPXqeEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4W3YRnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4W3YR3qeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_4W3YPnqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4W3YP3qeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4W3YQHqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4W3YQXqeEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="complex_invalid_model.uml#_4WasQHqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4W3YMXqeEeK5vdodFAvPrA" x="26" y="461"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_yER_0nqeEeK5vdodFAvPrA"/>
- <element xmi:type="uml:Model" href="complex_invalid_model.uml#_yER_0HqeEeK5vdodFAvPrA"/>
- </notation:Diagram>
- <notation:Diagram xmi:id="_yEbw0HqeEeK5vdodFAvPrA" type="PapyrusUMLTimingDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_E00tsHqfEeK5vdodFAvPrA" type="2">
- <children xmi:type="notation:DecorationNode" xmi:id="_E00tsnqfEeK5vdodFAvPrA" type="37"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_E00ts3qfEeK5vdodFAvPrA" type="5">
- <children xmi:type="notation:Shape" xmi:id="_FUXwcHqfEeK5vdodFAvPrA" type="19">
- <children xmi:type="notation:DecorationNode" xmi:id="_FUXwcnqfEeK5vdodFAvPrA" type="21"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_FUXwc3qfEeK5vdodFAvPrA" type="7">
- <children xmi:type="notation:Shape" xmi:id="_GnaFoHqfEeK5vdodFAvPrA" type="9">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GntAkXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GntAknqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_GntAkHqfEeK5vdodFAvPrA"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Gn2xkXqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 1"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_GnaFonqfEeK5vdodFAvPrA" type="38">
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_GnaFo3qfEeK5vdodFAvPrA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GnaFoXqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Gu2KYHqfEeK5vdodFAvPrA" type="9">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GvJFUXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GvJFUnqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_GvJFUHqfEeK5vdodFAvPrA"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GvJFVHqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 2"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_Gu2KYnqfEeK5vdodFAvPrA" type="38">
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_Gu2KY3qfEeK5vdodFAvPrA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gu2KYXqfEeK5vdodFAvPrA"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_FUXwdHqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_FUXwdXqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUXwdnqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_FUXwd3qfEeK5vdodFAvPrA" type="8">
- <children xmi:type="notation:Shape" xmi:id="_GoTdgHqfEeK5vdodFAvPrA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_GoTdgnqfEeK5vdodFAvPrA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_GoTdg3qfEeK5vdodFAvPrA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_Gn2xknqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GoTdgXqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_HtpU8HqfEeK5vdodFAvPrA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_HtpU9HqfEeK5vdodFAvPrA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HtpU9XqfEeK5vdodFAvPrA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_HtpU9nqfEeK5vdodFAvPrA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HtpU93qfEeK5vdodFAvPrA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_HtpU8XqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_HtpU8nqfEeK5vdodFAvPrA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_invalid_model.uml#_HtgLAHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HtpU-HqfEeK5vdodFAvPrA" x="49" y="90"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_HtpU-XqfEeK5vdodFAvPrA" type="39">
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HtpU-nqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Ht828HqfEeK5vdodFAvPrA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_HuGA4HqfEeK5vdodFAvPrA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HuGA4XqfEeK5vdodFAvPrA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_HtpU-3qfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ht828XqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_HzTRAHqfEeK5vdodFAvPrA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_HzTRBHqfEeK5vdodFAvPrA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HzTRBXqfEeK5vdodFAvPrA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_HzTRBnqfEeK5vdodFAvPrA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HzTRB3qfEeK5vdodFAvPrA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_HzTRAXqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_HzTRAnqfEeK5vdodFAvPrA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_invalid_model.uml#_HzKHEHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HzTRCHqfEeK5vdodFAvPrA" x="135" y="93"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_HzTRCXqfEeK5vdodFAvPrA" type="39">
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HzTRCnqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Hzv88HqfEeK5vdodFAvPrA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_Hzv88nqfEeK5vdodFAvPrA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Hzv883qfEeK5vdodFAvPrA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_HzTRC3qfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hzv88XqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_H5G-EHqfEeK5vdodFAvPrA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_H5G-FHqfEeK5vdodFAvPrA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_H5G-FXqfEeK5vdodFAvPrA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_H5G-FnqfEeK5vdodFAvPrA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_H5G-F3qfEeK5vdodFAvPrA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_H5G-EXqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_H5G-EnqfEeK5vdodFAvPrA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_invalid_model.uml#_H49NEHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_H5G-GHqfEeK5vdodFAvPrA" x="258" y="94"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_H5G-GXqfEeK5vdodFAvPrA" type="39">
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H5G-GnqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_H5jC8HqfEeK5vdodFAvPrA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_H5jC8nqfEeK5vdodFAvPrA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_H5jC83qfEeK5vdodFAvPrA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_H5G-G3qfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H5jC8XqfEeK5vdodFAvPrA"/>
- </children>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUXweHqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_FUXweXqfEeK5vdodFAvPrA" visible="false" type="82">
- <children xmi:type="notation:Shape" xmi:id="_FU-NYHqfEeK5vdodFAvPrA" type="24">
- <children xmi:type="notation:DecorationNode" xmi:id="_FU-NYnqfEeK5vdodFAvPrA" type="80">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FU-NY3qfEeK5vdodFAvPrA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FU-NYXqfEeK5vdodFAvPrA"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_FUXwenqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_FUXwe3qfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUXwfHqfEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Lifeline" href="complex_invalid_model.uml#_FUE1gHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUXwcXqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_GRh8QHqfEeK5vdodFAvPrA" type="19">
- <children xmi:type="notation:DecorationNode" xmi:id="_GRh8QnqfEeK5vdodFAvPrA" type="21"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_GRh8Q3qfEeK5vdodFAvPrA" type="7">
- <children xmi:type="notation:Shape" xmi:id="_G-7NwHqfEeK5vdodFAvPrA" type="9">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_G_EXsXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_G_EXsnqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_G_EXsHqfEeK5vdodFAvPrA"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_G_OIsXqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 1"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_G-7NwnqfEeK5vdodFAvPrA" type="38">
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_G-7Nw3qfEeK5vdodFAvPrA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G-7NwXqfEeK5vdodFAvPrA"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_GRh8RHqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_GRh8RXqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRh8RnqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_GRh8R3qfEeK5vdodFAvPrA" type="8">
- <children xmi:type="notation:Shape" xmi:id="_G_q0oHqfEeK5vdodFAvPrA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_G_q0onqfEeK5vdodFAvPrA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_G_q0o3qfEeK5vdodFAvPrA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_G_OIsnqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G_q0oXqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_IffBkHqfEeK5vdodFAvPrA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_IffBlHqfEeK5vdodFAvPrA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IffBlXqfEeK5vdodFAvPrA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_IffBlnqfEeK5vdodFAvPrA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IffBl3qfEeK5vdodFAvPrA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_IffBkXqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_IffBknqfEeK5vdodFAvPrA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_invalid_model.uml#_IfMGoHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IffBmHqfEeK5vdodFAvPrA" x="84" y="68"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_IffBmXqfEeK5vdodFAvPrA" type="39">
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IffBmnqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_IfyjkHqfEeK5vdodFAvPrA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_IfyjknqfEeK5vdodFAvPrA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Ifyjk3qfEeK5vdodFAvPrA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_IffBm3qfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IfyjkXqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_IoaUEHqfEeK5vdodFAvPrA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_IoaUFHqfEeK5vdodFAvPrA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IoaUFXqfEeK5vdodFAvPrA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_IoaUFnqfEeK5vdodFAvPrA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IoaUF3qfEeK5vdodFAvPrA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_IoaUEXqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_IoaUEnqfEeK5vdodFAvPrA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_invalid_model.uml#_IoRKIHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IoaUGHqfEeK5vdodFAvPrA" x="169" y="68"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_IoaUGXqfEeK5vdodFAvPrA" type="39">
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IoaUGnqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Io3AAHqfEeK5vdodFAvPrA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_Io3AAnqfEeK5vdodFAvPrA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Io3AA3qfEeK5vdodFAvPrA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_IoaUG3qfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Io3AAXqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_IvGx8HqfEeK5vdodFAvPrA" type="12">
- <children xmi:type="notation:DecorationNode" xmi:id="_IvGx9HqfEeK5vdodFAvPrA" type="10">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IvGx9XqfEeK5vdodFAvPrA" y="18"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_IvGx9nqfEeK5vdodFAvPrA" type="58">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IvGx93qfEeK5vdodFAvPrA" y="5"/>
- </children>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_IvGx8XqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_IvGx8nqfEeK5vdodFAvPrA"/>
- <element xmi:type="uml:OccurrenceSpecification" href="complex_invalid_model.uml#_Iu9oAHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IvGx-HqfEeK5vdodFAvPrA" x="249" y="68"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_IvGx-XqfEeK5vdodFAvPrA" type="39">
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvGx-nqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Ivjd4HqfEeK5vdodFAvPrA" type="11">
- <children xmi:type="notation:DecorationNode" xmi:id="_Ivjd4nqfEeK5vdodFAvPrA" type="62">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Ivjd43qfEeK5vdodFAvPrA" y="5"/>
- </children>
- <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_IvGx-3qfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ivjd4XqfEeK5vdodFAvPrA"/>
- </children>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRh8SHqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_GRh8SXqfEeK5vdodFAvPrA" visible="false" type="82">
- <children xmi:type="notation:Shape" xmi:id="_GR03MHqfEeK5vdodFAvPrA" type="24">
- <children xmi:type="notation:DecorationNode" xmi:id="_GR03MnqfEeK5vdodFAvPrA" type="80">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GR03M3qfEeK5vdodFAvPrA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GR03MXqfEeK5vdodFAvPrA"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_GRh8SnqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_GRh8S3qfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRh8THqfEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Lifeline" href="complex_invalid_model.uml#_GRFQUHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRh8QXqfEeK5vdodFAvPrA"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_E00ttHqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_E00ttXqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E00ttnqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_E00tt3qfEeK5vdodFAvPrA" type="29">
- <children xmi:type="notation:Shape" xmi:id="_E2eTgHqfEeK5vdodFAvPrA" type="24">
- <children xmi:type="notation:DecorationNode" xmi:id="_E2eTgnqfEeK5vdodFAvPrA" type="80">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E2eTg3qfEeK5vdodFAvPrA"/>
- </children>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E2eTgXqfEeK5vdodFAvPrA"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_E00tuHqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_E00tuXqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E00tunqfEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Interaction" href="complex_invalid_model.uml#_E0hywHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E00tsXqfEeK5vdodFAvPrA" x="30" y="135" width="621" height="501"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_yEbw0XqeEeK5vdodFAvPrA"/>
- <element xmi:type="uml:Model" href="complex_invalid_model.uml#_yER_0HqeEeK5vdodFAvPrA"/>
- </notation:Diagram>
- <notation:Diagram xmi:id="_A_vSgHqfEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_BlGCUHqfEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_BlGCUnqfEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_BlGCU3qfEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BlGCYnqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BlGCY3qfEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_BlGCVHqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_BlGCVXqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_BlGCVnqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlGCV3qfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_BlGCWHqfEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BlGCZHqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BlGCZXqfEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_BlGCWXqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_BlGCWnqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_BlGCW3qfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlGCXHqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_BlGCXXqfEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BlGCZnqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BlGCZ3qfEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_BlGCXnqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_BlGCX3qfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_BlGCYHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlGCYXqfEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="complex_invalid_model.uml#_BkzHYHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlGCUXqfEeK5vdodFAvPrA" x="210" y="59"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_BqdDcHqfEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_BqdDcnqfEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_BqdDc3qfEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BqdDgnqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BqdDg3qfEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_BqdDdHqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_BqdDdXqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_BqdDdnqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BqdDd3qfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_BqdDeHqfEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BqdDhHqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BqdDhXqfEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_BqdDeXqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_BqdDenqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_BqdDe3qfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BqdDfHqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_BqdDfXqfEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BqdDhnqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BqdDh3qfEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_BqdDfnqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_BqdDf3qfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_BqdDgHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BqdDgXqfEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="complex_invalid_model.uml#_BqKIgHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BqdDcXqfEeK5vdodFAvPrA" x="489" y="76"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_BwG_gHqfEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_BwG_gnqfEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_BwG_g3qfEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BwQwgHqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BwQwgXqfEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_BwG_hHqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_BwG_hXqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_BwG_hnqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BwG_h3qfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_BwG_iHqfEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BwQwgnqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BwQwg3qfEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_BwG_iXqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_BwG_inqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_BwG_i3qfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BwG_jHqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_BwG_jXqfEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BwQwhHqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BwQwhXqfEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_BwG_jnqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_BwG_j3qfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_BwG_kHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BwG_kXqfEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="complex_invalid_model.uml#_Bv0EkHqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BwG_gXqfEeK5vdodFAvPrA" x="294" y="428"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_B0vA0HqfEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_B0vA0nqfEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_B0vA03qfEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_B0vA4nqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B0vA43qfEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_B0vA1HqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_B0vA1XqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_B0vA1nqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B0vA13qfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_B0vA2HqfEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_B0vA5HqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B0vA5XqfEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_B0vA2XqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_B0vA2nqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_B0vA23qfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B0vA3HqfEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_B0vA3XqfEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_B0vA5nqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B0vA53qfEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_B0vA3nqfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_B0vA33qfEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_B0vA4HqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B0vA4XqfEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="complex_invalid_model.uml#_B0cF4HqfEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B0vA0XqfEeK5vdodFAvPrA" x="88" y="438"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_A_vSgXqfEeK5vdodFAvPrA"/>
- <element xmi:type="uml:Model" href="complex_invalid_model.uml#_yER_0HqeEeK5vdodFAvPrA"/>
- </notation:Diagram>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> + <notation:Diagram xmi:id="_yER_0XqeEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_4JBwgHqeEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_4JBwgnqeEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_4JBwg3qeEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4JBwknqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4JBwk3qeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4JBwhHqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4JBwhXqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4JBwhnqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4JBwh3qeEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_4JBwiHqeEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4JBwlHqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4JBwlXqeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4JBwiXqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4JBwinqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4JBwi3qeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4JBwjHqeEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_4JBwjXqeEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4JBwlnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4JBwl3qeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4JBwjnqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4JBwj3qeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4JBwkHqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4JBwkXqeEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="complex_invalid_model.uml#_4Iu1kHqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4JBwgXqeEeK5vdodFAvPrA" x="346" y="179"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_4QUrUHqeEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_4QUrUnqeEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_4QUrU3qeEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4QUrYnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4QUrY3qeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4QUrVHqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4QUrVXqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4QUrVnqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4QUrV3qeEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_4QUrWHqeEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4QUrZHqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4QUrZXqeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4QUrWXqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4QUrWnqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4QUrW3qeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4QUrXHqeEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_4QUrXXqeEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4QUrZnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4QUrZ3qeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4QUrXnqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4QUrX3qeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4QUrYHqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4QUrYXqeEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="complex_invalid_model.uml#_4QBwYHqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4QUrUXqeEeK5vdodFAvPrA" x="895" y="169"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_4Q6hMHqeEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_4Q6hMnqeEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_4Q6hM3qeEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4Q6hQnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4Q6hQ3qeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4Q6hNHqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4Q6hNXqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4Q6hNnqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Q6hN3qeEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_4Q6hOHqeEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4Q6hRHqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4Q6hRXqeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4Q6hOXqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4Q6hOnqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4Q6hO3qeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Q6hPHqeEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_4Q6hPXqeEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4Q6hRnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4Q6hR3qeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4Q6hPnqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4Q6hP3qeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4Q6hQHqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Q6hQXqeEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="complex_invalid_model.uml#_4QnmQHqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Q6hMXqeEeK5vdodFAvPrA" x="993" y="438"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_4UL3oHqeEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_4UL3onqeEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_4UL3o3qeEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4UL3snqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4UL3s3qeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4UL3pHqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4UL3pXqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4UL3pnqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4UL3p3qeEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_4UL3qHqeEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4UL3tHqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4UL3tXqeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4UL3qXqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4UL3qnqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4UL3q3qeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4UL3rHqeEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_4UL3rXqeEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4UL3tnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4UL3t3qeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4UL3rnqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4UL3r3qeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4UL3sHqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4UL3sXqeEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="complex_invalid_model.uml#_4T48sHqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4UL3oXqeEeK5vdodFAvPrA" x="443" y="461"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_4W3YMHqeEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_4W3YMnqeEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_4W3YM3qeEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4W3YQnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4W3YQ3qeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4W3YNHqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4W3YNXqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4W3YNnqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4W3YN3qeEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_4W3YOHqeEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4W3YRHqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4W3YRXqeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4W3YOXqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4W3YOnqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4W3YO3qeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4W3YPHqeEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_4W3YPXqeEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4W3YRnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4W3YR3qeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_4W3YPnqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_4W3YP3qeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_4W3YQHqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4W3YQXqeEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="complex_invalid_model.uml#_4WasQHqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4W3YMXqeEeK5vdodFAvPrA" x="26" y="461"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_yER_0nqeEeK5vdodFAvPrA"/> + <element xmi:type="uml:Model" href="complex_invalid_model.uml#_yER_0HqeEeK5vdodFAvPrA"/> + </notation:Diagram> + <notation:Diagram xmi:id="_yEbw0HqeEeK5vdodFAvPrA" type="PapyrusUMLTimingDiagram" name="NewDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_E00tsHqfEeK5vdodFAvPrA" type="2"> + <children xmi:type="notation:DecorationNode" xmi:id="_E00tsnqfEeK5vdodFAvPrA" type="37"/> + <children xmi:type="notation:DecorationNode" xmi:id="_E00ts3qfEeK5vdodFAvPrA" type="5"> + <children xmi:type="notation:Shape" xmi:id="_FUXwcHqfEeK5vdodFAvPrA" type="19"> + <children xmi:type="notation:DecorationNode" xmi:id="_FUXwcnqfEeK5vdodFAvPrA" type="21"/> + <children xmi:type="notation:DecorationNode" xmi:id="_FUXwc3qfEeK5vdodFAvPrA" type="7"> + <children xmi:type="notation:Shape" xmi:id="_GnaFoHqfEeK5vdodFAvPrA" type="9"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GntAkXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GntAknqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_GntAkHqfEeK5vdodFAvPrA"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Gn2xkXqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 1"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_GnaFonqfEeK5vdodFAvPrA" type="38"> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_GnaFo3qfEeK5vdodFAvPrA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GnaFoXqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_Gu2KYHqfEeK5vdodFAvPrA" type="9"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GvJFUXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GvJFUnqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_GvJFUHqfEeK5vdodFAvPrA"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GvJFVHqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 2"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_Gu2KYnqfEeK5vdodFAvPrA" type="38"> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_Gu2KY3qfEeK5vdodFAvPrA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gu2KYXqfEeK5vdodFAvPrA"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_FUXwdHqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_FUXwdXqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUXwdnqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_FUXwd3qfEeK5vdodFAvPrA" type="8"> + <children xmi:type="notation:Shape" xmi:id="_GoTdgHqfEeK5vdodFAvPrA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_GoTdgnqfEeK5vdodFAvPrA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_GoTdg3qfEeK5vdodFAvPrA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_Gn2xknqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GoTdgXqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_HtpU8HqfEeK5vdodFAvPrA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_HtpU9HqfEeK5vdodFAvPrA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_HtpU9XqfEeK5vdodFAvPrA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_HtpU9nqfEeK5vdodFAvPrA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_HtpU93qfEeK5vdodFAvPrA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_HtpU8XqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_HtpU8nqfEeK5vdodFAvPrA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_invalid_model.uml#_HtgLAHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_HtpU-HqfEeK5vdodFAvPrA" x="49" y="90"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_HtpU-XqfEeK5vdodFAvPrA" type="39"> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HtpU-nqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_Ht828HqfEeK5vdodFAvPrA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_HuGA4HqfEeK5vdodFAvPrA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_HuGA4XqfEeK5vdodFAvPrA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_HtpU-3qfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ht828XqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_HzTRAHqfEeK5vdodFAvPrA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_HzTRBHqfEeK5vdodFAvPrA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_HzTRBXqfEeK5vdodFAvPrA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_HzTRBnqfEeK5vdodFAvPrA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_HzTRB3qfEeK5vdodFAvPrA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_HzTRAXqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_HzTRAnqfEeK5vdodFAvPrA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_invalid_model.uml#_HzKHEHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_HzTRCHqfEeK5vdodFAvPrA" x="135" y="93"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_HzTRCXqfEeK5vdodFAvPrA" type="39"> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HzTRCnqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_Hzv88HqfEeK5vdodFAvPrA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_Hzv88nqfEeK5vdodFAvPrA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Hzv883qfEeK5vdodFAvPrA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_HzTRC3qfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hzv88XqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_H5G-EHqfEeK5vdodFAvPrA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_H5G-FHqfEeK5vdodFAvPrA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_H5G-FXqfEeK5vdodFAvPrA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_H5G-FnqfEeK5vdodFAvPrA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_H5G-F3qfEeK5vdodFAvPrA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_H5G-EXqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_H5G-EnqfEeK5vdodFAvPrA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_invalid_model.uml#_H49NEHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_H5G-GHqfEeK5vdodFAvPrA" x="258" y="94"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_H5G-GXqfEeK5vdodFAvPrA" type="39"> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H5G-GnqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_H5jC8HqfEeK5vdodFAvPrA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_H5jC8nqfEeK5vdodFAvPrA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_H5jC83qfEeK5vdodFAvPrA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_H5G-G3qfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H5jC8XqfEeK5vdodFAvPrA"/> + </children> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUXweHqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_FUXweXqfEeK5vdodFAvPrA" visible="false" type="82"> + <children xmi:type="notation:Shape" xmi:id="_FU-NYHqfEeK5vdodFAvPrA" type="24"> + <children xmi:type="notation:DecorationNode" xmi:id="_FU-NYnqfEeK5vdodFAvPrA" type="80"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FU-NY3qfEeK5vdodFAvPrA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FU-NYXqfEeK5vdodFAvPrA"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_FUXwenqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_FUXwe3qfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUXwfHqfEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Lifeline" href="complex_invalid_model.uml#_FUE1gHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUXwcXqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_GRh8QHqfEeK5vdodFAvPrA" type="19"> + <children xmi:type="notation:DecorationNode" xmi:id="_GRh8QnqfEeK5vdodFAvPrA" type="21"/> + <children xmi:type="notation:DecorationNode" xmi:id="_GRh8Q3qfEeK5vdodFAvPrA" type="7"> + <children xmi:type="notation:Shape" xmi:id="_G-7NwHqfEeK5vdodFAvPrA" type="9"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_G_EXsXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_G_EXsnqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_G_EXsHqfEeK5vdodFAvPrA"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_G_OIsXqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 1"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_G-7NwnqfEeK5vdodFAvPrA" type="38"> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_G-7Nw3qfEeK5vdodFAvPrA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G-7NwXqfEeK5vdodFAvPrA"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_GRh8RHqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_GRh8RXqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRh8RnqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_GRh8R3qfEeK5vdodFAvPrA" type="8"> + <children xmi:type="notation:Shape" xmi:id="_G_q0oHqfEeK5vdodFAvPrA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_G_q0onqfEeK5vdodFAvPrA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_G_q0o3qfEeK5vdodFAvPrA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_G_OIsnqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G_q0oXqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_IffBkHqfEeK5vdodFAvPrA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_IffBlHqfEeK5vdodFAvPrA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_IffBlXqfEeK5vdodFAvPrA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_IffBlnqfEeK5vdodFAvPrA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_IffBl3qfEeK5vdodFAvPrA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_IffBkXqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_IffBknqfEeK5vdodFAvPrA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_invalid_model.uml#_IfMGoHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_IffBmHqfEeK5vdodFAvPrA" x="84" y="68"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_IffBmXqfEeK5vdodFAvPrA" type="39"> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IffBmnqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_IfyjkHqfEeK5vdodFAvPrA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_IfyjknqfEeK5vdodFAvPrA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Ifyjk3qfEeK5vdodFAvPrA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_IffBm3qfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IfyjkXqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_IoaUEHqfEeK5vdodFAvPrA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_IoaUFHqfEeK5vdodFAvPrA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_IoaUFXqfEeK5vdodFAvPrA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_IoaUFnqfEeK5vdodFAvPrA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_IoaUF3qfEeK5vdodFAvPrA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_IoaUEXqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_IoaUEnqfEeK5vdodFAvPrA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_invalid_model.uml#_IoRKIHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_IoaUGHqfEeK5vdodFAvPrA" x="169" y="68"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_IoaUGXqfEeK5vdodFAvPrA" type="39"> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IoaUGnqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_Io3AAHqfEeK5vdodFAvPrA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_Io3AAnqfEeK5vdodFAvPrA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Io3AA3qfEeK5vdodFAvPrA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_IoaUG3qfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Io3AAXqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_IvGx8HqfEeK5vdodFAvPrA" type="12"> + <children xmi:type="notation:DecorationNode" xmi:id="_IvGx9HqfEeK5vdodFAvPrA" type="10"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_IvGx9XqfEeK5vdodFAvPrA" y="18"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_IvGx9nqfEeK5vdodFAvPrA" type="58"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_IvGx93qfEeK5vdodFAvPrA" y="5"/> + </children> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_IvGx8XqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FontStyle" xmi:id="_IvGx8nqfEeK5vdodFAvPrA"/> + <element xmi:type="uml:OccurrenceSpecification" href="complex_invalid_model.uml#_Iu9oAHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_IvGx-HqfEeK5vdodFAvPrA" x="249" y="68"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_IvGx-XqfEeK5vdodFAvPrA" type="39"> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvGx-nqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_Ivjd4HqfEeK5vdodFAvPrA" type="11"> + <children xmi:type="notation:DecorationNode" xmi:id="_Ivjd4nqfEeK5vdodFAvPrA" type="62"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Ivjd43qfEeK5vdodFAvPrA" y="5"/> + </children> + <element xmi:type="uml:StateInvariant" href="complex_invalid_model.uml#_IvGx-3qfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ivjd4XqfEeK5vdodFAvPrA"/> + </children> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRh8SHqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_GRh8SXqfEeK5vdodFAvPrA" visible="false" type="82"> + <children xmi:type="notation:Shape" xmi:id="_GR03MHqfEeK5vdodFAvPrA" type="24"> + <children xmi:type="notation:DecorationNode" xmi:id="_GR03MnqfEeK5vdodFAvPrA" type="80"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GR03M3qfEeK5vdodFAvPrA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GR03MXqfEeK5vdodFAvPrA"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_GRh8SnqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_GRh8S3qfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRh8THqfEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Lifeline" href="complex_invalid_model.uml#_GRFQUHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRh8QXqfEeK5vdodFAvPrA"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_E00ttHqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_E00ttXqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E00ttnqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_E00tt3qfEeK5vdodFAvPrA" type="29"> + <children xmi:type="notation:Shape" xmi:id="_E2eTgHqfEeK5vdodFAvPrA" type="24"> + <children xmi:type="notation:DecorationNode" xmi:id="_E2eTgnqfEeK5vdodFAvPrA" type="80"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E2eTg3qfEeK5vdodFAvPrA"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E2eTgXqfEeK5vdodFAvPrA"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_E00tuHqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_E00tuXqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E00tunqfEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Interaction" href="complex_invalid_model.uml#_E0hywHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E00tsXqfEeK5vdodFAvPrA" x="30" y="135" width="621" height="501"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_yEbw0XqeEeK5vdodFAvPrA"/> + <element xmi:type="uml:Model" href="complex_invalid_model.uml#_yER_0HqeEeK5vdodFAvPrA"/> + </notation:Diagram> + <notation:Diagram xmi:id="_A_vSgHqfEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_BlGCUHqfEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_BlGCUnqfEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_BlGCU3qfEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BlGCYnqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BlGCY3qfEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_BlGCVHqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_BlGCVXqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_BlGCVnqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlGCV3qfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_BlGCWHqfEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BlGCZHqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BlGCZXqfEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_BlGCWXqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_BlGCWnqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_BlGCW3qfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlGCXHqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_BlGCXXqfEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BlGCZnqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BlGCZ3qfEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_BlGCXnqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_BlGCX3qfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_BlGCYHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlGCYXqfEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="complex_invalid_model.uml#_BkzHYHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlGCUXqfEeK5vdodFAvPrA" x="210" y="59"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_BqdDcHqfEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_BqdDcnqfEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_BqdDc3qfEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BqdDgnqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BqdDg3qfEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_BqdDdHqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_BqdDdXqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_BqdDdnqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BqdDd3qfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_BqdDeHqfEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BqdDhHqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BqdDhXqfEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_BqdDeXqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_BqdDenqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_BqdDe3qfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BqdDfHqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_BqdDfXqfEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BqdDhnqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BqdDh3qfEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_BqdDfnqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_BqdDf3qfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_BqdDgHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BqdDgXqfEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="complex_invalid_model.uml#_BqKIgHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BqdDcXqfEeK5vdodFAvPrA" x="489" y="76"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_BwG_gHqfEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_BwG_gnqfEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_BwG_g3qfEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BwQwgHqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BwQwgXqfEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_BwG_hHqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_BwG_hXqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_BwG_hnqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BwG_h3qfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_BwG_iHqfEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BwQwgnqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BwQwg3qfEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_BwG_iXqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_BwG_inqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_BwG_i3qfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BwG_jHqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_BwG_jXqfEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BwQwhHqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BwQwhXqfEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_BwG_jnqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_BwG_j3qfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_BwG_kHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BwG_kXqfEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="complex_invalid_model.uml#_Bv0EkHqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BwG_gXqfEeK5vdodFAvPrA" x="294" y="428"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_B0vA0HqfEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_B0vA0nqfEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_B0vA03qfEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_B0vA4nqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B0vA43qfEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_B0vA1HqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_B0vA1XqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_B0vA1nqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B0vA13qfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_B0vA2HqfEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_B0vA5HqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B0vA5XqfEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_B0vA2XqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_B0vA2nqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_B0vA23qfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B0vA3HqfEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_B0vA3XqfEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_B0vA5nqfEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B0vA53qfEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_B0vA3nqfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_B0vA33qfEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_B0vA4HqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B0vA4XqfEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="complex_invalid_model.uml#_B0cF4HqfEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B0vA0XqfEeK5vdodFAvPrA" x="88" y="438"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_A_vSgXqfEeK5vdodFAvPrA"/> + <element xmi:type="uml:Model" href="complex_invalid_model.uml#_yER_0HqeEeK5vdodFAvPrA"/> + </notation:Diagram> +</xmi:XMI> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.uml index 9f7acb3777b..1ce9f208bec 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/complex_invalid_model.uml @@ -1,129 +1,129 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_yER_0HqeEeK5vdodFAvPrA" name="model">
- <packagedElement xmi:type="uml:Class" xmi:id="_4Iu1kHqeEeK5vdodFAvPrA" name="Class1"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_4QBwYHqeEeK5vdodFAvPrA" name="Class2"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_4QnmQHqeEeK5vdodFAvPrA" name="Class3"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_4T48sHqeEeK5vdodFAvPrA" name="Class4"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_4WasQHqeEeK5vdodFAvPrA" name="Class5"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_BkzHYHqfEeK5vdodFAvPrA" name="Class6"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_BqKIgHqfEeK5vdodFAvPrA" name="Class7"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_Bv0EkHqfEeK5vdodFAvPrA" name="Class8"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_B0cF4HqfEeK5vdodFAvPrA" name="Class9"/>
- <packagedElement xmi:type="uml:Interaction" xmi:id="_E0hywHqfEeK5vdodFAvPrA">
- <fragment xmi:type="uml:StateInvariant" xmi:id="_Gn2xknqfEeK5vdodFAvPrA" name="State 1_1" covered="_FUE1gHqfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_GoJsgHqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_GoJsgXqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_GntAkHqfEeK5vdodFAvPrA"/>
- </eAnnotations>
- <invariant xmi:id="_Gn2xk3qfEeK5vdodFAvPrA" name="InState_State 1">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gn2xlHqfEeK5vdodFAvPrA">
- <body>State 1</body>
- </specification>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_HtgLAHqfEeK5vdodFAvPrA" name="State 1_1_To_State 2_1" covered="_FUE1gHqfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_HtgLAXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_HtpU-3qfEeK5vdodFAvPrA" name="State 2_1" covered="_FUE1gHqfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_HtzF8HqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_HtzF8XqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_GvJFUHqfEeK5vdodFAvPrA"/>
- </eAnnotations>
- <invariant xmi:id="_HtpU_HqfEeK5vdodFAvPrA" name="InState_State 2">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_HtpU_XqfEeK5vdodFAvPrA">
- <body>State 2</body>
- </specification>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_HzKHEHqfEeK5vdodFAvPrA" name="State 2_1_To_State 1_2" covered="_FUE1gHqfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_HzKHEXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_HzTRC3qfEeK5vdodFAvPrA" name="State 1_2" covered="_FUE1gHqfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_HzdCAHqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_HzdCAXqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_GntAkHqfEeK5vdodFAvPrA"/>
- </eAnnotations>
- <invariant xmi:id="_HzTRDHqfEeK5vdodFAvPrA" name="InState_State 1">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_HzTRDXqfEeK5vdodFAvPrA">
- <body>State 1</body>
- </specification>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_H49NEHqfEeK5vdodFAvPrA" name="State 1_2_To_State 2_2" covered="_FUE1gHqfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_H49NEXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_H5G-G3qfEeK5vdodFAvPrA" name="State 2_2" covered="_FUE1gHqfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_H5QIAHqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_H5QIAXqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_GvJFUHqfEeK5vdodFAvPrA"/>
- </eAnnotations>
- <invariant xmi:id="_H5G-HHqfEeK5vdodFAvPrA" name="InState_State 2">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_H5G-HXqfEeK5vdodFAvPrA">
- <body>State 2</body>
- </specification>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_G_OIsnqfEeK5vdodFAvPrA" name="State 1_1" covered="_GRFQUHqfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_G_X5sHqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_G_X5sXqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_G_EXsHqfEeK5vdodFAvPrA"/>
- </eAnnotations>
- <invariant xmi:id="_G_OIs3qfEeK5vdodFAvPrA" name="InState_State 1">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_G_OItHqfEeK5vdodFAvPrA">
- <body>State 1</body>
- </specification>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_IfMGoHqfEeK5vdodFAvPrA" name="State 1_1_To_State 1_2" covered="_GRFQUHqfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_IfMGoXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_IffBm3qfEeK5vdodFAvPrA" name="State 1_2" covered="_GRFQUHqfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_IfoykHqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_IfoykXqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_G_EXsHqfEeK5vdodFAvPrA"/>
- </eAnnotations>
- <invariant xmi:id="_IffBnHqfEeK5vdodFAvPrA" name="InState_State 1">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_IffBnXqfEeK5vdodFAvPrA">
- <body>State 1</body>
- </specification>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_IoRKIHqfEeK5vdodFAvPrA" name="State 1_2_To_State 1_3" covered="_GRFQUHqfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_IoRKIXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_IoaUG3qfEeK5vdodFAvPrA" name="State 1_3" covered="_GRFQUHqfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_IokFEHqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_Iot2EHqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_G_EXsHqfEeK5vdodFAvPrA"/>
- </eAnnotations>
- <invariant xmi:id="_IoaUHHqfEeK5vdodFAvPrA" name="InState_State 1">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_IoaUHXqfEeK5vdodFAvPrA">
- <body>State 1</body>
- </specification>
- </invariant>
- </fragment>
- <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Iu9oAHqfEeK5vdodFAvPrA" name="State 1_3_To_State 1_4" covered="_GRFQUHqfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_Iu9oAXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
- </fragment>
- <fragment xmi:type="uml:StateInvariant" xmi:id="_IvGx-3qfEeK5vdodFAvPrA" name="State 1_4" covered="_GRFQUHqfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_IvQi8HqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
- <details xmi:id="_IvaT8HqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_G_EXsHqfEeK5vdodFAvPrA"/>
- </eAnnotations>
- <invariant xmi:id="_IvGx_HqfEeK5vdodFAvPrA" name="InState_State 1">
- <specification xmi:type="uml:OpaqueExpression" xmi:id="_IvGx_XqfEeK5vdodFAvPrA">
- <body>State 1</body>
- </specification>
- </invariant>
- </fragment>
- <lifeline xmi:id="_FUE1gHqfEeK5vdodFAvPrA" coveredBy="_Gn2xknqfEeK5vdodFAvPrA _HtgLAHqfEeK5vdodFAvPrA _HtpU-3qfEeK5vdodFAvPrA _HzKHEHqfEeK5vdodFAvPrA _HzTRC3qfEeK5vdodFAvPrA _H49NEHqfEeK5vdodFAvPrA _H5G-G3qfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_FUE1gXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline">
- <details xmi:id="_FUOmgHqfEeK5vdodFAvPrA" key="type" value="full"/>
- </eAnnotations>
- <eAnnotations xmi:id="_GntAk3qfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.LifelineStateDefinitions">
- <details xmi:id="_Gn2xkHqfEeK5vdodFAvPrA" key="_GntAkHqfEeK5vdodFAvPrA" value="State 1"/>
- <details xmi:id="_GvJFU3qfEeK5vdodFAvPrA" key="_GvJFUHqfEeK5vdodFAvPrA" value="State 2"/>
- </eAnnotations>
- </lifeline>
- <lifeline xmi:id="_GRFQUHqfEeK5vdodFAvPrA" coveredBy="_G_OIsnqfEeK5vdodFAvPrA _IfMGoHqfEeK5vdodFAvPrA _IffBm3qfEeK5vdodFAvPrA _IoRKIHqfEeK5vdodFAvPrA _IoaUG3qfEeK5vdodFAvPrA _Iu9oAHqfEeK5vdodFAvPrA _IvGx-3qfEeK5vdodFAvPrA">
- <eAnnotations xmi:id="_GRPBUHqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline">
- <details xmi:id="_GRPBUXqfEeK5vdodFAvPrA" key="type" value="full"/>
- </eAnnotations>
- <eAnnotations xmi:id="_G_EXs3qfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.LifelineStateDefinitions">
- <details xmi:id="_G_OIsHqfEeK5vdodFAvPrA" key="_G_EXsHqfEeK5vdodFAvPrA" value="State 1"/>
- </eAnnotations>
- </lifeline>
- </packagedElement>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_yER_0HqeEeK5vdodFAvPrA" name="model"> + <packagedElement xmi:type="uml:Class" xmi:id="_4Iu1kHqeEeK5vdodFAvPrA" name="Class1"/> + <packagedElement xmi:type="uml:Class" xmi:id="_4QBwYHqeEeK5vdodFAvPrA" name="Class2"/> + <packagedElement xmi:type="uml:Class" xmi:id="_4QnmQHqeEeK5vdodFAvPrA" name="Class3"/> + <packagedElement xmi:type="uml:Class" xmi:id="_4T48sHqeEeK5vdodFAvPrA" name="Class4"/> + <packagedElement xmi:type="uml:Class" xmi:id="_4WasQHqeEeK5vdodFAvPrA" name="Class5"/> + <packagedElement xmi:type="uml:Class" xmi:id="_BkzHYHqfEeK5vdodFAvPrA" name="Class6"/> + <packagedElement xmi:type="uml:Class" xmi:id="_BqKIgHqfEeK5vdodFAvPrA" name="Class7"/> + <packagedElement xmi:type="uml:Class" xmi:id="_Bv0EkHqfEeK5vdodFAvPrA" name="Class8"/> + <packagedElement xmi:type="uml:Class" xmi:id="_B0cF4HqfEeK5vdodFAvPrA" name="Class9"/> + <packagedElement xmi:type="uml:Interaction" xmi:id="_E0hywHqfEeK5vdodFAvPrA"> + <fragment xmi:type="uml:StateInvariant" xmi:id="_Gn2xknqfEeK5vdodFAvPrA" name="State 1_1" covered="_FUE1gHqfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_GoJsgHqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_GoJsgXqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_GntAkHqfEeK5vdodFAvPrA"/> + </eAnnotations> + <invariant xmi:id="_Gn2xk3qfEeK5vdodFAvPrA" name="InState_State 1"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gn2xlHqfEeK5vdodFAvPrA"> + <body>State 1</body> + </specification> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_HtgLAHqfEeK5vdodFAvPrA" name="State 1_1_To_State 2_1" covered="_FUE1gHqfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_HtgLAXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_HtpU-3qfEeK5vdodFAvPrA" name="State 2_1" covered="_FUE1gHqfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_HtzF8HqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_HtzF8XqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_GvJFUHqfEeK5vdodFAvPrA"/> + </eAnnotations> + <invariant xmi:id="_HtpU_HqfEeK5vdodFAvPrA" name="InState_State 2"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_HtpU_XqfEeK5vdodFAvPrA"> + <body>State 2</body> + </specification> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_HzKHEHqfEeK5vdodFAvPrA" name="State 2_1_To_State 1_2" covered="_FUE1gHqfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_HzKHEXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_HzTRC3qfEeK5vdodFAvPrA" name="State 1_2" covered="_FUE1gHqfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_HzdCAHqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_HzdCAXqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_GntAkHqfEeK5vdodFAvPrA"/> + </eAnnotations> + <invariant xmi:id="_HzTRDHqfEeK5vdodFAvPrA" name="InState_State 1"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_HzTRDXqfEeK5vdodFAvPrA"> + <body>State 1</body> + </specification> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_H49NEHqfEeK5vdodFAvPrA" name="State 1_2_To_State 2_2" covered="_FUE1gHqfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_H49NEXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_H5G-G3qfEeK5vdodFAvPrA" name="State 2_2" covered="_FUE1gHqfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_H5QIAHqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_H5QIAXqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_GvJFUHqfEeK5vdodFAvPrA"/> + </eAnnotations> + <invariant xmi:id="_H5G-HHqfEeK5vdodFAvPrA" name="InState_State 2"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_H5G-HXqfEeK5vdodFAvPrA"> + <body>State 2</body> + </specification> + </invariant> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_G_OIsnqfEeK5vdodFAvPrA" name="State 1_1" covered="_GRFQUHqfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_G_X5sHqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_G_X5sXqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_G_EXsHqfEeK5vdodFAvPrA"/> + </eAnnotations> + <invariant xmi:id="_G_OIs3qfEeK5vdodFAvPrA" name="InState_State 1"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_G_OItHqfEeK5vdodFAvPrA"> + <body>State 1</body> + </specification> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_IfMGoHqfEeK5vdodFAvPrA" name="State 1_1_To_State 1_2" covered="_GRFQUHqfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_IfMGoXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_IffBm3qfEeK5vdodFAvPrA" name="State 1_2" covered="_GRFQUHqfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_IfoykHqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_IfoykXqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_G_EXsHqfEeK5vdodFAvPrA"/> + </eAnnotations> + <invariant xmi:id="_IffBnHqfEeK5vdodFAvPrA" name="InState_State 1"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_IffBnXqfEeK5vdodFAvPrA"> + <body>State 1</body> + </specification> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_IoRKIHqfEeK5vdodFAvPrA" name="State 1_2_To_State 1_3" covered="_GRFQUHqfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_IoRKIXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_IoaUG3qfEeK5vdodFAvPrA" name="State 1_3" covered="_GRFQUHqfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_IokFEHqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_Iot2EHqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_G_EXsHqfEeK5vdodFAvPrA"/> + </eAnnotations> + <invariant xmi:id="_IoaUHHqfEeK5vdodFAvPrA" name="InState_State 1"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_IoaUHXqfEeK5vdodFAvPrA"> + <body>State 1</body> + </specification> + </invariant> + </fragment> + <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Iu9oAHqfEeK5vdodFAvPrA" name="State 1_3_To_State 1_4" covered="_GRFQUHqfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_Iu9oAXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/> + </fragment> + <fragment xmi:type="uml:StateInvariant" xmi:id="_IvGx-3qfEeK5vdodFAvPrA" name="State 1_4" covered="_GRFQUHqfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_IvQi8HqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant"> + <details xmi:id="_IvaT8HqfEeK5vdodFAvPrA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_G_EXsHqfEeK5vdodFAvPrA"/> + </eAnnotations> + <invariant xmi:id="_IvGx_HqfEeK5vdodFAvPrA" name="InState_State 1"> + <specification xmi:type="uml:OpaqueExpression" xmi:id="_IvGx_XqfEeK5vdodFAvPrA"> + <body>State 1</body> + </specification> + </invariant> + </fragment> + <lifeline xmi:id="_FUE1gHqfEeK5vdodFAvPrA" coveredBy="_Gn2xknqfEeK5vdodFAvPrA _HtgLAHqfEeK5vdodFAvPrA _HtpU-3qfEeK5vdodFAvPrA _HzKHEHqfEeK5vdodFAvPrA _HzTRC3qfEeK5vdodFAvPrA _H49NEHqfEeK5vdodFAvPrA _H5G-G3qfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_FUE1gXqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline"> + <details xmi:id="_FUOmgHqfEeK5vdodFAvPrA" key="type" value="full"/> + </eAnnotations> + <eAnnotations xmi:id="_GntAk3qfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.LifelineStateDefinitions"> + <details xmi:id="_Gn2xkHqfEeK5vdodFAvPrA" key="_GntAkHqfEeK5vdodFAvPrA" value="State 1"/> + <details xmi:id="_GvJFU3qfEeK5vdodFAvPrA" key="_GvJFUHqfEeK5vdodFAvPrA" value="State 2"/> + </eAnnotations> + </lifeline> + <lifeline xmi:id="_GRFQUHqfEeK5vdodFAvPrA" coveredBy="_G_OIsnqfEeK5vdodFAvPrA _IfMGoHqfEeK5vdodFAvPrA _IffBm3qfEeK5vdodFAvPrA _IoRKIHqfEeK5vdodFAvPrA _IoaUG3qfEeK5vdodFAvPrA _Iu9oAHqfEeK5vdodFAvPrA _IvGx-3qfEeK5vdodFAvPrA"> + <eAnnotations xmi:id="_GRPBUHqfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline"> + <details xmi:id="_GRPBUXqfEeK5vdodFAvPrA" key="type" value="full"/> + </eAnnotations> + <eAnnotations xmi:id="_G_EXs3qfEeK5vdodFAvPrA" source="org.eclipse.papyrus.uml.diagram.timing.LifelineStateDefinitions"> + <details xmi:id="_G_OIsHqfEeK5vdodFAvPrA" key="_G_EXsHqfEeK5vdodFAvPrA" value="State 1"/> + </eAnnotations> + </lifeline> + </packagedElement> +</uml:Model> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/empty_di_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/empty_di_model.di index 5779ff3e03e..999777efdca 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/empty_di_model.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/empty_di_model.di @@ -1,3 +1,3 @@ -<?xml version="1.0" encoding="ASCII"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="ASCII"?> +<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> +</di:SashWindowsMngr> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/empty_di_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/empty_di_model.notation index ad0a78dcaf1..09226e54cff 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/empty_di_model.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/empty_di_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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_eywzMHqbEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_fCi7oXqbEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_fCi7o3qbEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_fCi7pHqbEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCi7s3qbEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCi7tHqbEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_fCi7pXqbEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_fCi7pnqbEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_fCi7p3qbEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fCi7qHqbEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_fCi7qXqbEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCi7tXqbEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCi7tnqbEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_fCi7qnqbEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_fCi7q3qbEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_fCi7rHqbEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fCi7rXqbEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_fCi7rnqbEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCi7t3qbEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCi7uHqbEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_fCi7r3qbEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_fCi7sHqbEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_fCi7sXqbEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fCi7snqbEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="empty_di_model.uml#_fCi7oHqbEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fCi7onqbEeK5vdodFAvPrA" x="236" y="319"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_fb1lYHqbEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_fb1lYnqbEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_fb1lY3qbEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fb1lcnqbEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fb1lc3qbEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_fb1lZHqbEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_fb1lZXqbEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_fb1lZnqbEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fb1lZ3qbEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_fb1laHqbEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fb1ldHqbEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fb1ldXqbEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_fb1laXqbEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_fb1lanqbEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_fb1la3qbEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fb1lbHqbEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_fb1lbXqbEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fb1ldnqbEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fb1ld3qbEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_fb1lbnqbEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_fb1lb3qbEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_fb1lcHqbEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fb1lcXqbEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="empty_di_model.uml#_fbr0YHqbEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fb1lYXqbEeK5vdodFAvPrA" x="694" y="329"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_eywzMXqbEeK5vdodFAvPrA"/>
- <element xmi:type="uml:Model" href="empty_di_model.uml#_drozEHqbEeK5vdodFAvPrA"/>
- <edges xmi:type="notation:Connector" xmi:id="_f2BnAHqbEeK5vdodFAvPrA" type="4001" source="_fCi7oXqbEeK5vdodFAvPrA" target="_fb1lYHqbEeK5vdodFAvPrA">
- <children xmi:type="notation:DecorationNode" xmi:id="_f2BnA3qbEeK5vdodFAvPrA" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_f2BnBHqbEeK5vdodFAvPrA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_f2BnBXqbEeK5vdodFAvPrA" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_f2BnBnqbEeK5vdodFAvPrA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_f2BnB3qbEeK5vdodFAvPrA" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_f2BnCHqbEeK5vdodFAvPrA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_f2LYAHqbEeK5vdodFAvPrA" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_f2LYAXqbEeK5vdodFAvPrA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_f2LYAnqbEeK5vdodFAvPrA" type="6033">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_f2LYA3qbEeK5vdodFAvPrA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_f2LYBHqbEeK5vdodFAvPrA" type="6034">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_f2LYBXqbEeK5vdodFAvPrA" y="-20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_f2BnAXqbEeK5vdodFAvPrA"/>
- <element xmi:type="uml:Association" href="empty_di_model.uml#_f14dEHqbEeK5vdodFAvPrA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f2BnAnqbEeK5vdodFAvPrA" points="[50, 1, -408, -9]$[461, 60, 3, 50]"/>
- </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_eywzMHqbEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_fCi7oXqbEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_fCi7o3qbEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_fCi7pHqbEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCi7s3qbEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCi7tHqbEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_fCi7pXqbEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_fCi7pnqbEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_fCi7p3qbEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fCi7qHqbEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_fCi7qXqbEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCi7tXqbEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCi7tnqbEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_fCi7qnqbEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_fCi7q3qbEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_fCi7rHqbEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fCi7rXqbEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_fCi7rnqbEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fCi7t3qbEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fCi7uHqbEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_fCi7r3qbEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_fCi7sHqbEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_fCi7sXqbEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fCi7snqbEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="empty_di_model.uml#_fCi7oHqbEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fCi7onqbEeK5vdodFAvPrA" x="236" y="319"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_fb1lYHqbEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_fb1lYnqbEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_fb1lY3qbEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fb1lcnqbEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fb1lc3qbEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_fb1lZHqbEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_fb1lZXqbEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_fb1lZnqbEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fb1lZ3qbEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_fb1laHqbEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fb1ldHqbEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fb1ldXqbEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_fb1laXqbEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_fb1lanqbEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_fb1la3qbEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fb1lbHqbEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_fb1lbXqbEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fb1ldnqbEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fb1ld3qbEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_fb1lbnqbEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_fb1lb3qbEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_fb1lcHqbEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fb1lcXqbEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="empty_di_model.uml#_fbr0YHqbEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fb1lYXqbEeK5vdodFAvPrA" x="694" y="329"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_eywzMXqbEeK5vdodFAvPrA"/> + <element xmi:type="uml:Model" href="empty_di_model.uml#_drozEHqbEeK5vdodFAvPrA"/> + <edges xmi:type="notation:Connector" xmi:id="_f2BnAHqbEeK5vdodFAvPrA" type="4001" source="_fCi7oXqbEeK5vdodFAvPrA" target="_fb1lYHqbEeK5vdodFAvPrA"> + <children xmi:type="notation:DecorationNode" xmi:id="_f2BnA3qbEeK5vdodFAvPrA" type="6001"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_f2BnBHqbEeK5vdodFAvPrA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_f2BnBXqbEeK5vdodFAvPrA" type="6002"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_f2BnBnqbEeK5vdodFAvPrA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_f2BnB3qbEeK5vdodFAvPrA" type="6003"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_f2BnCHqbEeK5vdodFAvPrA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_f2LYAHqbEeK5vdodFAvPrA" type="6005"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_f2LYAXqbEeK5vdodFAvPrA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_f2LYAnqbEeK5vdodFAvPrA" type="6033"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_f2LYA3qbEeK5vdodFAvPrA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_f2LYBHqbEeK5vdodFAvPrA" type="6034"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_f2LYBXqbEeK5vdodFAvPrA" y="-20"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_f2BnAXqbEeK5vdodFAvPrA"/> + <element xmi:type="uml:Association" href="empty_di_model.uml#_f14dEHqbEeK5vdodFAvPrA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f2BnAnqbEeK5vdodFAvPrA" points="[50, 1, -408, -9]$[461, 60, 3, 50]"/> + </edges> +</notation:Diagram> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/empty_di_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/empty_di_model.uml index 1b5e21d1129..af3a8b2813a 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/empty_di_model.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/empty_di_model.uml @@ -1,16 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_drozEHqbEeK5vdodFAvPrA" name="model">
- <packagedElement xmi:type="uml:Class" xmi:id="_fCi7oHqbEeK5vdodFAvPrA" name="Class1">
- <ownedAttribute xmi:id="_f1usEHqbEeK5vdodFAvPrA" name="class2" type="_fbr0YHqbEeK5vdodFAvPrA" association="_f14dEHqbEeK5vdodFAvPrA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_f1usEXqbEeK5vdodFAvPrA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_f1usEnqbEeK5vdodFAvPrA" value="1"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_fbr0YHqbEeK5vdodFAvPrA" name="Class2"/>
- <packagedElement xmi:type="uml:Association" xmi:id="_f14dEHqbEeK5vdodFAvPrA" name="class1_class2_1" memberEnd="_f14dEXqbEeK5vdodFAvPrA _f1usEHqbEeK5vdodFAvPrA">
- <ownedEnd xmi:id="_f14dEXqbEeK5vdodFAvPrA" name="class1" type="_fCi7oHqbEeK5vdodFAvPrA" association="_f14dEHqbEeK5vdodFAvPrA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_f14dEnqbEeK5vdodFAvPrA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_f14dE3qbEeK5vdodFAvPrA" value="1"/>
- </ownedEnd>
- </packagedElement>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_drozEHqbEeK5vdodFAvPrA" name="model"> + <packagedElement xmi:type="uml:Class" xmi:id="_fCi7oHqbEeK5vdodFAvPrA" name="Class1"> + <ownedAttribute xmi:id="_f1usEHqbEeK5vdodFAvPrA" name="class2" type="_fbr0YHqbEeK5vdodFAvPrA" association="_f14dEHqbEeK5vdodFAvPrA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_f1usEXqbEeK5vdodFAvPrA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_f1usEnqbEeK5vdodFAvPrA" value="1"/> + </ownedAttribute> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_fbr0YHqbEeK5vdodFAvPrA" name="Class2"/> + <packagedElement xmi:type="uml:Association" xmi:id="_f14dEHqbEeK5vdodFAvPrA" name="class1_class2_1" memberEnd="_f14dEXqbEeK5vdodFAvPrA _f1usEHqbEeK5vdodFAvPrA"> + <ownedEnd xmi:id="_f14dEXqbEeK5vdodFAvPrA" name="class1" type="_fCi7oHqbEeK5vdodFAvPrA" association="_f14dEHqbEeK5vdodFAvPrA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_f14dEnqbEeK5vdodFAvPrA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_f14dE3qbEeK5vdodFAvPrA" value="1"/> + </ownedEnd> + </packagedElement> +</uml:Model> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalidAvailablePage.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalidAvailablePage.di index da40187324e..0a036f53b02 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalidAvailablePage.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalidAvailablePage.di @@ -1,24 +1,24 @@ -<?xml version="1.0" encoding="ASCII"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage>
- <emfPageIdentifier href="invalidAvailablePage.notation#_1xkSQHqQEeK9jI2Tc6HWsA"/>
- </availablePage>
- <availablePage/>
- <availablePage>
- <emfPageIdentifier href="invalidAvailablePage.notation#_5jhK0HqZEeK5vdodFAvPrA"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="invalidAvailablePage.notation#_1xkSQHqQEeK9jI2Tc6HWsA"/>
- </children>
- <children>
- <emfPageIdentifier href="invalidAvailablePage.notation#_5jhK0HqZEeK5vdodFAvPrA"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="ASCII"?> +<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> + <pageList> + <availablePage> + <emfPageIdentifier href="invalidAvailablePage.notation#_1xkSQHqQEeK9jI2Tc6HWsA"/> + </availablePage> + <availablePage/> + <availablePage> + <emfPageIdentifier href="invalidAvailablePage.notation#_5jhK0HqZEeK5vdodFAvPrA"/> + </availablePage> + </pageList> + <sashModel currentSelection="//@sashModel/@windows.0/@children.0"> + <windows> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="invalidAvailablePage.notation#_1xkSQHqQEeK9jI2Tc6HWsA"/> + </children> + <children> + <emfPageIdentifier href="invalidAvailablePage.notation#_5jhK0HqZEeK5vdodFAvPrA"/> + </children> + </children> + </windows> + </sashModel> +</di:SashWindowsMngr> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalidAvailablePage.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalidAvailablePage.notation index 987e8519d88..8c5a0aa6b53 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalidAvailablePage.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalidAvailablePage.notation @@ -1,131 +1,131 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
- <notation:Diagram xmi:id="_1xkSQHqQEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_2WT-EHqQEeK9jI2Tc6HWsA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_2WdvEHqQEeK9jI2Tc6HWsA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvEXqQEeK9jI2Tc6HWsA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvIHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvIXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvEnqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvE3qQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvFHqQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvFXqQEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvFnqQEeK9jI2Tc6HWsA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvInqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvI3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvF3qQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvGHqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvGXqQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvGnqQEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvG3qQEeK9jI2Tc6HWsA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvJHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvJXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvHHqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvHXqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvHnqQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvH3qQEeK9jI2Tc6HWsA"/>
- </children>
- <element xmi:type="uml:Class" href="invalidAvailablePage.uml#_2O35UHqQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WT-EXqQEeK9jI2Tc6HWsA" x="290" y="270"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_3N8wsHqQEeK9jI2Tc6HWsA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_3N8wsnqQEeK9jI2Tc6HWsA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_3N8ws3qQEeK9jI2Tc6HWsA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wwnqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8ww3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wtHqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wtXqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wtnqQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wt3qQEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_3N8wuHqQEeK9jI2Tc6HWsA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wxHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8wxXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wuXqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wunqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wu3qQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wvHqQEeK9jI2Tc6HWsA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_3N8wvXqQEeK9jI2Tc6HWsA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wxnqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8wx3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wvnqQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wv3qQEeK9jI2Tc6HWsA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wwHqQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wwXqQEeK9jI2Tc6HWsA"/>
- </children>
- <element xmi:type="uml:Class" href="invalidAvailablePage.uml#_3Np1wHqQEeK9jI2Tc6HWsA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wsXqQEeK9jI2Tc6HWsA" x="840" y="270"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_1xkSQXqQEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Model" href="invalidAvailablePage.uml#_1w91UHqQEeK9jI2Tc6HWsA"/>
- <edges xmi:type="notation:Connector" xmi:id="_4hkUsHqQEeK9jI2Tc6HWsA" type="4001" source="_2WT-EHqQEeK9jI2Tc6HWsA" target="_3N8wsHqQEeK9jI2Tc6HWsA">
- <children xmi:type="notation:DecorationNode" xmi:id="_4hkUs3qQEeK9jI2Tc6HWsA" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUtHqQEeK9jI2Tc6HWsA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_4hkUtXqQEeK9jI2Tc6HWsA" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUtnqQEeK9jI2Tc6HWsA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_4hkUt3qQEeK9jI2Tc6HWsA" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUuHqQEeK9jI2Tc6HWsA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_4hkUuXqQEeK9jI2Tc6HWsA" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUunqQEeK9jI2Tc6HWsA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_4hkUu3qQEeK9jI2Tc6HWsA" type="6033">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUvHqQEeK9jI2Tc6HWsA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_4hkUvXqQEeK9jI2Tc6HWsA" type="6034">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUvnqQEeK9jI2Tc6HWsA" y="-20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_4hkUsXqQEeK9jI2Tc6HWsA"/>
- <element xmi:type="uml:Association" href="invalidAvailablePage.uml#_4hHowHqQEeK9jI2Tc6HWsA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4hkUsnqQEeK9jI2Tc6HWsA" points="[77, -1, -567, -9]$[645, -42, 1, -50]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4nEfwHqQEeK9jI2Tc6HWsA" id="(0.23,0.45)"/>
- </edges>
- </notation:Diagram>
- <notation:Diagram xmi:id="_5jhK0HqZEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_6KpcQHqZEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_6KpcQnqZEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_6KpcQ3qZEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6KpcUnqZEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6KpcU3qZEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_6KpcRHqZEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_6KpcRXqZEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_6KpcRnqZEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KpcR3qZEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_6KpcSHqZEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6KpcVHqZEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6KpcVXqZEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_6KpcSXqZEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_6KpcSnqZEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_6KpcS3qZEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KpcTHqZEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_6KpcTXqZEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6KpcVnqZEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6KpcV3qZEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_6KpcTnqZEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_6KpcT3qZEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_6KpcUHqZEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KpcUXqZEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="invalidAvailablePage.uml#_6JKOgHqZEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KpcQXqZEeK5vdodFAvPrA" x="345" y="210" width="496" height="271"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_5jhK0XqZEeK5vdodFAvPrA"/>
- <element xmi:type="uml:Model" href="invalidAvailablePage.uml#_1w91UHqQEeK9jI2Tc6HWsA"/>
- </notation:Diagram>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> + <notation:Diagram xmi:id="_1xkSQHqQEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_2WT-EHqQEeK9jI2Tc6HWsA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_2WdvEHqQEeK9jI2Tc6HWsA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvEXqQEeK9jI2Tc6HWsA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvIHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvIXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvEnqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvE3qQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvFHqQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvFXqQEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvFnqQEeK9jI2Tc6HWsA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvInqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvI3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvF3qQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvGHqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvGXqQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvGnqQEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvG3qQEeK9jI2Tc6HWsA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvJHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvJXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvHHqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvHXqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvHnqQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvH3qQEeK9jI2Tc6HWsA"/> + </children> + <element xmi:type="uml:Class" href="invalidAvailablePage.uml#_2O35UHqQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WT-EXqQEeK9jI2Tc6HWsA" x="290" y="270"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_3N8wsHqQEeK9jI2Tc6HWsA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_3N8wsnqQEeK9jI2Tc6HWsA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_3N8ws3qQEeK9jI2Tc6HWsA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wwnqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8ww3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wtHqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wtXqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wtnqQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wt3qQEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_3N8wuHqQEeK9jI2Tc6HWsA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wxHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8wxXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wuXqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wunqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wu3qQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wvHqQEeK9jI2Tc6HWsA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_3N8wvXqQEeK9jI2Tc6HWsA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wxnqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8wx3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wvnqQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wv3qQEeK9jI2Tc6HWsA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wwHqQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wwXqQEeK9jI2Tc6HWsA"/> + </children> + <element xmi:type="uml:Class" href="invalidAvailablePage.uml#_3Np1wHqQEeK9jI2Tc6HWsA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wsXqQEeK9jI2Tc6HWsA" x="840" y="270"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_1xkSQXqQEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Model" href="invalidAvailablePage.uml#_1w91UHqQEeK9jI2Tc6HWsA"/> + <edges xmi:type="notation:Connector" xmi:id="_4hkUsHqQEeK9jI2Tc6HWsA" type="4001" source="_2WT-EHqQEeK9jI2Tc6HWsA" target="_3N8wsHqQEeK9jI2Tc6HWsA"> + <children xmi:type="notation:DecorationNode" xmi:id="_4hkUs3qQEeK9jI2Tc6HWsA" type="6001"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUtHqQEeK9jI2Tc6HWsA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_4hkUtXqQEeK9jI2Tc6HWsA" type="6002"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUtnqQEeK9jI2Tc6HWsA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_4hkUt3qQEeK9jI2Tc6HWsA" type="6003"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUuHqQEeK9jI2Tc6HWsA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_4hkUuXqQEeK9jI2Tc6HWsA" type="6005"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUunqQEeK9jI2Tc6HWsA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_4hkUu3qQEeK9jI2Tc6HWsA" type="6033"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUvHqQEeK9jI2Tc6HWsA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_4hkUvXqQEeK9jI2Tc6HWsA" type="6034"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUvnqQEeK9jI2Tc6HWsA" y="-20"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_4hkUsXqQEeK9jI2Tc6HWsA"/> + <element xmi:type="uml:Association" href="invalidAvailablePage.uml#_4hHowHqQEeK9jI2Tc6HWsA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4hkUsnqQEeK9jI2Tc6HWsA" points="[77, -1, -567, -9]$[645, -42, 1, -50]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4nEfwHqQEeK9jI2Tc6HWsA" id="(0.23,0.45)"/> + </edges> + </notation:Diagram> + <notation:Diagram xmi:id="_5jhK0HqZEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_6KpcQHqZEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_6KpcQnqZEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_6KpcQ3qZEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6KpcUnqZEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6KpcU3qZEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_6KpcRHqZEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_6KpcRXqZEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_6KpcRnqZEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KpcR3qZEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_6KpcSHqZEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6KpcVHqZEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6KpcVXqZEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_6KpcSXqZEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_6KpcSnqZEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_6KpcS3qZEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KpcTHqZEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_6KpcTXqZEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6KpcVnqZEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6KpcV3qZEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_6KpcTnqZEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_6KpcT3qZEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_6KpcUHqZEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KpcUXqZEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="invalidAvailablePage.uml#_6JKOgHqZEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KpcQXqZEeK5vdodFAvPrA" x="345" y="210" width="496" height="271"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_5jhK0XqZEeK5vdodFAvPrA"/> + <element xmi:type="uml:Model" href="invalidAvailablePage.uml#_1w91UHqQEeK9jI2Tc6HWsA"/> + </notation:Diagram> +</xmi:XMI> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalidAvailablePage.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalidAvailablePage.uml index 3fb29cbb21f..2de07cebb9e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalidAvailablePage.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalidAvailablePage.uml @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_1w91UHqQEeK9jI2Tc6HWsA" name="Model">
- <packagedElement xmi:type="uml:Class" xmi:id="_2O35UHqQEeK9jI2Tc6HWsA" name="Class1">
- <ownedAttribute xmi:id="_4g93wHqQEeK9jI2Tc6HWsA" name="class2" type="_3Np1wHqQEeK9jI2Tc6HWsA" association="_4hHowHqQEeK9jI2Tc6HWsA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4g93wXqQEeK9jI2Tc6HWsA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4g93wnqQEeK9jI2Tc6HWsA" value="1"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_3Np1wHqQEeK9jI2Tc6HWsA" name="Class2"/>
- <packagedElement xmi:type="uml:Association" xmi:id="_4hHowHqQEeK9jI2Tc6HWsA" name="class1_class2_1" memberEnd="_4hHowXqQEeK9jI2Tc6HWsA _4g93wHqQEeK9jI2Tc6HWsA">
- <ownedEnd xmi:id="_4hHowXqQEeK9jI2Tc6HWsA" name="class1" type="_2O35UHqQEeK9jI2Tc6HWsA" association="_4hHowHqQEeK9jI2Tc6HWsA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4hHownqQEeK9jI2Tc6HWsA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4hHow3qQEeK9jI2Tc6HWsA" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_6JKOgHqZEeK5vdodFAvPrA" name="Class3"/>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_1w91UHqQEeK9jI2Tc6HWsA" name="Model"> + <packagedElement xmi:type="uml:Class" xmi:id="_2O35UHqQEeK9jI2Tc6HWsA" name="Class1"> + <ownedAttribute xmi:id="_4g93wHqQEeK9jI2Tc6HWsA" name="class2" type="_3Np1wHqQEeK9jI2Tc6HWsA" association="_4hHowHqQEeK9jI2Tc6HWsA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4g93wXqQEeK9jI2Tc6HWsA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4g93wnqQEeK9jI2Tc6HWsA" value="1"/> + </ownedAttribute> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_3Np1wHqQEeK9jI2Tc6HWsA" name="Class2"/> + <packagedElement xmi:type="uml:Association" xmi:id="_4hHowHqQEeK9jI2Tc6HWsA" name="class1_class2_1" memberEnd="_4hHowXqQEeK9jI2Tc6HWsA _4g93wHqQEeK9jI2Tc6HWsA"> + <ownedEnd xmi:id="_4hHowXqQEeK9jI2Tc6HWsA" name="class1" type="_2O35UHqQEeK9jI2Tc6HWsA" association="_4hHowHqQEeK9jI2Tc6HWsA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4hHownqQEeK9jI2Tc6HWsA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4hHow3qQEeK9jI2Tc6HWsA" value="1"/> + </ownedEnd> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_6JKOgHqZEeK5vdodFAvPrA" name="Class3"/> +</uml:Model> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalid_child_tab.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalid_child_tab.di index ff276f9cd63..9d0978390cd 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalid_child_tab.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalid_child_tab.di @@ -1,18 +1,18 @@ -<?xml version="1.0" encoding="ASCII"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage>
- <emfPageIdentifier href="invalid_child_tab.notation#_A8FeYHqbEeK5vdodFAvPrA"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children/>
- <children>
- <emfPageIdentifier href="invalid_child_tab.notation#_A8FeYHqbEeK5vdodFAvPrA"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="ASCII"?> +<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> + <pageList> + <availablePage> + <emfPageIdentifier href="invalid_child_tab.notation#_A8FeYHqbEeK5vdodFAvPrA"/> + </availablePage> + </pageList> + <sashModel currentSelection="//@sashModel/@windows.0/@children.0"> + <windows> + <children xsi:type="di:TabFolder"> + <children/> + <children> + <emfPageIdentifier href="invalid_child_tab.notation#_A8FeYHqbEeK5vdodFAvPrA"/> + </children> + </children> + </windows> + </sashModel> +</di:SashWindowsMngr> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalid_child_tab.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalid_child_tab.notation index 5cb52265c3d..7f116ca591e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalid_child_tab.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalid_child_tab.notation @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_A8FeYHqbEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <styles xmi:type="notation:DiagramStyle" xmi:id="_A8FeYXqbEeK5vdodFAvPrA"/>
- <element xmi:type="uml:Model" href="invalid_child_tab.uml#_A5_zsHqbEeK5vdodFAvPrA"/>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_A8FeYHqbEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> + <styles xmi:type="notation:DiagramStyle" xmi:id="_A8FeYXqbEeK5vdodFAvPrA"/> + <element xmi:type="uml:Model" href="invalid_child_tab.uml#_A5_zsHqbEeK5vdodFAvPrA"/> +</notation:Diagram> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalid_child_tab.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalid_child_tab.uml index eed0ddaa469..87ae8a924d3 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalid_child_tab.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/invalid_child_tab.uml @@ -1,2 +1,2 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_A5_zsHqbEeK5vdodFAvPrA" name="model"/>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_A5_zsHqbEeK5vdodFAvPrA" name="model"/> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/missing_page_recovery.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/missing_page_recovery.di index 57c4cacd79a..3083fd532f7 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/missing_page_recovery.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/missing_page_recovery.di @@ -1,12 +1,12 @@ -<?xml version="1.0" encoding="ASCII"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage/>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="ASCII"?> +<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> + <pageList> + <availablePage/> + </pageList> + <sashModel currentSelection="//@sashModel/@windows.0/@children.0"> + <windows> + <children xsi:type="di:TabFolder"> + </children> + </windows> + </sashModel> +</di:SashWindowsMngr> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/missing_page_recovery.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/missing_page_recovery.notation index 8b06128a92a..79a8c707090 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/missing_page_recovery.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/missing_page_recovery.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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_Dy62sXqdEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_EJ-r0HqdEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_EJ-r0nqdEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_EJ-r03qdEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EJ-r4nqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EJ-r43qdEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_EJ-r1HqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_EJ-r1XqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_EJ-r1nqdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EJ-r13qdEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_EJ-r2HqdEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EJ-r5HqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EJ-r5XqdEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_EJ-r2XqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_EJ-r2nqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_EJ-r23qdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EJ-r3HqdEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_EJ-r3XqdEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EJ-r5nqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EJ-r53qdEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_EJ-r3nqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_EJ-r33qdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_EJ-r4HqdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EJ-r4XqdEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="missing_page_recovery.uml#_EJ1h4HqdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EJ-r0XqdEeK5vdodFAvPrA" x="365" y="282"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_ETgbQHqdEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_ETgbQnqdEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_ETgbQ3qdEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ETgbUnqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ETgbU3qdEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_ETgbRHqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_ETgbRXqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_ETgbRnqdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ETgbR3qdEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_ETgbSHqdEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ETgbVHqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ETgbVXqdEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_ETgbSXqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_ETgbSnqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_ETgbS3qdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ETgbTHqdEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_ETgbTXqdEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ETgbVnqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ETgbV3qdEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_ETgbTnqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_ETgbT3qdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_ETgbUHqdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ETgbUXqdEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="missing_page_recovery.uml#_ETM5QHqdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ETgbQXqdEeK5vdodFAvPrA" x="867" y="288"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_Dy62snqdEeK5vdodFAvPrA"/>
- <element xmi:type="uml:Model" href="missing_page_recovery.uml#_Dy62sHqdEeK5vdodFAvPrA"/>
- <edges xmi:type="notation:Connector" xmi:id="_EoLqwHqdEeK5vdodFAvPrA" type="4001" source="_EJ-r0HqdEeK5vdodFAvPrA" target="_ETgbQHqdEeK5vdodFAvPrA">
- <children xmi:type="notation:DecorationNode" xmi:id="_EoLqw3qdEeK5vdodFAvPrA" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_EoLqxHqdEeK5vdodFAvPrA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_EoLqxXqdEeK5vdodFAvPrA" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_EoLqxnqdEeK5vdodFAvPrA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_EoLqx3qdEeK5vdodFAvPrA" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_EoLqyHqdEeK5vdodFAvPrA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_EoLqyXqdEeK5vdodFAvPrA" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_EoLqynqdEeK5vdodFAvPrA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_EoLqy3qdEeK5vdodFAvPrA" type="6033">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_EoLqzHqdEeK5vdodFAvPrA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_EoLqzXqdEeK5vdodFAvPrA" type="6034">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_EoLqznqdEeK5vdodFAvPrA" y="-20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_EoLqwXqdEeK5vdodFAvPrA"/>
- <element xmi:type="uml:Association" href="missing_page_recovery.uml#_En4v0HqdEeK5vdodFAvPrA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EoLqwnqdEeK5vdodFAvPrA" points="[50, 2, -452, -4]$[501, -44, -1, -50]"/>
- </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_Dy62sXqdEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_EJ-r0HqdEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_EJ-r0nqdEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_EJ-r03qdEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EJ-r4nqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EJ-r43qdEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_EJ-r1HqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_EJ-r1XqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_EJ-r1nqdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EJ-r13qdEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_EJ-r2HqdEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EJ-r5HqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EJ-r5XqdEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_EJ-r2XqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_EJ-r2nqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_EJ-r23qdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EJ-r3HqdEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_EJ-r3XqdEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EJ-r5nqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EJ-r53qdEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_EJ-r3nqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_EJ-r33qdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_EJ-r4HqdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EJ-r4XqdEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="missing_page_recovery.uml#_EJ1h4HqdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EJ-r0XqdEeK5vdodFAvPrA" x="365" y="282"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_ETgbQHqdEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_ETgbQnqdEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_ETgbQ3qdEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ETgbUnqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ETgbU3qdEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_ETgbRHqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_ETgbRXqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_ETgbRnqdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ETgbR3qdEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_ETgbSHqdEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ETgbVHqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ETgbVXqdEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_ETgbSXqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_ETgbSnqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_ETgbS3qdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ETgbTHqdEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_ETgbTXqdEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ETgbVnqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ETgbV3qdEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_ETgbTnqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_ETgbT3qdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_ETgbUHqdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ETgbUXqdEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="missing_page_recovery.uml#_ETM5QHqdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ETgbQXqdEeK5vdodFAvPrA" x="867" y="288"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_Dy62snqdEeK5vdodFAvPrA"/> + <element xmi:type="uml:Model" href="missing_page_recovery.uml#_Dy62sHqdEeK5vdodFAvPrA"/> + <edges xmi:type="notation:Connector" xmi:id="_EoLqwHqdEeK5vdodFAvPrA" type="4001" source="_EJ-r0HqdEeK5vdodFAvPrA" target="_ETgbQHqdEeK5vdodFAvPrA"> + <children xmi:type="notation:DecorationNode" xmi:id="_EoLqw3qdEeK5vdodFAvPrA" type="6001"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_EoLqxHqdEeK5vdodFAvPrA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_EoLqxXqdEeK5vdodFAvPrA" type="6002"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_EoLqxnqdEeK5vdodFAvPrA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_EoLqx3qdEeK5vdodFAvPrA" type="6003"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_EoLqyHqdEeK5vdodFAvPrA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_EoLqyXqdEeK5vdodFAvPrA" type="6005"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_EoLqynqdEeK5vdodFAvPrA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_EoLqy3qdEeK5vdodFAvPrA" type="6033"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_EoLqzHqdEeK5vdodFAvPrA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_EoLqzXqdEeK5vdodFAvPrA" type="6034"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_EoLqznqdEeK5vdodFAvPrA" y="-20"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_EoLqwXqdEeK5vdodFAvPrA"/> + <element xmi:type="uml:Association" href="missing_page_recovery.uml#_En4v0HqdEeK5vdodFAvPrA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EoLqwnqdEeK5vdodFAvPrA" points="[50, 2, -452, -4]$[501, -44, -1, -50]"/> + </edges> +</notation:Diagram> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/missing_page_recovery.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/missing_page_recovery.uml index e66e282062a..32914dd29ce 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/missing_page_recovery.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/missing_page_recovery.uml @@ -1,16 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_Dy62sHqdEeK5vdodFAvPrA" name="model">
- <packagedElement xmi:type="uml:Class" xmi:id="_EJ1h4HqdEeK5vdodFAvPrA" name="Class1">
- <ownedAttribute xmi:id="_Enu-0HqdEeK5vdodFAvPrA" name="class2" type="_ETM5QHqdEeK5vdodFAvPrA" association="_En4v0HqdEeK5vdodFAvPrA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Enu-0XqdEeK5vdodFAvPrA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Enu-0nqdEeK5vdodFAvPrA" value="1"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_ETM5QHqdEeK5vdodFAvPrA" name="Class2"/>
- <packagedElement xmi:type="uml:Association" xmi:id="_En4v0HqdEeK5vdodFAvPrA" name="class1_class2_1" memberEnd="_En4v0XqdEeK5vdodFAvPrA _Enu-0HqdEeK5vdodFAvPrA">
- <ownedEnd xmi:id="_En4v0XqdEeK5vdodFAvPrA" name="class1" type="_EJ1h4HqdEeK5vdodFAvPrA" association="_En4v0HqdEeK5vdodFAvPrA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_En4v0nqdEeK5vdodFAvPrA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_En4v03qdEeK5vdodFAvPrA" value="1"/>
- </ownedEnd>
- </packagedElement>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_Dy62sHqdEeK5vdodFAvPrA" name="model"> + <packagedElement xmi:type="uml:Class" xmi:id="_EJ1h4HqdEeK5vdodFAvPrA" name="Class1"> + <ownedAttribute xmi:id="_Enu-0HqdEeK5vdodFAvPrA" name="class2" type="_ETM5QHqdEeK5vdodFAvPrA" association="_En4v0HqdEeK5vdodFAvPrA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Enu-0XqdEeK5vdodFAvPrA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Enu-0nqdEeK5vdodFAvPrA" value="1"/> + </ownedAttribute> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_ETM5QHqdEeK5vdodFAvPrA" name="Class2"/> + <packagedElement xmi:type="uml:Association" xmi:id="_En4v0HqdEeK5vdodFAvPrA" name="class1_class2_1" memberEnd="_En4v0XqdEeK5vdodFAvPrA _Enu-0HqdEeK5vdodFAvPrA"> + <ownedEnd xmi:id="_En4v0XqdEeK5vdodFAvPrA" name="class1" type="_EJ1h4HqdEeK5vdodFAvPrA" association="_En4v0HqdEeK5vdodFAvPrA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_En4v0nqdEeK5vdodFAvPrA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_En4v03qdEeK5vdodFAvPrA" value="1"/> + </ownedEnd> + </packagedElement> +</uml:Model> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_diagram_recovery.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_diagram_recovery.di index ca1bbab7d32..915cb124ff0 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_diagram_recovery.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_diagram_recovery.di @@ -1,23 +1,23 @@ -<?xml version="1.0" encoding="ASCII"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage>
- <emfPageIdentifier href="proxy_diagram_recovery1.notation#_TQ5noXqdEeK5vdodFAvPrA"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="proxy_diagram_recovery.notation#_ahijsHqdEeK5vdodFAvPrA"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="proxy_diagram_recovery1.notation#_TQ5noXqdEeK5vdodFAvPrA"/>
- </children>
- <children>
- <emfPageIdentifier href="proxy_diagram_recovery.notation#_ahijsHqdEeK5vdodFAvPrA"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="ASCII"?> +<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> + <pageList> + <availablePage> + <emfPageIdentifier href="proxy_diagram_recovery1.notation#_TQ5noXqdEeK5vdodFAvPrA"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="proxy_diagram_recovery.notation#_ahijsHqdEeK5vdodFAvPrA"/> + </availablePage> + </pageList> + <sashModel currentSelection="//@sashModel/@windows.0/@children.0"> + <windows> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="proxy_diagram_recovery1.notation#_TQ5noXqdEeK5vdodFAvPrA"/> + </children> + <children> + <emfPageIdentifier href="proxy_diagram_recovery.notation#_ahijsHqdEeK5vdodFAvPrA"/> + </children> + </children> + </windows> + </sashModel> +</di:SashWindowsMngr> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_diagram_recovery.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_diagram_recovery.notation index 25489bba383..5e48e04744d 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_diagram_recovery.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_diagram_recovery.notation @@ -1,98 +1,98 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
- <notation:Diagram xmi:id="_TQ5noXqdEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_TsAPQHqdEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_TsAPQnqdEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_TsAPQ3qdEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TsAPUnqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TsAPU3qdEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_TsAPRHqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_TsAPRXqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_TsAPRnqdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TsAPR3qdEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_TsAPSHqdEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TsAPVHqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TsAPVXqdEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_TsAPSXqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_TsAPSnqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_TsAPS3qdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TsAPTHqdEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_TsAPTXqdEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TsAPVnqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TsAPV3qdEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_TsAPTnqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_TsAPT3qdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_TsAPUHqdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TsAPUXqdEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="proxy_diagram_recovery.uml#_Tr2eQHqdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TsAPQXqdEeK5vdodFAvPrA" x="315" y="315"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_T0L64HqdEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_T0L64nqdEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_T0L643qdEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_T0L68nqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_T0L683qdEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_T0L65HqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_T0L65XqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_T0L65nqdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T0L653qdEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_T0L66HqdEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_T0L69HqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_T0L69XqdEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_T0L66XqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_T0L66nqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_T0L663qdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T0L67HqdEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_T0L67XqdEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_T0L69nqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_T0L693qdEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_T0L67nqdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_T0L673qdEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_T0L68HqdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T0L68XqdEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="proxy_diagram_recovery.uml#_T0CJ4HqdEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T0L64XqdEeK5vdodFAvPrA" x="795" y="315"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_TQ5nonqdEeK5vdodFAvPrA"/>
- <element xmi:type="uml:Model" href="proxy_diagram_recovery.uml#_TQ5noHqdEeK5vdodFAvPrA"/>
- <edges xmi:type="notation:Connector" xmi:id="_UJKFUHqdEeK5vdodFAvPrA" type="4001" source="_TsAPQHqdEeK5vdodFAvPrA" target="_T0L64HqdEeK5vdodFAvPrA">
- <children xmi:type="notation:DecorationNode" xmi:id="_UJKFU3qdEeK5vdodFAvPrA" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UJKFVHqdEeK5vdodFAvPrA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_UJKFVXqdEeK5vdodFAvPrA" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UJKFVnqdEeK5vdodFAvPrA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_UJKFV3qdEeK5vdodFAvPrA" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UJKFWHqdEeK5vdodFAvPrA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_UJKFWXqdEeK5vdodFAvPrA" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UJKFWnqdEeK5vdodFAvPrA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_UJKFW3qdEeK5vdodFAvPrA" type="6033">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UJKFXHqdEeK5vdodFAvPrA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_UJKFXXqdEeK5vdodFAvPrA" type="6034">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UJKFXnqdEeK5vdodFAvPrA" y="-20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_UJKFUXqdEeK5vdodFAvPrA"/>
- <element xmi:type="uml:Association" href="proxy_diagram_recovery.uml#_UJA7YHqdEeK5vdodFAvPrA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UJKFUnqdEeK5vdodFAvPrA" points="[50, -9, -519, 5]$[565, 36, -4, 50]"/>
- </edges>
- </notation:Diagram>
- <notation:Diagram xmi:id="_ahijsHqdEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
- <styles xmi:type="notation:DiagramStyle" xmi:id="_ahijsXqdEeK5vdodFAvPrA"/>
- <element xmi:type="uml:Model" href="proxy_diagram_recovery.uml#_TQ5noHqdEeK5vdodFAvPrA"/>
- </notation:Diagram>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> + <notation:Diagram xmi:id="_TQ5noXqdEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_TsAPQHqdEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_TsAPQnqdEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_TsAPQ3qdEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TsAPUnqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TsAPU3qdEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_TsAPRHqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_TsAPRXqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_TsAPRnqdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TsAPR3qdEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_TsAPSHqdEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TsAPVHqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TsAPVXqdEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_TsAPSXqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_TsAPSnqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_TsAPS3qdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TsAPTHqdEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_TsAPTXqdEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TsAPVnqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TsAPV3qdEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_TsAPTnqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_TsAPT3qdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_TsAPUHqdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TsAPUXqdEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="proxy_diagram_recovery.uml#_Tr2eQHqdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TsAPQXqdEeK5vdodFAvPrA" x="315" y="315"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_T0L64HqdEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_T0L64nqdEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_T0L643qdEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_T0L68nqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_T0L683qdEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_T0L65HqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_T0L65XqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_T0L65nqdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T0L653qdEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_T0L66HqdEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_T0L69HqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_T0L69XqdEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_T0L66XqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_T0L66nqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_T0L663qdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T0L67HqdEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_T0L67XqdEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_T0L69nqdEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_T0L693qdEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_T0L67nqdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_T0L673qdEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_T0L68HqdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T0L68XqdEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="proxy_diagram_recovery.uml#_T0CJ4HqdEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T0L64XqdEeK5vdodFAvPrA" x="795" y="315"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_TQ5nonqdEeK5vdodFAvPrA"/> + <element xmi:type="uml:Model" href="proxy_diagram_recovery.uml#_TQ5noHqdEeK5vdodFAvPrA"/> + <edges xmi:type="notation:Connector" xmi:id="_UJKFUHqdEeK5vdodFAvPrA" type="4001" source="_TsAPQHqdEeK5vdodFAvPrA" target="_T0L64HqdEeK5vdodFAvPrA"> + <children xmi:type="notation:DecorationNode" xmi:id="_UJKFU3qdEeK5vdodFAvPrA" type="6001"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UJKFVHqdEeK5vdodFAvPrA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_UJKFVXqdEeK5vdodFAvPrA" type="6002"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UJKFVnqdEeK5vdodFAvPrA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_UJKFV3qdEeK5vdodFAvPrA" type="6003"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UJKFWHqdEeK5vdodFAvPrA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_UJKFWXqdEeK5vdodFAvPrA" type="6005"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UJKFWnqdEeK5vdodFAvPrA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_UJKFW3qdEeK5vdodFAvPrA" type="6033"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UJKFXHqdEeK5vdodFAvPrA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_UJKFXXqdEeK5vdodFAvPrA" type="6034"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_UJKFXnqdEeK5vdodFAvPrA" y="-20"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_UJKFUXqdEeK5vdodFAvPrA"/> + <element xmi:type="uml:Association" href="proxy_diagram_recovery.uml#_UJA7YHqdEeK5vdodFAvPrA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UJKFUnqdEeK5vdodFAvPrA" points="[50, -9, -519, 5]$[565, 36, -4, 50]"/> + </edges> + </notation:Diagram> + <notation:Diagram xmi:id="_ahijsHqdEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel"> + <styles xmi:type="notation:DiagramStyle" xmi:id="_ahijsXqdEeK5vdodFAvPrA"/> + <element xmi:type="uml:Model" href="proxy_diagram_recovery.uml#_TQ5noHqdEeK5vdodFAvPrA"/> + </notation:Diagram> +</xmi:XMI> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_diagram_recovery.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_diagram_recovery.uml index f3af34a067d..a479a3d973b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_diagram_recovery.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_diagram_recovery.uml @@ -1,16 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_TQ5noHqdEeK5vdodFAvPrA" name="model">
- <packagedElement xmi:type="uml:Class" xmi:id="_Tr2eQHqdEeK5vdodFAvPrA" name="Class1">
- <ownedAttribute xmi:id="_UI3KYHqdEeK5vdodFAvPrA" name="class2" type="_T0CJ4HqdEeK5vdodFAvPrA" association="_UJA7YHqdEeK5vdodFAvPrA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UI3KYXqdEeK5vdodFAvPrA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UI3KYnqdEeK5vdodFAvPrA" value="1"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_T0CJ4HqdEeK5vdodFAvPrA" name="Class2"/>
- <packagedElement xmi:type="uml:Association" xmi:id="_UJA7YHqdEeK5vdodFAvPrA" name="class1_class2_1" memberEnd="_UJA7YXqdEeK5vdodFAvPrA _UI3KYHqdEeK5vdodFAvPrA">
- <ownedEnd xmi:id="_UJA7YXqdEeK5vdodFAvPrA" name="class1" type="_Tr2eQHqdEeK5vdodFAvPrA" association="_UJA7YHqdEeK5vdodFAvPrA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UJA7YnqdEeK5vdodFAvPrA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UJA7Y3qdEeK5vdodFAvPrA" value="1"/>
- </ownedEnd>
- </packagedElement>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_TQ5noHqdEeK5vdodFAvPrA" name="model"> + <packagedElement xmi:type="uml:Class" xmi:id="_Tr2eQHqdEeK5vdodFAvPrA" name="Class1"> + <ownedAttribute xmi:id="_UI3KYHqdEeK5vdodFAvPrA" name="class2" type="_T0CJ4HqdEeK5vdodFAvPrA" association="_UJA7YHqdEeK5vdodFAvPrA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UI3KYXqdEeK5vdodFAvPrA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UI3KYnqdEeK5vdodFAvPrA" value="1"/> + </ownedAttribute> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_T0CJ4HqdEeK5vdodFAvPrA" name="Class2"/> + <packagedElement xmi:type="uml:Association" xmi:id="_UJA7YHqdEeK5vdodFAvPrA" name="class1_class2_1" memberEnd="_UJA7YXqdEeK5vdodFAvPrA _UI3KYHqdEeK5vdodFAvPrA"> + <ownedEnd xmi:id="_UJA7YXqdEeK5vdodFAvPrA" name="class1" type="_Tr2eQHqdEeK5vdodFAvPrA" association="_UJA7YHqdEeK5vdodFAvPrA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UJA7YnqdEeK5vdodFAvPrA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UJA7Y3qdEeK5vdodFAvPrA" value="1"/> + </ownedEnd> + </packagedElement> +</uml:Model> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.di index a11b4af9890..ef395d7bb10 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.di @@ -1,199 +1,199 @@ -<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2">
- <di:SashWindowsMngr>
- <pageList>
- <availablePage emfPageIdentifier="/23"/>
- <availablePage>
- <emfPageIdentifier href="proxy_table_recovery.notation#_Xp_5YHqeEeK5vdodFAvPrA"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children emfPageIdentifier="/112"/>
- <children>
- <emfPageIdentifier href="proxy_table_recovery.notation#_Xp_5YHqeEeK5vdodFAvPrA"/>
- </children>
- </children>
- </windows>
- </sashModel>
- </di:SashWindowsMngr>
- <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/>
- <tableinstance2:TableInstance2 description="Table Description">
- <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>
- <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>
- <customizations href="#/2/@localCustomizations.1"/>
- <customizations href="#/2/@localCustomizations.0"/>
- <context href="proxy_table_recovery.uml#_42wOoHqdEeK5vdodFAvPrA"/>
- <columns xsi:type="tableinstance:DefaultLabelColumn"/>
- <columns xsi:type="tableinstance:MetaClassColumn"/>
- <columns xsi:type="tableinstance:EContainerColumn"/>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>
- </columns>
- <columns xsi:type="tableinstance:AttributeColumn">
- <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>
- </columns>
- <columns xsi:type="tableinstance:ReferenceColumn">
- <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>
- </columns>
- <rows>
- <element href="proxy_table_recovery.uml#_6cXhkHqdEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="proxy_table_recovery.uml#_7Bj5UHqdEeK5vdodFAvPrA"/>
- </rows>
- <rows>
- <element href="proxy_table_recovery.uml#_7nMV8HqdEeK5vdodFAvPrA"/>
- </rows>
- <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>
- <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>
- </tableinstance2:TableInstance2>
-</xmi:XMI>
+<?xml version="1.0" encoding="ASCII"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2"> + <di:SashWindowsMngr> + <pageList> + <availablePage emfPageIdentifier="/23"/> + <availablePage> + <emfPageIdentifier href="proxy_table_recovery.notation#_Xp_5YHqeEeK5vdodFAvPrA"/> + </availablePage> + </pageList> + <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0"> + <windows> + <children xsi:type="di:TabFolder"> + <children emfPageIdentifier="/112"/> + <children> + <emfPageIdentifier href="proxy_table_recovery.notation#_Xp_5YHqeEeK5vdodFAvPrA"/> + </children> + </children> + </windows> + </sashModel> + </di:SashWindowsMngr> + <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/> + <tableinstance2:TableInstance2 description="Table Description"> + <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/> + <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/> + <customizations href="#/2/@localCustomizations.1"/> + <customizations href="#/2/@localCustomizations.0"/> + <context href="proxy_table_recovery.uml#_42wOoHqdEeK5vdodFAvPrA"/> + <columns xsi:type="tableinstance:DefaultLabelColumn"/> + <columns xsi:type="tableinstance:MetaClassColumn"/> + <columns xsi:type="tableinstance:EContainerColumn"/> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/> + </columns> + <columns xsi:type="tableinstance:AttributeColumn"> + <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/> + </columns> + <columns xsi:type="tableinstance:ReferenceColumn"> + <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/> + </columns> + <rows> + <element href="proxy_table_recovery.uml#_6cXhkHqdEeK5vdodFAvPrA"/> + </rows> + <rows> + <element href="proxy_table_recovery.uml#_7Bj5UHqdEeK5vdodFAvPrA"/> + </rows> + <rows> + <element href="proxy_table_recovery.uml#_7nMV8HqdEeK5vdodFAvPrA"/> + </rows> + <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/> + <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/> + </tableinstance2:TableInstance2> +</xmi:XMI> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.notation index cf16a51643e..2170ffcb63d 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_Xp_5YHqeEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_YAnpoHqeEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_YAnponqeEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_YAnpo3qeEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YAnpsnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YAnps3qeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_YAnppHqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_YAnppXqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_YAnppnqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YAnpp3qeEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_YAnpqHqeEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YAnptHqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YAnptXqeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_YAnpqXqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_YAnpqnqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_YAnpq3qeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YAnprHqeEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_YAnprXqeEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YAnptnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YAnpt3qeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_YAnprnqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_YAnpr3qeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_YAnpsHqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YAnpsXqeEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="proxy_table_recovery.uml#_YAd4oHqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YAnpoXqeEeK5vdodFAvPrA" x="286" y="231"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_YIgaUHqeEeK5vdodFAvPrA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_YIgaUnqeEeK5vdodFAvPrA" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_YIgaU3qeEeK5vdodFAvPrA" type="7017">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YIgaYnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YIgaY3qeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_YIgaVHqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_YIgaVXqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_YIgaVnqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YIgaV3qeEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_YIgaWHqeEeK5vdodFAvPrA" type="7018">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YIgaZHqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YIgaZXqeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_YIgaWXqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_YIgaWnqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_YIgaW3qeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YIgaXHqeEeK5vdodFAvPrA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_YIgaXXqeEeK5vdodFAvPrA" type="7019">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YIgaZnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YIgaZ3qeEeK5vdodFAvPrA" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_YIgaXnqeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_YIgaX3qeEeK5vdodFAvPrA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_YIgaYHqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YIgaYXqeEeK5vdodFAvPrA"/>
- </children>
- <element xmi:type="uml:Class" href="proxy_table_recovery.uml#_YIWpUHqeEeK5vdodFAvPrA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YIgaUXqeEeK5vdodFAvPrA" x="775" y="229"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_Xp_5YXqeEeK5vdodFAvPrA"/>
- <element xmi:type="uml:Model" href="proxy_table_recovery.uml#_42wOoHqdEeK5vdodFAvPrA"/>
- <edges xmi:type="notation:Connector" xmi:id="_YYk2oHqeEeK5vdodFAvPrA" type="4001" source="_YAnpoHqeEeK5vdodFAvPrA" target="_YIgaUHqeEeK5vdodFAvPrA">
- <children xmi:type="notation:DecorationNode" xmi:id="_YYk2o3qeEeK5vdodFAvPrA" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_YYk2pHqeEeK5vdodFAvPrA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_YYk2pXqeEeK5vdodFAvPrA" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_YYk2pnqeEeK5vdodFAvPrA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_YYk2p3qeEeK5vdodFAvPrA" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_YYk2qHqeEeK5vdodFAvPrA" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_YYk2qXqeEeK5vdodFAvPrA" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_YYk2qnqeEeK5vdodFAvPrA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_YYk2q3qeEeK5vdodFAvPrA" type="6033">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_YYk2rHqeEeK5vdodFAvPrA" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_YYk2rXqeEeK5vdodFAvPrA" type="6034">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_YYk2rnqeEeK5vdodFAvPrA" y="-20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_YYk2oXqeEeK5vdodFAvPrA"/>
- <element xmi:type="uml:Association" href="proxy_table_recovery.uml#_YYR7sHqeEeK5vdodFAvPrA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YYk2onqeEeK5vdodFAvPrA" points="[50, 1, -439, 3]$[539, 1, 50, 3]"/>
- </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_Xp_5YHqeEeK5vdodFAvPrA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_YAnpoHqeEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_YAnponqeEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_YAnpo3qeEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YAnpsnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YAnps3qeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_YAnppHqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_YAnppXqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_YAnppnqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YAnpp3qeEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_YAnpqHqeEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YAnptHqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YAnptXqeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_YAnpqXqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_YAnpqnqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_YAnpq3qeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YAnprHqeEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_YAnprXqeEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YAnptnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YAnpt3qeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_YAnprnqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_YAnpr3qeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_YAnpsHqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YAnpsXqeEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="proxy_table_recovery.uml#_YAd4oHqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YAnpoXqeEeK5vdodFAvPrA" x="286" y="231"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_YIgaUHqeEeK5vdodFAvPrA" type="2008"> + <children xmi:type="notation:DecorationNode" xmi:id="_YIgaUnqeEeK5vdodFAvPrA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_YIgaU3qeEeK5vdodFAvPrA" type="7017"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YIgaYnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YIgaY3qeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_YIgaVHqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_YIgaVXqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_YIgaVnqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YIgaV3qeEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_YIgaWHqeEeK5vdodFAvPrA" type="7018"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YIgaZHqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YIgaZXqeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_YIgaWXqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_YIgaWnqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_YIgaW3qeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YIgaXHqeEeK5vdodFAvPrA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_YIgaXXqeEeK5vdodFAvPrA" type="7019"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YIgaZnqeEeK5vdodFAvPrA" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YIgaZ3qeEeK5vdodFAvPrA" key="showTitle" value="true"/> + </eAnnotations> + <styles xmi:type="notation:TitleStyle" xmi:id="_YIgaXnqeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_YIgaX3qeEeK5vdodFAvPrA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_YIgaYHqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YIgaYXqeEeK5vdodFAvPrA"/> + </children> + <element xmi:type="uml:Class" href="proxy_table_recovery.uml#_YIWpUHqeEeK5vdodFAvPrA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YIgaUXqeEeK5vdodFAvPrA" x="775" y="229"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_Xp_5YXqeEeK5vdodFAvPrA"/> + <element xmi:type="uml:Model" href="proxy_table_recovery.uml#_42wOoHqdEeK5vdodFAvPrA"/> + <edges xmi:type="notation:Connector" xmi:id="_YYk2oHqeEeK5vdodFAvPrA" type="4001" source="_YAnpoHqeEeK5vdodFAvPrA" target="_YIgaUHqeEeK5vdodFAvPrA"> + <children xmi:type="notation:DecorationNode" xmi:id="_YYk2o3qeEeK5vdodFAvPrA" type="6001"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_YYk2pHqeEeK5vdodFAvPrA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_YYk2pXqeEeK5vdodFAvPrA" type="6002"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_YYk2pnqeEeK5vdodFAvPrA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_YYk2p3qeEeK5vdodFAvPrA" type="6003"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_YYk2qHqeEeK5vdodFAvPrA" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_YYk2qXqeEeK5vdodFAvPrA" type="6005"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_YYk2qnqeEeK5vdodFAvPrA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_YYk2q3qeEeK5vdodFAvPrA" type="6033"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_YYk2rHqeEeK5vdodFAvPrA" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_YYk2rXqeEeK5vdodFAvPrA" type="6034"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_YYk2rnqeEeK5vdodFAvPrA" y="-20"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_YYk2oXqeEeK5vdodFAvPrA"/> + <element xmi:type="uml:Association" href="proxy_table_recovery.uml#_YYR7sHqeEeK5vdodFAvPrA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YYk2onqeEeK5vdodFAvPrA" points="[50, 1, -439, 3]$[539, 1, 50, 3]"/> + </edges> +</notation:Diagram> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.uml index 9832a801e19..f19c0930f1b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/recovery/proxy_table_recovery.uml @@ -1,19 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_42wOoHqdEeK5vdodFAvPrA" name="model">
- <packagedElement xmi:type="uml:Class" xmi:id="_6cXhkHqdEeK5vdodFAvPrA" name="Class1"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_7Bj5UHqdEeK5vdodFAvPrA" name="Class2"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_7nMV8HqdEeK5vdodFAvPrA" name="Class3"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_YAd4oHqeEeK5vdodFAvPrA" name="Class4">
- <ownedAttribute xmi:id="_YYIxwHqeEeK5vdodFAvPrA" name="class5" type="_YIWpUHqeEeK5vdodFAvPrA" association="_YYR7sHqeEeK5vdodFAvPrA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YYIxwXqeEeK5vdodFAvPrA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YYIxwnqeEeK5vdodFAvPrA" value="1"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_YIWpUHqeEeK5vdodFAvPrA" name="Class5"/>
- <packagedElement xmi:type="uml:Association" xmi:id="_YYR7sHqeEeK5vdodFAvPrA" name="class4_class5_1" memberEnd="_YYR7sXqeEeK5vdodFAvPrA _YYIxwHqeEeK5vdodFAvPrA">
- <ownedEnd xmi:id="_YYR7sXqeEeK5vdodFAvPrA" name="class4" type="_YAd4oHqeEeK5vdodFAvPrA" association="_YYR7sHqeEeK5vdodFAvPrA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YYR7snqeEeK5vdodFAvPrA" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YYR7s3qeEeK5vdodFAvPrA" value="1"/>
- </ownedEnd>
- </packagedElement>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_42wOoHqdEeK5vdodFAvPrA" name="model"> + <packagedElement xmi:type="uml:Class" xmi:id="_6cXhkHqdEeK5vdodFAvPrA" name="Class1"/> + <packagedElement xmi:type="uml:Class" xmi:id="_7Bj5UHqdEeK5vdodFAvPrA" name="Class2"/> + <packagedElement xmi:type="uml:Class" xmi:id="_7nMV8HqdEeK5vdodFAvPrA" name="Class3"/> + <packagedElement xmi:type="uml:Class" xmi:id="_YAd4oHqeEeK5vdodFAvPrA" name="Class4"> + <ownedAttribute xmi:id="_YYIxwHqeEeK5vdodFAvPrA" name="class5" type="_YIWpUHqeEeK5vdodFAvPrA" association="_YYR7sHqeEeK5vdodFAvPrA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YYIxwXqeEeK5vdodFAvPrA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YYIxwnqeEeK5vdodFAvPrA" value="1"/> + </ownedAttribute> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_YIWpUHqeEeK5vdodFAvPrA" name="Class5"/> + <packagedElement xmi:type="uml:Association" xmi:id="_YYR7sHqeEeK5vdodFAvPrA" name="class4_class5_1" memberEnd="_YYR7sXqeEeK5vdodFAvPrA _YYIxwHqeEeK5vdodFAvPrA"> + <ownedEnd xmi:id="_YYR7sXqeEeK5vdodFAvPrA" name="class4" type="_YAd4oHqeEeK5vdodFAvPrA" association="_YYR7sHqeEeK5vdodFAvPrA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YYR7snqeEeK5vdodFAvPrA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YYR7s3qeEeK5vdodFAvPrA" value="1"/> + </ownedEnd> + </packagedElement> +</uml:Model> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/banking.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/banking.di index db3312a6d7a..db3312a6d7a 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/banking.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/banking.di diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/banking.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/banking.notation index 7a00061ce0e..7a00061ce0e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/banking.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/banking.notation diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/banking.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/banking.uml index aa426b736e7..aa426b736e7 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/banking.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/banking.uml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/employment.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/employment.di index d94f1fa4ed4..d94f1fa4ed4 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/employment.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/employment.di diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/employment.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/employment.notation index 16e458be63e..16e458be63e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/employment.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/employment.notation diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/employment.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/employment.uml index 4ff766e905a..4ff766e905a 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/employment.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/employment.uml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/employment_sashes.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/employment_sashes.di index 68491525f92..68491525f92 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/employment_sashes.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/employment_sashes.di diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/employment_sashes.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/employment_sashes.notation index a80718a7ca7..a80718a7ca7 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/employment_sashes.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/employment_sashes.notation diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/employment_sashes.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/employment_sashes.uml index 4ff766e905a..4ff766e905a 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/employment_sashes.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/employment_sashes.uml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/library.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/library.di index 42ec9bffb56..42ec9bffb56 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/library.di +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/library.di diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/library.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/library.notation index 97b9536a1e0..97b9536a1e0 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/library.notation +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/library.notation diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/library.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/library.uml index 06f7daf5a6a..06f7daf5a6a 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/reload/library.uml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/reload/library.uml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/org.eclipse.papyrus.editor.integration.tests.launch b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/org.eclipse.papyrus.editor.integration.tests.launch index 53fb6cee559..53fb6cee559 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/org.eclipse.papyrus.editor.integration.tests.launch +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/org.eclipse.papyrus.editor.integration.tests.launch diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/pom.xml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/pom.xml index 8099fd490fc..1b054c2571d 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/pom.xml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.editor.integration.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/Activator.java b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/Activator.java index 24f922e413c..57072ae8043 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/Activator.java +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/Activator.java @@ -1,76 +1,76 @@ -/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.editor.integration.tests;
-
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-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.editor.integration.tests"; //$NON-NLS-1$
-
- /**
- * The shared instance
- */
- private static Activator plugin;
-
- /**
- * The Log helper for this plug-in
- */
- public static LogHelper log;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- log = new LogHelper(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @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;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.editor.integration.tests; + +import org.eclipse.papyrus.infra.core.log.LogHelper; +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.editor.integration.tests"; //$NON-NLS-1$ + + /** + * The shared instance + */ + private static Activator plugin; + + /** + * The Log helper for this plug-in + */ + public static LogHelper log; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + log = new LogHelper(this); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @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/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/AllTests.java b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/AllTests.java index 627ff0c83b0..b4021cf42be 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/AllTests.java +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/AllTests.java @@ -1,41 +1,41 @@ -/*****************************************************************************
- * Copyright (c) 2013, 2014 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 422257
- * Christian W. Damus (CEA) - bug 432813
- * Christian W. Damus (CEA) - bug 437217
- *
- *****************************************************************************/
-package org.eclipse.papyrus.editor.integration.tests;
-
-import org.eclipse.papyrus.editor.integration.tests.tests.EditingScenariosMemoryLeakTest;
-import org.eclipse.papyrus.editor.integration.tests.tests.EditorMemoryLeakTest;
-import org.eclipse.papyrus.editor.integration.tests.tests.EditorReloadTest;
-import org.eclipse.papyrus.editor.integration.tests.tests.ModelSetTests;
-import org.eclipse.papyrus.editor.integration.tests.tests.PageManagerTests;
-import org.eclipse.papyrus.editor.integration.tests.tests.RecoveryTest;
-import org.junit.runner.RunWith;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
-import org.junit.runners.Suite.SuiteClasses;
-
-
-/**
- * The {@link EditorMemoryLeakTest} suite <b>must</b> run first, because some test case in one of the other suites
- * breaks the Outline view: it causes a pair of Overview/Outline actions from some diagram editor to linger in
- * the outline view's toolbar even after the editor was closed, and these persistent actions cause leaks of
- * models opened later.
- */
-@RunWith(ClassificationSuite.class)
-@SuiteClasses({ EditorMemoryLeakTest.class, EditingScenariosMemoryLeakTest.class, //
-PageManagerTests.class, RecoveryTest.class, ModelSetTests.class, //
-EditorReloadTest.class })
-public class AllTests {
-
-}
+/***************************************************************************** + * Copyright (c) 2013, 2014 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - bug 422257 + * Christian W. Damus (CEA) - bug 432813 + * Christian W. Damus (CEA) - bug 437217 + * + *****************************************************************************/ +package org.eclipse.papyrus.editor.integration.tests; + +import org.eclipse.papyrus.editor.integration.tests.tests.EditingScenariosMemoryLeakTest; +import org.eclipse.papyrus.editor.integration.tests.tests.EditorMemoryLeakTest; +import org.eclipse.papyrus.editor.integration.tests.tests.EditorReloadTest; +import org.eclipse.papyrus.editor.integration.tests.tests.ModelSetTests; +import org.eclipse.papyrus.editor.integration.tests.tests.PageManagerTests; +import org.eclipse.papyrus.editor.integration.tests.tests.RecoveryTest; +import org.junit.runner.RunWith; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; +import org.junit.runners.Suite.SuiteClasses; + + +/** + * The {@link EditorMemoryLeakTest} suite <b>must</b> run first, because some test case in one of the other suites + * breaks the Outline view: it causes a pair of Overview/Outline actions from some diagram editor to linger in + * the outline view's toolbar even after the editor was closed, and these persistent actions cause leaks of + * models opened later. + */ +@RunWith(ClassificationSuite.class) +@SuiteClasses({ EditorMemoryLeakTest.class, EditingScenariosMemoryLeakTest.class, // +PageManagerTests.class, RecoveryTest.class, ModelSetTests.class, // +EditorReloadTest.class }) +public class AllTests { + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/AbstractEditorIntegrationTest.java b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/AbstractEditorIntegrationTest.java index 3dc26b39d77..52b05d47f0c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/AbstractEditorIntegrationTest.java +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/AbstractEditorIntegrationTest.java @@ -1,26 +1,26 @@ -/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.editor.integration.tests.tests;
-
-import org.eclipse.papyrus.editor.integration.tests.Activator;
-import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
-import org.osgi.framework.Bundle;
-
-
-public abstract class AbstractEditorIntegrationTest extends AbstractEditorTest {
-
- @Override
- protected Bundle getBundle() {
- return Activator.getDefault().getBundle();
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.editor.integration.tests.tests; + +import org.eclipse.papyrus.editor.integration.tests.Activator; +import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest; +import org.osgi.framework.Bundle; + + +public abstract class AbstractEditorIntegrationTest extends AbstractEditorTest { + + @Override + protected Bundle getBundle() { + return Activator.getDefault().getBundle(); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingMemoryLeakFixture.java b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingMemoryLeakFixture.java index a406ceb41ba..a406ceb41ba 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingMemoryLeakFixture.java +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingMemoryLeakFixture.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingScenariosMemoryLeakTest.java b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingScenariosMemoryLeakTest.java index 651e20ec554..651e20ec554 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingScenariosMemoryLeakTest.java +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingScenariosMemoryLeakTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditorMemoryLeakTest.java b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditorMemoryLeakTest.java index 899a2bf8cf6..899a2bf8cf6 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditorMemoryLeakTest.java +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditorMemoryLeakTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditorReloadTest.java b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditorReloadTest.java index cd443491697..cd443491697 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditorReloadTest.java +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditorReloadTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/ModelSetTests.java b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/ModelSetTests.java index f4ffc871dd0..79f6099c62b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/ModelSetTests.java +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/ModelSetTests.java @@ -1,128 +1,128 @@ -/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.editor.integration.tests.tests;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.papyrus.commands.ICreationCommand;
-import org.eclipse.papyrus.editor.integration.tests.Activator;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
-import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
-import org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand;
-import org.eclipse.papyrus.junit.utils.EditorUtils;
-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
-import org.eclipse.papyrus.uml.diagram.clazz.UmlClassDiagramForMultiEditor;
-import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;
-import org.eclipse.papyrus.uml.tools.model.UmlModel;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.uml2.uml.Model;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Test case for handling models with special characters in their name/path
- *
- * @author Camille Letavernier
- *
- */
-public class ModelSetTests extends AbstractEditorIntegrationTest {
-
- public static final String SOURCE_PATH = "/model/model set/";
-
- @Test
- public void testOpenModelWithSpecialChars() throws Exception {
- initModel("openSpecialChars", "^&_&^", getBundle());
- IPageManager pageManager = getPageManager();
- //Fix test to match re-specification in Bug 429242: we only expect 2 pages (Instead of 3), because one of them is
- //now invalid (Table v1 framework is deprecated and not available anymore)
- Assert.assertEquals("Some pages cannot be found", 2, pageManager.allPages().size());
-
- UmlModel umlModel = (UmlModel)getModelSet().getModel(UmlModel.MODEL_ID);
- Model rootModel = (Model)umlModel.lookupRoot();
- Assert.assertEquals("The UML Model has not been correctly loaded", 3, rootModel.getOwnedElements().size());
- }
-
- @Test
- public void testCreateModelWithSpecialChars() throws Exception {
- ModelSet modelSet = new DiResourceSet();
- IProject emptyModelCreationProject = ResourcesPlugin.getWorkspace().getRoot().getProject("diagramCreationWithSpecialChars");
- emptyModelCreationProject.create(new NullProgressMonitor());
- emptyModelCreationProject.open(new NullProgressMonitor());
-
- String modelName = "++n�w m�d�l & sp�c��l ch�r$++";
-
- final IFile emptyModelDi = emptyModelCreationProject.getFile(modelName + ".di");
-
- modelSet.createsModels(emptyModelDi);
-
- IFile emptyModelNotation = emptyModelCreationProject.getFile(modelName + ".notation");
- IFile emptyModelUml = emptyModelCreationProject.getFile(modelName + ".uml");
-
- ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);
- try {
- registry.add(ModelSet.class, Integer.MAX_VALUE, modelSet);
- registry.startRegistry();
- } catch (ServiceException ex) {
- //Ignore
- }
-
- IModelCreationCommand creationCommand = new CreateUMLModelCommand();
- creationCommand.createModel(modelSet);
-
- //Create the root UML Model
- UmlModel umlModel = (UmlModel)modelSet.getModel(UmlModel.MODEL_ID);
- Model model = (Model)umlModel.lookupRoot();
-
- //Creates and opens a Papyrus Class Diagram
- ICreationCommand diagramCreationCommand = new CreateClassDiagramCommand();
- diagramCreationCommand.createDiagram(modelSet, model, modelName);
-
- modelSet.save(new NullProgressMonitor());
-
- Assert.assertTrue("The DI file has not been created", emptyModelDi.exists());
- Assert.assertTrue("The Notation file has not been created", emptyModelNotation.exists());
- Assert.assertTrue("The UML file has not been created", emptyModelUml.exists());
-
- Display.getDefault().syncExec(new Runnable() {
-
- public void run() {
- try {
- editor = EditorUtils.openPapyrusEditor(emptyModelDi);
- } catch (Exception ex) {
- Activator.log.error(ex);
- Assert.fail(ex.getMessage());
- }
- }
- });
-
- Assert.assertNotNull("Cannot open the Papyrus editor", editor);
- Assert.assertTrue("The active editor should be a Papyrus Class Diagram editor", editor.getActiveEditor() instanceof UmlClassDiagramForMultiEditor);
-
- try {
- registry.disposeRegistry();
- } catch (ServiceException ex) {
- //Ignore
- }
-
- }
-
- @Override
- protected String getSourcePath() {
- return SOURCE_PATH;
- }
-}
+/***************************************************************************** + * Copyright (c) 2013 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.editor.integration.tests.tests; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.papyrus.commands.ICreationCommand; +import org.eclipse.papyrus.editor.integration.tests.Activator; +import org.eclipse.papyrus.infra.core.resource.ModelSet; +import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager; +import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry; +import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.core.services.ServicesRegistry; +import org.eclipse.papyrus.infra.core.utils.DiResourceSet; +import org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand; +import org.eclipse.papyrus.junit.utils.EditorUtils; +import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand; +import org.eclipse.papyrus.uml.diagram.clazz.UmlClassDiagramForMultiEditor; +import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand; +import org.eclipse.papyrus.uml.tools.model.UmlModel; +import org.eclipse.swt.widgets.Display; +import org.eclipse.uml2.uml.Model; +import org.junit.Assert; +import org.junit.Test; + +/** + * Test case for handling models with special characters in their name/path + * + * @author Camille Letavernier + * + */ +public class ModelSetTests extends AbstractEditorIntegrationTest { + + public static final String SOURCE_PATH = "/model/model set/"; + + @Test + public void testOpenModelWithSpecialChars() throws Exception { + initModel("openSpecialChars", "^&_&^", getBundle()); + IPageManager pageManager = getPageManager(); + //Fix test to match re-specification in Bug 429242: we only expect 2 pages (Instead of 3), because one of them is + //now invalid (Table v1 framework is deprecated and not available anymore) + Assert.assertEquals("Some pages cannot be found", 2, pageManager.allPages().size()); + + UmlModel umlModel = (UmlModel)getModelSet().getModel(UmlModel.MODEL_ID); + Model rootModel = (Model)umlModel.lookupRoot(); + Assert.assertEquals("The UML Model has not been correctly loaded", 3, rootModel.getOwnedElements().size()); + } + + @Test + public void testCreateModelWithSpecialChars() throws Exception { + ModelSet modelSet = new DiResourceSet(); + IProject emptyModelCreationProject = ResourcesPlugin.getWorkspace().getRoot().getProject("diagramCreationWithSpecialChars"); + emptyModelCreationProject.create(new NullProgressMonitor()); + emptyModelCreationProject.open(new NullProgressMonitor()); + + String modelName = "++n�w m�d�l & sp�c��l ch�r$++"; + + final IFile emptyModelDi = emptyModelCreationProject.getFile(modelName + ".di"); + + modelSet.createsModels(emptyModelDi); + + IFile emptyModelNotation = emptyModelCreationProject.getFile(modelName + ".notation"); + IFile emptyModelUml = emptyModelCreationProject.getFile(modelName + ".uml"); + + ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID); + try { + registry.add(ModelSet.class, Integer.MAX_VALUE, modelSet); + registry.startRegistry(); + } catch (ServiceException ex) { + //Ignore + } + + IModelCreationCommand creationCommand = new CreateUMLModelCommand(); + creationCommand.createModel(modelSet); + + //Create the root UML Model + UmlModel umlModel = (UmlModel)modelSet.getModel(UmlModel.MODEL_ID); + Model model = (Model)umlModel.lookupRoot(); + + //Creates and opens a Papyrus Class Diagram + ICreationCommand diagramCreationCommand = new CreateClassDiagramCommand(); + diagramCreationCommand.createDiagram(modelSet, model, modelName); + + modelSet.save(new NullProgressMonitor()); + + Assert.assertTrue("The DI file has not been created", emptyModelDi.exists()); + Assert.assertTrue("The Notation file has not been created", emptyModelNotation.exists()); + Assert.assertTrue("The UML file has not been created", emptyModelUml.exists()); + + Display.getDefault().syncExec(new Runnable() { + + public void run() { + try { + editor = EditorUtils.openPapyrusEditor(emptyModelDi); + } catch (Exception ex) { + Activator.log.error(ex); + Assert.fail(ex.getMessage()); + } + } + }); + + Assert.assertNotNull("Cannot open the Papyrus editor", editor); + Assert.assertTrue("The active editor should be a Papyrus Class Diagram editor", editor.getActiveEditor() instanceof UmlClassDiagramForMultiEditor); + + try { + registry.disposeRegistry(); + } catch (ServiceException ex) { + //Ignore + } + + } + + @Override + protected String getSourcePath() { + return SOURCE_PATH; + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java index 4bbcfb5f3c1..4bbcfb5f3c1 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/RecoveryTest.java b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/RecoveryTest.java index 18fb0ba9019..18fb0ba9019 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/RecoveryTest.java +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/RecoveryTest.java diff --git a/tests/junit/plugins/editor/pom.xml b/tests/junit/plugins/editor/pom.xml new file mode 100755 index 00000000000..079e2454f48 --- /dev/null +++ b/tests/junit/plugins/editor/pom.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <packaging>pom</packaging> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.plugins.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.editor.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <description>Tests for the Eclipse Editors contributions of Papyrus</description> + + <modules> + <module>org.eclipse.papyrus.eclipse.project.editors.tests</module> + <module>org.eclipse.papyrus.editor.integration.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/.classpath b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.classpath index eca7bdba8f0..eca7bdba8f0 100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/.classpath +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.classpath diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/.project b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.project index d7e9bd1f78e..d7e9bd1f78e 100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/.project +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.project diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.core.prefs index 62a08f4494d..b3aa6d60f94 100644..100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,291 +1,291 @@ -eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.ui.prefs index 954281dbc31..954281dbc31 100644..100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.settings/org.eclipse.jdt.ui.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.ui.prefs diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/ClipboardTests.launch b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/ClipboardTests.launch index a2ba00d6405..a2ba00d6405 100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/ClipboardTests.launch +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/ClipboardTests.launch diff --git a/tests/junit/plugins/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 fa829adba86..359924c7d8c 100755 --- a/tests/junit/plugins/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",
- org.eclipse.papyrus.junit.utils;bundle-version="2.0.100",
- org.eclipse.papyrus.infra.core;bundle-version="[2.2.0,3.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", + org.eclipse.papyrus.junit.utils;bundle-version="2.0.100", + org.eclipse.papyrus.infra.core;bundle-version="[2.2.0,3.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/core/org.eclipse.papyrus.infra.core.clipboard.tests/about.html b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/about.html index dd3c089a94c..dd3c089a94c 100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/about.html +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/about.html diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/build.properties b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/build.properties index f4bd95dd18e..f4bd95dd18e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/build.properties +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/build.properties diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/plugin.properties b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/plugin.properties index 4a5eeecce71..4a5eeecce71 100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/plugin.properties +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/plugin.properties diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/plugin.xml b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/plugin.xml index 499607a6c58..499607a6c58 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/plugin.xml +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/plugin.xml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/pom.xml b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/pom.xml index e8fadb2e6c4..64146022501 100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/pom.xml +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/pom.xml @@ -6,9 +6,9 @@ <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../../../../../releng/main-tests</relativePath> + <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.core.clipboard.tests</artifactId> <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/AWTClipboardUtils.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/AWTClipboardUtils.java index 222bcfbb536..222bcfbb536 100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/AWTClipboardUtils.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/AWTClipboardUtils.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/Activator.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/Activator.java index b47db9d61cd..b47db9d61cd 100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/Activator.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/Activator.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/AllTests.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/AllTests.java index 1a6091a0012..1a6091a0012 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/AllTests.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/AllTests.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/ClipboardTests.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/ClipboardTests.java index 06b1381bbdf..06b1381bbdf 100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/ClipboardTests.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/ClipboardTests.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/CopierFactoryTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/CopierFactoryTest.java index 08241e954ab..08241e954ab 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/CopierFactoryTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/CopierFactoryTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/SWTClipboardUtils.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/SWTClipboardUtils.java index d07f10965b7..d07f10965b7 100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/SWTClipboardUtils.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/SWTClipboardUtils.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.classpath b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.classpath index 046bda900d2..969b4034060 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.classpath +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.classpath @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="test"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="test"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.project b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.project index 65b43a58362..2cee6e820ee 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.project +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.project @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.core.sasheditor.di.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.core.sasheditor.di.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/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.settings/org.eclipse.jdt.core.prefs index 4759947300a..c585cc455ae 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,291 +1,291 @@ -eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.settings/org.eclipse.jdt.ui.prefs index 954281dbc31..954281dbc31 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.settings/org.eclipse.jdt.ui.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.settings/org.eclipse.jdt.ui.prefs diff --git a/tests/junit/plugins/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 d1aa705cee3..d1aa705cee3 100644 --- a/tests/junit/plugins/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 diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/OSGI-INF/l10n/bundle.properties b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/OSGI-INF/l10n/bundle.properties index a5066a7037e..bb13940c6b9 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/OSGI-INF/l10n/bundle.properties +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/OSGI-INF/l10n/bundle.properties @@ -1,3 +1,3 @@ -#Properties file for org.eclipse.papyrus.infra.core.sasheditor.di.tests
-Bundle-Vendor = Eclipse Modeling Project
+#Properties file for org.eclipse.papyrus.infra.core.sasheditor.di.tests +Bundle-Vendor = Eclipse Modeling Project Bundle-Name = Test fragment for org.eclipse.papyrus.infra.core.sasheditor.di plugin
\ No newline at end of file diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/about.html b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/about.html index 82d49bf5f81..d35d5aed64c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/about.html +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.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/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/build.properties b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/build.properties index 2df796013bd..e67a45af40f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/build.properties +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/build.properties @@ -1,6 +1,6 @@ -source.. = test/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- OSGI-INF/
+source.. = test/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + about.html,\ + OSGI-INF/ diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/org.eclipse.papyrus.sasheditor.di.tests.launch b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/org.eclipse.papyrus.sasheditor.di.tests.launch index a0624255ff2..52d272a6ffc 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/org.eclipse.papyrus.sasheditor.di.tests.launch +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/org.eclipse.papyrus.sasheditor.di.tests.launch @@ -1,41 +1,41 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/tests/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.core.sasheditor.di.tests.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.core.sasheditor.di.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="append.args" value="true"/> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/tests/AllTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.core.sasheditor.di.tests.AllTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.core.sasheditor.di.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="false"/> +<booleanAttribute key="useProduct" value="true"/> +</launchConfiguration> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/pom.xml b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/pom.xml index 067d87ee232..b02007732e7 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/pom.xml +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/pom.xml @@ -6,9 +6,9 @@ <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../../../../../releng/main-tests</relativePath> + <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.core.sasheditor.di.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngrTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngrTest.java index 56015a2d975..56015a2d975 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngrTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngrTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/FakeModelFactory.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/FakeModelFactory.java index 5f18bc09626..b842c17a7aa 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/FakeModelFactory.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/FakeModelFactory.java @@ -1,36 +1,36 @@ -/*****************************************************************************
- * Copyright (c) 2009 CEA LIST & LIFL
- *
- *
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-
-
-/**
- * @author dumoulin
- */
-public class FakeModelFactory implements IPageModelFactory {
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory#createIPageModel(org.eclipse.emf.ecore.EObject)
- *
- * @param pageIdentifier
- * @return
- */
- public IPageModel createIPageModel(Object pageIdentifier) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2009 CEA LIST & LIFL + * + * + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; + + +/** + * @author dumoulin + */ +public class FakeModelFactory implements IPageModelFactory { + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory#createIPageModel(org.eclipse.emf.ecore.EObject) + * + * @param pageIdentifier + * @return + */ + public IPageModel createIPageModel(Object pageIdentifier) { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/AbstractDiContentProviderTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/AbstractDiContentProviderTest.java index 4f5cb8728f7..3433a910f52 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/AbstractDiContentProviderTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/AbstractDiContentProviderTest.java @@ -1,394 +1,394 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-
-import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.folder;
-import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.hSash;
-import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.page;
-import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.vSash;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder;
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash;
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryExp;
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page;
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.QueryException;
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.swt.SWT;
-import org.junit.Test;
-
-/**
- * Common ancestor for transactional and non transactional tests.
- *
- * @author cedric dumoulin
- *
- */
-public abstract class AbstractDiContentProviderTest extends AbstractPapyrusTest {
-
- /**
- * The {@link DiContentProvider} under test.
- */
- protected DiContentProvider diContentProvider;
-
- /**
- * The {@link DiContentProvider} under test.
- */
- protected ISashWindowsContentProvider contentProvider;
-
- /**
- * ModelQuery used to query SashModel.
- */
- protected SashModelQuery modelQuery;
-
-
- /**
- * Create the specified model in the SashModel.
- * Concrete implementation should call {@link SashModelQuery}, and surround call
- * with transaction if needed.
- *
- *
- * @param query
- */
- protected abstract void createModel(IQueryExp query) throws QueryException;
-
- /**
- * Test if the model can be modofied.
- *
- * @throws QueryException
- */
- @Test
- public void testModelIsWritable() throws QueryException {
-
- // Try to create a model
- IQueryExp query = folder("a", page(), page());
- createModel(query);
- // Check creation
- modelQuery.assertConform(query);
-
- // Other query
- // Other query
- query = new HSash(new Folder(new Page(), new Page("p1")), new Folder("a", new Page()));
- createModel(query);
-
- // Check creation
- modelQuery.assertConform(query);
- Map<String, Object> result = modelQuery.queryModel(query);
- assertNotNull("folder found", result.get("a"));
- assertTrue("right type", result.get("a") instanceof TabFolder);
- assertNotNull("page found", result.get("p1"));
- assertTrue("right type", result.get("p1") instanceof PageRef);
-
- // *********************
- // Other query
- query = hSash(folder(page(), page()), vSash("s2", folder(page()), folder(page())));
- createModel(query);
-
- // Check creation
- modelQuery.assertConform(query);
- result = modelQuery.queryModel(query);
-
- }
-
- /**
- * Test tab close from a folder with more than one tab
- *
- * @throws QueryException
- */
- @Test
- public void testClosePage() throws QueryException {
-
- // Create a folder with several page
- IQueryExp query = folder("f1", page("p1"), page("p2"), page("p3"));
- createModel(query);
- // Check creation
- modelQuery.assertConform(query);
-
- // get models (from diModels, and factory for sashModel)
- Map<String, Object> modelElements = modelQuery.queryModel(query);
- SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements);
-
- // do action : Close a page
- contentProvider.removePage(sashModels.getFolder("f1"), 1);
-
- // check result
- IQueryExp expectedModel = folder("f1", page("p1"), page("p3"));
- modelQuery.assertConform(expectedModel);
-
- }
-
- /**
- * Test tab close from a folder with only one tab. Some other folder
- * exist
- *
- * @throws QueryException
- */
- @Test
- public void testCloseLastTab() throws QueryException {
- // Create a folder with several page
- IQueryExp query = hSash(folder("f1", page("p1"), page("p2"), page("p3")), folder("f2", page("p4")));
- createModel(query);
- // Check creation
- modelQuery.assertConform(query);
-
- // get models (from diModels, and factory for sashModel)
- Map<String, Object> modelElements = modelQuery.queryModel(query);
- SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements);
-
- // do action : Close a page
- contentProvider.removePage(sashModels.getFolder("f2"), 0);
-
- // check result
- IQueryExp expectedModel = folder("f1", page("p1"), page("p2"), page("p3"));
- modelQuery.assertConform(expectedModel);
-
-
- }
-
- /**
- * Test tab close from the last folder with only one tab. No more folder
- * exists.
- *
- * @throws QueryException
- *
- */
- @Test
- public void testCloseLastTabFromLastFolder() throws QueryException {
-
- // Create a folder with several page
- IQueryExp query = folder("f1", page("p1"));
- createModel(query);
- // Check creation
- modelQuery.assertConform(query);
-
- // get models (from diModels, and factory for sashModel)
- Map<String, Object> modelElements = modelQuery.queryModel(query);
- SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements);
-
- // do action : Close a page
- contentProvider.removePage(sashModels.getFolder("f1"), 0);
-
- // check result
- IQueryExp expectedModel = folder("f1");
- modelQuery.assertConform(expectedModel);
- }
-
- /**
- * Test moving a page inside the same folder
- *
- * @throws QueryException
- */
- @Test
- public void testMovePageInsideFolder() throws QueryException {
-
- // Create a folder with several page
- IQueryExp query = folder("f1", page("p1"), page("p2"), page("p3"));
- createModel(query);
- // Check creation
- modelQuery.assertConform(query);
-
- // get models (from diModels, and factory for sashModel)
- Map<String, Object> modelElements = modelQuery.queryModel(query);
- SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements);
-
- // do action : move a page
- contentProvider.movePage(sashModels.getFolder("f1"), 1, 0);
-
- // check result
- IQueryExp expectedModel = folder("f1", page("p2"), page("p1"), page("p3"));
- modelQuery.assertConform(expectedModel);
-
- // do action : move a page
- contentProvider.movePage(sashModels.getFolder("f1"), 0, 2);
-
- // check result
- expectedModel = folder("f1", page("p1"), page("p3"), page("p2"));
- modelQuery.assertConform(expectedModel);
-
- // do action : move a page
- contentProvider.movePage(sashModels.getFolder("f1"), 2, 0);
-
- // check result
- expectedModel = folder("f1", page("p2"), page("p1"), page("p3"));
- modelQuery.assertConform(expectedModel);
- }
-
- /**
- * Test moving a page from folder to folder
- *
- * @throws QueryException
- */
- @Test
- public void testMovePageBetweenFolder() throws QueryException {
-
- // Create a folder with several page
- IQueryExp query = hSash(folder("f1", page("p1"), page("p2"), page("p3")), folder("f2", page("p4")));
- createModel(query);
- // Check creation
- modelQuery.assertConform(query);
-
- // get models (from diModels, and factory for sashModel)
- Map<String, Object> modelElements = modelQuery.queryModel(query);
- SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements);
-
- // do action : move a page
- contentProvider.movePage(sashModels.getFolder("f1"), 1, sashModels.getFolder("f2"), 0);
-
- // check result
- IQueryExp expectedModel = hSash(folder("f1", page("p1"), page("p3")), folder("f2", page("p2"), page("p4")));
- modelQuery.assertConform(expectedModel);
-
- // do action : move a page
- contentProvider.movePage(sashModels.getFolder("f1"), 1, sashModels.getFolder("f2"), 1);
-
- // check result
- expectedModel = hSash(folder("f1", page("p1")), folder("f2", page("p2"), page("p3"), page("p4")));
- modelQuery.assertConform(expectedModel);
-
- // do action : move a page, drop in target page (targetIndex == -1
- contentProvider.movePage(sashModels.getFolder("f2"), 0, sashModels.getFolder("f1"), -1);
-
- // check result
- expectedModel = hSash(folder("f1", page("p1"), page("p2")), folder("f2", page("p3"), page("p4")));
- modelQuery.assertConform(expectedModel);
-
- }
-
- /**
- * Test tab close from a folder with more than one tab
- *
- * @throws QueryException
- */
- @Test
- public void testCreateFolder() throws QueryException {
-
- // Create a folder with several page
- IQueryExp query = folder("f1", page("p1"), page("p2"), page("p3"));
- createModel(query);
- // Check creation
- modelQuery.assertConform(query);
-
- // get models (from diModels, and factory for sashModel)
- Map<String, Object> modelElements = modelQuery.queryModel(query);
- SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements);
-
- // do action : create a folder
- contentProvider.createFolder(sashModels.getFolder("f1"), 1, sashModels.getFolder("f1"), SWT.RIGHT);
-
- // check result
- IQueryExp expectedModel = hSash(folder("f1", page("p1"), page("p3")), folder(page("p2")));
- modelQuery.assertConform(expectedModel);
-
- // do action : create a folder
- contentProvider.createFolder(sashModels.getFolder("f1"), 0, sashModels.getFolder("f1"), SWT.UP);
-
- // check result
- expectedModel = hSash(vSash(folder(page("p1")), folder("f1", page("p3"))), folder(page("p2")));
- modelQuery.assertConform(expectedModel);
-
- }
-
- /**
- * Test moving a folder around another folder
- *
- * @throws QueryException
- */
- @Test
- public void testMoveFolderAroundFolder() throws QueryException {
-
- // Create a folder with several page
- IQueryExp query = hSash(folder("f1", page("p1"), page("p2"), page("p3")), folder("f2", page("p4"), page("p5")));
- createModel(query);
- // Check creation
- modelQuery.assertConform(query);
-
- // get models (from diModels, and factory for sashModel)
- Map<String, Object> modelElements = modelQuery.queryModel(query);
- SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements);
-
- // do action : move a folder
- // -1 mean all pages
- contentProvider.createFolder(sashModels.getFolder("f2"), -1, sashModels.getFolder("f1"), SWT.UP);
-
- // check result
- IQueryExp expectedModel = vSash(folder(page("p4"), page("p5")), folder("f1", page("p1"), page("p2"), page("p3")));
- modelQuery.assertConform(expectedModel);
-
- }
-
- /**
- * Test moving a folder inside another folder
- *
- * @throws QueryException
- */
- @Test
- public void testMoveFolderInsideFolder() throws QueryException {
-
- // Create a folder with several page
- IQueryExp query = hSash(folder("f1", page("p1"), page("p2"), page("p3")), folder("f2", page("p4"), page("p5")));
- createModel(query);
- // Check creation
- modelQuery.assertConform(query);
-
- // get models (from diModels, and factory for sashModel)
- Map<String, Object> modelElements = modelQuery.queryModel(query);
- SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements);
-
- // do action : move a folder. In fact, move all the pages
- // -1 mean all pages
- contentProvider.movePage(sashModels.getFolder("f2"), -1, sashModels.getFolder("f1"), -1);
-
- // check result
- IQueryExp expectedModel = folder("f1", page("p1"), page("p2"), page("p3"), page("p4"), page("p5"));
- modelQuery.assertConform(expectedModel);
-
- }
-
- /**
- * Test moving a folder inside another folder
- *
- * @throws QueryException
- */
- @Test
- public void testMoveFolderInsideFolderAtSpecifiedIndex() throws QueryException {
-
- // Create a folder with several page
- IQueryExp query = hSash(folder("f1", page("p1"), page("p2"), page("p3")), folder("f2", page("p4"), page("p5")));
- createModel(query);
- // Check creation
- modelQuery.assertConform(query);
-
- // get models (from diModels, and factory for sashModel)
- Map<String, Object> modelElements = modelQuery.queryModel(query);
- SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements);
-
- // do action : move a folder. In fact, move all the pages
- // -1 mean all pages
- contentProvider.movePage(sashModels.getFolder("f2"), -1, sashModels.getFolder("f1"), 0);
-
- // check result
- IQueryExp expectedModel = folder("f1", page("p4"), page("p5"), page("p1"), page("p2"), page("p3"));
- modelQuery.assertConform(expectedModel);
-
- }
-
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal; + +import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.folder; +import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.hSash; +import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.page; +import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.vSash; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder; +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash; +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryExp; +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page; +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.QueryException; +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery; +import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; +import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder; +import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; +import org.eclipse.swt.SWT; +import org.junit.Test; + +/** + * Common ancestor for transactional and non transactional tests. + * + * @author cedric dumoulin + * + */ +public abstract class AbstractDiContentProviderTest extends AbstractPapyrusTest { + + /** + * The {@link DiContentProvider} under test. + */ + protected DiContentProvider diContentProvider; + + /** + * The {@link DiContentProvider} under test. + */ + protected ISashWindowsContentProvider contentProvider; + + /** + * ModelQuery used to query SashModel. + */ + protected SashModelQuery modelQuery; + + + /** + * Create the specified model in the SashModel. + * Concrete implementation should call {@link SashModelQuery}, and surround call + * with transaction if needed. + * + * + * @param query + */ + protected abstract void createModel(IQueryExp query) throws QueryException; + + /** + * Test if the model can be modofied. + * + * @throws QueryException + */ + @Test + public void testModelIsWritable() throws QueryException { + + // Try to create a model + IQueryExp query = folder("a", page(), page()); + createModel(query); + // Check creation + modelQuery.assertConform(query); + + // Other query + // Other query + query = new HSash(new Folder(new Page(), new Page("p1")), new Folder("a", new Page())); + createModel(query); + + // Check creation + modelQuery.assertConform(query); + Map<String, Object> result = modelQuery.queryModel(query); + assertNotNull("folder found", result.get("a")); + assertTrue("right type", result.get("a") instanceof TabFolder); + assertNotNull("page found", result.get("p1")); + assertTrue("right type", result.get("p1") instanceof PageRef); + + // ********************* + // Other query + query = hSash(folder(page(), page()), vSash("s2", folder(page()), folder(page()))); + createModel(query); + + // Check creation + modelQuery.assertConform(query); + result = modelQuery.queryModel(query); + + } + + /** + * Test tab close from a folder with more than one tab + * + * @throws QueryException + */ + @Test + public void testClosePage() throws QueryException { + + // Create a folder with several page + IQueryExp query = folder("f1", page("p1"), page("p2"), page("p3")); + createModel(query); + // Check creation + modelQuery.assertConform(query); + + // get models (from diModels, and factory for sashModel) + Map<String, Object> modelElements = modelQuery.queryModel(query); + SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements); + + // do action : Close a page + contentProvider.removePage(sashModels.getFolder("f1"), 1); + + // check result + IQueryExp expectedModel = folder("f1", page("p1"), page("p3")); + modelQuery.assertConform(expectedModel); + + } + + /** + * Test tab close from a folder with only one tab. Some other folder + * exist + * + * @throws QueryException + */ + @Test + public void testCloseLastTab() throws QueryException { + // Create a folder with several page + IQueryExp query = hSash(folder("f1", page("p1"), page("p2"), page("p3")), folder("f2", page("p4"))); + createModel(query); + // Check creation + modelQuery.assertConform(query); + + // get models (from diModels, and factory for sashModel) + Map<String, Object> modelElements = modelQuery.queryModel(query); + SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements); + + // do action : Close a page + contentProvider.removePage(sashModels.getFolder("f2"), 0); + + // check result + IQueryExp expectedModel = folder("f1", page("p1"), page("p2"), page("p3")); + modelQuery.assertConform(expectedModel); + + + } + + /** + * Test tab close from the last folder with only one tab. No more folder + * exists. + * + * @throws QueryException + * + */ + @Test + public void testCloseLastTabFromLastFolder() throws QueryException { + + // Create a folder with several page + IQueryExp query = folder("f1", page("p1")); + createModel(query); + // Check creation + modelQuery.assertConform(query); + + // get models (from diModels, and factory for sashModel) + Map<String, Object> modelElements = modelQuery.queryModel(query); + SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements); + + // do action : Close a page + contentProvider.removePage(sashModels.getFolder("f1"), 0); + + // check result + IQueryExp expectedModel = folder("f1"); + modelQuery.assertConform(expectedModel); + } + + /** + * Test moving a page inside the same folder + * + * @throws QueryException + */ + @Test + public void testMovePageInsideFolder() throws QueryException { + + // Create a folder with several page + IQueryExp query = folder("f1", page("p1"), page("p2"), page("p3")); + createModel(query); + // Check creation + modelQuery.assertConform(query); + + // get models (from diModels, and factory for sashModel) + Map<String, Object> modelElements = modelQuery.queryModel(query); + SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements); + + // do action : move a page + contentProvider.movePage(sashModels.getFolder("f1"), 1, 0); + + // check result + IQueryExp expectedModel = folder("f1", page("p2"), page("p1"), page("p3")); + modelQuery.assertConform(expectedModel); + + // do action : move a page + contentProvider.movePage(sashModels.getFolder("f1"), 0, 2); + + // check result + expectedModel = folder("f1", page("p1"), page("p3"), page("p2")); + modelQuery.assertConform(expectedModel); + + // do action : move a page + contentProvider.movePage(sashModels.getFolder("f1"), 2, 0); + + // check result + expectedModel = folder("f1", page("p2"), page("p1"), page("p3")); + modelQuery.assertConform(expectedModel); + } + + /** + * Test moving a page from folder to folder + * + * @throws QueryException + */ + @Test + public void testMovePageBetweenFolder() throws QueryException { + + // Create a folder with several page + IQueryExp query = hSash(folder("f1", page("p1"), page("p2"), page("p3")), folder("f2", page("p4"))); + createModel(query); + // Check creation + modelQuery.assertConform(query); + + // get models (from diModels, and factory for sashModel) + Map<String, Object> modelElements = modelQuery.queryModel(query); + SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements); + + // do action : move a page + contentProvider.movePage(sashModels.getFolder("f1"), 1, sashModels.getFolder("f2"), 0); + + // check result + IQueryExp expectedModel = hSash(folder("f1", page("p1"), page("p3")), folder("f2", page("p2"), page("p4"))); + modelQuery.assertConform(expectedModel); + + // do action : move a page + contentProvider.movePage(sashModels.getFolder("f1"), 1, sashModels.getFolder("f2"), 1); + + // check result + expectedModel = hSash(folder("f1", page("p1")), folder("f2", page("p2"), page("p3"), page("p4"))); + modelQuery.assertConform(expectedModel); + + // do action : move a page, drop in target page (targetIndex == -1 + contentProvider.movePage(sashModels.getFolder("f2"), 0, sashModels.getFolder("f1"), -1); + + // check result + expectedModel = hSash(folder("f1", page("p1"), page("p2")), folder("f2", page("p3"), page("p4"))); + modelQuery.assertConform(expectedModel); + + } + + /** + * Test tab close from a folder with more than one tab + * + * @throws QueryException + */ + @Test + public void testCreateFolder() throws QueryException { + + // Create a folder with several page + IQueryExp query = folder("f1", page("p1"), page("p2"), page("p3")); + createModel(query); + // Check creation + modelQuery.assertConform(query); + + // get models (from diModels, and factory for sashModel) + Map<String, Object> modelElements = modelQuery.queryModel(query); + SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements); + + // do action : create a folder + contentProvider.createFolder(sashModels.getFolder("f1"), 1, sashModels.getFolder("f1"), SWT.RIGHT); + + // check result + IQueryExp expectedModel = hSash(folder("f1", page("p1"), page("p3")), folder(page("p2"))); + modelQuery.assertConform(expectedModel); + + // do action : create a folder + contentProvider.createFolder(sashModels.getFolder("f1"), 0, sashModels.getFolder("f1"), SWT.UP); + + // check result + expectedModel = hSash(vSash(folder(page("p1")), folder("f1", page("p3"))), folder(page("p2"))); + modelQuery.assertConform(expectedModel); + + } + + /** + * Test moving a folder around another folder + * + * @throws QueryException + */ + @Test + public void testMoveFolderAroundFolder() throws QueryException { + + // Create a folder with several page + IQueryExp query = hSash(folder("f1", page("p1"), page("p2"), page("p3")), folder("f2", page("p4"), page("p5"))); + createModel(query); + // Check creation + modelQuery.assertConform(query); + + // get models (from diModels, and factory for sashModel) + Map<String, Object> modelElements = modelQuery.queryModel(query); + SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements); + + // do action : move a folder + // -1 mean all pages + contentProvider.createFolder(sashModels.getFolder("f2"), -1, sashModels.getFolder("f1"), SWT.UP); + + // check result + IQueryExp expectedModel = vSash(folder(page("p4"), page("p5")), folder("f1", page("p1"), page("p2"), page("p3"))); + modelQuery.assertConform(expectedModel); + + } + + /** + * Test moving a folder inside another folder + * + * @throws QueryException + */ + @Test + public void testMoveFolderInsideFolder() throws QueryException { + + // Create a folder with several page + IQueryExp query = hSash(folder("f1", page("p1"), page("p2"), page("p3")), folder("f2", page("p4"), page("p5"))); + createModel(query); + // Check creation + modelQuery.assertConform(query); + + // get models (from diModels, and factory for sashModel) + Map<String, Object> modelElements = modelQuery.queryModel(query); + SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements); + + // do action : move a folder. In fact, move all the pages + // -1 mean all pages + contentProvider.movePage(sashModels.getFolder("f2"), -1, sashModels.getFolder("f1"), -1); + + // check result + IQueryExp expectedModel = folder("f1", page("p1"), page("p2"), page("p3"), page("p4"), page("p5")); + modelQuery.assertConform(expectedModel); + + } + + /** + * Test moving a folder inside another folder + * + * @throws QueryException + */ + @Test + public void testMoveFolderInsideFolderAtSpecifiedIndex() throws QueryException { + + // Create a folder with several page + IQueryExp query = hSash(folder("f1", page("p1"), page("p2"), page("p3")), folder("f2", page("p4"), page("p5"))); + createModel(query); + // Check creation + modelQuery.assertConform(query); + + // get models (from diModels, and factory for sashModel) + Map<String, Object> modelElements = modelQuery.queryModel(query); + SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements); + + // do action : move a folder. In fact, move all the pages + // -1 mean all pages + contentProvider.movePage(sashModels.getFolder("f2"), -1, sashModels.getFolder("f1"), 0); + + // check result + IQueryExp expectedModel = folder("f1", page("p4"), page("p5"), page("p1"), page("p2"), page("p3")); + modelQuery.assertConform(expectedModel); + + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/CheckVisitor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/CheckVisitor.java index d0e8a6b105a..a96170a69c0 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/CheckVisitor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/CheckVisitor.java @@ -1,119 +1,119 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NoMatchException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
-import org.eclipse.swt.SWT;
-
-
-/**
- * @author cedric dumoulin
- *
- */
-public class CheckVisitor extends DiContentProviderBaseVisitor implements IPagesModelVisitor<Object> {
-
- /**
- * @return the isVisitingParentFirst
- */
- @Override
- public boolean isVisitingParentFirst() {
- return false;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window)
- *
- * @param windowTerm
- * @param windowModel
- */
- @Override
- public void visit(WindowTerm windowTerm, Window windowModel) {
- // TODO Auto-generated method stub
-
- }
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder)
- *
- * @param folder
- */
- @Override
- public void visit(Folder folder, TabFolder folderModel) {
- // Check name
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash)
- *
- * @param sash
- * @throws NoMatchException
- */
- @Override
- public void visit(HSash sash, SashPanel sashModel) throws NoMatchException {
- // Check orientation
- if( sashModel.getDirection() != SWT.HORIZONTAL) {
- throw new NoMatchException( this.toString() + " - SashOrientation does not match 'HORIZONTAL'" );
- }
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash)
- *
- * @param sash
- * @throws NoMatchException
- */
- @Override
- public void visit(VSash sash , SashPanel sashModel) throws NoMatchException {
- // Check orientation
- if( sashModel.getDirection() != SWT.VERTICAL) {
- throw new NoMatchException( this.toString() + " - SashOrientation does not match 'VERTICAL'" );
- }
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page)
- *
- * @param page
- * @throws NoMatchException
- */
- @Override
- public void visit(Page page, PageRef pageModel) throws PagesModelException {
- //check name
- if(page.getIdentifier() != null) {
- checkName(page.getIdentifier(), pageModel.getPageIdentifier()) ;
- }
- else if(page.getName() != null) {
- checkName(page.getName(), pageModel.getPageIdentifier()) ;
- }
- }
-
-
- protected void checkName( Object expectedName, Object foundName) throws NoMatchException {
- if( expectedName != foundName )
- throw new NoMatchException( "Names do not match (expected="
- + expectedName + ", found="+ foundName );
- }
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal; + +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NoMatchException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm; +import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel; +import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder; +import org.eclipse.papyrus.infra.core.sashwindows.di.Window; +import org.eclipse.swt.SWT; + + +/** + * @author cedric dumoulin + * + */ +public class CheckVisitor extends DiContentProviderBaseVisitor implements IPagesModelVisitor<Object> { + + /** + * @return the isVisitingParentFirst + */ + @Override + public boolean isVisitingParentFirst() { + return false; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window) + * + * @param windowTerm + * @param windowModel + */ + @Override + public void visit(WindowTerm windowTerm, Window windowModel) { + // TODO Auto-generated method stub + + } + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder) + * + * @param folder + */ + @Override + public void visit(Folder folder, TabFolder folderModel) { + // Check name + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash) + * + * @param sash + * @throws NoMatchException + */ + @Override + public void visit(HSash sash, SashPanel sashModel) throws NoMatchException { + // Check orientation + if( sashModel.getDirection() != SWT.HORIZONTAL) { + throw new NoMatchException( this.toString() + " - SashOrientation does not match 'HORIZONTAL'" ); + } + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash) + * + * @param sash + * @throws NoMatchException + */ + @Override + public void visit(VSash sash , SashPanel sashModel) throws NoMatchException { + // Check orientation + if( sashModel.getDirection() != SWT.VERTICAL) { + throw new NoMatchException( this.toString() + " - SashOrientation does not match 'VERTICAL'" ); + } + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page) + * + * @param page + * @throws NoMatchException + */ + @Override + public void visit(Page page, PageRef pageModel) throws PagesModelException { + //check name + if(page.getIdentifier() != null) { + checkName(page.getIdentifier(), pageModel.getPageIdentifier()) ; + } + else if(page.getName() != null) { + checkName(page.getName(), pageModel.getPageIdentifier()) ; + } + } + + + protected void checkName( Object expectedName, Object foundName) throws NoMatchException { + if( expectedName != foundName ) + throw new NoMatchException( "Names do not match (expected=" + + expectedName + ", found="+ foundName ); + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ContentChangeListener.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ContentChangeListener.java index 856058412db..754a2546064 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ContentChangeListener.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ContentChangeListener.java @@ -1,43 +1,43 @@ -/*****************************************************************************
- * Copyright (c) 2009 CEA LIST & LIFL
- *
- *
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;
-
-/**
- * Listener on ContentChange for Tests.
- *
- * @author dumoulin
- */
-public class ContentChangeListener implements IContentChangedListener {
-
- /** Count number of change event */
- private int changeCount = 0;
-
- /**
- * @return the changeCount
- */
- public int getChangeCount() {
- return changeCount;
- }
-
- public void contentChanged(ContentEvent event) {
- changeCount++;
- }
-
- public void reset() {
- changeCount = 0;
- }
-}
+/***************************************************************************** + * Copyright (c) 2009 CEA LIST & LIFL + * + * + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener; + +/** + * Listener on ContentChange for Tests. + * + * @author dumoulin + */ +public class ContentChangeListener implements IContentChangedListener { + + /** Count number of change event */ + private int changeCount = 0; + + /** + * @return the changeCount + */ + public int getChangeCount() { + return changeCount; + } + + public void contentChanged(ContentEvent event) { + changeCount++; + } + + public void reset() { + changeCount = 0; + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/CreateModelVisitor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/CreateModelVisitor.java index c50242dd7a6..85034df40fd 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/CreateModelVisitor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/CreateModelVisitor.java @@ -1,147 +1,147 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.AbstractSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PanelTerm;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm;
-import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
-import org.eclipse.swt.SWT;
-
-/**
- * This visitor is used with {@link IQueryTerm} to create a {@link SashModel} instancied
- * with the Sash, folders and pages specified in the query.
- *
- *
- * @author cedric dumoulin
- *
- */
-public class CreateModelVisitor extends DiContentProviderBaseVisitor implements IPagesModelVisitor<Object> {
-
- /**
- * @return the isVisitingParentFirst
- */
- public boolean isVisitingParentFirst() {
- return true;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window)
- *
- * @param windowTerm
- * @param windowModel
- */
- public void visit(WindowTerm windowTerm, Window windowModel) {
- // Create children of the sash
- PanelTerm panel = windowTerm.getPanel();
- if(panel instanceof AbstractSash) {
- windowModel.setPanel(DiFactory.eINSTANCE.createSashPanel());
- }
- else if (panel instanceof Folder) {
- windowModel.setPanel(DiFactory.eINSTANCE.createTabFolder());
- }
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder, org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder)
- *
- * @param folder
- * @param folderModel
- */
- public void visit(Folder folder, TabFolder folderModel) {
-
- // Create children of the folder
- for( Page page : folder.getPages() ) {
- folderModel.getChildren().add(DiFactory.eINSTANCE.createPageRef());
- }
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)
- *
- * @param sashQuery
- * @param sashModel
- */
- public void visit(HSash sashQuery, SashPanel sashModel) {
-
- // sash orientation
- sashModel.setDirection(SWT.HORIZONTAL);
- // Create children of the sash
-
- createPanelOrFolder(sashQuery.getLeftup(), sashModel);
- createPanelOrFolder(sashQuery.getRightdown(), sashModel);
- }
-
- /**
- * @param sashModel
- * @param panel
- */
- private void createPanelOrFolder(PanelTerm panel, SashPanel parent ) {
- if(panel instanceof AbstractSash) {
- parent.getChildren().add(DiFactory.eINSTANCE.createSashPanel());
- }
- else if (panel instanceof Folder) {
- parent.getChildren().add(DiFactory.eINSTANCE.createTabFolder());
- }
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)
- *
- * @param sash
- * @param sashModel
- */
- public void visit(VSash sashQuery, SashPanel sashModel) {
- // sash orientation
- sashModel.setDirection(SWT.VERTICAL);
- // Create children of the sash
- createPanelOrFolder(sashQuery.getLeftup(), sashModel);
- createPanelOrFolder(sashQuery.getRightdown(), sashModel);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page, org.eclipse.papyrus.infra.core.sashwindows.di.PageRef)
- *
- * @param page
- * @param pageModel
- */
- public void visit(Page page, PageRef pageModel) {
-
-
- if(page.getIdentifier() != null) {
- pageModel.setPageIdentifier(page.getIdentifier());
- }
- else if(page.getName() != null) {
- pageModel.setPageIdentifier(page.getName());
- }
- else {
- pageModel.setPageIdentifier(new Object());
- }
-
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal; + +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.AbstractSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PanelTerm; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm; +import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory; +import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel; +import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder; +import org.eclipse.papyrus.infra.core.sashwindows.di.Window; +import org.eclipse.swt.SWT; + +/** + * This visitor is used with {@link IQueryTerm} to create a {@link SashModel} instancied + * with the Sash, folders and pages specified in the query. + * + * + * @author cedric dumoulin + * + */ +public class CreateModelVisitor extends DiContentProviderBaseVisitor implements IPagesModelVisitor<Object> { + + /** + * @return the isVisitingParentFirst + */ + public boolean isVisitingParentFirst() { + return true; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window) + * + * @param windowTerm + * @param windowModel + */ + public void visit(WindowTerm windowTerm, Window windowModel) { + // Create children of the sash + PanelTerm panel = windowTerm.getPanel(); + if(panel instanceof AbstractSash) { + windowModel.setPanel(DiFactory.eINSTANCE.createSashPanel()); + } + else if (panel instanceof Folder) { + windowModel.setPanel(DiFactory.eINSTANCE.createTabFolder()); + } + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder, org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder) + * + * @param folder + * @param folderModel + */ + public void visit(Folder folder, TabFolder folderModel) { + + // Create children of the folder + for( Page page : folder.getPages() ) { + folderModel.getChildren().add(DiFactory.eINSTANCE.createPageRef()); + } + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel) + * + * @param sashQuery + * @param sashModel + */ + public void visit(HSash sashQuery, SashPanel sashModel) { + + // sash orientation + sashModel.setDirection(SWT.HORIZONTAL); + // Create children of the sash + + createPanelOrFolder(sashQuery.getLeftup(), sashModel); + createPanelOrFolder(sashQuery.getRightdown(), sashModel); + } + + /** + * @param sashModel + * @param panel + */ + private void createPanelOrFolder(PanelTerm panel, SashPanel parent ) { + if(panel instanceof AbstractSash) { + parent.getChildren().add(DiFactory.eINSTANCE.createSashPanel()); + } + else if (panel instanceof Folder) { + parent.getChildren().add(DiFactory.eINSTANCE.createTabFolder()); + } + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel) + * + * @param sash + * @param sashModel + */ + public void visit(VSash sashQuery, SashPanel sashModel) { + // sash orientation + sashModel.setDirection(SWT.VERTICAL); + // Create children of the sash + createPanelOrFolder(sashQuery.getLeftup(), sashModel); + createPanelOrFolder(sashQuery.getRightdown(), sashModel); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page, org.eclipse.papyrus.infra.core.sashwindows.di.PageRef) + * + * @param page + * @param pageModel + */ + public void visit(Page page, PageRef pageModel) { + + + if(page.getIdentifier() != null) { + pageModel.setPageIdentifier(page.getIdentifier()); + } + else if(page.getName() != null) { + pageModel.setPageIdentifier(page.getName()); + } + else { + pageModel.setPageIdentifier(new Object()); + } + + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider2Test.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider2Test.java index 8e6020259fb..d31b8cc26cb 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider2Test.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider2Test.java @@ -1,67 +1,67 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryExp;
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.QueryException;
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
-import org.junit.After;
-import org.junit.Before;
-
-/**
- * @author dumoulin
- *
- */
-public class DiContentProvider2Test extends AbstractDiContentProviderTest {
-
- /*
- *
- */
- @Before
- public void setUp() throws Exception {
- IPageModelFactory pageModelFactory = new FakePageModelFactory();
- SashModel diSashModel = DiUtils.createDefaultSashModel();
- diContentProvider = new DiContentProvider(diSashModel, pageModelFactory);
- contentProvider = diContentProvider;
-
- // Create model query
- modelQuery = new SashModelQuery(diSashModel);
- }
-
- /**
- *
- * @see junit.framework.TestCase#tearDown()
- *
- * @throws Exception
- */
- @After
- public void tearDown() throws Exception {
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.AbstractDiContentProviderTest#createModel(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm)
- *
- * @param query
- * @throws QueryException
- */
- @Override
- protected void createModel(IQueryExp query) throws QueryException {
- modelQuery.createModel(query);
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal; + +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory; +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryExp; +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.QueryException; +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel; +import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils; +import org.junit.After; +import org.junit.Before; + +/** + * @author dumoulin + * + */ +public class DiContentProvider2Test extends AbstractDiContentProviderTest { + + /* + * + */ + @Before + public void setUp() throws Exception { + IPageModelFactory pageModelFactory = new FakePageModelFactory(); + SashModel diSashModel = DiUtils.createDefaultSashModel(); + diContentProvider = new DiContentProvider(diSashModel, pageModelFactory); + contentProvider = diContentProvider; + + // Create model query + modelQuery = new SashModelQuery(diSashModel); + } + + /** + * + * @see junit.framework.TestCase#tearDown() + * + * @throws Exception + */ + @After + public void tearDown() throws Exception { + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.AbstractDiContentProviderTest#createModel(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm) + * + * @param query + * @throws QueryException + */ + @Override + protected void createModel(IQueryExp query) throws QueryException { + modelQuery.createModel(query); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderBaseVisitor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderBaseVisitor.java index a7486266eb7..83e0d2c000f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderBaseVisitor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderBaseVisitor.java @@ -1,326 +1,326 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-
-import java.util.Iterator;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NoMatchException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModel;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm;
-import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
-
-/**
- * A base implementation of {@link IPagesModelVisitor} to visit conjointly SashPagesModel and
- * {@link DiContentProvider}.
- *
- * This implementation separate the navigation part (walk(term, contentProviderModel)) and
- * the visit part (visit(term, contentProviderModel)). It implements the navigation part.
- * <br>
- * The visit part should be implemented by subclasses.
- *
- *
- *
- * @author cedric dumoulin
- *
- */
-public class DiContentProviderBaseVisitor implements IPagesModelVisitor<Object> {
-
- /**
- * @return the isVisitingParentFirst
- */
- public boolean isVisitingParentFirst() {
- return true;
- }
-
- /**
- * Visit the model.
- * The second argument should be a SashModel, or one of its container (ex: DiContentProvider).
- *
- * @param pagesModel
- * @param diPagesModel
- * @throws PagesModelException
- */
- public void walk(SashPagesModel pagesModel, Object diPagesModel) throws PagesModelException {
- // Check associated model type
- // It can be of different type: DiContentProvider or SashModel
- //
- SashModel sashModel = null;
- if( diPagesModel instanceof SashModel) {
- sashModel = (SashModel)diPagesModel;
- }
- else if(diPagesModel instanceof DiContentProvider) {
- sashModel = ((DiContentProvider)diPagesModel).getDiSashModel();
- }
- else {
- throw new NoMatchException( "ContentProvider type ("+ diPagesModel.getClass().getName()+ ") does not match to SashModel or one of its container" );
- }
-
-
- if( isVisitingParentFirst() ) {
- visit(pagesModel, sashModel);
- }
- // visit children
- for( WindowTerm windowTerm : pagesModel.getWindows() ) {
- // Only one window
- Window windowModel = sashModel.getWindows().get(0);
- windowTerm.getPanel().accept(this, windowModel);
- }
- if( ! isVisitingParentFirst() ) {
- visit(pagesModel, sashModel);
- }
- }
-
- /**
- * Walk the WindowTerm and its child.
- * @param windowTerm
- * @param windowModel
- * @throws PagesModelException
- */
- public void walk(WindowTerm windowTerm, Object windowModel) throws PagesModelException {
- // Check associated model type
- if(! (windowModel instanceof Window) ) {
- throw new NoMatchException( "ContentProvider type ("+ windowModel.getClass().getName()+ ") does not match to Window" );
- }
-
- Window window = (Window)windowModel;
-
- if( isVisitingParentFirst() ) {
- visit(windowTerm, window);
- }
- // visit children
- for( AbstractPanel panel : window.getChildren())
- windowTerm.getPanel().accept(this, panel);
-
- if( ! isVisitingParentFirst() ) {
- visit(windowTerm, window);
- }
- }
-
- /**
- * Walk folder and its children.
- *
- * @param folder
- * @param folderModel
- * @throws PagesModelException
- */
- public void walk(Folder folder, Object model) throws PagesModelException {
- // Check associated model type
- if(! (model instanceof TabFolder) ) {
- throw new NoMatchException( this.toString()
- + "\n" + folder
- + "\n - Model object type does not match to FolderQueryPart."
- + " Expected TabFolder, found '" + model.getClass().getSimpleName() + "'."
- + " (" + folder.getName() +")" );
- }
- TabFolder folderModel = (TabFolder)model;
-
- // Visit this
- if( isVisitingParentFirst() ) {
- visit(folder, folderModel);
- }
-
- // visit children
- Iterator<PageRef> pageRefs = folderModel.getChildren().iterator();
- Iterator<Page> pageQueries = folder.getPages().iterator();
- while (pageRefs.hasNext() && pageQueries.hasNext() ) {
- PageRef pageRef = pageRefs.next();
- Page query = pageQueries.next();
-
- query.accept(this, pageRef);
- }
- if (pageRefs.hasNext()) {
- // some page left
- throw new NoMatchException( "Folder matching - "
- + this.toString()
- +" folder model have more pages than folder query. ("+folder.getName()+")" );
- } else if (pageQueries.hasNext() ) {
- // some queries left
- throw new NoMatchException( "Folder matching - "
- + this.toString()
- +" folder query have more page than folder model. ("+folder.getName()+")" );
- }
- // Visit this
- if( ! isVisitingParentFirst() ) {
- visit(folder, folderModel);
- }
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor#walk(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash, java.lang.Object)
- *
- * @param sash
- * @param sashModel
- * @throws PagesModelException
- */
- public void walk(HSash sash, Object model) throws PagesModelException {
- // Check associated model type
- if(! (model instanceof SashPanel) ) {
- throw new NoMatchException( this.toString() + " - Model object type does not match to SashPanel (found "
- + model.getClass()
- + " )");
- }
-
- SashPanel sashModel = (SashPanel)model;
-
-// // Check orientation
-// if( sashModel.getDirection() != SWT.HORIZONTAL) {
-// throw new NoMatchException( this.toString() + " - SashOrientation does not match 'HORIZONTAL'" );
-// }
- // Visit this
- if( isVisitingParentFirst() ) {
- visit(sash, sashModel);
- }
-
- // Visit children
- sash.getLeftup().accept(this, sashModel.getChildren().get(0));
- sash.getRightdown().accept(this, sashModel.getChildren().get(1));
-
- if( !isVisitingParentFirst() ) {
- visit(sash, sashModel);
- }
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor#walk(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash, java.lang.Object)
- *
- * @param sash
- * @param sashModel
- * @throws PagesModelException
- */
- public void walk(VSash sash, Object model) throws PagesModelException {
- // Check associated model type
- if(! (model instanceof SashPanel) ) {
- throw new NoMatchException( this.toString() + " - Model object type does not match to SashPanel (found "
- + model.getClass()
- + " )");
- }
-
- SashPanel sashModel = (SashPanel)model;
-
-// // Check orientation
-// if( sashModel.getDirection() != SWT.VERTICAL) {
-// throw new NoMatchException( this.toString() + " - SashOrientation does not match 'VERTICAL'" );
-// }
- // Visit this
- if( isVisitingParentFirst() ) {
- visit(sash, sashModel);
- }
-
- // Visit children
- sash.getLeftup().accept(this, sashModel.getChildren().get(0));
- sash.getRightdown().accept(this, sashModel.getChildren().get(1));
-
- if( !isVisitingParentFirst() ) {
- visit(sash, sashModel);
- }
- }
-
- /**
- * Walk the page. Simply call the corresponding {@link DiContentProviderBaseVisitor#visit(Page, IPageModel)} method.
- * @param page
- * @param pageModel
- * @throws PagesModelException
- */
- public void walk(Page page, Object model) throws PagesModelException {
- // Check associated model type
- if(! (model instanceof PageRef) ) {
- throw new NoMatchException( this.toString() + " - Model object type does not match to PageRef" );
- }
- PageRef pageModel = (PageRef)model;
- visit(page, pageModel);
- }
-
-
- /**
- * Visit the model. Actually, there is no counterpart for {@link SashPagesModel} in {@link SimpleContentProvider}.
- *
- * @param windowTerm
- * @param windowModel
- * @throws PagesModelException
- */
- public void visit(SashPagesModel pagesModel, SashModel windowModel) throws PagesModelException {
-
- }
-
- /**
- * Visit the corresponding node.
- * To be implemented by subclass.
- *
- *
- * @param windowTerm
- * @param windowModel
- */
- public void visit(WindowTerm windowTerm, Window windowModel) throws PagesModelException {
- // To be implemented by subclass.
- }
-
- /**
- * Visit the corresponding node.
- * To be implemented by subclass.
- *
- * @param folder
- * @param folderModel
- */
- public void visit(Folder folder, TabFolder folderModel) throws PagesModelException{
-
- }
-
- /**
- * Visit the corresponding node.
- * To be implemented by subclass.
- *
- * @param sashQuery
- * @param sashModel
- */
- public void visit(HSash sashQuery, SashPanel sashModel) throws PagesModelException {
-
- }
-
- /**
- * Visit the corresponding node.
- * To be implemented by subclass.
- *
- *
- * @param sash
- * @param sashModel
- */
- public void visit(VSash sashQuery, SashPanel sashModel) throws PagesModelException{
- }
-
- /**
- * Visit the corresponding node.
- * To be implemented by subclass.
- *
- *
- * @param page
- * @param pageModel
- */
- public void visit(Page page, PageRef pageModel) throws PagesModelException {
-
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal; + +import java.util.Iterator; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NoMatchException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModel; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm; +import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel; +import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel; +import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder; +import org.eclipse.papyrus.infra.core.sashwindows.di.Window; + +/** + * A base implementation of {@link IPagesModelVisitor} to visit conjointly SashPagesModel and + * {@link DiContentProvider}. + * + * This implementation separate the navigation part (walk(term, contentProviderModel)) and + * the visit part (visit(term, contentProviderModel)). It implements the navigation part. + * <br> + * The visit part should be implemented by subclasses. + * + * + * + * @author cedric dumoulin + * + */ +public class DiContentProviderBaseVisitor implements IPagesModelVisitor<Object> { + + /** + * @return the isVisitingParentFirst + */ + public boolean isVisitingParentFirst() { + return true; + } + + /** + * Visit the model. + * The second argument should be a SashModel, or one of its container (ex: DiContentProvider). + * + * @param pagesModel + * @param diPagesModel + * @throws PagesModelException + */ + public void walk(SashPagesModel pagesModel, Object diPagesModel) throws PagesModelException { + // Check associated model type + // It can be of different type: DiContentProvider or SashModel + // + SashModel sashModel = null; + if( diPagesModel instanceof SashModel) { + sashModel = (SashModel)diPagesModel; + } + else if(diPagesModel instanceof DiContentProvider) { + sashModel = ((DiContentProvider)diPagesModel).getDiSashModel(); + } + else { + throw new NoMatchException( "ContentProvider type ("+ diPagesModel.getClass().getName()+ ") does not match to SashModel or one of its container" ); + } + + + if( isVisitingParentFirst() ) { + visit(pagesModel, sashModel); + } + // visit children + for( WindowTerm windowTerm : pagesModel.getWindows() ) { + // Only one window + Window windowModel = sashModel.getWindows().get(0); + windowTerm.getPanel().accept(this, windowModel); + } + if( ! isVisitingParentFirst() ) { + visit(pagesModel, sashModel); + } + } + + /** + * Walk the WindowTerm and its child. + * @param windowTerm + * @param windowModel + * @throws PagesModelException + */ + public void walk(WindowTerm windowTerm, Object windowModel) throws PagesModelException { + // Check associated model type + if(! (windowModel instanceof Window) ) { + throw new NoMatchException( "ContentProvider type ("+ windowModel.getClass().getName()+ ") does not match to Window" ); + } + + Window window = (Window)windowModel; + + if( isVisitingParentFirst() ) { + visit(windowTerm, window); + } + // visit children + for( AbstractPanel panel : window.getChildren()) + windowTerm.getPanel().accept(this, panel); + + if( ! isVisitingParentFirst() ) { + visit(windowTerm, window); + } + } + + /** + * Walk folder and its children. + * + * @param folder + * @param folderModel + * @throws PagesModelException + */ + public void walk(Folder folder, Object model) throws PagesModelException { + // Check associated model type + if(! (model instanceof TabFolder) ) { + throw new NoMatchException( this.toString() + + "\n" + folder + + "\n - Model object type does not match to FolderQueryPart." + + " Expected TabFolder, found '" + model.getClass().getSimpleName() + "'." + + " (" + folder.getName() +")" ); + } + TabFolder folderModel = (TabFolder)model; + + // Visit this + if( isVisitingParentFirst() ) { + visit(folder, folderModel); + } + + // visit children + Iterator<PageRef> pageRefs = folderModel.getChildren().iterator(); + Iterator<Page> pageQueries = folder.getPages().iterator(); + while (pageRefs.hasNext() && pageQueries.hasNext() ) { + PageRef pageRef = pageRefs.next(); + Page query = pageQueries.next(); + + query.accept(this, pageRef); + } + if (pageRefs.hasNext()) { + // some page left + throw new NoMatchException( "Folder matching - " + + this.toString() + +" folder model have more pages than folder query. ("+folder.getName()+")" ); + } else if (pageQueries.hasNext() ) { + // some queries left + throw new NoMatchException( "Folder matching - " + + this.toString() + +" folder query have more page than folder model. ("+folder.getName()+")" ); + } + // Visit this + if( ! isVisitingParentFirst() ) { + visit(folder, folderModel); + } + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor#walk(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash, java.lang.Object) + * + * @param sash + * @param sashModel + * @throws PagesModelException + */ + public void walk(HSash sash, Object model) throws PagesModelException { + // Check associated model type + if(! (model instanceof SashPanel) ) { + throw new NoMatchException( this.toString() + " - Model object type does not match to SashPanel (found " + + model.getClass() + + " )"); + } + + SashPanel sashModel = (SashPanel)model; + +// // Check orientation +// if( sashModel.getDirection() != SWT.HORIZONTAL) { +// throw new NoMatchException( this.toString() + " - SashOrientation does not match 'HORIZONTAL'" ); +// } + // Visit this + if( isVisitingParentFirst() ) { + visit(sash, sashModel); + } + + // Visit children + sash.getLeftup().accept(this, sashModel.getChildren().get(0)); + sash.getRightdown().accept(this, sashModel.getChildren().get(1)); + + if( !isVisitingParentFirst() ) { + visit(sash, sashModel); + } + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor#walk(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash, java.lang.Object) + * + * @param sash + * @param sashModel + * @throws PagesModelException + */ + public void walk(VSash sash, Object model) throws PagesModelException { + // Check associated model type + if(! (model instanceof SashPanel) ) { + throw new NoMatchException( this.toString() + " - Model object type does not match to SashPanel (found " + + model.getClass() + + " )"); + } + + SashPanel sashModel = (SashPanel)model; + +// // Check orientation +// if( sashModel.getDirection() != SWT.VERTICAL) { +// throw new NoMatchException( this.toString() + " - SashOrientation does not match 'VERTICAL'" ); +// } + // Visit this + if( isVisitingParentFirst() ) { + visit(sash, sashModel); + } + + // Visit children + sash.getLeftup().accept(this, sashModel.getChildren().get(0)); + sash.getRightdown().accept(this, sashModel.getChildren().get(1)); + + if( !isVisitingParentFirst() ) { + visit(sash, sashModel); + } + } + + /** + * Walk the page. Simply call the corresponding {@link DiContentProviderBaseVisitor#visit(Page, IPageModel)} method. + * @param page + * @param pageModel + * @throws PagesModelException + */ + public void walk(Page page, Object model) throws PagesModelException { + // Check associated model type + if(! (model instanceof PageRef) ) { + throw new NoMatchException( this.toString() + " - Model object type does not match to PageRef" ); + } + PageRef pageModel = (PageRef)model; + visit(page, pageModel); + } + + + /** + * Visit the model. Actually, there is no counterpart for {@link SashPagesModel} in {@link SimpleContentProvider}. + * + * @param windowTerm + * @param windowModel + * @throws PagesModelException + */ + public void visit(SashPagesModel pagesModel, SashModel windowModel) throws PagesModelException { + + } + + /** + * Visit the corresponding node. + * To be implemented by subclass. + * + * + * @param windowTerm + * @param windowModel + */ + public void visit(WindowTerm windowTerm, Window windowModel) throws PagesModelException { + // To be implemented by subclass. + } + + /** + * Visit the corresponding node. + * To be implemented by subclass. + * + * @param folder + * @param folderModel + */ + public void visit(Folder folder, TabFolder folderModel) throws PagesModelException{ + + } + + /** + * Visit the corresponding node. + * To be implemented by subclass. + * + * @param sashQuery + * @param sashModel + */ + public void visit(HSash sashQuery, SashPanel sashModel) throws PagesModelException { + + } + + /** + * Visit the corresponding node. + * To be implemented by subclass. + * + * + * @param sash + * @param sashModel + */ + public void visit(VSash sashQuery, SashPanel sashModel) throws PagesModelException{ + } + + /** + * Visit the corresponding node. + * To be implemented by subclass. + * + * + * @param page + * @param pageModel + */ + public void visit(Page page, PageRef pageModel) throws PagesModelException { + + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderFacade.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderFacade.java index 42111da6ef4..e330fe6e88b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderFacade.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderFacade.java @@ -1,441 +1,441 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.QueryException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.BadNameException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NotFoundException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PanelTerm;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm;
-import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
-import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
-
-/**
- * Class providing a facade to test the {@link SimpleSashWindowsContentProvider} class.
- * <br>
- * This facade own a {@link DiContentProvider} and provides methods to manipulate it with
- * the help of names. Each element in the {@link DiContentProvider} can be identified
- * by a name (String). Then, the facade provide methods similar to {@link ISashWindowsContentProvider}, but using
- * names rather than {@link IAbstractPanelModel} and {@link ITabFolderModel}.
- * <br>
- * The facade maintains a mapping between the names and the {@link ISashWindowsContentProvider} models.
- *
- * @author cedric dumoulin
- *
- */
-public class DiContentProviderFacade implements ISashWindowsContentProviderFacade {
-
- /**
- * The internal content provider this facade is for.
- */
- protected DiContentProvider contentProvider;
-
- /**
- * Mapping between names provided in the expressions and internal implementations of the {@link SashModel}.
- * This mapping is maintained when elements are added or removed.
- *
- */
- protected Map<String, Object> namesMapping;
- /**
- * Cache used to maintain wrappers used to wrap internal SashModel object
- * to {@link ISashWindowsContentProvider} model.
- */
- protected Map<String, Object> contentProviderWrapperCache = new HashMap<String, Object>();
-
- /**
- * Constructor.
- * Create a default internal {@link SimpleSashWindowsContentProvider};
- * @param modelMngr
- */
- public DiContentProviderFacade() {
- IPageModelFactory pageModelFactory = new FakePageModelFactory();
- SashModel diSashModel = DiUtils.createDefaultSashModel();
- this.contentProvider = new DiContentProvider(diSashModel, pageModelFactory);
- }
-
- /**
- * Constructor.
- *
- * @param modelMngr
- */
- public DiContentProviderFacade(DiContentProvider contentProvider) {
- this.contentProvider = contentProvider;
- }
-
- /**
- * @return the contentProvider
- */
- public ISashWindowsContentProvider getIContentProvider() {
- return contentProvider;
- }
-
-
- /**
- * Reset the namesMapping context accordingly to the provided expr.
- * A side effect is that the internal structure is checked against the expr.
- * <br>
- * Reseting the names context allows to remove or add names to the context.
- * It is used to add names of newly created elements (created with addPage() or createFolder() )
-
- * @param expr
- * @throws PagesModelException
- */
- public void resetNamesContext(IModelExp expr) throws PagesModelException {
- namesMapping = queryModel(expr);
- }
-
- /**
- * Check if the internal {@link ISashWindowsContentProvider} is conformed to the specified expression.
- * @param expr
- * @throws QueryException
- */
- public void assertConform(IModelExp expr) throws PagesModelException {
-
- Object first;
- if( expr instanceof WindowTerm) {
- first = getFirstWindowModel();
- }
- else if( expr instanceof PanelTerm) {
- first = getFirstPanelModel();
- }
- else {
- throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + expr.toString() + ")");
- }
-
- CheckVisitor visitor = new CheckVisitor();
- expr.accept(visitor, first);
- }
-
- /**
- * Create an internal model conform to the specified expression.
- * Any previous model is disguarded.
- *
- * This method should only be called once on a {@link SimpleSashWindowsContentProvider}.
- * <br>
- * If an expr term have a name, this name is kept in the facade and can be used later in methods like move, delete, ...
- *
- * @param expr Expression denoting the configuration to create. Must be one of (Folder, HSash, VSash)
- * @throws QueryException
- *
- * TODO Ensure that the method can only be called once. For example,
- * let this class extends {@link SimpleSashWindowsContentProvider}, and the constructor
- * call this method.
- */
- public void createModel(IModelExp expr) throws PagesModelException {
-
- Window first ;
- if( expr instanceof PanelTerm) {
- first = getFirstWindowModel();
- }
- else {
- throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + expr.toString() + ")");
- }
-
- // Create a surrounding WindowTerm
- WindowTerm windowTerm = new WindowTerm((PanelTerm)expr);
-
- CreateModelVisitor visitor = new CreateModelVisitor();
- windowTerm.accept(visitor, first);
-
- // Fill mapping
- namesMapping = queryModel(expr);
- }
-
- /**
- * Get element in the model.
- * Each model element whose corresponding model query part as a name is added to the result map.
- * The element is then accessible with the name set in the query part.
- *
- * @param query
- * @return
- * @throws QueryException
- */
- public Map<String, Object> queryModel(IModelExp query) throws PagesModelException {
-
- Object first;
- if( query instanceof WindowTerm) {
- first = getFirstWindowModel();
- }
- else if( query instanceof PanelTerm) {
- first = getFirstPanelModel();
- }
- else {
- throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")");
- }
-
- QueryVisitor visitor = new QueryVisitor();
- query.accept(visitor, first);
-
- return visitor.getResult();
- }
-
- /**
- * Get the model of the first the first window (in actual implementation their is only one window).
- * @return
- */
- private Window getFirstWindowModel() {
- // Silly method to get the RootModel
- return contentProvider.getDiSashModel().getWindows().get(0);
- }
-
- /**
- * Get the panel of the first window (in actual implementation their is only one window).
- * @return
- */
- private AbstractPanel getFirstPanelModel() {
- //
- return contentProvider.getDiSashModel().getWindows().get(0).getPanel();
- }
-
- /**
- * Add a page to the model
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade#addPage(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page, java.lang.String, int)
- *
- * @param page
- * @param folderName
- * @param index
- * @throws PagesModelException
- */
- public void /*IPageModel*/ addPage(Page page, String folderName, int index) throws PagesModelException {
- // Get the folder
- TabFolderModel folderModel = getITabFolderModel( folderName );
-
- Object pageRawModel = createPageRawModel(page);
-
- contentProvider.addPage(folderModel, index, pageRawModel);
-
- // Create the IContentProvider model, and return it.
-// IPageModel pageModel = folderModel.createChildSashModel(???);
-// return pageModel;
- }
-
- /**
- * Add a page to the model
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade#addPage(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page, java.lang.String, int)
- *
- * @param page
- * @param folderName
- * @throws PagesModelException
- */
- public void /*IPageModel*/ addPage(Page page, String folderName) throws PagesModelException {
- // Get the folder
- TabFolderModel folderModel = getITabFolderModel( folderName );
-
-
- Object pageRawModel = createPageRawModel(page);
-
- contentProvider.addPage(folderModel, pageRawModel);
-
- // Create the IContentProvider model, and return it.
- // createChildSashModel() require a PageRef
-// IPageModel pageModel = folderModel.createChildSashModel(???);
-// return pageModel;
- }
-
- /**
- * Get the pageModel used as identifier of a page.
- * In the {@link DiContentProvider} implementation, the pageModel
- * is an Object.
- * In this implementation, we simply return the identifier of the name found in the
- * declared page. If none is set, return a new Object.
- *
- * @param page
- * @return an identifier for te page
- */
- static public Object createPageRawModel( Page page ) {
-
- if(page.getIdentifier() != null) {
- return page.getIdentifier();
- }
- else if(page.getName() != null) {
- return page.getName();
- }
- else {
- return new Object();
- }
-
- }
-
- /**
- *
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade#movePage(java.lang.String, int, int)
- *
- * @param folderName
- * @param oldIndex
- * @param newIndex
- * @throws NotFoundException
- */
- public void movePage(String folderName, int oldIndex, int newIndex) throws NotFoundException {
- // Get the folder
- ITabFolderModel folderModel = getITabFolderModel( folderName );
-
- contentProvider.movePage(folderModel, oldIndex, newIndex);
- }
-
- public void movePage(String srcFolderName, int sourceIndex, String targetFolderName, int targetIndex) throws NotFoundException {
- // Get the folders
- ITabFolderModel srcFolderModel = getITabFolderModel( srcFolderName );
- ITabFolderModel targetFolderModel = getITabFolderModel( targetFolderName );
-
- contentProvider.movePage(srcFolderModel, sourceIndex, targetFolderModel, targetIndex);
- }
-
- public void removePage(String pageName) throws NotFoundException {
- IPageModel pageModel = getIPageModel(pageName);
-
- contentProvider.removePage(pageModel);
-
- }
-
- public void removePage(String folderName, int tabIndex) throws NotFoundException {
- // Get the folder
- ITabFolderModel folderModel = getITabFolderModel( folderName );
-
- contentProvider.removePage(folderModel, tabIndex);
- // TODO remove page name from context
- }
-
- public void createFolder(String tabFolderName, int tabIndex, String targetFolderName, int side) throws PagesModelException {
- // Get the folders
- ITabFolderModel srcFolderModel = getITabFolderModel( tabFolderName );
- TabFolderModel targetFolderModel = getITabFolderModel( targetFolderName );
-
- contentProvider.createFolder(srcFolderModel, tabIndex, targetFolderModel, side);
-
- }
-
- /**
- * Add an element in namesMapping. Throw an exception if the name already exist or if the name is not correct.
- *
- * @param name
- * @param element
- * @throws BadNameException
- */
- protected void putNameMapping( String name, Object element) throws BadNameException {
-
- if( name == null || name.length() == 0 ) {
- throw new BadNameException("Name '" + name + "' is not valid.");
- }
-
- if(namesMapping.containsKey(name)) {
- throw new BadNameException("Name '" + name + "' already exist in the context. Can't add it (but element is created).");
- }
-
- }
- /**
- * Get the {@link ITabFolderModel} associated to the name.
- * In this implementation, each internal model is wrapped with its {@link ISashWindowsContentProvider} counterpart.
- * For a folder, the wrapper is a {@link TabFolderModel}.
- * The wrapper are cached in an associated cache.
- * @param folderName
- * @return
- * @throws NotFoundException
- */
- public TabFolderModel getITabFolderModel(String folderName) throws NotFoundException {
-
- // Check if the wrapper is already in the cache
- Object cachedModel = contentProviderWrapperCache.get(folderName);
- if(cachedModel != null) {
- // Check the type
- if( ! (cachedModel instanceof TabFolderModel) )
- throw new NotFoundException("An element named '" + folderName + "' is found but it is not of the expected type (ITabFolderModel). " );
-
- // Found
- return (TabFolderModel)cachedModel;
- }
- // Not found, create it
- // Create a new wrapper
- // First, get the corresponding internal representation
- Object rawModel = namesMapping.get(folderName);
- if( rawModel == null )
- throw new NotFoundException("Folder named '" + folderName + "' not found in the context of the expression.");
- if( ! (rawModel instanceof TabFolder) )
- throw new NotFoundException("An element named '" + folderName + "' is found but it is not of the expected type (TabFolder). " );
-
- // Create a wrapper and put it in the cache
- TabFolderModel tabFolderModel = (TabFolderModel)contentProvider.createChildSashModel(rawModel);
- contentProviderWrapperCache.put(folderName, tabFolderModel);
-
- // result
- return tabFolderModel;
-
- }
-
- /**
- * Get the {@link IPageModel} associated to the name.
- * In this implementation, this is the internal element.
- * @param pageName
- * @return
- * @throws NotFoundException
- */
- public IPageModel getIPageModel(String pageName) throws NotFoundException {
-
- // Check if the wrapper is already in the cache
- Object cachedModel = contentProviderWrapperCache.get(pageName);
- if(cachedModel != null) {
- // Check the type
- if( ! (cachedModel instanceof IPageModel) )
- throw new NotFoundException("An element named '" + pageName + "' is found but it is not of the expected type (IPageModel). " );
-
- // Found
- return (IPageModel)cachedModel;
- }
- // Not found, create it
- // Create a new wrapper
- // First, get the corresponding internal representation
- Object rawModel = namesMapping.get(pageName);
- if( rawModel == null )
- throw new NotFoundException("Page named '" + pageName + "' not found in the context of the expression.");
- if( ! (rawModel instanceof PageRef) )
- throw new NotFoundException("An element named '" + pageName + "' is found but it is not of the expected type (PageRef). " );
-
- // Create a wrapper and put it in the cache
- IPageModel pageModel = (IPageModel)contentProvider.createChildSashModel(rawModel);
- contentProviderWrapperCache.put(pageName, pageModel);
-
- // result
- return pageModel;
-
- }
-
- /**
- * Return the associated maps of (names, internal representation).
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade#getNamesToInternalMap()
- *
- * @return
- */
- public Map<String, Object> getNamesToInternalMap() {
- return namesMapping;
- }
-
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory; +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.QueryException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.BadNameException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NotFoundException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PanelTerm; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm; +import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel; +import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel; +import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder; +import org.eclipse.papyrus.infra.core.sashwindows.di.Window; +import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils; + +/** + * Class providing a facade to test the {@link SimpleSashWindowsContentProvider} class. + * <br> + * This facade own a {@link DiContentProvider} and provides methods to manipulate it with + * the help of names. Each element in the {@link DiContentProvider} can be identified + * by a name (String). Then, the facade provide methods similar to {@link ISashWindowsContentProvider}, but using + * names rather than {@link IAbstractPanelModel} and {@link ITabFolderModel}. + * <br> + * The facade maintains a mapping between the names and the {@link ISashWindowsContentProvider} models. + * + * @author cedric dumoulin + * + */ +public class DiContentProviderFacade implements ISashWindowsContentProviderFacade { + + /** + * The internal content provider this facade is for. + */ + protected DiContentProvider contentProvider; + + /** + * Mapping between names provided in the expressions and internal implementations of the {@link SashModel}. + * This mapping is maintained when elements are added or removed. + * + */ + protected Map<String, Object> namesMapping; + /** + * Cache used to maintain wrappers used to wrap internal SashModel object + * to {@link ISashWindowsContentProvider} model. + */ + protected Map<String, Object> contentProviderWrapperCache = new HashMap<String, Object>(); + + /** + * Constructor. + * Create a default internal {@link SimpleSashWindowsContentProvider}; + * @param modelMngr + */ + public DiContentProviderFacade() { + IPageModelFactory pageModelFactory = new FakePageModelFactory(); + SashModel diSashModel = DiUtils.createDefaultSashModel(); + this.contentProvider = new DiContentProvider(diSashModel, pageModelFactory); + } + + /** + * Constructor. + * + * @param modelMngr + */ + public DiContentProviderFacade(DiContentProvider contentProvider) { + this.contentProvider = contentProvider; + } + + /** + * @return the contentProvider + */ + public ISashWindowsContentProvider getIContentProvider() { + return contentProvider; + } + + + /** + * Reset the namesMapping context accordingly to the provided expr. + * A side effect is that the internal structure is checked against the expr. + * <br> + * Reseting the names context allows to remove or add names to the context. + * It is used to add names of newly created elements (created with addPage() or createFolder() ) + + * @param expr + * @throws PagesModelException + */ + public void resetNamesContext(IModelExp expr) throws PagesModelException { + namesMapping = queryModel(expr); + } + + /** + * Check if the internal {@link ISashWindowsContentProvider} is conformed to the specified expression. + * @param expr + * @throws QueryException + */ + public void assertConform(IModelExp expr) throws PagesModelException { + + Object first; + if( expr instanceof WindowTerm) { + first = getFirstWindowModel(); + } + else if( expr instanceof PanelTerm) { + first = getFirstPanelModel(); + } + else { + throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + expr.toString() + ")"); + } + + CheckVisitor visitor = new CheckVisitor(); + expr.accept(visitor, first); + } + + /** + * Create an internal model conform to the specified expression. + * Any previous model is disguarded. + * + * This method should only be called once on a {@link SimpleSashWindowsContentProvider}. + * <br> + * If an expr term have a name, this name is kept in the facade and can be used later in methods like move, delete, ... + * + * @param expr Expression denoting the configuration to create. Must be one of (Folder, HSash, VSash) + * @throws QueryException + * + * TODO Ensure that the method can only be called once. For example, + * let this class extends {@link SimpleSashWindowsContentProvider}, and the constructor + * call this method. + */ + public void createModel(IModelExp expr) throws PagesModelException { + + Window first ; + if( expr instanceof PanelTerm) { + first = getFirstWindowModel(); + } + else { + throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + expr.toString() + ")"); + } + + // Create a surrounding WindowTerm + WindowTerm windowTerm = new WindowTerm((PanelTerm)expr); + + CreateModelVisitor visitor = new CreateModelVisitor(); + windowTerm.accept(visitor, first); + + // Fill mapping + namesMapping = queryModel(expr); + } + + /** + * Get element in the model. + * Each model element whose corresponding model query part as a name is added to the result map. + * The element is then accessible with the name set in the query part. + * + * @param query + * @return + * @throws QueryException + */ + public Map<String, Object> queryModel(IModelExp query) throws PagesModelException { + + Object first; + if( query instanceof WindowTerm) { + first = getFirstWindowModel(); + } + else if( query instanceof PanelTerm) { + first = getFirstPanelModel(); + } + else { + throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")"); + } + + QueryVisitor visitor = new QueryVisitor(); + query.accept(visitor, first); + + return visitor.getResult(); + } + + /** + * Get the model of the first the first window (in actual implementation their is only one window). + * @return + */ + private Window getFirstWindowModel() { + // Silly method to get the RootModel + return contentProvider.getDiSashModel().getWindows().get(0); + } + + /** + * Get the panel of the first window (in actual implementation their is only one window). + * @return + */ + private AbstractPanel getFirstPanelModel() { + // + return contentProvider.getDiSashModel().getWindows().get(0).getPanel(); + } + + /** + * Add a page to the model + * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade#addPage(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page, java.lang.String, int) + * + * @param page + * @param folderName + * @param index + * @throws PagesModelException + */ + public void /*IPageModel*/ addPage(Page page, String folderName, int index) throws PagesModelException { + // Get the folder + TabFolderModel folderModel = getITabFolderModel( folderName ); + + Object pageRawModel = createPageRawModel(page); + + contentProvider.addPage(folderModel, index, pageRawModel); + + // Create the IContentProvider model, and return it. +// IPageModel pageModel = folderModel.createChildSashModel(???); +// return pageModel; + } + + /** + * Add a page to the model + * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade#addPage(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page, java.lang.String, int) + * + * @param page + * @param folderName + * @throws PagesModelException + */ + public void /*IPageModel*/ addPage(Page page, String folderName) throws PagesModelException { + // Get the folder + TabFolderModel folderModel = getITabFolderModel( folderName ); + + + Object pageRawModel = createPageRawModel(page); + + contentProvider.addPage(folderModel, pageRawModel); + + // Create the IContentProvider model, and return it. + // createChildSashModel() require a PageRef +// IPageModel pageModel = folderModel.createChildSashModel(???); +// return pageModel; + } + + /** + * Get the pageModel used as identifier of a page. + * In the {@link DiContentProvider} implementation, the pageModel + * is an Object. + * In this implementation, we simply return the identifier of the name found in the + * declared page. If none is set, return a new Object. + * + * @param page + * @return an identifier for te page + */ + static public Object createPageRawModel( Page page ) { + + if(page.getIdentifier() != null) { + return page.getIdentifier(); + } + else if(page.getName() != null) { + return page.getName(); + } + else { + return new Object(); + } + + } + + /** + * + * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade#movePage(java.lang.String, int, int) + * + * @param folderName + * @param oldIndex + * @param newIndex + * @throws NotFoundException + */ + public void movePage(String folderName, int oldIndex, int newIndex) throws NotFoundException { + // Get the folder + ITabFolderModel folderModel = getITabFolderModel( folderName ); + + contentProvider.movePage(folderModel, oldIndex, newIndex); + } + + public void movePage(String srcFolderName, int sourceIndex, String targetFolderName, int targetIndex) throws NotFoundException { + // Get the folders + ITabFolderModel srcFolderModel = getITabFolderModel( srcFolderName ); + ITabFolderModel targetFolderModel = getITabFolderModel( targetFolderName ); + + contentProvider.movePage(srcFolderModel, sourceIndex, targetFolderModel, targetIndex); + } + + public void removePage(String pageName) throws NotFoundException { + IPageModel pageModel = getIPageModel(pageName); + + contentProvider.removePage(pageModel); + + } + + public void removePage(String folderName, int tabIndex) throws NotFoundException { + // Get the folder + ITabFolderModel folderModel = getITabFolderModel( folderName ); + + contentProvider.removePage(folderModel, tabIndex); + // TODO remove page name from context + } + + public void createFolder(String tabFolderName, int tabIndex, String targetFolderName, int side) throws PagesModelException { + // Get the folders + ITabFolderModel srcFolderModel = getITabFolderModel( tabFolderName ); + TabFolderModel targetFolderModel = getITabFolderModel( targetFolderName ); + + contentProvider.createFolder(srcFolderModel, tabIndex, targetFolderModel, side); + + } + + /** + * Add an element in namesMapping. Throw an exception if the name already exist or if the name is not correct. + * + * @param name + * @param element + * @throws BadNameException + */ + protected void putNameMapping( String name, Object element) throws BadNameException { + + if( name == null || name.length() == 0 ) { + throw new BadNameException("Name '" + name + "' is not valid."); + } + + if(namesMapping.containsKey(name)) { + throw new BadNameException("Name '" + name + "' already exist in the context. Can't add it (but element is created)."); + } + + } + /** + * Get the {@link ITabFolderModel} associated to the name. + * In this implementation, each internal model is wrapped with its {@link ISashWindowsContentProvider} counterpart. + * For a folder, the wrapper is a {@link TabFolderModel}. + * The wrapper are cached in an associated cache. + * @param folderName + * @return + * @throws NotFoundException + */ + public TabFolderModel getITabFolderModel(String folderName) throws NotFoundException { + + // Check if the wrapper is already in the cache + Object cachedModel = contentProviderWrapperCache.get(folderName); + if(cachedModel != null) { + // Check the type + if( ! (cachedModel instanceof TabFolderModel) ) + throw new NotFoundException("An element named '" + folderName + "' is found but it is not of the expected type (ITabFolderModel). " ); + + // Found + return (TabFolderModel)cachedModel; + } + // Not found, create it + // Create a new wrapper + // First, get the corresponding internal representation + Object rawModel = namesMapping.get(folderName); + if( rawModel == null ) + throw new NotFoundException("Folder named '" + folderName + "' not found in the context of the expression."); + if( ! (rawModel instanceof TabFolder) ) + throw new NotFoundException("An element named '" + folderName + "' is found but it is not of the expected type (TabFolder). " ); + + // Create a wrapper and put it in the cache + TabFolderModel tabFolderModel = (TabFolderModel)contentProvider.createChildSashModel(rawModel); + contentProviderWrapperCache.put(folderName, tabFolderModel); + + // result + return tabFolderModel; + + } + + /** + * Get the {@link IPageModel} associated to the name. + * In this implementation, this is the internal element. + * @param pageName + * @return + * @throws NotFoundException + */ + public IPageModel getIPageModel(String pageName) throws NotFoundException { + + // Check if the wrapper is already in the cache + Object cachedModel = contentProviderWrapperCache.get(pageName); + if(cachedModel != null) { + // Check the type + if( ! (cachedModel instanceof IPageModel) ) + throw new NotFoundException("An element named '" + pageName + "' is found but it is not of the expected type (IPageModel). " ); + + // Found + return (IPageModel)cachedModel; + } + // Not found, create it + // Create a new wrapper + // First, get the corresponding internal representation + Object rawModel = namesMapping.get(pageName); + if( rawModel == null ) + throw new NotFoundException("Page named '" + pageName + "' not found in the context of the expression."); + if( ! (rawModel instanceof PageRef) ) + throw new NotFoundException("An element named '" + pageName + "' is found but it is not of the expected type (PageRef). " ); + + // Create a wrapper and put it in the cache + IPageModel pageModel = (IPageModel)contentProvider.createChildSashModel(rawModel); + contentProviderWrapperCache.put(pageName, pageModel); + + // result + return pageModel; + + } + + /** + * Return the associated maps of (names, internal representation). + * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade#getNamesToInternalMap() + * + * @return + */ + public Map<String, Object> getNamesToInternalMap() { + return namesMapping; + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderFacadeTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderFacadeTest.java index 66d662675a5..d66ffd6eccf 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderFacadeTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderFacadeTest.java @@ -1,44 +1,44 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.AbstractSashWindowContentProviderFacadeTest;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade;
-
-
-/**
- * @author dumoulin
- *
- */
-public class DiContentProviderFacadeTest extends AbstractSashWindowContentProviderFacadeTest {
-
- /**
- * Constructor.
- *
- */
- public DiContentProviderFacadeTest() {
- super();
- }
-
- /**
- * Return the concrete implementation under test.
- * @return
- */
- @Override
- public ISashWindowsContentProviderFacade createISashWindowsContentProviderFacade() {
- return new DiContentProviderFacade();
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.AbstractSashWindowContentProviderFacadeTest; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade; + + +/** + * @author dumoulin + * + */ +public class DiContentProviderFacadeTest extends AbstractSashWindowContentProviderFacadeTest { + + /** + * Constructor. + * + */ + public DiContentProviderFacadeTest() { + super(); + } + + /** + * Return the concrete implementation under test. + * @return + */ + @Override + public ISashWindowsContentProviderFacade createISashWindowsContentProviderFacade() { + return new DiContentProviderFacade(); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderTest.java index 7e78fec38b9..7e78fec38b9 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/FakePageModelFactory.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/FakePageModelFactory.java index 152b4654da1..bf5d29c0d12 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/FakePageModelFactory.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/FakePageModelFactory.java @@ -1,37 +1,37 @@ -/*****************************************************************************
- * Copyright (c) 2009 CEA LIST & LIFL
- *
- *
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;
-
-
-/**
- * @author dumoulin
- */
-public class FakePageModelFactory implements IPageModelFactory {
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory#createIPageModel(java.lang.Object)
- *
- * @param pageIdentifier
- * @return
- */
- public IPageModel createIPageModel(Object pageIdentifier) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2009 CEA LIST & LIFL + * + * + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory; + + +/** + * @author dumoulin + */ +public class FakePageModelFactory implements IPageModelFactory { + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory#createIPageModel(java.lang.Object) + * + * @param pageIdentifier + * @return + */ + public IPageModel createIPageModel(Object pageIdentifier) { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageManagerImplTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageManagerImplTest.java index b563cd91000..b563cd91000 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageManagerImplTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageManagerImplTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/QueryVisitor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/QueryVisitor.java index 0d3b5006ade..767158b6000 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/QueryVisitor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/QueryVisitor.java @@ -1,138 +1,138 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelObject;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
-
-/**
- * Visitor used to collect element in the model.
- * Each element in the model associated with a{@link IQueryTerm} whose name is set is collectted.
- * The collected element is then accessible from the result map, using the name set in the IQueryTerm.
- *
- *
- * @author cedric dumoulin
- *
- */
-public class QueryVisitor extends DiContentProviderBaseVisitor implements IPagesModelVisitor<Object> {
-
- /**
- * The result map.
- */
- protected Map<String, Object>result = new HashMap<String, Object>();
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window)
- *
- * @param windowTerm
- * @param windowModel
- */
- @Override
- public void visit(WindowTerm windowTerm, Window windowModel) {
- collect( windowTerm, windowModel);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder, org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder)
- *
- * @param folder
- * @param folderModel
- */
- @Override
- public void visit(Folder folder, TabFolder folderModel) {
- collect(folder, folderModel);
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)
- *
- * @param sash
- * @param sashModel
- */
- @Override
- public void visit(HSash sash, SashPanel sashModel) {
- collect(sash, sashModel);
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)
- *
- * @param sash
- * @param sashModel
- */
- @Override
- public void visit(VSash sash, SashPanel sashModel) {
- collect(sash, sashModel);
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page, org.eclipse.papyrus.infra.core.sashwindows.di.PageRef)
- *
- * @param page
- * @param pageModel
- */
- @Override
- public void visit(Page page, PageRef pageModel) {
- collect(page, pageModel);
-
- }
-
- /**
- * Add the element associated to the query to the result, if the query has a name.
- * @param iQueryTerm
- * @param element
- */
- protected void collect( IModelObject iQueryTerm, Object element) {
-
- if( iQueryTerm.getName() == null) {
- return;
- }
-
- result.put(iQueryTerm.getName(), element);
- }
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#isVisitingParentFirst()
- *
- * @return
- */
- @Override
- public boolean isVisitingParentFirst() {
- return true;
- }
-
- /**
- * @return the result
- */
- public Map<String, Object> getResult() {
- return result;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelObject; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm; +import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel; +import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder; +import org.eclipse.papyrus.infra.core.sashwindows.di.Window; + +/** + * Visitor used to collect element in the model. + * Each element in the model associated with a{@link IQueryTerm} whose name is set is collectted. + * The collected element is then accessible from the result map, using the name set in the IQueryTerm. + * + * + * @author cedric dumoulin + * + */ +public class QueryVisitor extends DiContentProviderBaseVisitor implements IPagesModelVisitor<Object> { + + /** + * The result map. + */ + protected Map<String, Object>result = new HashMap<String, Object>(); + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window) + * + * @param windowTerm + * @param windowModel + */ + @Override + public void visit(WindowTerm windowTerm, Window windowModel) { + collect( windowTerm, windowModel); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder, org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder) + * + * @param folder + * @param folderModel + */ + @Override + public void visit(Folder folder, TabFolder folderModel) { + collect(folder, folderModel); + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel) + * + * @param sash + * @param sashModel + */ + @Override + public void visit(HSash sash, SashPanel sashModel) { + collect(sash, sashModel); + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel) + * + * @param sash + * @param sashModel + */ + @Override + public void visit(VSash sash, SashPanel sashModel) { + collect(sash, sashModel); + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page, org.eclipse.papyrus.infra.core.sashwindows.di.PageRef) + * + * @param page + * @param pageModel + */ + @Override + public void visit(Page page, PageRef pageModel) { + collect(page, pageModel); + + } + + /** + * Add the element associated to the query to the result, if the query has a name. + * @param iQueryTerm + * @param element + */ + protected void collect( IModelObject iQueryTerm, Object element) { + + if( iQueryTerm.getName() == null) { + return; + } + + result.put(iQueryTerm.getName(), element); + } + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#isVisitingParentFirst() + * + * @return + */ + @Override + public boolean isVisitingParentFirst() { + return true; + } + + /** + * @return the result + */ + public Map<String, Object> getResult() { + return result; + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/SashContainerModels.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/SashContainerModels.java index fd881050514..9e8cc663449 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/SashContainerModels.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/SashContainerModels.java @@ -1,63 +1,63 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
-
-/**
- * A class used to translate di models to {@link ISashWindowsContentProvider} models.
- *
- *
- * @author cedric dumoulin
- *
- */
-public class SashContainerModels {
-
- protected Map<String, Object> diModelElements;
-
- protected Map<String, Object> cache = new HashMap<String, Object>();
-
- protected DiContentProvider diContentProvider;
- /**
- * Constructor.
- *
- * @param diModelElements
- */
- public SashContainerModels(DiContentProvider diContentProvider, Map<String, Object> diModelElements) {
- this.diModelElements = diModelElements;
- this.diContentProvider = diContentProvider;
- }
-
-
- /**
- * @param string
- * @return
- */
- public ITabFolderModel getFolder(String name) {
-
- ITabFolderModel result = (ITabFolderModel)cache.get(name);
- if(result==null) {
- // Create container model and cache it
- result = (ITabFolderModel)diContentProvider.createChildSashModel(diModelElements.get(name));
-
- cache.put(name, result);
- }
- return result;
- }
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel; + +/** + * A class used to translate di models to {@link ISashWindowsContentProvider} models. + * + * + * @author cedric dumoulin + * + */ +public class SashContainerModels { + + protected Map<String, Object> diModelElements; + + protected Map<String, Object> cache = new HashMap<String, Object>(); + + protected DiContentProvider diContentProvider; + /** + * Constructor. + * + * @param diModelElements + */ + public SashContainerModels(DiContentProvider diContentProvider, Map<String, Object> diModelElements) { + this.diModelElements = diModelElements; + this.diContentProvider = diContentProvider; + } + + + /** + * @param string + * @return + */ + public ITabFolderModel getFolder(String name) { + + ITabFolderModel result = (ITabFolderModel)cache.get(name); + if(result==null) { + // Create container model and cache it + result = (ITabFolderModel)diContentProvider.createChildSashModel(diModelElements.get(name)); + + cache.put(name, result); + } + return result; + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalDiContentProvider2Test.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalDiContentProvider2Test.java index 3cf23254804..4b07a342193 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalDiContentProvider2Test.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalDiContentProvider2Test.java @@ -1,170 +1,170 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-
-import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.folder;
-import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.page;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryExp;
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.QueryException;
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @author dumoulin
- *
- */
-public class TransactionalDiContentProvider2Test extends AbstractDiContentProviderTest {
-
- protected TransactionalEditingDomain editingDomain;
-
- /*
- *
- */
- @Before
- public void setUp() throws Exception {
-
- editingDomain = TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain();
-
-
- // Register the default resource factory -- only needed for stand-alone!
- editingDomain.getResourceSet().getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
-
-
- final Resource resource = editingDomain.createResource("temp.di");
-
- IPageModelFactory pageModelFactory = new FakePageModelFactory();
- final SashModel diSashModel = DiUtils.createDefaultSashModel();
-
- // Add model to ResourceSet
- editingDomain.getCommandStack().execute(new RecordingCommand(editingDomain) {
-
- @Override
- protected void doExecute() {
- resource.getContents().add(diSashModel);
- }
- });
-
-
- diContentProvider = new DiContentProvider(diSashModel, pageModelFactory);
-
-
-
- contentProvider = new TransactionalDiContentProvider(diContentProvider, editingDomain);
- // Create model query
- modelQuery = new SashModelQuery(diSashModel);
- }
-
- /**
- *
- * @see junit.framework.TestCase#tearDown()
- *
- * @throws Exception
- */
- @After
- public void tearDown() throws Exception {
- editingDomain.dispose();
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.AbstractDiContentProviderTest#createModel(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm)
- *
- * @param query
- * @throws QueryException
- */
- @Override
- protected void createModel(final IQueryExp query) throws QueryException {
- editingDomain.getCommandStack().execute(new RecordingCommand(editingDomain) {
-
- @Override
- protected void doExecute() {
- try {
- modelQuery.createModel(query);
- } catch (QueryException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- });
-
- }
-
- /**
- * Test undo/Redo moving a page inside the same folder
- *
- * @throws QueryException
- */
- @Test
- public void testUndoRedoMovePageInsideFolder() throws QueryException {
-
- // Create a folder with several page
- IQueryExp query1 = folder("f1", page("p1"), page("p2"), page("p3"));
- createModel(query1);
- // Check creation
- modelQuery.assertConform(query1);
-
- // get models (from diModels, and factory for sashModel)
- Map<String, Object> modelElements = modelQuery.queryModel(query1);
- final SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements);
-
- // do action : move a page
- //Fix test after refactoring in Bug 429239: by default, the contentProvider actions are transactional, but not undoable
- //Create a recording command to force it to be undoable
- RecordingCommand movePageCommand = new RecordingCommand(editingDomain, "Move page") {
-
- @Override
- protected void doExecute() {
- contentProvider.movePage(sashModels.getFolder("f1"), 1, 0);
- }
- };
- editingDomain.getCommandStack().execute(movePageCommand);
- //End of fix for Bug 429239
-
- // check result
- IQueryExp query2 = folder("f1", page("p2"), page("p1"), page("p3"));
- modelQuery.assertConform(query2);
-
- // do action : undo
- editingDomain.getCommandStack().undo();
- // check result
- modelQuery.assertConform(query1);
-
- // do action : redo
- editingDomain.getCommandStack().redo();
- // check result
- modelQuery.assertConform(query2);
-
- // do action : undo
- editingDomain.getCommandStack().undo();
- // check result
- modelQuery.assertConform(query1);
-
- // do action : redo
- editingDomain.getCommandStack().redo();
- // check result
- modelQuery.assertConform(query2);
- }
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal; + +import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.folder; +import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.page; + +import java.util.Map; + +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; +import org.eclipse.emf.transaction.RecordingCommand; +import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory; +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryExp; +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.QueryException; +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel; +import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * @author dumoulin + * + */ +public class TransactionalDiContentProvider2Test extends AbstractDiContentProviderTest { + + protected TransactionalEditingDomain editingDomain; + + /* + * + */ + @Before + public void setUp() throws Exception { + + editingDomain = TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(); + + + // Register the default resource factory -- only needed for stand-alone! + editingDomain.getResourceSet().getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl()); + + + final Resource resource = editingDomain.createResource("temp.di"); + + IPageModelFactory pageModelFactory = new FakePageModelFactory(); + final SashModel diSashModel = DiUtils.createDefaultSashModel(); + + // Add model to ResourceSet + editingDomain.getCommandStack().execute(new RecordingCommand(editingDomain) { + + @Override + protected void doExecute() { + resource.getContents().add(diSashModel); + } + }); + + + diContentProvider = new DiContentProvider(diSashModel, pageModelFactory); + + + + contentProvider = new TransactionalDiContentProvider(diContentProvider, editingDomain); + // Create model query + modelQuery = new SashModelQuery(diSashModel); + } + + /** + * + * @see junit.framework.TestCase#tearDown() + * + * @throws Exception + */ + @After + public void tearDown() throws Exception { + editingDomain.dispose(); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.AbstractDiContentProviderTest#createModel(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm) + * + * @param query + * @throws QueryException + */ + @Override + protected void createModel(final IQueryExp query) throws QueryException { + editingDomain.getCommandStack().execute(new RecordingCommand(editingDomain) { + + @Override + protected void doExecute() { + try { + modelQuery.createModel(query); + } catch (QueryException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + + } + + /** + * Test undo/Redo moving a page inside the same folder + * + * @throws QueryException + */ + @Test + public void testUndoRedoMovePageInsideFolder() throws QueryException { + + // Create a folder with several page + IQueryExp query1 = folder("f1", page("p1"), page("p2"), page("p3")); + createModel(query1); + // Check creation + modelQuery.assertConform(query1); + + // get models (from diModels, and factory for sashModel) + Map<String, Object> modelElements = modelQuery.queryModel(query1); + final SashContainerModels sashModels = new SashContainerModels(diContentProvider, modelElements); + + // do action : move a page + //Fix test after refactoring in Bug 429239: by default, the contentProvider actions are transactional, but not undoable + //Create a recording command to force it to be undoable + RecordingCommand movePageCommand = new RecordingCommand(editingDomain, "Move page") { + + @Override + protected void doExecute() { + contentProvider.movePage(sashModels.getFolder("f1"), 1, 0); + } + }; + editingDomain.getCommandStack().execute(movePageCommand); + //End of fix for Bug 429239 + + // check result + IQueryExp query2 = folder("f1", page("p2"), page("p1"), page("p3")); + modelQuery.assertConform(query2); + + // do action : undo + editingDomain.getCommandStack().undo(); + // check result + modelQuery.assertConform(query1); + + // do action : redo + editingDomain.getCommandStack().redo(); + // check result + modelQuery.assertConform(query2); + + // do action : undo + editingDomain.getCommandStack().undo(); + // check result + modelQuery.assertConform(query1); + + // do action : redo + editingDomain.getCommandStack().redo(); + // check result + modelQuery.assertConform(query2); + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/AbstractSash.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/AbstractSash.java index 6d7dafccfac..b77038d0484 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/AbstractSash.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/AbstractSash.java @@ -1,97 +1,97 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * Base class for structure representing sash in Checker
- * @author cedric dumoulin
- *
- */
-public abstract class AbstractSash extends PanelTerm {
-
- protected PanelTerm leftup;
- protected PanelTerm rightdown;
-
- /**
- * Constructor.
- *
- */
- public AbstractSash(PanelTerm left, PanelTerm right) {
- this.leftup = left;
- this.rightdown = right;
- }
-
- /**
- * Constructor.
- *
- * @param name
- * @param up
- * @param down
- */
- public AbstractSash(String name, PanelTerm left, PanelTerm right) {
- super(name);
- this.leftup = left;
- this.rightdown = right;
- }
-
- /**
- * @return the leftup
- */
- public PanelTerm getLeftup() {
- return leftup;
- }
-
- /**
- * @return the rightdown
- */
- public PanelTerm getRightdown() {
- return rightdown;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor)
- *
- * @param visitor
- * @throws QueryException
- */
- abstract public void accept(IQueryVisitor visitor, EObject modelObject) throws QueryException ;
-
- /**
- * @return The name used in toString
- */
- protected abstract String getStringName();
-
- /**
- * @see java.lang.Object#toString()
- *
- * @return
- */
- @Override
- public String toString() {
-
- StringBuffer buff = new StringBuffer(getStringName());
-
- buff.append("(");
- buff.append(leftup.toString());
- buff.append(", ");
- buff.append(rightdown.toString());
- buff.append(")");
-
- return buff.toString();
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +import org.eclipse.emf.ecore.EObject; + +/** + * Base class for structure representing sash in Checker + * @author cedric dumoulin + * + */ +public abstract class AbstractSash extends PanelTerm { + + protected PanelTerm leftup; + protected PanelTerm rightdown; + + /** + * Constructor. + * + */ + public AbstractSash(PanelTerm left, PanelTerm right) { + this.leftup = left; + this.rightdown = right; + } + + /** + * Constructor. + * + * @param name + * @param up + * @param down + */ + public AbstractSash(String name, PanelTerm left, PanelTerm right) { + super(name); + this.leftup = left; + this.rightdown = right; + } + + /** + * @return the leftup + */ + public PanelTerm getLeftup() { + return leftup; + } + + /** + * @return the rightdown + */ + public PanelTerm getRightdown() { + return rightdown; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor) + * + * @param visitor + * @throws QueryException + */ + abstract public void accept(IQueryVisitor visitor, EObject modelObject) throws QueryException ; + + /** + * @return The name used in toString + */ + protected abstract String getStringName(); + + /** + * @see java.lang.Object#toString() + * + * @return + */ + @Override + public String toString() { + + StringBuffer buff = new StringBuffer(getStringName()); + + buff.append("("); + buff.append(leftup.toString()); + buff.append(", "); + buff.append(rightdown.toString()); + buff.append(")"); + + return buff.toString(); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/CheckVisitor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/CheckVisitor.java index c85b51ced4c..2a2128afa76 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/CheckVisitor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/CheckVisitor.java @@ -1,97 +1,97 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-
-
-/**
- * @author cedric dumoulin
- *
- */
-public class CheckVisitor implements IQueryVisitor {
-
- /**
- * @return the isVisitingParentFirst
- */
- public boolean isVisitingParentFirst() {
- return false;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window)
- *
- * @param windowTerm
- * @param windowModel
- */
- public void visit(WindowTerm windowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window windowModel) {
- // TODO Auto-generated method stub
-
- }
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder)
- *
- * @param folder
- */
- public void visit(Folder folder, TabFolder folderModel) {
- // Check name
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash)
- *
- * @param sash
- */
- public void visit(HSash sash, SashPanel sashModel) {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash)
- *
- * @param sash
- */
- public void visit(VSash sash , SashPanel sashModel) {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page)
- *
- * @param page
- * @throws NoMatchException
- */
- public void visit(Page page, PageRef pageModel) throws QueryException {
- //check name
- if(page.getIdentifier() != null) {
- checkName(page.getIdentifier(), pageModel.getPageIdentifier()) ;
- }
- else if(page.getName() != null) {
- checkName(page.getName(), pageModel.getPageIdentifier()) ;
- }
- }
-
-
- protected void checkName( Object expectedName, Object foundName) throws NoMatchException {
- if( expectedName != foundName )
- throw new NoMatchException( "Names do not match (expected="
- + expectedName + ", found="+ foundName );
- }
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel; +import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder; + + +/** + * @author cedric dumoulin + * + */ +public class CheckVisitor implements IQueryVisitor { + + /** + * @return the isVisitingParentFirst + */ + public boolean isVisitingParentFirst() { + return false; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window) + * + * @param windowTerm + * @param windowModel + */ + public void visit(WindowTerm windowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window windowModel) { + // TODO Auto-generated method stub + + } + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder) + * + * @param folder + */ + public void visit(Folder folder, TabFolder folderModel) { + // Check name + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash) + * + * @param sash + */ + public void visit(HSash sash, SashPanel sashModel) { + // TODO Auto-generated method stub + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash) + * + * @param sash + */ + public void visit(VSash sash , SashPanel sashModel) { + // TODO Auto-generated method stub + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page) + * + * @param page + * @throws NoMatchException + */ + public void visit(Page page, PageRef pageModel) throws QueryException { + //check name + if(page.getIdentifier() != null) { + checkName(page.getIdentifier(), pageModel.getPageIdentifier()) ; + } + else if(page.getName() != null) { + checkName(page.getName(), pageModel.getPageIdentifier()) ; + } + } + + + protected void checkName( Object expectedName, Object foundName) throws NoMatchException { + if( expectedName != foundName ) + throw new NoMatchException( "Names do not match (expected=" + + expectedName + ", found="+ foundName ); + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/CreateModelVisitor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/CreateModelVisitor.java index 6f8b51d92d8..b81a1259ab4 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/CreateModelVisitor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/CreateModelVisitor.java @@ -1,138 +1,138 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
-import org.eclipse.swt.SWT;
-
-/**
- * This visitor is used with {@link IQueryTerm} to create a {@link SashModel} instancied
- * with the Sash, folders and pages specified in the query.
- *
- *
- * @author cedric dumoulin
- *
- */
-public class CreateModelVisitor implements IQueryVisitor {
-
- /**
- * @return the isVisitingParentFirst
- */
- public boolean isVisitingParentFirst() {
- return true;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window)
- *
- * @param windowTerm
- * @param windowModel
- */
- public void visit(WindowTerm windowTerm, Window windowModel) {
- // Create children of the sash
- PanelTerm panel = windowTerm.getPanel();
- if(panel instanceof AbstractSash) {
- windowModel.setPanel(DiFactory.eINSTANCE.createSashPanel());
- }
- else if (panel instanceof Folder) {
- windowModel.setPanel(DiFactory.eINSTANCE.createTabFolder());
- }
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder, org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder)
- *
- * @param folder
- * @param folderModel
- */
- public void visit(Folder folder, TabFolder folderModel) {
-
- // Create children of the folder
- for( Page page : folder.getPages() ) {
- folderModel.getChildren().add(DiFactory.eINSTANCE.createPageRef());
- }
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)
- *
- * @param sashQuery
- * @param sashModel
- */
- public void visit(HSash sashQuery, SashPanel sashModel) {
-
- // sash orientation
- sashModel.setDirection(SWT.HORIZONTAL);
- // Create children of the sash
-
- createPanelOrFolder(sashQuery.leftup, sashModel);
- createPanelOrFolder(sashQuery.rightdown, sashModel);
- }
-
- /**
- * @param sashModel
- * @param panel
- */
- private void createPanelOrFolder(PanelTerm panel, SashPanel parent ) {
- if(panel instanceof AbstractSash) {
- parent.getChildren().add(DiFactory.eINSTANCE.createSashPanel());
- }
- else if (panel instanceof Folder) {
- parent.getChildren().add(DiFactory.eINSTANCE.createTabFolder());
- }
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)
- *
- * @param sash
- * @param sashModel
- */
- public void visit(VSash sashQuery, SashPanel sashModel) {
- // sash orientation
- sashModel.setDirection(SWT.VERTICAL);
- // Create children of the sash
- createPanelOrFolder(sashQuery.leftup, sashModel);
- createPanelOrFolder(sashQuery.rightdown, sashModel);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page, org.eclipse.papyrus.infra.core.sashwindows.di.PageRef)
- *
- * @param page
- * @param pageModel
- */
- public void visit(Page page, PageRef pageModel) {
-
-
- if(page.getIdentifier() != null) {
- pageModel.setPageIdentifier(page.getIdentifier());
- }
- else if(page.getName() != null) {
- pageModel.setPageIdentifier(page.getName());
- }
- else {
- pageModel.setPageIdentifier(new Object());
- }
-
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory; +import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel; +import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder; +import org.eclipse.papyrus.infra.core.sashwindows.di.Window; +import org.eclipse.swt.SWT; + +/** + * This visitor is used with {@link IQueryTerm} to create a {@link SashModel} instancied + * with the Sash, folders and pages specified in the query. + * + * + * @author cedric dumoulin + * + */ +public class CreateModelVisitor implements IQueryVisitor { + + /** + * @return the isVisitingParentFirst + */ + public boolean isVisitingParentFirst() { + return true; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window) + * + * @param windowTerm + * @param windowModel + */ + public void visit(WindowTerm windowTerm, Window windowModel) { + // Create children of the sash + PanelTerm panel = windowTerm.getPanel(); + if(panel instanceof AbstractSash) { + windowModel.setPanel(DiFactory.eINSTANCE.createSashPanel()); + } + else if (panel instanceof Folder) { + windowModel.setPanel(DiFactory.eINSTANCE.createTabFolder()); + } + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder, org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder) + * + * @param folder + * @param folderModel + */ + public void visit(Folder folder, TabFolder folderModel) { + + // Create children of the folder + for( Page page : folder.getPages() ) { + folderModel.getChildren().add(DiFactory.eINSTANCE.createPageRef()); + } + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel) + * + * @param sashQuery + * @param sashModel + */ + public void visit(HSash sashQuery, SashPanel sashModel) { + + // sash orientation + sashModel.setDirection(SWT.HORIZONTAL); + // Create children of the sash + + createPanelOrFolder(sashQuery.leftup, sashModel); + createPanelOrFolder(sashQuery.rightdown, sashModel); + } + + /** + * @param sashModel + * @param panel + */ + private void createPanelOrFolder(PanelTerm panel, SashPanel parent ) { + if(panel instanceof AbstractSash) { + parent.getChildren().add(DiFactory.eINSTANCE.createSashPanel()); + } + else if (panel instanceof Folder) { + parent.getChildren().add(DiFactory.eINSTANCE.createTabFolder()); + } + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel) + * + * @param sash + * @param sashModel + */ + public void visit(VSash sashQuery, SashPanel sashModel) { + // sash orientation + sashModel.setDirection(SWT.VERTICAL); + // Create children of the sash + createPanelOrFolder(sashQuery.leftup, sashModel); + createPanelOrFolder(sashQuery.rightdown, sashModel); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page, org.eclipse.papyrus.infra.core.sashwindows.di.PageRef) + * + * @param page + * @param pageModel + */ + public void visit(Page page, PageRef pageModel) { + + + if(page.getIdentifier() != null) { + pageModel.setPageIdentifier(page.getIdentifier()); + } + else if(page.getName() != null) { + pageModel.setPageIdentifier(page.getName()); + } + else { + pageModel.setPageIdentifier(new Object()); + } + + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/Folder.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/Folder.java index bbc0ccf7192..c83b9172ffe 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/Folder.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/Folder.java @@ -1,126 +1,126 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-
-/**
- * This represent a Folder in the Checker query.
- *
- * @author cedric dumoulin
- */
-public class Folder extends PanelTerm implements IQueryTerm {
-
- protected List<Page> pages;
-
- /**
- * Constructor.
- *
- */
- public Folder(Page ... pages) {
- this.pages = Arrays.asList(pages);
- }
-
- /**
- * Constructor.
- *
- */
- public Folder(String name, Page ... pages) {
- super(name);
- this.pages = Arrays.asList(pages);
- }
-
- /**
- * @return the pages
- */
- public List<Page> getPages() {
- return pages;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm#accept(IQueryVisitor, EObject)
- *
- * @param visitor
- * @throws QueryException
- */
- public void accept(IQueryVisitor visitor, EObject modelObject) throws QueryException {
-
- // Check associated model type
- if(! (modelObject instanceof TabFolder) ) {
- throw new NoMatchException( this.toString() + " - Model object type does not match to FolderQueryPart" );
- }
- TabFolder folderModel = (TabFolder)modelObject;
-
- // Visit this
- if( visitor.isVisitingParentFirst() ) {
- visitor.visit(this, folderModel);
- }
-
- // visit children
- Iterator<PageRef> pageRefs = folderModel.getChildren().iterator();
- Iterator<Page> pageQueries = pages.iterator();
- while (pageRefs.hasNext() && pageQueries.hasNext() ) {
- PageRef pageRef = pageRefs.next();
- Page query = pageQueries.next();
-
- query.accept(visitor, pageRef);
- }
- if (pageRefs.hasNext()) {
- // some page left
- throw new NoMatchException( "Folder matching - "
- + this.toString()
- +" folder model have more pages than folder query." );
- } else if (pageQueries.hasNext() ) {
- // some queries left
- throw new NoMatchException( "Folder matching - "
- + this.toString()
- +" folder query have more page than folder model." );
- }
-
- // Visit this
- if( ! visitor.isVisitingParentFirst() ) {
- visitor.visit(this, folderModel);
- }
- }
-
- /**
- * @see java.lang.Object#toString()
- *
- * @return
- */
- @Override
- public String toString() {
-
- StringBuffer buff = new StringBuffer("Folder(");
-
- for(Page page : pages ) {
- buff.append(page.toString()).append(", ");
- }
- // Remove extra ,
- int length = buff.length();
- if(buff.charAt(length-1) == ' ') {
- buff.delete(length-2, length );
- }
- buff.append(")");
-
- return buff.toString();
- }
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; +import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder; + +/** + * This represent a Folder in the Checker query. + * + * @author cedric dumoulin + */ +public class Folder extends PanelTerm implements IQueryTerm { + + protected List<Page> pages; + + /** + * Constructor. + * + */ + public Folder(Page ... pages) { + this.pages = Arrays.asList(pages); + } + + /** + * Constructor. + * + */ + public Folder(String name, Page ... pages) { + super(name); + this.pages = Arrays.asList(pages); + } + + /** + * @return the pages + */ + public List<Page> getPages() { + return pages; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm#accept(IQueryVisitor, EObject) + * + * @param visitor + * @throws QueryException + */ + public void accept(IQueryVisitor visitor, EObject modelObject) throws QueryException { + + // Check associated model type + if(! (modelObject instanceof TabFolder) ) { + throw new NoMatchException( this.toString() + " - Model object type does not match to FolderQueryPart" ); + } + TabFolder folderModel = (TabFolder)modelObject; + + // Visit this + if( visitor.isVisitingParentFirst() ) { + visitor.visit(this, folderModel); + } + + // visit children + Iterator<PageRef> pageRefs = folderModel.getChildren().iterator(); + Iterator<Page> pageQueries = pages.iterator(); + while (pageRefs.hasNext() && pageQueries.hasNext() ) { + PageRef pageRef = pageRefs.next(); + Page query = pageQueries.next(); + + query.accept(visitor, pageRef); + } + if (pageRefs.hasNext()) { + // some page left + throw new NoMatchException( "Folder matching - " + + this.toString() + +" folder model have more pages than folder query." ); + } else if (pageQueries.hasNext() ) { + // some queries left + throw new NoMatchException( "Folder matching - " + + this.toString() + +" folder query have more page than folder model." ); + } + + // Visit this + if( ! visitor.isVisitingParentFirst() ) { + visitor.visit(this, folderModel); + } + } + + /** + * @see java.lang.Object#toString() + * + * @return + */ + @Override + public String toString() { + + StringBuffer buff = new StringBuffer("Folder("); + + for(Page page : pages ) { + buff.append(page.toString()).append(", "); + } + // Remove extra , + int length = buff.length(); + if(buff.charAt(length-1) == ' ') { + buff.delete(length-2, length ); + } + buff.append(")"); + + return buff.toString(); + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/HSash.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/HSash.java index f6246370437..198a505f071 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/HSash.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/HSash.java @@ -1,87 +1,87 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
-
-/**
- * @author dumoulin
- *
- */
-public class HSash extends AbstractSash {
-
- /**
- * Constructor.
- *
- * @param leftup
- * @param rightdown
- */
- public HSash(PanelTerm up, PanelTerm down) {
- super(up, down);
- }
-
- /**
- * Constructor.
- *
- * @param leftup
- * @param rightdown
- */
- public HSash(String name, PanelTerm up, PanelTerm down) {
- super(name, up, down);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm#accept(IQueryVisitor, EObject)
- *
- * @param visitor
- * @throws QueryException
- */
- public void accept(IQueryVisitor visitor, EObject modelObject) throws QueryException {
- // Check associated model type
- if(! (modelObject instanceof SashPanel) ) {
- throw new NoMatchException( this.toString() + " - Model object type does not match to SashPanel (found "
- + modelObject.getClass()
- + " )");
- }
-
- SashPanel sashModel = (SashPanel)modelObject;
-
- // Visit this
- if( visitor.isVisitingParentFirst() ) {
- visitor.visit(this, sashModel);
- }
-
- // Visit children
- leftup.accept(visitor, sashModel.getChildren().get(0));
- rightdown.accept(visitor, sashModel.getChildren().get(1));
-
- if( !visitor.isVisitingParentFirst() ) {
- visitor.visit(this, sashModel);
- }
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.AbstractSash#getStringName()
- *
- * @return
- */
- @Override
- protected String getStringName() {
- return "HSash";
- }
-
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel; + +/** + * @author dumoulin + * + */ +public class HSash extends AbstractSash { + + /** + * Constructor. + * + * @param leftup + * @param rightdown + */ + public HSash(PanelTerm up, PanelTerm down) { + super(up, down); + } + + /** + * Constructor. + * + * @param leftup + * @param rightdown + */ + public HSash(String name, PanelTerm up, PanelTerm down) { + super(name, up, down); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm#accept(IQueryVisitor, EObject) + * + * @param visitor + * @throws QueryException + */ + public void accept(IQueryVisitor visitor, EObject modelObject) throws QueryException { + // Check associated model type + if(! (modelObject instanceof SashPanel) ) { + throw new NoMatchException( this.toString() + " - Model object type does not match to SashPanel (found " + + modelObject.getClass() + + " )"); + } + + SashPanel sashModel = (SashPanel)modelObject; + + // Visit this + if( visitor.isVisitingParentFirst() ) { + visitor.visit(this, sashModel); + } + + // Visit children + leftup.accept(visitor, sashModel.getChildren().get(0)); + rightdown.accept(visitor, sashModel.getChildren().get(1)); + + if( !visitor.isVisitingParentFirst() ) { + visitor.visit(this, sashModel); + } + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.AbstractSash#getStringName() + * + * @return + */ + @Override + protected String getStringName() { + return "HSash"; + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/IQueryExp.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/IQueryExp.java index 82c67c8dbce..29476824cb0 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/IQueryExp.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/IQueryExp.java @@ -1,28 +1,28 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-/**
- * A Query Expression represent an expression used to query a SashModel.
- * Term implementing this interface can be used as starting point of expression.
- * <br>
- * Following classses are expressions: {@link PanelTerm}, {@link WindowTerm}.
- *
- * @author cedric dumoulin
- *
- */
-public interface IQueryExp extends IQueryTerm {
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +/** + * A Query Expression represent an expression used to query a SashModel. + * Term implementing this interface can be used as starting point of expression. + * <br> + * Following classses are expressions: {@link PanelTerm}, {@link WindowTerm}. + * + * @author cedric dumoulin + * + */ +public interface IQueryExp extends IQueryTerm { + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/IQueryTerm.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/IQueryTerm.java index 86865a79271..a07c3ff0191 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/IQueryTerm.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/IQueryTerm.java @@ -1,40 +1,40 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * A Query term is a part of a Query expression.
- * All term that can be used in a query should implement this interface.
- *
- * @author cedric dumoulin
- *
- */
-public interface IQueryTerm {
-
- /**
- * Visit the query.
- * @param visitor
- * @throws QueryException
- */
- public void accept(IQueryVisitor visitor, EObject panel) throws QueryException;
-
- /**
- * Get the name associated to the query part.
- * Can return null;
- */
- public String getName();
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +import org.eclipse.emf.ecore.EObject; + +/** + * A Query term is a part of a Query expression. + * All term that can be used in a query should implement this interface. + * + * @author cedric dumoulin + * + */ +public interface IQueryTerm { + + /** + * Visit the query. + * @param visitor + * @throws QueryException + */ + public void accept(IQueryVisitor visitor, EObject panel) throws QueryException; + + /** + * Get the name associated to the query part. + * Can return null; + */ + public String getName(); +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/IQueryVisitor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/IQueryVisitor.java index 804a9f5289f..66a9f19ded9 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/IQueryVisitor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/IQueryVisitor.java @@ -1,44 +1,44 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-
-/**
- * Visitor used to visit query structure.
- *
- * @author cedric dumoulin
- *
- */
-public interface IQueryVisitor {
-
- public void visit( WindowTerm windowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window windowModel );
- public void visit( Folder folder, TabFolder folderModel );
-
- public void visit(HSash sash, SashPanel sashModel);
- public void visit(VSash sash, SashPanel sashModel);
-
- public void visit(Page page, PageRef pageModel) throws QueryException;
-
- /**
- * If true, parent are visited before children.
- * If false, parent are visited after children.
- * @return
- */
- public boolean isVisitingParentFirst();
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel; +import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder; + +/** + * Visitor used to visit query structure. + * + * @author cedric dumoulin + * + */ +public interface IQueryVisitor { + + public void visit( WindowTerm windowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window windowModel ); + public void visit( Folder folder, TabFolder folderModel ); + + public void visit(HSash sash, SashPanel sashModel); + public void visit(VSash sash, SashPanel sashModel); + + public void visit(Page page, PageRef pageModel) throws QueryException; + + /** + * If true, parent are visited before children. + * If false, parent are visited after children. + * @return + */ + public boolean isVisitingParentFirst(); + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/NoMatchException.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/NoMatchException.java index 6a6af1c79e7..e8788b56156 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/NoMatchException.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/NoMatchException.java @@ -1,77 +1,77 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-/**
- * Exception thrown when a query part does not match a modelpart.
- *
- * @author cedric dumoulin
- *
- */
-public class NoMatchException extends QueryException {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructor.
- *
- */
- public NoMatchException() {
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- */
- public NoMatchException(String arg0) {
- super(arg0);
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- */
- public NoMatchException(Throwable arg0) {
- super(arg0);
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- * @param arg1
- */
- public NoMatchException(String arg0, Throwable arg1) {
- super(arg0, arg1);
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- * @param arg1
- * @param arg2
- * @param arg3
- */
- public NoMatchException(String arg0, Throwable arg1, boolean arg2, boolean arg3) {
- super(arg0, arg1, arg2, arg3);
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +/** + * Exception thrown when a query part does not match a modelpart. + * + * @author cedric dumoulin + * + */ +public class NoMatchException extends QueryException { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * Constructor. + * + */ + public NoMatchException() { + } + + /** + * Constructor. + * + * @param arg0 + */ + public NoMatchException(String arg0) { + super(arg0); + } + + /** + * Constructor. + * + * @param arg0 + */ + public NoMatchException(Throwable arg0) { + super(arg0); + } + + /** + * Constructor. + * + * @param arg0 + * @param arg1 + */ + public NoMatchException(String arg0, Throwable arg1) { + super(arg0, arg1); + } + + /** + * Constructor. + * + * @param arg0 + * @param arg1 + * @param arg2 + * @param arg3 + */ + public NoMatchException(String arg0, Throwable arg1, boolean arg2, boolean arg3) { + super(arg0, arg1, arg2, arg3); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/Page.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/Page.java index b709a4e74c4..eba008268c6 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/Page.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/Page.java @@ -1,117 +1,117 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-
-/**
- * This represent a page in the Checker query.
- *
- * @author cedric dumoulin
- *
- */
-public class Page implements IQueryTerm {
-
- protected Object identifier;
-
- protected String name;
-
- /**
- * Constructor.
- *
- */
- public Page() {
-
- }
-
- /**
- * Constructor.
- *
- * @param identifier
- */
- public Page(Object identifier) {
- this.identifier = identifier;
- }
-
- /**
- * Constructor.
- *
- * @param name
- * @param identifier
- */
- public Page(String name) {
- this.name = name;
- this.identifier = name;
- }
-
- /**
- * Constructor.
- *
- * @param name
- * @param identifier
- */
- public Page(String name, Object identifier) {
- this.name = name;
- this.identifier = identifier;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm#accept(IQueryVisitor, EObject)
- *
- * @param visitor
- * @throws QueryException
- */
- public void accept(IQueryVisitor visitor, EObject modelObject) throws QueryException {
- // Check associated model type
- if(! (modelObject instanceof PageRef) ) {
- throw new NoMatchException( this.toString() + " - Model object type does not match to PageRef" );
- }
- PageRef pageRef = (PageRef)modelObject;
- visitor.visit(this, pageRef);
- }
-
- /**
- * @return the identifier
- */
- public Object getIdentifier() {
- return identifier;
- }
-
- /**
- * @param identifier the identifier to set
- */
- public void setIdentifier(Object identifier) {
- this.identifier = identifier;
- }
-
- /**
- * @see java.lang.Object#toString()
- *
- * @return
- */
- @Override
- public String toString() {
-
- return "Page()";
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; + +/** + * This represent a page in the Checker query. + * + * @author cedric dumoulin + * + */ +public class Page implements IQueryTerm { + + protected Object identifier; + + protected String name; + + /** + * Constructor. + * + */ + public Page() { + + } + + /** + * Constructor. + * + * @param identifier + */ + public Page(Object identifier) { + this.identifier = identifier; + } + + /** + * Constructor. + * + * @param name + * @param identifier + */ + public Page(String name) { + this.name = name; + this.identifier = name; + } + + /** + * Constructor. + * + * @param name + * @param identifier + */ + public Page(String name, Object identifier) { + this.name = name; + this.identifier = identifier; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm#accept(IQueryVisitor, EObject) + * + * @param visitor + * @throws QueryException + */ + public void accept(IQueryVisitor visitor, EObject modelObject) throws QueryException { + // Check associated model type + if(! (modelObject instanceof PageRef) ) { + throw new NoMatchException( this.toString() + " - Model object type does not match to PageRef" ); + } + PageRef pageRef = (PageRef)modelObject; + visitor.visit(this, pageRef); + } + + /** + * @return the identifier + */ + public Object getIdentifier() { + return identifier; + } + + /** + * @param identifier the identifier to set + */ + public void setIdentifier(Object identifier) { + this.identifier = identifier; + } + + /** + * @see java.lang.Object#toString() + * + * @return + */ + @Override + public String toString() { + + return "Page()"; + } + + /** + * @return the name + */ + public String getName() { + return name; + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/PanelTerm.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/PanelTerm.java index c04cf02c4e2..967998b9473 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/PanelTerm.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/PanelTerm.java @@ -1,76 +1,76 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * Common ancestor of Panel (Folder and Sash) in queries structure.
- * <br>
- * This class can also be used a starting point of query expression (and so Folder, VSash and HSash).
- *
- * @author cedric dumoulin
- *
- */
-public abstract class PanelTerm implements IQueryExp {
-
- protected String name;
-
-
- /**
- * Constructor.
- *
- */
- public PanelTerm() {
- // TODO Auto-generated constructor stub
- }
-
- /**
- * Constructor.
- *
- * @param name
- */
- public PanelTerm(String name) {
- this.name = name;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm#accept(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor, org.eclipse.emf.ecore.EObject)
- *
- * @param visitor
- * @param panel
- * @throws QueryException
- */
- public void accept(IQueryVisitor visitor, EObject panel)
- throws QueryException {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +import org.eclipse.emf.ecore.EObject; + +/** + * Common ancestor of Panel (Folder and Sash) in queries structure. + * <br> + * This class can also be used a starting point of query expression (and so Folder, VSash and HSash). + * + * @author cedric dumoulin + * + */ +public abstract class PanelTerm implements IQueryExp { + + protected String name; + + + /** + * Constructor. + * + */ + public PanelTerm() { + // TODO Auto-generated constructor stub + } + + /** + * Constructor. + * + * @param name + */ + public PanelTerm(String name) { + this.name = name; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm#accept(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor, org.eclipse.emf.ecore.EObject) + * + * @param visitor + * @param panel + * @throws QueryException + */ + public void accept(IQueryVisitor visitor, EObject panel) + throws QueryException { + // TODO Auto-generated method stub + + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/QueryException.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/QueryException.java index 698301dcc9d..52644437231 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/QueryException.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/QueryException.java @@ -1,77 +1,77 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-/**
- * Root Exception of the query package
- *
- * @author cedric dumoulin
- *
- */
-public class QueryException extends Exception {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructor.
- *
- */
- public QueryException() {
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- */
- public QueryException(String arg0) {
- super(arg0);
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- */
- public QueryException(Throwable arg0) {
- super(arg0);
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- * @param arg1
- */
- public QueryException(String arg0, Throwable arg1) {
- super(arg0, arg1);
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- * @param arg1
- * @param arg2
- * @param arg3
- */
- public QueryException(String arg0, Throwable arg1, boolean arg2, boolean arg3) {
- super(arg0, arg1);//, arg2, arg3);
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +/** + * Root Exception of the query package + * + * @author cedric dumoulin + * + */ +public class QueryException extends Exception { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * Constructor. + * + */ + public QueryException() { + } + + /** + * Constructor. + * + * @param arg0 + */ + public QueryException(String arg0) { + super(arg0); + } + + /** + * Constructor. + * + * @param arg0 + */ + public QueryException(Throwable arg0) { + super(arg0); + } + + /** + * Constructor. + * + * @param arg0 + * @param arg1 + */ + public QueryException(String arg0, Throwable arg1) { + super(arg0, arg1); + } + + /** + * Constructor. + * + * @param arg0 + * @param arg1 + * @param arg2 + * @param arg3 + */ + public QueryException(String arg0, Throwable arg1, boolean arg2, boolean arg3) { + super(arg0, arg1);//, arg2, arg3); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/QueryVisitor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/QueryVisitor.java index 5e6aaba10bf..9a053915926 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/QueryVisitor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/QueryVisitor.java @@ -1,124 +1,124 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
-
-/**
- * Visitor used to collect element in the model.
- * Each element in the model associated with a{@link IQueryTerm} whose name is set is collectted.
- * The collected element is then accessible from the result map, using the name set in the IQueryTerm.
- *
- *
- * @author cedric dumoulin
- *
- */
-public class QueryVisitor implements IQueryVisitor {
-
- /**
- * The result map.
- */
- protected Map<String, Object>result = new HashMap<String, Object>();
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window)
- *
- * @param windowTerm
- * @param windowModel
- */
- public void visit(WindowTerm windowTerm, Window windowModel) {
- collect( windowTerm, windowModel);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder, org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder)
- *
- * @param folder
- * @param folderModel
- */
- public void visit(Folder folder, TabFolder folderModel) {
- collect(folder, folderModel);
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)
- *
- * @param sash
- * @param sashModel
- */
- public void visit(HSash sash, SashPanel sashModel) {
- collect(sash, sashModel);
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)
- *
- * @param sash
- * @param sashModel
- */
- public void visit(VSash sash, SashPanel sashModel) {
- collect(sash, sashModel);
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page, org.eclipse.papyrus.infra.core.sashwindows.di.PageRef)
- *
- * @param page
- * @param pageModel
- */
- public void visit(Page page, PageRef pageModel) {
- collect(page, pageModel);
-
- }
-
- /**
- * Add the element associated to the query to the result, if the query has a name.
- * @param iQueryTerm
- * @param element
- */
- protected void collect( IQueryTerm iQueryTerm, Object element) {
-
- if( iQueryTerm.getName() == null) {
- return;
- }
-
- result.put(iQueryTerm.getName(), element);
- }
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#isVisitingParentFirst()
- *
- * @return
- */
- public boolean isVisitingParentFirst() {
- return true;
- }
-
- /**
- * @return the result
- */
- public Map<String, Object> getResult() {
- return result;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel; +import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder; +import org.eclipse.papyrus.infra.core.sashwindows.di.Window; + +/** + * Visitor used to collect element in the model. + * Each element in the model associated with a{@link IQueryTerm} whose name is set is collectted. + * The collected element is then accessible from the result map, using the name set in the IQueryTerm. + * + * + * @author cedric dumoulin + * + */ +public class QueryVisitor implements IQueryVisitor { + + /** + * The result map. + */ + protected Map<String, Object>result = new HashMap<String, Object>(); + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window) + * + * @param windowTerm + * @param windowModel + */ + public void visit(WindowTerm windowTerm, Window windowModel) { + collect( windowTerm, windowModel); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder, org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder) + * + * @param folder + * @param folderModel + */ + public void visit(Folder folder, TabFolder folderModel) { + collect(folder, folderModel); + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel) + * + * @param sash + * @param sashModel + */ + public void visit(HSash sash, SashPanel sashModel) { + collect(sash, sashModel); + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel) + * + * @param sash + * @param sashModel + */ + public void visit(VSash sash, SashPanel sashModel) { + collect(sash, sashModel); + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page, org.eclipse.papyrus.infra.core.sashwindows.di.PageRef) + * + * @param page + * @param pageModel + */ + public void visit(Page page, PageRef pageModel) { + collect(page, pageModel); + + } + + /** + * Add the element associated to the query to the result, if the query has a name. + * @param iQueryTerm + * @param element + */ + protected void collect( IQueryTerm iQueryTerm, Object element) { + + if( iQueryTerm.getName() == null) { + return; + } + + result.put(iQueryTerm.getName(), element); + } + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#isVisitingParentFirst() + * + * @return + */ + public boolean isVisitingParentFirst() { + return true; + } + + /** + * @return the result + */ + public Map<String, Object> getResult() { + return result; + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/SashModelQuery.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/SashModelQuery.java index 7d98b85d88b..ab49a7b1002 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/SashModelQuery.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/SashModelQuery.java @@ -1,220 +1,220 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
-import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
-
-/**
- * Class used to check and query (from tests) the DiContentProvider.
- * <br>
- * This class also provide a set of static constructor helping in writing query.
- * <br>
- * Examples:
- * <ul>
- * <li>PanelTerm query = folder("a", page(), page() );</li>
- * <li>query = hSash( folder( page("p1"), page() ), vSash("s2", folder( page() ), folder( page() )) );</li>
- * <li>PanelTerm query = hSash( folder("f1", page("p1"), page("p2"), page("p3") ), folder("f2", page("p4") ) );</li>
- * <li></li>
- * </ul>
- * @author cedric dumoulin
- *
- */
-public class SashModelQuery {
-
- /**
- * Model to query.
- */
- protected SashModel sashModel;
-
- /**
- * Static constructor for {@link Page}.
- * @return
- */
- static public Page page() {
- return new Page();
- }
-
- /**
- * Static constructor for {@link Page}.
- * @return
- */
- static public Page page(String name) {
- return new Page(name);
- }
-
- /**
- * Static constructor for {@link Folder}.
- * @return
- */
- static public Folder folder( Page ...pages ) {
- return new Folder(pages);
- }
-
- /**
- * Static constructor for {@link Folder}.
- * @return
- */
- static public Folder folder( String name, Page ...pages ) {
- return new Folder(name, pages);
- }
-
- /**
- * Static constructor for {@link VSash}.
- * @return
- */
- static public VSash vSash( String name, PanelTerm up, PanelTerm down) {
- return new VSash(name, up, down);
- }
-
- /**
- * Static constructor for {@link VSash}.
- * @return
- */
- static public VSash vSash( PanelTerm up, PanelTerm down) {
- return new VSash(up, down);
- }
-
- /**
- * Static constructor for {@link HSash}.
- * @return
- */
- static public HSash hSash( String name, PanelTerm left, PanelTerm right) {
- return new HSash(name, left, right);
- }
-
- /**
- * Static constructor for {@link HSash}.
- * @return
- */
- static public HSash hSash( PanelTerm left, PanelTerm right) {
- return new HSash(left, right);
- }
-
- /**
- * Constructor.
- *
- * @param modelMngr
- */
- public SashModelQuery(SashWindowsMngr modelMngr) {
- this.sashModel = modelMngr.getSashModel();
- }
-
- /**
- * Constructor.
- *
- * @param sashModel
- */
- public SashModelQuery(SashModel sashModel) {
- this.sashModel = sashModel;
- }
-
-
- /**
- * Check if the sashModel is conformed to the specified query.
- * @param query
- * @throws QueryException
- */
- public void assertConform(IQueryExp query) throws QueryException {
-
- EObject first;
- if( query instanceof WindowTerm) {
- first = getFirstWindowModel();
- }
- else if( query instanceof PanelTerm) {
- first = getFirstPanelModel();
- }
- else {
- throw new QueryException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")");
- }
-
- CheckVisitor visitor = new CheckVisitor();
- query.accept(visitor, first);
- }
-
- /**
- * Create an internal model conform to the specified query.
- * Any previous model is disguarded.
- *
- * @param query Should be a subtype PanelTerm (Folder, HSash, VSash)
- * @throws QueryException
- */
- public void createModel(IQueryExp query) throws QueryException {
-
- Window first;
- if( query instanceof PanelTerm) {
- first = getFirstWindowModel();
- }
- else {
- throw new QueryException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")");
- }
-
- // Create a surrounding WindowTerm
- WindowTerm windowTerm = new WindowTerm((PanelTerm)query);
-
- CreateModelVisitor visitor = new CreateModelVisitor();
- windowTerm.accept(visitor, first);
- }
-
- /**
- * Get element in the model.
- * Each model element whose corresponding model query part as a name is added to the result map.
- * The element is then accessible with the name set in the query part.
- *
- * @param query
- * @return
- * @throws QueryException
- */
- public Map<String, Object> queryModel(IQueryExp query) throws QueryException {
-
- EObject first;
- if( query instanceof WindowTerm) {
- first = getFirstWindowModel();
- }
- else if( query instanceof PanelTerm) {
- first = getFirstPanelModel();
- }
- else {
- throw new QueryException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")");
- }
-
- QueryVisitor visitor = new QueryVisitor();
- query.accept(visitor, first);
-
- return visitor.getResult();
- }
-
- /**
- * Get the model of the first the first window (in actual implementation their is only one window).
- * @return
- */
- private Window getFirstWindowModel() {
- return sashModel.getWindows().get(0);
- }
-
- /**
- * Get the panel of the first window (in actual implementation their is only one window).
- * @return
- */
- private AbstractPanel getFirstPanelModel() {
- return sashModel.getWindows().get(0).getPanel();
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +import java.util.Map; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr; +import org.eclipse.papyrus.infra.core.sashwindows.di.Window; + +/** + * Class used to check and query (from tests) the DiContentProvider. + * <br> + * This class also provide a set of static constructor helping in writing query. + * <br> + * Examples: + * <ul> + * <li>PanelTerm query = folder("a", page(), page() );</li> + * <li>query = hSash( folder( page("p1"), page() ), vSash("s2", folder( page() ), folder( page() )) );</li> + * <li>PanelTerm query = hSash( folder("f1", page("p1"), page("p2"), page("p3") ), folder("f2", page("p4") ) );</li> + * <li></li> + * </ul> + * @author cedric dumoulin + * + */ +public class SashModelQuery { + + /** + * Model to query. + */ + protected SashModel sashModel; + + /** + * Static constructor for {@link Page}. + * @return + */ + static public Page page() { + return new Page(); + } + + /** + * Static constructor for {@link Page}. + * @return + */ + static public Page page(String name) { + return new Page(name); + } + + /** + * Static constructor for {@link Folder}. + * @return + */ + static public Folder folder( Page ...pages ) { + return new Folder(pages); + } + + /** + * Static constructor for {@link Folder}. + * @return + */ + static public Folder folder( String name, Page ...pages ) { + return new Folder(name, pages); + } + + /** + * Static constructor for {@link VSash}. + * @return + */ + static public VSash vSash( String name, PanelTerm up, PanelTerm down) { + return new VSash(name, up, down); + } + + /** + * Static constructor for {@link VSash}. + * @return + */ + static public VSash vSash( PanelTerm up, PanelTerm down) { + return new VSash(up, down); + } + + /** + * Static constructor for {@link HSash}. + * @return + */ + static public HSash hSash( String name, PanelTerm left, PanelTerm right) { + return new HSash(name, left, right); + } + + /** + * Static constructor for {@link HSash}. + * @return + */ + static public HSash hSash( PanelTerm left, PanelTerm right) { + return new HSash(left, right); + } + + /** + * Constructor. + * + * @param modelMngr + */ + public SashModelQuery(SashWindowsMngr modelMngr) { + this.sashModel = modelMngr.getSashModel(); + } + + /** + * Constructor. + * + * @param sashModel + */ + public SashModelQuery(SashModel sashModel) { + this.sashModel = sashModel; + } + + + /** + * Check if the sashModel is conformed to the specified query. + * @param query + * @throws QueryException + */ + public void assertConform(IQueryExp query) throws QueryException { + + EObject first; + if( query instanceof WindowTerm) { + first = getFirstWindowModel(); + } + else if( query instanceof PanelTerm) { + first = getFirstPanelModel(); + } + else { + throw new QueryException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")"); + } + + CheckVisitor visitor = new CheckVisitor(); + query.accept(visitor, first); + } + + /** + * Create an internal model conform to the specified query. + * Any previous model is disguarded. + * + * @param query Should be a subtype PanelTerm (Folder, HSash, VSash) + * @throws QueryException + */ + public void createModel(IQueryExp query) throws QueryException { + + Window first; + if( query instanceof PanelTerm) { + first = getFirstWindowModel(); + } + else { + throw new QueryException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")"); + } + + // Create a surrounding WindowTerm + WindowTerm windowTerm = new WindowTerm((PanelTerm)query); + + CreateModelVisitor visitor = new CreateModelVisitor(); + windowTerm.accept(visitor, first); + } + + /** + * Get element in the model. + * Each model element whose corresponding model query part as a name is added to the result map. + * The element is then accessible with the name set in the query part. + * + * @param query + * @return + * @throws QueryException + */ + public Map<String, Object> queryModel(IQueryExp query) throws QueryException { + + EObject first; + if( query instanceof WindowTerm) { + first = getFirstWindowModel(); + } + else if( query instanceof PanelTerm) { + first = getFirstPanelModel(); + } + else { + throw new QueryException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")"); + } + + QueryVisitor visitor = new QueryVisitor(); + query.accept(visitor, first); + + return visitor.getResult(); + } + + /** + * Get the model of the first the first window (in actual implementation their is only one window). + * @return + */ + private Window getFirstWindowModel() { + return sashModel.getWindows().get(0); + } + + /** + * Get the panel of the first window (in actual implementation their is only one window). + * @return + */ + private AbstractPanel getFirstPanelModel() { + return sashModel.getWindows().get(0).getPanel(); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/SashModelQueryTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/SashModelQueryTest.java index 7b27fce2b7f..9e041e633c1 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/SashModelQueryTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/SashModelQueryTest.java @@ -1,194 +1,194 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.folder;
-import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.hSash;
-import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.page;
-import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.vSash;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.junit.Test;
-
-/**
- * Tests on SashModelQuery.
- * Tests for the {@link SashModelQuery} implementation. This is not tests on SashModel
- *
- * @author dumoulin
- *
- */
-public class SashModelQueryTest extends AbstractPapyrusTest {
-
- /**
- * Test query structure
- */
- @Test
- public void testQuery() {
-
- // Try to create a query
- Folder folder = new Folder(new Page(), new Page());
- // Check if well constructed
- assertEquals("Contain Two pages", 2, folder.getPages().size());
-
- // Check sash
- HSash hsash = new HSash(new Folder(new Page()), new Folder(new Page()));
- assertNotNull("Folder set", hsash.getLeftup());
- assertNotNull("Folder set", hsash.getRightdown());
- }
-
- /**
- * Test accept visitor.
- *
- * @throws QueryException
- */
- @Test
- public void testCreateModelFPP() throws QueryException {
-
- // Create a modelQuery
- SashWindowsMngr diSashModel = DiUtils.createDefaultSashWindowsMngr();
- SashModelQuery modelQuery = new SashModelQuery(diSashModel);
-
- // Try to create a model
- IQueryExp query = new Folder(new Page(), new Page());
- modelQuery.createModel(query);
-
- // Check creation
- modelQuery.assertConform(query);
-
- // Other query
- query = new HSash(new Folder(new Page(), new Page()), new Folder(new Page()));
- modelQuery.createModel(query);
-
- // Check creation
- modelQuery.assertConform(query);
-
- // *********************
- // Other query
- query = new HSash(new Folder(new Page(), new Page()), new VSash(new Folder(new Page()), new Folder(new Page())));
- modelQuery.createModel(query);
-
- // Check creation
- modelQuery.assertConform(query);
-
-
- }
-
- /**
- * Test accept visitor.
- *
- * @throws QueryException
- */
- @Test
- public void testQueriesWithResult() throws QueryException {
-
- // Create a modelQuery
- SashWindowsMngr diSashModel = DiUtils.createDefaultSashWindowsMngr();
- SashModelQuery modelQuery = new SashModelQuery(diSashModel);
-
- // Try to create a model
- IQueryExp query = new Folder("a", new Page(), new Page());
- modelQuery.createModel(query);
- Map<String, Object> result = modelQuery.queryModel(query);
- assertNotNull("folder found", result.get("a"));
-
- // Check creation
- modelQuery.assertConform(query);
-
- // Other query
- query = new HSash(new Folder(new Page(), new Page("p1")), new Folder("a", new Page()));
- modelQuery.createModel(query);
-
- // Check creation
- modelQuery.assertConform(query);
- result = modelQuery.queryModel(query);
- assertNotNull("folder found", result.get("a"));
- assertTrue("right type", result.get("a") instanceof TabFolder);
- assertNotNull("page found", result.get("p1"));
- assertTrue("right type", result.get("p1") instanceof PageRef);
-
- // *********************
- // Other query
- query = new HSash(new Folder(new Page(), new Page()), new VSash("s2", new Folder(new Page()), new Folder(new Page())));
- modelQuery.createModel(query);
-
- // Check creation
- modelQuery.assertConform(query);
- result = modelQuery.queryModel(query);
- assertNotNull("sash found", result.get("s2"));
- assertTrue("right type ", result.get("s2") instanceof SashPanel);
-
-
- }
-
- /**
- * Test accept visitor.
- *
- * @throws QueryException
- */
- @Test
- public void testStaticCreates() throws QueryException {
-
- // Create a modelQuery
- SashWindowsMngr diSashModel = DiUtils.createDefaultSashWindowsMngr();
- SashModelQuery modelQuery = new SashModelQuery(diSashModel);
-
- // Try to create a model
- IQueryExp query = folder("a", page(), page());
- modelQuery.createModel(query);
- // Check creation
- modelQuery.assertConform(query);
-
- // Other query
- query = hSash(folder(page(), page("p1")), folder("f1", page()));
- modelQuery.createModel(query);
-
- // Check creation
- modelQuery.assertConform(query);
-
- // *********************
- // Other query
- query = hSash(folder(page(), page()), vSash("s2", folder(page()), folder(page())));
- modelQuery.createModel(query);
-
- // Check creation
- modelQuery.assertConform(query);
-
- }
-
- /**
- * Test toString.
- */
- @Test
- public void testToString() {
-
- // Try to create a query
- Folder folder = new Folder(new Page(), new Page());
-
- assertEquals("String match", "Folder(Page(), Page())", folder.toString());
-
- HSash sash = new HSash(folder, new Folder(new Page()));
- assertEquals("String match", "HSash(Folder(Page(), Page()), Folder(Page()))", sash.toString());
- }
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.folder; +import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.hSash; +import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.page; +import static org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQuery.vSash; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr; +import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder; +import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils; +import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; +import org.junit.Test; + +/** + * Tests on SashModelQuery. + * Tests for the {@link SashModelQuery} implementation. This is not tests on SashModel + * + * @author dumoulin + * + */ +public class SashModelQueryTest extends AbstractPapyrusTest { + + /** + * Test query structure + */ + @Test + public void testQuery() { + + // Try to create a query + Folder folder = new Folder(new Page(), new Page()); + // Check if well constructed + assertEquals("Contain Two pages", 2, folder.getPages().size()); + + // Check sash + HSash hsash = new HSash(new Folder(new Page()), new Folder(new Page())); + assertNotNull("Folder set", hsash.getLeftup()); + assertNotNull("Folder set", hsash.getRightdown()); + } + + /** + * Test accept visitor. + * + * @throws QueryException + */ + @Test + public void testCreateModelFPP() throws QueryException { + + // Create a modelQuery + SashWindowsMngr diSashModel = DiUtils.createDefaultSashWindowsMngr(); + SashModelQuery modelQuery = new SashModelQuery(diSashModel); + + // Try to create a model + IQueryExp query = new Folder(new Page(), new Page()); + modelQuery.createModel(query); + + // Check creation + modelQuery.assertConform(query); + + // Other query + query = new HSash(new Folder(new Page(), new Page()), new Folder(new Page())); + modelQuery.createModel(query); + + // Check creation + modelQuery.assertConform(query); + + // ********************* + // Other query + query = new HSash(new Folder(new Page(), new Page()), new VSash(new Folder(new Page()), new Folder(new Page()))); + modelQuery.createModel(query); + + // Check creation + modelQuery.assertConform(query); + + + } + + /** + * Test accept visitor. + * + * @throws QueryException + */ + @Test + public void testQueriesWithResult() throws QueryException { + + // Create a modelQuery + SashWindowsMngr diSashModel = DiUtils.createDefaultSashWindowsMngr(); + SashModelQuery modelQuery = new SashModelQuery(diSashModel); + + // Try to create a model + IQueryExp query = new Folder("a", new Page(), new Page()); + modelQuery.createModel(query); + Map<String, Object> result = modelQuery.queryModel(query); + assertNotNull("folder found", result.get("a")); + + // Check creation + modelQuery.assertConform(query); + + // Other query + query = new HSash(new Folder(new Page(), new Page("p1")), new Folder("a", new Page())); + modelQuery.createModel(query); + + // Check creation + modelQuery.assertConform(query); + result = modelQuery.queryModel(query); + assertNotNull("folder found", result.get("a")); + assertTrue("right type", result.get("a") instanceof TabFolder); + assertNotNull("page found", result.get("p1")); + assertTrue("right type", result.get("p1") instanceof PageRef); + + // ********************* + // Other query + query = new HSash(new Folder(new Page(), new Page()), new VSash("s2", new Folder(new Page()), new Folder(new Page()))); + modelQuery.createModel(query); + + // Check creation + modelQuery.assertConform(query); + result = modelQuery.queryModel(query); + assertNotNull("sash found", result.get("s2")); + assertTrue("right type ", result.get("s2") instanceof SashPanel); + + + } + + /** + * Test accept visitor. + * + * @throws QueryException + */ + @Test + public void testStaticCreates() throws QueryException { + + // Create a modelQuery + SashWindowsMngr diSashModel = DiUtils.createDefaultSashWindowsMngr(); + SashModelQuery modelQuery = new SashModelQuery(diSashModel); + + // Try to create a model + IQueryExp query = folder("a", page(), page()); + modelQuery.createModel(query); + // Check creation + modelQuery.assertConform(query); + + // Other query + query = hSash(folder(page(), page("p1")), folder("f1", page())); + modelQuery.createModel(query); + + // Check creation + modelQuery.assertConform(query); + + // ********************* + // Other query + query = hSash(folder(page(), page()), vSash("s2", folder(page()), folder(page()))); + modelQuery.createModel(query); + + // Check creation + modelQuery.assertConform(query); + + } + + /** + * Test toString. + */ + @Test + public void testToString() { + + // Try to create a query + Folder folder = new Folder(new Page(), new Page()); + + assertEquals("String match", "Folder(Page(), Page())", folder.toString()); + + HSash sash = new HSash(folder, new Folder(new Page())); + assertEquals("String match", "HSash(Folder(Page(), Page()), Folder(Page()))", sash.toString()); + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/VSash.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/VSash.java index e1d258fe8f7..b449634d439 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/VSash.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/VSash.java @@ -1,87 +1,87 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
-
-/**
- * Class for structure representing vertical sash in Checker
- *
- * @author dumoulin
- *
- */
-public class VSash extends AbstractSash {
-
- /**
- * Constructor.
- *
- * @param leftup
- * @param rightdown
- */
- public VSash(PanelTerm left, PanelTerm right) {
- super(left, right);
- }
-
- /**
- * Constructor.
- *
- * @param leftup
- * @param rightdown
- */
- public VSash(String name, PanelTerm left, PanelTerm right) {
- super(name, left, right);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm#accept(IQueryVisitor, EObject)
- *
- * @param visitor
- * @throws QueryException
- */
- public void accept(IQueryVisitor visitor, EObject modelObject) throws QueryException {
- // Check associated model type
- if(! (modelObject instanceof SashPanel) ) {
- throw new NoMatchException( "Model object type does not match to SashPanel" );
- }
-
- SashPanel sashModel = (SashPanel)modelObject;
-
- // Visit this
- if( visitor.isVisitingParentFirst() ) {
- visitor.visit(this, sashModel);
- }
-
- // Visit children
- leftup.accept(visitor, sashModel.getChildren().get(0));
- rightdown.accept(visitor, sashModel.getChildren().get(1));
-
- // Visit this
- if( !visitor.isVisitingParentFirst() ) {
- visitor.visit(this, sashModel);
- }
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.AbstractSash#getStringName()
- *
- * @return
- */
- @Override
- protected String getStringName() {
- return "VSash";
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel; + +/** + * Class for structure representing vertical sash in Checker + * + * @author dumoulin + * + */ +public class VSash extends AbstractSash { + + /** + * Constructor. + * + * @param leftup + * @param rightdown + */ + public VSash(PanelTerm left, PanelTerm right) { + super(left, right); + } + + /** + * Constructor. + * + * @param leftup + * @param rightdown + */ + public VSash(String name, PanelTerm left, PanelTerm right) { + super(name, left, right); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm#accept(IQueryVisitor, EObject) + * + * @param visitor + * @throws QueryException + */ + public void accept(IQueryVisitor visitor, EObject modelObject) throws QueryException { + // Check associated model type + if(! (modelObject instanceof SashPanel) ) { + throw new NoMatchException( "Model object type does not match to SashPanel" ); + } + + SashPanel sashModel = (SashPanel)modelObject; + + // Visit this + if( visitor.isVisitingParentFirst() ) { + visitor.visit(this, sashModel); + } + + // Visit children + leftup.accept(visitor, sashModel.getChildren().get(0)); + rightdown.accept(visitor, sashModel.getChildren().get(1)); + + // Visit this + if( !visitor.isVisitingParentFirst() ) { + visitor.visit(this, sashModel); + } + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.AbstractSash#getStringName() + * + * @return + */ + @Override + protected String getStringName() { + return "VSash"; + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/WindowTerm.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/WindowTerm.java index 7749d26d99a..12f0cdbc314 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/WindowTerm.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/sashmodel/query/WindowTerm.java @@ -1,100 +1,100 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
-
-/**
- * A term representing a Window in the query
- *
- * @author cedric dumoulin
- *
- */
-public class WindowTerm implements IQueryTerm {
-
- /**
- * A window have only one panel.
- */
- protected PanelTerm panel;
-
- protected String name;
-
- /**
- * Constructor.
- *
- * @param panel
- */
- public WindowTerm(PanelTerm panel) {
- this.panel = panel;
- }
-
- /**
- * Constructor.
- *
- * @param name
- * @param panel
- */
- public WindowTerm(String name, PanelTerm panel) {
- this.name = name;
- this.panel = panel;
- }
-
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm#accept(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor, org.eclipse.emf.ecore.EObject)
- *
- * @param visitor
- * @param panel
- * @throws QueryException
- */
- public void accept(IQueryVisitor visitor, EObject model) throws QueryException {
-
- // Check associated model type
- if(! (model instanceof Window) ) {
- throw new NoMatchException( "Model object type does not match to Window" );
- }
-
- Window window = (Window)model;
-
- if( visitor.isVisitingParentFirst() ) {
- visitor.visit(this, window);
- }
- // visit children
- panel.accept(visitor, window.getPanel());
-
- if( ! visitor.isVisitingParentFirst() ) {
- visitor.visit(this, window);
- }
-
- }
-
-
- /**
- * @return the panel
- */
- public PanelTerm getPanel() {
- return panel;
- }
-
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.infra.core.sashwindows.di.Window; + +/** + * A term representing a Window in the query + * + * @author cedric dumoulin + * + */ +public class WindowTerm implements IQueryTerm { + + /** + * A window have only one panel. + */ + protected PanelTerm panel; + + protected String name; + + /** + * Constructor. + * + * @param panel + */ + public WindowTerm(PanelTerm panel) { + this.panel = panel; + } + + /** + * Constructor. + * + * @param name + * @param panel + */ + public WindowTerm(String name, PanelTerm panel) { + this.name = name; + this.panel = panel; + } + + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryTerm#accept(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor, org.eclipse.emf.ecore.EObject) + * + * @param visitor + * @param panel + * @throws QueryException + */ + public void accept(IQueryVisitor visitor, EObject model) throws QueryException { + + // Check associated model type + if(! (model instanceof Window) ) { + throw new NoMatchException( "Model object type does not match to Window" ); + } + + Window window = (Window)model; + + if( visitor.isVisitingParentFirst() ) { + visitor.visit(this, window); + } + // visit children + panel.accept(visitor, window.getPanel()); + + if( ! visitor.isVisitingParentFirst() ) { + visitor.visit(this, window); + } + + } + + + /** + * @return the panel + */ + public PanelTerm getPanel() { + return panel; + } + + + /** + * @return the name + */ + public String getName() { + return name; + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/tests/AllTests.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/tests/AllTests.java index efcdccd61b0..cc66d500988 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/tests/AllTests.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/tests/AllTests.java @@ -1,43 +1,43 @@ -/*****************************************************************************
- * Copyright (c) 2009 CEA LIST & LIFL
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.di.tests;
-
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngrTest;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.DiContentProvider2Test;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.DiContentProviderTest;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageManagerImplTest;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.TransactionalDiContentProvider2Test;
-import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQueryTest;
-import org.junit.runner.RunWith;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
-import org.junit.runners.Suite.SuiteClasses;
-
-/**
- * Test suite for this fragment
- */
-@RunWith(ClassificationSuite.class)
-@SuiteClasses({
- // package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider
- DiSashModelMngrTest.class,
- // package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal
- DiContentProviderTest.class,
- DiContentProvider2Test.class,
- TransactionalDiContentProvider2Test.class,
- PageManagerImplTest.class,
- // package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query
- SashModelQueryTest.class
-})
-public class AllTests {
-
-}
+/***************************************************************************** + * Copyright (c) 2009 CEA LIST & LIFL + * + * + * 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 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.di.tests; + +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngrTest; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.DiContentProvider2Test; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.DiContentProviderTest; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageManagerImplTest; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.TransactionalDiContentProvider2Test; +import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQueryTest; +import org.junit.runner.RunWith; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; +import org.junit.runners.Suite.SuiteClasses; + +/** + * Test suite for this fragment + */ +@RunWith(ClassificationSuite.class) +@SuiteClasses({ + // package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider + DiSashModelMngrTest.class, + // package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal + DiContentProviderTest.class, + DiContentProvider2Test.class, + TransactionalDiContentProvider2Test.class, + PageManagerImplTest.class, + // package org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query + SashModelQueryTest.class +}) +public class AllTests { + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.classpath b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.classpath index 046bda900d2..969b4034060 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.classpath +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.classpath @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="test"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="test"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.project b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.project index 13ca6a9419b..03820d2e1f9 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.project +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.project @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.core.sasheditor.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.core.sasheditor.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/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.settings/org.eclipse.jdt.core.prefs index 4759947300a..c585cc455ae 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,291 +1,291 @@ -eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.settings/org.eclipse.jdt.ui.prefs index 954281dbc31..954281dbc31 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/.settings/org.eclipse.jdt.ui.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.settings/org.eclipse.jdt.ui.prefs diff --git a/tests/junit/plugins/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 ff298d7c6f3..ff298d7c6f3 100644 --- a/tests/junit/plugins/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 diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/about.html b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/about.html index 82d49bf5f81..d35d5aed64c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/about.html +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.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/core/org.eclipse.papyrus.infra.core.sasheditor.tests/build.properties b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/build.properties index 4cedaeae848..4cedaeae848 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/build.properties +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/build.properties diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/org.eclipse.papyrus.infra.core.sasheditor.tests.launch b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/org.eclipse.papyrus.infra.core.sasheditor.tests.launch index 8bb91f42500..7f1f30aa592 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/org.eclipse.papyrus.infra.core.sasheditor.tests.launch +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/org.eclipse.papyrus.infra.core.sasheditor.tests.launch @@ -1,40 +1,40 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.core.sasheditor.tests.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.core.sasheditor.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="append.args" value="true"/> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.core.sasheditor.tests.AllTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.core.sasheditor.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="false"/> +<booleanAttribute key="useProduct" value="true"/> +</launchConfiguration> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.properties b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.properties index 195f10e33bb..71c09758d64 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.properties +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.properties @@ -1,13 +1,13 @@ -#################################################################################
-# Copyright (c) 2010 CEA LIST.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
-##################################################################################
-pluginName=Papyrus Sash editor Tests Fragment
-providerName=Eclipse Modeling Project
-
+################################################################################# +# Copyright (c) 2010 CEA LIST. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation +################################################################################## +pluginName=Papyrus Sash editor Tests Fragment +providerName=Eclipse Modeling Project + diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.xml b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.xml index 882b613cbe1..f4ffcab7f35 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.xml +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.xml @@ -1,20 +1,20 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<fragment>
- <extension
- point="org.eclipse.ui.editors">
- <editor
- class="org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.FakeMultiSashPageEditor"
- default="false"
- id="org.eclipse.papyrus.infra.core.sasheditor.tests.editor.FakeMultiSashPageEditor"
- name="FakeMultiSashPageEditor">
- </editor>
- <editor
- class="org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.TestTextEditor"
- default="false"
- id="org.eclipse.papyrus.infra.core.sasheditor.tests.editor.TestTextEditor"
- name="TestTextEditor">
- </editor>
- </extension>
-
-</fragment>
+<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<fragment> + <extension + point="org.eclipse.ui.editors"> + <editor + class="org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.FakeMultiSashPageEditor" + default="false" + id="org.eclipse.papyrus.infra.core.sasheditor.tests.editor.FakeMultiSashPageEditor" + name="FakeMultiSashPageEditor"> + </editor> + <editor + class="org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.TestTextEditor" + default="false" + id="org.eclipse.papyrus.infra.core.sasheditor.tests.editor.TestTextEditor" + name="TestTextEditor"> + </editor> + </extension> + +</fragment> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/pom.xml b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/pom.xml index 7f80786cb12..0920728f374 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/pom.xml +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/pom.xml @@ -6,9 +6,9 @@ <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../../../../../releng/main-tests</relativePath> + <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.core.sasheditor.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/AbstractSashWindowContentProviderFacadeTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/AbstractSashWindowContentProviderFacadeTest.java index 4f75964c4e1..19eb3343010 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/AbstractSashWindowContentProviderFacadeTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/AbstractSashWindowContentProviderFacadeTest.java @@ -1,272 +1,272 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
-
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.folder;
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.page;
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.vSash;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-import org.eclipse.swt.SWT;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * Test suite for {@link ISashWindowsContentProviderFacade} implementations.
- * Each implementation of {@link ISashWindowsContentProviderFacade} can be tested with this suite.
- * This class provides the tests common to all implementation.
- *
- * An implementation can be tested by subclassing this class, and by implementing the
- * getIcontentProviderFacade method. This later should return the implementation of
- * {@link ISashWindowsContentProviderFacade} to test.
- *
- * @author cedric dumoulin
- *
- */
-public abstract class AbstractSashWindowContentProviderFacadeTest {
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- }
-
- /**
- * Create an instance of the {@link ISashWindowsContentProviderFacade} to test.
- *
- * @return an instance of {@link ISashWindowsContentProviderFacade};
- */
- abstract public ISashWindowsContentProviderFacade createISashWindowsContentProviderFacade();
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#assertConform(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}.
- * @throws PagesModelException
- */
- @Test
- public void testAssertConform() throws PagesModelException {
- ISashWindowsContentProviderFacade helper = createISashWindowsContentProviderFacade();
-
- assertNotNull("helper created", helper);
- // Create a query
- IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2")));
- // Try to create the model
- helper.createModel(expr);
-
- // Try to check model
- helper.assertConform(expr);
-
- }
-
- /**
- * Test assertConform with expr starting with a folder.
- * @throws PagesModelException
- */
- @Test
- public void testAssertConformExprStartngWithFolder() throws PagesModelException {
- ISashWindowsContentProviderFacade helper = createISashWindowsContentProviderFacade();
-
- assertNotNull("helper created", helper);
- // Create a query
- IModelExp expr = folder( "f1", page("p1"), page("p2"), page("p3"), page("p4"),
- page("p5"), page("p6"), page("p7"), page("p8"));
- // Try to create the model
- helper.createModel(expr);
-
-
- // Check if conform
- helper.assertConform(expr);
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#createModel(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}.
- * @throws PagesModelException
- */
- @Test
- public void testCreateModel() throws PagesModelException {
- ISashWindowsContentProviderFacade helper = createISashWindowsContentProviderFacade();
-
- assertNotNull("helper created", helper);
- // Create a query
- IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2")));
- // Try to create the model
- helper.createModel(expr);
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#queryModel(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}.
- * @throws PagesModelException
- */
- @Test
- public void testQueryModel() throws PagesModelException {
- ISashWindowsContentProviderFacade helper = createISashWindowsContentProviderFacade();
-
- assertNotNull("helper created", helper);
- // Create a query
- IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2")));
- // Try to create the model
- helper.createModel(expr);
-
- // Query model
- Map<String, Object> res = helper.queryModel(expr);
- assertNotNull("found f1", res.get("f1"));
-// assertTrue("right type", res.get("f1") instanceof TabFolderModel );
-
- assertNotNull("found f2", res.get("f2"));
-// assertTrue("right type", res.get("f2") instanceof TabFolderModel );
-
- assertNotNull("found p2", res.get("p2"));
-// assertTrue("right type", res.get("p2") instanceof IPageModel );
- }
-
- /**
- * Test folder creation.
- * Use the pagemodels utilities {@link SimpleSashWindowContentProviderUtils}.
- * @throws PagesModelException
- */
- @Test
- public void testCreateFolder() throws PagesModelException {
-
-
- ISashWindowsContentProviderFacade contentFacade = createISashWindowsContentProviderFacade();
-
- assertNotNull("helper created", contentFacade);
- // Create a query
-// IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2")));
- IModelExp expr = folder( "f1", page("p1"), page("p2"), page("p3"), page("p4"),
- page("p5"), page("p6"), page("p7"), page("p8"));
- // Try to create the model
- contentFacade.createModel(expr);
-
- // Create another folder
- contentFacade.createFolder("f1", 0, "f1", SWT.UP);
- // Check the content configuration
- IModelExp conf1Expr = vSash(
- folder( "f2", page("p1") ),
- folder( "f1", page("p2"), page("p3"), page("p4"),
- page("p5"), page("p6"), page("p7"), page("p8") )
- );
- // Check if conform
- contentFacade.assertConform(conf1Expr);
-
- // Check resetContext
- contentFacade.resetNamesContext(conf1Expr);
-
- assertNotNull("new name found", contentFacade.getNamesToInternalMap().get("f2"));
- }
-
-
- /**
- * Test page creation.
- * @throws PagesModelException
- */
- @Test
- public void testCreateNewPage() throws PagesModelException {
- ISashWindowsContentProviderFacade helper = createISashWindowsContentProviderFacade();
-
- assertNotNull("helper created", helper);
- // Create a query
- IModelExp expr = folder( "f1", page("p1"), page("p2"), page("p3"), page("p4"),
- page("p5"), page("p6"), page("p7"), page("p8"));
- // Try to create the model
- helper.createModel(expr);
-
- // Create a new page
- helper.addPage(page("newPage"), "f1");
-
- // Check the content configuration
- IModelExp conf1Expr = folder( "f1", page("p1"), page("p2"), page("p3"), page("p4"),
- page("p5"), page("p6"), page("p7"), page("p8"), page("newPage"));
-
- // Check if conform
- helper.assertConform(conf1Expr);
-
- }
-
- /**
- * Test page deletion.
- * @throws PagesModelException
- */
- @Test
- public void testClosePage() throws PagesModelException {
- ISashWindowsContentProviderFacade helper = createISashWindowsContentProviderFacade();
-
- assertNotNull("helper created", helper);
- // Create a query
- IModelExp expr = folder( "f1", page("p1"), page("p2"), page("p3"), page("p4"),
- page("p5"), page("p6"), page("p7"), page("p8"));
- // Try to create the model
- helper.createModel(expr);
-
- // Create a new page
- helper.removePage( "p8");
-
- // Check the content configuration
- IModelExp conf1Expr = folder( "f1", page("p1"), page("p2"), page("p3"), page("p4"),
- page("p5"), page("p6"), page("p7"));
-
- // Check if conform
- helper.assertConform(conf1Expr);
-
- }
-
- /**
- * Test folder deletion.
- * Use the pagemodels utilities {@link SimpleSashWindowContentProviderUtils}.
- * @throws PagesModelException
- */
- @Test
- public void testDeleteFolder() throws PagesModelException {
-
-
- ISashWindowsContentProviderFacade contentFacade = createISashWindowsContentProviderFacade();
-
- assertNotNull("helper created", contentFacade);
- // Create a query
-// IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2")));
- IModelExp expr = vSash(
- folder( "f1", page("p2"), page("p3"), page("p4") ),
- folder( "f2", page("p1") )
- );
- // Try to create the model
- contentFacade.createModel(expr);
-
- // Create the folder.
- // This is done by closing the last page
- contentFacade.removePage("p1");
-
- // Check the content configuration
- IModelExp conf1Expr = folder( "f1", page("p2"), page("p3"), page("p4"));
- // Check if conform
- contentFacade.assertConform(conf1Expr);
-
- }
-
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider; + +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.folder; +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.page; +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.vSash; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; +import org.eclipse.swt.SWT; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + + +/** + * Test suite for {@link ISashWindowsContentProviderFacade} implementations. + * Each implementation of {@link ISashWindowsContentProviderFacade} can be tested with this suite. + * This class provides the tests common to all implementation. + * + * An implementation can be tested by subclassing this class, and by implementing the + * getIcontentProviderFacade method. This later should return the implementation of + * {@link ISashWindowsContentProviderFacade} to test. + * + * @author cedric dumoulin + * + */ +public abstract class AbstractSashWindowContentProviderFacadeTest { + + /** + * @throws java.lang.Exception + */ + @Before + public void setUp() throws Exception { + } + + /** + * @throws java.lang.Exception + */ + @After + public void tearDown() throws Exception { + } + + /** + * Create an instance of the {@link ISashWindowsContentProviderFacade} to test. + * + * @return an instance of {@link ISashWindowsContentProviderFacade}; + */ + abstract public ISashWindowsContentProviderFacade createISashWindowsContentProviderFacade(); + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#assertConform(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}. + * @throws PagesModelException + */ + @Test + public void testAssertConform() throws PagesModelException { + ISashWindowsContentProviderFacade helper = createISashWindowsContentProviderFacade(); + + assertNotNull("helper created", helper); + // Create a query + IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2"))); + // Try to create the model + helper.createModel(expr); + + // Try to check model + helper.assertConform(expr); + + } + + /** + * Test assertConform with expr starting with a folder. + * @throws PagesModelException + */ + @Test + public void testAssertConformExprStartngWithFolder() throws PagesModelException { + ISashWindowsContentProviderFacade helper = createISashWindowsContentProviderFacade(); + + assertNotNull("helper created", helper); + // Create a query + IModelExp expr = folder( "f1", page("p1"), page("p2"), page("p3"), page("p4"), + page("p5"), page("p6"), page("p7"), page("p8")); + // Try to create the model + helper.createModel(expr); + + + // Check if conform + helper.assertConform(expr); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#createModel(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}. + * @throws PagesModelException + */ + @Test + public void testCreateModel() throws PagesModelException { + ISashWindowsContentProviderFacade helper = createISashWindowsContentProviderFacade(); + + assertNotNull("helper created", helper); + // Create a query + IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2"))); + // Try to create the model + helper.createModel(expr); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#queryModel(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}. + * @throws PagesModelException + */ + @Test + public void testQueryModel() throws PagesModelException { + ISashWindowsContentProviderFacade helper = createISashWindowsContentProviderFacade(); + + assertNotNull("helper created", helper); + // Create a query + IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2"))); + // Try to create the model + helper.createModel(expr); + + // Query model + Map<String, Object> res = helper.queryModel(expr); + assertNotNull("found f1", res.get("f1")); +// assertTrue("right type", res.get("f1") instanceof TabFolderModel ); + + assertNotNull("found f2", res.get("f2")); +// assertTrue("right type", res.get("f2") instanceof TabFolderModel ); + + assertNotNull("found p2", res.get("p2")); +// assertTrue("right type", res.get("p2") instanceof IPageModel ); + } + + /** + * Test folder creation. + * Use the pagemodels utilities {@link SimpleSashWindowContentProviderUtils}. + * @throws PagesModelException + */ + @Test + public void testCreateFolder() throws PagesModelException { + + + ISashWindowsContentProviderFacade contentFacade = createISashWindowsContentProviderFacade(); + + assertNotNull("helper created", contentFacade); + // Create a query +// IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2"))); + IModelExp expr = folder( "f1", page("p1"), page("p2"), page("p3"), page("p4"), + page("p5"), page("p6"), page("p7"), page("p8")); + // Try to create the model + contentFacade.createModel(expr); + + // Create another folder + contentFacade.createFolder("f1", 0, "f1", SWT.UP); + // Check the content configuration + IModelExp conf1Expr = vSash( + folder( "f2", page("p1") ), + folder( "f1", page("p2"), page("p3"), page("p4"), + page("p5"), page("p6"), page("p7"), page("p8") ) + ); + // Check if conform + contentFacade.assertConform(conf1Expr); + + // Check resetContext + contentFacade.resetNamesContext(conf1Expr); + + assertNotNull("new name found", contentFacade.getNamesToInternalMap().get("f2")); + } + + + /** + * Test page creation. + * @throws PagesModelException + */ + @Test + public void testCreateNewPage() throws PagesModelException { + ISashWindowsContentProviderFacade helper = createISashWindowsContentProviderFacade(); + + assertNotNull("helper created", helper); + // Create a query + IModelExp expr = folder( "f1", page("p1"), page("p2"), page("p3"), page("p4"), + page("p5"), page("p6"), page("p7"), page("p8")); + // Try to create the model + helper.createModel(expr); + + // Create a new page + helper.addPage(page("newPage"), "f1"); + + // Check the content configuration + IModelExp conf1Expr = folder( "f1", page("p1"), page("p2"), page("p3"), page("p4"), + page("p5"), page("p6"), page("p7"), page("p8"), page("newPage")); + + // Check if conform + helper.assertConform(conf1Expr); + + } + + /** + * Test page deletion. + * @throws PagesModelException + */ + @Test + public void testClosePage() throws PagesModelException { + ISashWindowsContentProviderFacade helper = createISashWindowsContentProviderFacade(); + + assertNotNull("helper created", helper); + // Create a query + IModelExp expr = folder( "f1", page("p1"), page("p2"), page("p3"), page("p4"), + page("p5"), page("p6"), page("p7"), page("p8")); + // Try to create the model + helper.createModel(expr); + + // Create a new page + helper.removePage( "p8"); + + // Check the content configuration + IModelExp conf1Expr = folder( "f1", page("p1"), page("p2"), page("p3"), page("p4"), + page("p5"), page("p6"), page("p7")); + + // Check if conform + helper.assertConform(conf1Expr); + + } + + /** + * Test folder deletion. + * Use the pagemodels utilities {@link SimpleSashWindowContentProviderUtils}. + * @throws PagesModelException + */ + @Test + public void testDeleteFolder() throws PagesModelException { + + + ISashWindowsContentProviderFacade contentFacade = createISashWindowsContentProviderFacade(); + + assertNotNull("helper created", contentFacade); + // Create a query +// IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2"))); + IModelExp expr = vSash( + folder( "f1", page("p2"), page("p3"), page("p4") ), + folder( "f2", page("p1") ) + ); + // Try to create the model + contentFacade.createModel(expr); + + // Create the folder. + // This is done by closing the last page + contentFacade.removePage("p1"); + + // Check the content configuration + IModelExp conf1Expr = folder( "f1", page("p2"), page("p3"), page("p4")); + // Check if conform + contentFacade.assertConform(conf1Expr); + + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngrTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngrTest.java index b4dab94ba55..73ae5b404ea 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngrTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageMngrTest.java @@ -1,58 +1,58 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
-
-import junit.framework.TestCase;
-
-import org.junit.After;
-import org.junit.Before;
-
-
-/**
- * Base class for testing real implementation of ContentProvider.
- * Real implementation should subclass this class, and implement the create method.
- *
- * @author cedric dumoulin
- *
- */
-public abstract class IPageMngrTest extends TestCase {
-
- /**
- * The public API allowing to access to the implementation.
- */
- protected ISashWindowsContentProvider contentProvider;
-
- /**
- * The public API allowing to access to the implementation.
- */
- // protected IPageMngr pageMngr;
-
- /**
- * Setup the test.
- *
- * @see junit.framework.TestCase#setUp()
- *
- * @throws Exception
- */
- @Before
- @Override
- protected void setUp() throws Exception {
- // TODO Auto-generated method stub
- super.setUp();
- }
-
- @After
- @Override
- protected void tearDown() throws Exception {
- // TODO Auto-generated method stub
- super.tearDown();
- }
-
- /**
- * Test that the pageIdentifier passed to addPAge() is provided back from {@link ISashWindowsContainer#getActiveEditor()()}
- */
- public void testAddPage() {
-
- }
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider; + +import junit.framework.TestCase; + +import org.junit.After; +import org.junit.Before; + + +/** + * Base class for testing real implementation of ContentProvider. + * Real implementation should subclass this class, and implement the create method. + * + * @author cedric dumoulin + * + */ +public abstract class IPageMngrTest extends TestCase { + + /** + * The public API allowing to access to the implementation. + */ + protected ISashWindowsContentProvider contentProvider; + + /** + * The public API allowing to access to the implementation. + */ + // protected IPageMngr pageMngr; + + /** + * Setup the test. + * + * @see junit.framework.TestCase#setUp() + * + * @throws Exception + */ + @Before + @Override + protected void setUp() throws Exception { + // TODO Auto-generated method stub + super.setUp(); + } + + @After + @Override + protected void tearDown() throws Exception { + // TODO Auto-generated method stub + super.tearDown(); + } + + /** + * Test that the pageIdentifier passed to addPAge() is provided back from {@link ISashWindowsContainer#getActiveEditor()()} + */ + public void testAddPage() { + + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProviderFacade.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProviderFacade.java index 46c057284e4..99fc3632b88 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProviderFacade.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProviderFacade.java @@ -1,220 +1,220 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
-
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NotFoundException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-
-
-/**
- * Interface providing a common facade to test the {@link ISashWindowsContentProvider} implementations.
- * <br>
- * This facade provides methods to manipulate {@link ISashWindowsContentProvider} with
- * the help of names. Each element in the {@link SimpleSashWindowsContentProvider} can be identified
- * by a name (String). Then, the facade provide methods similar to {@link ISashWindowsContentProvider}, but using
- * names rather than {@link IAbstractPanelModel} and {@link ITabFolderModel}.
- * <br>
- * The facade maintains a mapping between the names and the {@link ISashWindowsContentProvider} models.
-
- * <br>
- * Implementations of this class
- * allow to create an internal model according to a provided {@link IModelExp}. It is also possible
- * to check if the internal model is conform to the {@link IModelExp}.
- *
- * <br>
- * There is several {@link ISashWindowsContentProvider} implementations, but a lot of tests are commons to
- * all the implementations. The interface allows to develop common tests regardless of the real implementation.
- * <br>
- * One develop common tests using {@link ISashWindowsContentProvider} and {@link ISashWindowsContentProviderFacade}. Then,
- * this test is subclassed and the appropriate implementations are specified in the subclasses.
- *
- *
- * @author cedric dumoulin
- *
- */
-public interface ISashWindowsContentProviderFacade {
-
- /**
- * Create an internal model conform to the specified query.
- * Any previous model is disguarded.
- *
- * Some implementations do not allow to call this method more than once. In this case,
- * the implementation should throw an Exception.
- *
- * @param query Should be a subtype PanelTerm (Folder, HSash, VSash)
- * @throws QueryException
- *
- */
- public abstract void createModel(IModelExp query) throws PagesModelException;
-
- /**
- * Check if the internal model is conformed to the specified query.
- * @param query
- * @throws QueryException
- */
- public abstract void assertConform(IModelExp query) throws PagesModelException;
-
- /**
- * Get element in the model.
- * Each model element whose corresponding model query part as a name is added to the result map.
- * The element is then accessible with the name set in the query part.
- *
- * @param query
- * @return
- * @throws QueryException
- */
- public abstract Map<String, Object> queryModel(IModelExp query) throws PagesModelException;
-
- /**
- * Get the {@link ISashWindowsContentProvider} associated to this utility class.
- * @return
- */
- public ISashWindowsContentProvider getIContentProvider();
-
- /**
- * Add a page at the specified index of TabFolder.
- * <br>
- * This method is not used by the {@link ISashWindowsContainer}.
- *
- * @param page
- * An object identifying the page to add. The object could be anything. It will be
- * passed to the {@link ITabFolderModel#createChildSashModel(Object)} method.
- * @param index
- * Index to where the tabItem should be added.
- * @throws NotFoundException
- */
- public void /*IPageModel*/ addPage(Page page, String folderName, int index) throws PagesModelException;
-
- /**
- * Add a page at the end of TabFolder.
- * <br>
- * This method is not used by the {@link ISashWindowsContainer}.
- *
- * @param page
- * An object identifying the page to add. The object could be anything. It will be
- * passed to the {@link ITabFolderModel#createChildSashModel(Object)} method.
- * @return
- * @throws NotFoundException
- */
- public void /*IPageModel*/ addPage(Page page, String folderName) throws PagesModelException;
-
- /**
- * Move a tab inside the specified folder.
- *
- * @param model
- * @param oldIndex
- * @param newIndex
- * @throws NotFoundException
- */
- public void movePage(String folderName, int oldIndex, int newIndex) throws NotFoundException;
-
- /**
- * Move a tab from folder to folder.
- *
- * @param model
- * @param sourceIndex
- * @param model2
- * @param targetIndex
- */
- public void movePage(String srcFolderName, int sourceIndex, String targetFolderName, int targetIndex) throws NotFoundException;
-
- /**
- * Remove the page from the sashes window.
- * Look for the folder containing the page.
- *
- * @param page
- * The Object identifying the page. This is the object used in {@link #addPage(Object)}.
- */
- public void removePage(String pageName) throws NotFoundException;
-
- /**
- * Remove the specified page from the parentFolder.
- *
- * @param tabItem
- */
- public void removePage(String folderName, int tabIndex) throws NotFoundException;
-
- /**
- * Ask the model to move the specified tab to the specified side of the specified targetFolder.
- * This method
- * is called by the the SashTileContainer when the user
- * have drag a tab in a correct place. The SashTileContainer has not change is presentation yet. This
- * will be done when the corresponding event will occur.
- *
- * @param tabFolder
- * The folder containing the tab to move
- * @param tabIndex
- * The index of the tab to move
- * @param targetFolder
- * The folder to which the side refer to
- * @param side
- * Side where node should be inserted : SWT.LEFT, SWT.RIGHT, SWT.TOP, SWT.DOWN.
- * @throws PagesModelException
- */
- public void createFolder(String tabFolder, int tabIndex, String targetFolder, int side) throws PagesModelException;
-
- /**
- *
- * Reset the namesMapping context accordingly to the provided expr.
- * The names mapping is used to lookup Model element by there name.
- * The name mapping should be reset when the internal structure has change,
- * and especially when an element is added.
- * <br>
- * Reseting the names context allows to remove or add names to the context.
- * It is used to add names of newly created elements (created with addPage() or createFolder() )
-
- * @param expr
- * @throws PagesModelException
- */
- public void resetNamesContext(IModelExp expr) throws PagesModelException;
-
- /**
- * A facade is associated to a names and internal models map that is internally used
- * to lookup elements.
- * This maps is reset with {@link #resetNamesContext(IModelExp)}
- * @return The names to internal maps.
- */
- public Map<String, Object> getNamesToInternalMap();
-
- /**
- * Ask the model to move the specified tab to the specified side of the specified targetFolder.
- * This method
- * is called by the the SashTileContainer when the user
- * have drag a tab in a correct place. The SashTileContainer has not change is presentation yet. This
- * will be done when the corresponding event will occur.
- *
- * @param tabFolder
- * The folder containing the tab to move
- * @param tabIndex
- * The index of the tab to move
- * @param targetFolder
- * The folder to which the side refer to
- * @param side
- * Side where node should be inserted : SWT.LEFT, SWT.RIGHT, SWT.TOP, SWT.DOWN.
- * @throws PagesModelException
- */
-// public void createFolder(String newFolderName, String tabFolder, int tabIndex, String targetFolder, int side) throws PagesModelException;
-
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider; + +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NotFoundException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; + + +/** + * Interface providing a common facade to test the {@link ISashWindowsContentProvider} implementations. + * <br> + * This facade provides methods to manipulate {@link ISashWindowsContentProvider} with + * the help of names. Each element in the {@link SimpleSashWindowsContentProvider} can be identified + * by a name (String). Then, the facade provide methods similar to {@link ISashWindowsContentProvider}, but using + * names rather than {@link IAbstractPanelModel} and {@link ITabFolderModel}. + * <br> + * The facade maintains a mapping between the names and the {@link ISashWindowsContentProvider} models. + + * <br> + * Implementations of this class + * allow to create an internal model according to a provided {@link IModelExp}. It is also possible + * to check if the internal model is conform to the {@link IModelExp}. + * + * <br> + * There is several {@link ISashWindowsContentProvider} implementations, but a lot of tests are commons to + * all the implementations. The interface allows to develop common tests regardless of the real implementation. + * <br> + * One develop common tests using {@link ISashWindowsContentProvider} and {@link ISashWindowsContentProviderFacade}. Then, + * this test is subclassed and the appropriate implementations are specified in the subclasses. + * + * + * @author cedric dumoulin + * + */ +public interface ISashWindowsContentProviderFacade { + + /** + * Create an internal model conform to the specified query. + * Any previous model is disguarded. + * + * Some implementations do not allow to call this method more than once. In this case, + * the implementation should throw an Exception. + * + * @param query Should be a subtype PanelTerm (Folder, HSash, VSash) + * @throws QueryException + * + */ + public abstract void createModel(IModelExp query) throws PagesModelException; + + /** + * Check if the internal model is conformed to the specified query. + * @param query + * @throws QueryException + */ + public abstract void assertConform(IModelExp query) throws PagesModelException; + + /** + * Get element in the model. + * Each model element whose corresponding model query part as a name is added to the result map. + * The element is then accessible with the name set in the query part. + * + * @param query + * @return + * @throws QueryException + */ + public abstract Map<String, Object> queryModel(IModelExp query) throws PagesModelException; + + /** + * Get the {@link ISashWindowsContentProvider} associated to this utility class. + * @return + */ + public ISashWindowsContentProvider getIContentProvider(); + + /** + * Add a page at the specified index of TabFolder. + * <br> + * This method is not used by the {@link ISashWindowsContainer}. + * + * @param page + * An object identifying the page to add. The object could be anything. It will be + * passed to the {@link ITabFolderModel#createChildSashModel(Object)} method. + * @param index + * Index to where the tabItem should be added. + * @throws NotFoundException + */ + public void /*IPageModel*/ addPage(Page page, String folderName, int index) throws PagesModelException; + + /** + * Add a page at the end of TabFolder. + * <br> + * This method is not used by the {@link ISashWindowsContainer}. + * + * @param page + * An object identifying the page to add. The object could be anything. It will be + * passed to the {@link ITabFolderModel#createChildSashModel(Object)} method. + * @return + * @throws NotFoundException + */ + public void /*IPageModel*/ addPage(Page page, String folderName) throws PagesModelException; + + /** + * Move a tab inside the specified folder. + * + * @param model + * @param oldIndex + * @param newIndex + * @throws NotFoundException + */ + public void movePage(String folderName, int oldIndex, int newIndex) throws NotFoundException; + + /** + * Move a tab from folder to folder. + * + * @param model + * @param sourceIndex + * @param model2 + * @param targetIndex + */ + public void movePage(String srcFolderName, int sourceIndex, String targetFolderName, int targetIndex) throws NotFoundException; + + /** + * Remove the page from the sashes window. + * Look for the folder containing the page. + * + * @param page + * The Object identifying the page. This is the object used in {@link #addPage(Object)}. + */ + public void removePage(String pageName) throws NotFoundException; + + /** + * Remove the specified page from the parentFolder. + * + * @param tabItem + */ + public void removePage(String folderName, int tabIndex) throws NotFoundException; + + /** + * Ask the model to move the specified tab to the specified side of the specified targetFolder. + * This method + * is called by the the SashTileContainer when the user + * have drag a tab in a correct place. The SashTileContainer has not change is presentation yet. This + * will be done when the corresponding event will occur. + * + * @param tabFolder + * The folder containing the tab to move + * @param tabIndex + * The index of the tab to move + * @param targetFolder + * The folder to which the side refer to + * @param side + * Side where node should be inserted : SWT.LEFT, SWT.RIGHT, SWT.TOP, SWT.DOWN. + * @throws PagesModelException + */ + public void createFolder(String tabFolder, int tabIndex, String targetFolder, int side) throws PagesModelException; + + /** + * + * Reset the namesMapping context accordingly to the provided expr. + * The names mapping is used to lookup Model element by there name. + * The name mapping should be reset when the internal structure has change, + * and especially when an element is added. + * <br> + * Reseting the names context allows to remove or add names to the context. + * It is used to add names of newly created elements (created with addPage() or createFolder() ) + + * @param expr + * @throws PagesModelException + */ + public void resetNamesContext(IModelExp expr) throws PagesModelException; + + /** + * A facade is associated to a names and internal models map that is internally used + * to lookup elements. + * This maps is reset with {@link #resetNamesContext(IModelExp)} + * @return The names to internal maps. + */ + public Map<String, Object> getNamesToInternalMap(); + + /** + * Ask the model to move the specified tab to the specified side of the specified targetFolder. + * This method + * is called by the the SashTileContainer when the user + * have drag a tab in a correct place. The SashTileContainer has not change is presentation yet. This + * will be done when the corresponding event will occur. + * + * @param tabFolder + * The folder containing the tab to move + * @param tabIndex + * The index of the tab to move + * @param targetFolder + * The folder to which the side refer to + * @param side + * Side where node should be inserted : SWT.LEFT, SWT.RIGHT, SWT.TOP, SWT.DOWN. + * @throws PagesModelException + */ +// public void createFolder(String newFolderName, String tabFolder, int tabIndex, String targetFolder, int side) throws PagesModelException; + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AllTests.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AllTests.java index 33e6b522ff6..d0419df3d64 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AllTests.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AllTests.java @@ -1,26 +1,26 @@ -/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import org.junit.runner.RunWith;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
-import org.junit.runners.Suite.SuiteClasses;
-
-
-/**
- * All tests for package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple
- */
-@RunWith(ClassificationSuite.class)
-@SuiteClasses({ SimpleSashWindowsContentProviderTest.class })
-public class AllTests {
-
-}
+/***************************************************************************** + * Copyright (c) 2010 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import org.junit.runner.RunWith; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; +import org.junit.runners.Suite.SuiteClasses; + + +/** + * All tests for package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple + */ +@RunWith(ClassificationSuite.class) +@SuiteClasses({ SimpleSashWindowsContentProviderTest.class }) +public class AllTests { + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/CheckVisitor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/CheckVisitor.java index 1c33b4ae10d..2acf33b4c6e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/CheckVisitor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/CheckVisitor.java @@ -1,109 +1,109 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NoMatchException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm;
-
-
-/**
- * @author cedric dumoulin
- *
- */
-public class CheckVisitor extends SimpleContentProviderBaseVisitor implements IPagesModelVisitor<Object> {
-
- /**
- * @return the isVisitingParentFirst
- */
- @Override
- public boolean isVisitingParentFirst() {
- return false;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window)
- *
- * @param windowTerm
- * @param windowModel
- */
- @Override
- public void visit(WindowTerm windowTerm, RootModel windowModel) {
- // TODO Auto-generated method stub
-
- }
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder)
- *
- * @param folder
- */
- @Override
- public void visit(Folder folder, TabFolderModel folderModel) {
- // Check name
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash)
- *
- * @param sash
- */
- @Override
- public void visit(HSash sash, SashPanelModel sashModel) {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash)
- *
- * @param sash
- */
- @Override
- public void visit(VSash sash , SashPanelModel sashModel) {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page)
- *
- * @param page
- * @throws NoMatchException
- */
- @Override
- public void visit(Page page, IPageModel pageModel) throws PagesModelException {
- //check name
- if(page.getIdentifier() != null) {
- checkName(page.getIdentifier(), pageModel.getTabTitle()) ;
- }
- else if(page.getName() != null) {
- checkName(page.getName(), pageModel.getTabTitle()) ;
- }
- }
-
-
- protected void checkName( Object expectedName, Object foundName) throws NoMatchException {
- if( expectedName != foundName )
- throw new NoMatchException( "Names do not match (expected="
- + expectedName + ", found="+ foundName );
- }
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NoMatchException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm; + + +/** + * @author cedric dumoulin + * + */ +public class CheckVisitor extends SimpleContentProviderBaseVisitor implements IPagesModelVisitor<Object> { + + /** + * @return the isVisitingParentFirst + */ + @Override + public boolean isVisitingParentFirst() { + return false; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window) + * + * @param windowTerm + * @param windowModel + */ + @Override + public void visit(WindowTerm windowTerm, RootModel windowModel) { + // TODO Auto-generated method stub + + } + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder) + * + * @param folder + */ + @Override + public void visit(Folder folder, TabFolderModel folderModel) { + // Check name + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash) + * + * @param sash + */ + @Override + public void visit(HSash sash, SashPanelModel sashModel) { + // TODO Auto-generated method stub + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash) + * + * @param sash + */ + @Override + public void visit(VSash sash , SashPanelModel sashModel) { + // TODO Auto-generated method stub + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page) + * + * @param page + * @throws NoMatchException + */ + @Override + public void visit(Page page, IPageModel pageModel) throws PagesModelException { + //check name + if(page.getIdentifier() != null) { + checkName(page.getIdentifier(), pageModel.getTabTitle()) ; + } + else if(page.getName() != null) { + checkName(page.getName(), pageModel.getTabTitle()) ; + } + } + + + protected void checkName( Object expectedName, Object foundName) throws NoMatchException { + if( expectedName != foundName ) + throw new NoMatchException( "Names do not match (expected=" + + expectedName + ", found="+ foundName ); + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/CreateModelInSimpleContentProviderVisitor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/CreateModelInSimpleContentProviderVisitor.java index 1987f1b0322..bcee016650c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/CreateModelInSimpleContentProviderVisitor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/CreateModelInSimpleContentProviderVisitor.java @@ -1,157 +1,157 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.AbstractPanelModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SashPanelModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.TabFolderModel;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.MessagePartModel;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PanelTerm;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm;
-import org.eclipse.swt.SWT;
-
-/**
- * This visitor is used with {@link IModelExp} to create a pages model in a {@link SimpleContentProvider} instancied
- * with the Sash, folders and pages specified in the expr.
- *
- *
- * @author cedric dumoulin
- *
- */
-public class CreateModelInSimpleContentProviderVisitor extends SimpleContentProviderBaseVisitor implements IPagesModelVisitor<Object> {
-
- /**
- * {@link SimpleSashWindowsContentProvider} into which model is created.
- */
- private SimpleSashWindowsContentProvider contentProvider;
-
- /**
- * Constructor.
- *
- * @param contentProvider
- */
- public CreateModelInSimpleContentProviderVisitor(SimpleSashWindowsContentProvider contentProvider) {
- this.contentProvider = contentProvider;
- }
-
- /**
- * @return the isVisitingParentFirst
- */
- public boolean isVisitingParentFirst() {
- return true;
- }
-
- /**
- * There is no windowTerm counterpart in {@link SimpleSashWindowsContentProvider}.
- * @param windowTerm
- * @param windowModel
- */
- @Override
- public void visit(WindowTerm windowTerm, RootModel windowModel) {
- // Create children of the window
- PanelTerm panel = windowTerm.getPanel();
-
- AbstractPanelModel childPanel = createPanelOrFolder(panel, windowModel);
- windowModel.replaceChild(windowModel.getChild(), childPanel);
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder, org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder)
- *
- * @param folder
- * @param folderModel
- */
- @Override
- public void visit(Folder folder, TabFolderModel folderModel) {
-
- // Create children of the folder
- for( Page page : folder.getPages() ) {
- // Create a page of type "MessagePartModel".
- folderModel.getChildren().add( new MessagePartModel( page.getName(), page.getName() ));
- }
-
- }
-
- /**
- *
- * @param sashQuery
- * @param sashModel
- */
- public void visit(HSash sashQuery, SashPanelModel sashModel) {
-
- // Create children of the sash
- AbstractPanelModel leftChild = createPanelOrFolder(sashQuery.getLeftup(), sashModel);
- sashModel.setLeftChild( leftChild ) ;
- AbstractPanelModel rightChild = createPanelOrFolder(sashQuery.getRightdown(), sashModel);
- sashModel.setRightChild(rightChild);
- }
-
- /**
- * @param sashModel
- * @param panel
- */
- private AbstractPanelModel createPanelOrFolder(PanelTerm panel, AbstractModel parent ) {
- if(panel instanceof HSash) {
- // Create a sash with null children.
- // This is not a good example of how to proceed. Avoid to use it like this.
- // Here we can do this because we know that we create the children soon.
- return new SashPanelModel(parent, null, null, SWT.HORIZONTAL);
- }
- else if(panel instanceof VSash) {
- return new SashPanelModel(parent, null, null, SWT.VERTICAL);
- }
- else /*if (panel instanceof Folder)*/ {
- TabFolderModel folder = new TabFolderModel(contentProvider);
- folder.setParent(parent);
- return folder;
- }
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)
- *
- * @param sash
- * @param sashModel
- */
- public void visit(VSash sashQuery, SashPanelModel sashModel) {
- // Create children of the sash
- AbstractPanelModel leftChild = createPanelOrFolder(sashQuery.getLeftup(), sashModel);
- sashModel.setLeftChild( leftChild ) ;
- AbstractPanelModel rightChild = createPanelOrFolder(sashQuery.getRightdown(), sashModel);
- sashModel.setRightChild(rightChild);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page, org.eclipse.papyrus.infra.core.sashwindows.di.PageRef)
- *
- * @param page
- * @param pageModel
- */
- public void visit(Page page, IPageModel pageModel) {
- // Page is created and identifier already set.
- // Nothing to do
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.AbstractPanelModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SashPanelModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.TabFolderModel; +import org.eclipse.papyrus.infra.core.sasheditor.editor.MessagePartModel; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PanelTerm; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm; +import org.eclipse.swt.SWT; + +/** + * This visitor is used with {@link IModelExp} to create a pages model in a {@link SimpleContentProvider} instancied + * with the Sash, folders and pages specified in the expr. + * + * + * @author cedric dumoulin + * + */ +public class CreateModelInSimpleContentProviderVisitor extends SimpleContentProviderBaseVisitor implements IPagesModelVisitor<Object> { + + /** + * {@link SimpleSashWindowsContentProvider} into which model is created. + */ + private SimpleSashWindowsContentProvider contentProvider; + + /** + * Constructor. + * + * @param contentProvider + */ + public CreateModelInSimpleContentProviderVisitor(SimpleSashWindowsContentProvider contentProvider) { + this.contentProvider = contentProvider; + } + + /** + * @return the isVisitingParentFirst + */ + public boolean isVisitingParentFirst() { + return true; + } + + /** + * There is no windowTerm counterpart in {@link SimpleSashWindowsContentProvider}. + * @param windowTerm + * @param windowModel + */ + @Override + public void visit(WindowTerm windowTerm, RootModel windowModel) { + // Create children of the window + PanelTerm panel = windowTerm.getPanel(); + + AbstractPanelModel childPanel = createPanelOrFolder(panel, windowModel); + windowModel.replaceChild(windowModel.getChild(), childPanel); + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder, org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder) + * + * @param folder + * @param folderModel + */ + @Override + public void visit(Folder folder, TabFolderModel folderModel) { + + // Create children of the folder + for( Page page : folder.getPages() ) { + // Create a page of type "MessagePartModel". + folderModel.getChildren().add( new MessagePartModel( page.getName(), page.getName() )); + } + + } + + /** + * + * @param sashQuery + * @param sashModel + */ + public void visit(HSash sashQuery, SashPanelModel sashModel) { + + // Create children of the sash + AbstractPanelModel leftChild = createPanelOrFolder(sashQuery.getLeftup(), sashModel); + sashModel.setLeftChild( leftChild ) ; + AbstractPanelModel rightChild = createPanelOrFolder(sashQuery.getRightdown(), sashModel); + sashModel.setRightChild(rightChild); + } + + /** + * @param sashModel + * @param panel + */ + private AbstractPanelModel createPanelOrFolder(PanelTerm panel, AbstractModel parent ) { + if(panel instanceof HSash) { + // Create a sash with null children. + // This is not a good example of how to proceed. Avoid to use it like this. + // Here we can do this because we know that we create the children soon. + return new SashPanelModel(parent, null, null, SWT.HORIZONTAL); + } + else if(panel instanceof VSash) { + return new SashPanelModel(parent, null, null, SWT.VERTICAL); + } + else /*if (panel instanceof Folder)*/ { + TabFolderModel folder = new TabFolderModel(contentProvider); + folder.setParent(parent); + return folder; + } + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel) + * + * @param sash + * @param sashModel + */ + public void visit(VSash sashQuery, SashPanelModel sashModel) { + // Create children of the sash + AbstractPanelModel leftChild = createPanelOrFolder(sashQuery.getLeftup(), sashModel); + sashModel.setLeftChild( leftChild ) ; + AbstractPanelModel rightChild = createPanelOrFolder(sashQuery.getRightdown(), sashModel); + sashModel.setRightChild(rightChild); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page, org.eclipse.papyrus.infra.core.sashwindows.di.PageRef) + * + * @param page + * @param pageModel + */ + public void visit(Page page, IPageModel pageModel) { + // Page is created and identifier already set. + // Nothing to do + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/FakePageModel.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/FakePageModel.java index 095f6774e71..e3b72e57d75 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/FakePageModel.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/FakePageModel.java @@ -1,69 +1,69 @@ -/*****************************************************************************
- * Copyright (c) 2009, 2014 LIFL, CEA LIST, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 392301
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * A fake page for testing purpose
- *
- * @author dumoulin
- */
-public class FakePageModel implements IPageModel {
-
- String title;
-
- static int count = 0;
-
- public FakePageModel() {
- title = "noname" + count++;
- }
-
- /**
- * @param title
- */
- public FakePageModel(String title) {
- this.title = title;
- }
-
- /**
- * {@inheritDoc}
- */
- public Object getRawModel() {
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- public Image getTabIcon() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getTabTitle() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void dispose() {
- // Pass
- }
-}
+/***************************************************************************** + * Copyright (c) 2009, 2014 LIFL, CEA LIST, and others. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation + * Christian W. Damus (CEA) - bug 392301 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.swt.graphics.Image; + + +/** + * A fake page for testing purpose + * + * @author dumoulin + */ +public class FakePageModel implements IPageModel { + + String title; + + static int count = 0; + + public FakePageModel() { + title = "noname" + count++; + } + + /** + * @param title + */ + public FakePageModel(String title) { + this.title = title; + } + + /** + * {@inheritDoc} + */ + public Object getRawModel() { + return this; + } + + /** + * {@inheritDoc} + */ + public Image getTabIcon() { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + public String getTabTitle() { + // TODO Auto-generated method stub + return null; + } + + public void dispose() { + // Pass + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/QueryVisitor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/QueryVisitor.java index a44ba367f40..3773db2b87f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/QueryVisitor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/QueryVisitor.java @@ -1,134 +1,134 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelObject;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm;
-
-/**
- * Visitor used to collect element in the model.
- * Each element in the model associated with a{@link IQueryTerm} whose name is set is collectted.
- * The collected element is then accessible from the result map, using the name set in the IQueryTerm.
- *
- *
- * @author cedric dumoulin
- *
- */
-public class QueryVisitor extends SimpleContentProviderBaseVisitor implements IPagesModelVisitor<Object> {
-
- /**
- * The result map.
- */
- protected Map<String, Object>result = new HashMap<String, Object>();
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window)
- *
- * @param windowTerm
- * @param windowModel
- */
- @Override
- public void visit(WindowTerm windowTerm, RootModel windowModel) {
- collect( windowTerm, windowModel);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder, org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder)
- *
- * @param folder
- * @param folderModel
- */
- @Override
- public void visit(Folder folder, TabFolderModel folderModel) {
- collect(folder, folderModel);
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)
- *
- * @param sash
- * @param sashModel
- */
- @Override
- public void visit(HSash sash, SashPanelModel sashModel) {
- collect(sash, sashModel);
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)
- *
- * @param sash
- * @param sashModel
- */
- @Override
- public void visit(VSash sash, SashPanelModel sashModel) {
- collect(sash, sashModel);
-
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page, org.eclipse.papyrus.infra.core.sashwindows.di.PageRef)
- *
- * @param page
- * @param pageModel
- */
- @Override
- public void visit(Page page, IPageModel pageModel) {
- collect(page, pageModel);
-
- }
-
- /**
- * Add the element associated to the query to the result, if the query has a name.
- * @param iQueryTerm
- * @param element
- */
- protected void collect( IModelObject iQueryTerm, Object element) {
-
- if( iQueryTerm.getName() == null) {
- return;
- }
-
- result.put(iQueryTerm.getName(), element);
- }
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#isVisitingParentFirst()
- *
- * @return
- */
- @Override
- public boolean isVisitingParentFirst() {
- return true;
- }
-
- /**
- * @return the result
- */
- public Map<String, Object> getResult() {
- return result;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelObject; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm; + +/** + * Visitor used to collect element in the model. + * Each element in the model associated with a{@link IQueryTerm} whose name is set is collectted. + * The collected element is then accessible from the result map, using the name set in the IQueryTerm. + * + * + * @author cedric dumoulin + * + */ +public class QueryVisitor extends SimpleContentProviderBaseVisitor implements IPagesModelVisitor<Object> { + + /** + * The result map. + */ + protected Map<String, Object>result = new HashMap<String, Object>(); + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.WindowTerm, org.eclipse.papyrus.infra.core.sashwindows.di.Window) + * + * @param windowTerm + * @param windowModel + */ + @Override + public void visit(WindowTerm windowTerm, RootModel windowModel) { + collect( windowTerm, windowModel); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Folder, org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder) + * + * @param folder + * @param folderModel + */ + @Override + public void visit(Folder folder, TabFolderModel folderModel) { + collect(folder, folderModel); + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.HSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel) + * + * @param sash + * @param sashModel + */ + @Override + public void visit(HSash sash, SashPanelModel sashModel) { + collect(sash, sashModel); + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.VSash, org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel) + * + * @param sash + * @param sashModel + */ + @Override + public void visit(VSash sash, SashPanelModel sashModel) { + collect(sash, sashModel); + + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#visit(org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.Page, org.eclipse.papyrus.infra.core.sashwindows.di.PageRef) + * + * @param page + * @param pageModel + */ + @Override + public void visit(Page page, IPageModel pageModel) { + collect(page, pageModel); + + } + + /** + * Add the element associated to the query to the result, if the query has a name. + * @param iQueryTerm + * @param element + */ + protected void collect( IModelObject iQueryTerm, Object element) { + + if( iQueryTerm.getName() == null) { + return; + } + + result.put(iQueryTerm.getName(), element); + } + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.IQueryVisitor#isVisitingParentFirst() + * + * @return + */ + @Override + public boolean isVisitingParentFirst() { + return true; + } + + /** + * @return the result + */ + public Map<String, Object> getResult() { + return result; + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleContentProviderBaseVisitor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleContentProviderBaseVisitor.java index d84f0399f0d..2879acc4191 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleContentProviderBaseVisitor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleContentProviderBaseVisitor.java @@ -1,316 +1,316 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import java.util.Iterator;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.AbstractPanelModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.RootModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SashPanelModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.TabFolderModel;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NoMatchException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModel;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm;
-import org.eclipse.swt.SWT;
-
-/**
- * A base implementation of {@link IPagesModelVisitor} to visit conjointly SashPagesModel and
- * SimpleContentProvider.
- *
- * This implementation separate the navigation part (walk(term, contentProviderModel)) and
- * the visit part (visit(term, contentProviderModel)). It implements the navigation part.
- * <br>
- * The visit part should be implemented by subclasses.
- *
- *
- *
- * @author cedric dumoulin
- *
- */
-public class SimpleContentProviderBaseVisitor implements IPagesModelVisitor<Object> {
-
- /**
- * @return the isVisitingParentFirst
- */
- public boolean isVisitingParentFirst() {
- return true;
- }
-
- /**
- * Visit the model. Actually, there is no counterpart for {@link SashPagesModel} in {@link SimpleContentProvider}.
- *
- * @param windowTerm
- * @param windowModel
- * @throws PagesModelException
- */
- public void walk(SashPagesModel pagesModel, Object contentProviderModel) throws PagesModelException {
- // Check associated model type
- if(! (contentProviderModel instanceof SimpleSashWindowsContentProvider) ) {
- throw new NoMatchException( "ContentProvider type ("+ contentProviderModel.getClass().getName()+ ") does not match to WindowTerm" );
- }
-
- SimpleSashWindowsContentProvider contentProvider = (SimpleSashWindowsContentProvider)contentProviderModel;
-
- if( isVisitingParentFirst() ) {
- visit(pagesModel, contentProvider);
- }
- // visit children
- for( WindowTerm windowTerm : pagesModel.getWindows() ) {
- // Only one window
- RootModel windowModel = (RootModel) ((AbstractPanelModel)contentProvider.getRootModel()).getParent();
- windowTerm.getPanel().accept(this, windowModel);
- }
- if( ! isVisitingParentFirst() ) {
- visit(pagesModel, contentProvider);
- }
- }
-
- /**
- * Walk the WindowTerm and its child.
- * @param windowTerm
- * @param windowModel
- * @throws PagesModelException
- */
- public void walk(WindowTerm windowTerm, Object windowModel) throws PagesModelException {
- // Check associated model type
- if(! (windowModel instanceof RootModel) ) {
- throw new NoMatchException( "ContentProvider type ("+ windowModel.getClass().getName()+ ") does not match to WindowTerm" );
- }
-
- RootModel window = (RootModel)windowModel;
-
- if( isVisitingParentFirst() ) {
- visit(windowTerm, window);
- }
- // visit children
- windowTerm.getPanel().accept(this, window.getChild());
-
- if( ! isVisitingParentFirst() ) {
- visit(windowTerm, window);
- }
- }
-
- /**
- * Walk folder and its children.
- *
- * @param folder
- * @param folderModel
- * @throws PagesModelException
- */
- public void walk(Folder folder, Object model) throws PagesModelException {
- // Check associated model type
- if(! (model instanceof TabFolderModel) ) {
- throw new NoMatchException( this.toString()
- + "\n" + folder
- + "\n - Model object type does not match to FolderQueryPart."
- + " Expected TabFolderModel, found '" + model.getClass().getSimpleName() + "'."
- + " (" + folder.getName() +")" );
- }
- TabFolderModel folderModel = (TabFolderModel)model;
-
- // Visit this
- if( isVisitingParentFirst() ) {
- visit(folder, folderModel);
- }
-
- // visit children
- Iterator<IPageModel> pageRefs = folderModel.getChildren().iterator();
- Iterator<Page> pageQueries = folder.getPages().iterator();
- while (pageRefs.hasNext() && pageQueries.hasNext() ) {
- IPageModel pageRef = pageRefs.next();
- Page query = pageQueries.next();
-
- query.accept(this, pageRef);
- }
- if (pageRefs.hasNext()) {
- // some page left
- throw new NoMatchException( "Folder matching - "
- + this.toString()
- +" folder model have more pages than folder query. ("+folder.getName()+")" );
- } else if (pageQueries.hasNext() ) {
- // some queries left
- throw new NoMatchException( "Folder matching - "
- + this.toString()
- +" folder query have more page than folder model. ("+folder.getName()+")" );
- }
- // Visit this
- if( ! isVisitingParentFirst() ) {
- visit(folder, folderModel);
- }
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor#walk(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash, java.lang.Object)
- *
- * @param sash
- * @param sashModel
- * @throws PagesModelException
- */
- public void walk(HSash sash, Object model) throws PagesModelException {
- // Check associated model type
- if(! (model instanceof SashPanelModel) ) {
- throw new NoMatchException( this.toString() + " - Model object type does not match to SashPanel (found "
- + model.getClass()
- + " )");
- }
-
- SashPanelModel sashModel = (SashPanelModel)model;
-
- // Check orientation
- if( sashModel.getSashDirection() != SWT.HORIZONTAL) {
- throw new NoMatchException( this.toString() + " - SashOrientation does not match 'HORIZONTAL'" );
- }
- // Visit this
- if( isVisitingParentFirst() ) {
- visit(sash, sashModel);
- }
-
- // Visit children
- sash.getLeftup().accept(this, sashModel.getChildren().get(0));
- sash.getRightdown().accept(this, sashModel.getChildren().get(1));
-
- if( !isVisitingParentFirst() ) {
- visit(sash, sashModel);
- }
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor#walk(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash, java.lang.Object)
- *
- * @param sash
- * @param sashModel
- * @throws PagesModelException
- */
- public void walk(VSash sash, Object model) throws PagesModelException {
- // Check associated model type
- if(! (model instanceof SashPanelModel) ) {
- throw new NoMatchException( this.toString() + " - Model object type does not match to SashPanel (found "
- + model.getClass()
- + " )");
- }
-
- SashPanelModel sashModel = (SashPanelModel)model;
-
- // Check orientation
- if( sashModel.getSashDirection() != SWT.VERTICAL) {
- throw new NoMatchException( this.toString() + " - SashOrientation does not match 'VERTICAL'" );
- }
- // Visit this
- if( isVisitingParentFirst() ) {
- visit(sash, sashModel);
- }
-
- // Visit children
- sash.getLeftup().accept(this, sashModel.getChildren().get(0));
- sash.getRightdown().accept(this, sashModel.getChildren().get(1));
-
- if( !isVisitingParentFirst() ) {
- visit(sash, sashModel);
- }
- }
-
- /**
- * Walk the page. Simply call the corresponding {@link SimpleContentProviderBaseVisitor#visit(Page, IPageModel)} method.
- * @param page
- * @param pageModel
- * @throws PagesModelException
- */
- public void walk(Page page, Object model) throws PagesModelException {
- // Check associated model type
- if(! (model instanceof IPageModel) ) {
- throw new NoMatchException( this.toString() + " - Model object type does not match to PageRef" );
- }
- IPageModel pageModel = (IPageModel)model;
- visit(page, pageModel);
- }
-
-
- /**
- * Visit the model. Actually, there is no counterpart for {@link SashPagesModel} in {@link SimpleContentProvider}.
- *
- * @param windowTerm
- * @param windowModel
- * @throws PagesModelException
- */
- public void visit(SashPagesModel pagesModel, Object windowModel) throws PagesModelException {
-
- }
-
- /**
- * Visit the corresponding node.
- * To be implemented by subclass.
- *
- *
- * @param windowTerm
- * @param windowModel
- */
- public void visit(WindowTerm windowTerm, RootModel windowModel) throws PagesModelException {
- // To be implemented by subclass.
- }
-
- /**
- * Visit the corresponding node.
- * To be implemented by subclass.
- *
- * @param folder
- * @param folderModel
- */
- public void visit(Folder folder, TabFolderModel folderModel) throws PagesModelException{
-
- }
-
- /**
- * Visit the corresponding node.
- * To be implemented by subclass.
- *
- * @param sashQuery
- * @param sashModel
- */
- public void visit(HSash sashQuery, SashPanelModel sashModel) throws PagesModelException {
-
- }
-
- /**
- * Visit the corresponding node.
- * To be implemented by subclass.
- *
- *
- * @param sash
- * @param sashModel
- */
- public void visit(VSash sashQuery, SashPanelModel sashModel) throws PagesModelException{
- }
-
- /**
- * Visit the corresponding node.
- * To be implemented by subclass.
- *
- *
- * @param page
- * @param pageModel
- */
- public void visit(Page page, IPageModel pageModel) throws PagesModelException {
-
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import java.util.Iterator; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.AbstractPanelModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.RootModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SashPanelModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.TabFolderModel; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Folder; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NoMatchException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModel; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm; +import org.eclipse.swt.SWT; + +/** + * A base implementation of {@link IPagesModelVisitor} to visit conjointly SashPagesModel and + * SimpleContentProvider. + * + * This implementation separate the navigation part (walk(term, contentProviderModel)) and + * the visit part (visit(term, contentProviderModel)). It implements the navigation part. + * <br> + * The visit part should be implemented by subclasses. + * + * + * + * @author cedric dumoulin + * + */ +public class SimpleContentProviderBaseVisitor implements IPagesModelVisitor<Object> { + + /** + * @return the isVisitingParentFirst + */ + public boolean isVisitingParentFirst() { + return true; + } + + /** + * Visit the model. Actually, there is no counterpart for {@link SashPagesModel} in {@link SimpleContentProvider}. + * + * @param windowTerm + * @param windowModel + * @throws PagesModelException + */ + public void walk(SashPagesModel pagesModel, Object contentProviderModel) throws PagesModelException { + // Check associated model type + if(! (contentProviderModel instanceof SimpleSashWindowsContentProvider) ) { + throw new NoMatchException( "ContentProvider type ("+ contentProviderModel.getClass().getName()+ ") does not match to WindowTerm" ); + } + + SimpleSashWindowsContentProvider contentProvider = (SimpleSashWindowsContentProvider)contentProviderModel; + + if( isVisitingParentFirst() ) { + visit(pagesModel, contentProvider); + } + // visit children + for( WindowTerm windowTerm : pagesModel.getWindows() ) { + // Only one window + RootModel windowModel = (RootModel) ((AbstractPanelModel)contentProvider.getRootModel()).getParent(); + windowTerm.getPanel().accept(this, windowModel); + } + if( ! isVisitingParentFirst() ) { + visit(pagesModel, contentProvider); + } + } + + /** + * Walk the WindowTerm and its child. + * @param windowTerm + * @param windowModel + * @throws PagesModelException + */ + public void walk(WindowTerm windowTerm, Object windowModel) throws PagesModelException { + // Check associated model type + if(! (windowModel instanceof RootModel) ) { + throw new NoMatchException( "ContentProvider type ("+ windowModel.getClass().getName()+ ") does not match to WindowTerm" ); + } + + RootModel window = (RootModel)windowModel; + + if( isVisitingParentFirst() ) { + visit(windowTerm, window); + } + // visit children + windowTerm.getPanel().accept(this, window.getChild()); + + if( ! isVisitingParentFirst() ) { + visit(windowTerm, window); + } + } + + /** + * Walk folder and its children. + * + * @param folder + * @param folderModel + * @throws PagesModelException + */ + public void walk(Folder folder, Object model) throws PagesModelException { + // Check associated model type + if(! (model instanceof TabFolderModel) ) { + throw new NoMatchException( this.toString() + + "\n" + folder + + "\n - Model object type does not match to FolderQueryPart." + + " Expected TabFolderModel, found '" + model.getClass().getSimpleName() + "'." + + " (" + folder.getName() +")" ); + } + TabFolderModel folderModel = (TabFolderModel)model; + + // Visit this + if( isVisitingParentFirst() ) { + visit(folder, folderModel); + } + + // visit children + Iterator<IPageModel> pageRefs = folderModel.getChildren().iterator(); + Iterator<Page> pageQueries = folder.getPages().iterator(); + while (pageRefs.hasNext() && pageQueries.hasNext() ) { + IPageModel pageRef = pageRefs.next(); + Page query = pageQueries.next(); + + query.accept(this, pageRef); + } + if (pageRefs.hasNext()) { + // some page left + throw new NoMatchException( "Folder matching - " + + this.toString() + +" folder model have more pages than folder query. ("+folder.getName()+")" ); + } else if (pageQueries.hasNext() ) { + // some queries left + throw new NoMatchException( "Folder matching - " + + this.toString() + +" folder query have more page than folder model. ("+folder.getName()+")" ); + } + // Visit this + if( ! isVisitingParentFirst() ) { + visit(folder, folderModel); + } + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor#walk(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.HSash, java.lang.Object) + * + * @param sash + * @param sashModel + * @throws PagesModelException + */ + public void walk(HSash sash, Object model) throws PagesModelException { + // Check associated model type + if(! (model instanceof SashPanelModel) ) { + throw new NoMatchException( this.toString() + " - Model object type does not match to SashPanel (found " + + model.getClass() + + " )"); + } + + SashPanelModel sashModel = (SashPanelModel)model; + + // Check orientation + if( sashModel.getSashDirection() != SWT.HORIZONTAL) { + throw new NoMatchException( this.toString() + " - SashOrientation does not match 'HORIZONTAL'" ); + } + // Visit this + if( isVisitingParentFirst() ) { + visit(sash, sashModel); + } + + // Visit children + sash.getLeftup().accept(this, sashModel.getChildren().get(0)); + sash.getRightdown().accept(this, sashModel.getChildren().get(1)); + + if( !isVisitingParentFirst() ) { + visit(sash, sashModel); + } + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IPagesModelVisitor#walk(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.VSash, java.lang.Object) + * + * @param sash + * @param sashModel + * @throws PagesModelException + */ + public void walk(VSash sash, Object model) throws PagesModelException { + // Check associated model type + if(! (model instanceof SashPanelModel) ) { + throw new NoMatchException( this.toString() + " - Model object type does not match to SashPanel (found " + + model.getClass() + + " )"); + } + + SashPanelModel sashModel = (SashPanelModel)model; + + // Check orientation + if( sashModel.getSashDirection() != SWT.VERTICAL) { + throw new NoMatchException( this.toString() + " - SashOrientation does not match 'VERTICAL'" ); + } + // Visit this + if( isVisitingParentFirst() ) { + visit(sash, sashModel); + } + + // Visit children + sash.getLeftup().accept(this, sashModel.getChildren().get(0)); + sash.getRightdown().accept(this, sashModel.getChildren().get(1)); + + if( !isVisitingParentFirst() ) { + visit(sash, sashModel); + } + } + + /** + * Walk the page. Simply call the corresponding {@link SimpleContentProviderBaseVisitor#visit(Page, IPageModel)} method. + * @param page + * @param pageModel + * @throws PagesModelException + */ + public void walk(Page page, Object model) throws PagesModelException { + // Check associated model type + if(! (model instanceof IPageModel) ) { + throw new NoMatchException( this.toString() + " - Model object type does not match to PageRef" ); + } + IPageModel pageModel = (IPageModel)model; + visit(page, pageModel); + } + + + /** + * Visit the model. Actually, there is no counterpart for {@link SashPagesModel} in {@link SimpleContentProvider}. + * + * @param windowTerm + * @param windowModel + * @throws PagesModelException + */ + public void visit(SashPagesModel pagesModel, Object windowModel) throws PagesModelException { + + } + + /** + * Visit the corresponding node. + * To be implemented by subclass. + * + * + * @param windowTerm + * @param windowModel + */ + public void visit(WindowTerm windowTerm, RootModel windowModel) throws PagesModelException { + // To be implemented by subclass. + } + + /** + * Visit the corresponding node. + * To be implemented by subclass. + * + * @param folder + * @param folderModel + */ + public void visit(Folder folder, TabFolderModel folderModel) throws PagesModelException{ + + } + + /** + * Visit the corresponding node. + * To be implemented by subclass. + * + * @param sashQuery + * @param sashModel + */ + public void visit(HSash sashQuery, SashPanelModel sashModel) throws PagesModelException { + + } + + /** + * Visit the corresponding node. + * To be implemented by subclass. + * + * + * @param sash + * @param sashModel + */ + public void visit(VSash sashQuery, SashPanelModel sashModel) throws PagesModelException{ + } + + /** + * Visit the corresponding node. + * To be implemented by subclass. + * + * + * @param page + * @param pageModel + */ + public void visit(Page page, IPageModel pageModel) throws PagesModelException { + + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContainerTestFacade.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContainerTestFacade.java index 5f6fcdf1fcf..b5ea7881d7e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContainerTestFacade.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContainerTestFacade.java @@ -1,452 +1,452 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.MessagePartModel;
-import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.BadNameException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NotFoundException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PanelTerm;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Class providing a facade to test the {@link SashWindowsContainer} class.
- * <br>
- * This facade own a {@link SimpleSashWindowsContentProvider}, a {@link SashWindowsContainer} and
- * provides methods to manipulate it with the help of names.
- * <br>
- * The facade allows to create pages and folders in the sashContainer, thru the ContentProvider.
- * It also allows to check the resulting structure inside the SashContainer.
- * The facade can also be used to create a particular configuration of the SashContainer, and apply
- * tests on this configuration.
- * <br>
- * Each element in the {@link SimpleSashWindowsContentProvider} can be identified
- * by a name (String). Then, the facade provide methods similar to {@link ISashWindowsContentProvider}, but using
- * names rather than {@link IAbstractPanelModel} and {@link ITabFolderModel}.
- * <br>
- * The facade maintains a mapping between the names and the {@link ISashWindowsContentProvider} models.
- * <br>
- * The
- * @author cedric dumoulin
- *
- */
-public class SimpleSashWindowContainerTestFacade implements ISashWindowsContentProviderFacade {
-
- /**
- * The internal content provider this facade is for.
- */
- protected SimpleSashWindowsContentProvider contentProvider;
-
- /**
- * The associated SashContainer
- */
- protected SashWindowsContainer sashContainer;
- /**
- * Display used to create windows.
- */
- protected Display display;
-
-
- /**
- * Mapping between names provided in the expressions and internal implementations of the {@link SimpleSashWindowsContentProvider}.
- * This mapping is maintained when elements are added or removed.
- *
- */
- protected Map<String, Object> namesMapping;
-
- /**
- * Constructor.
- * Create a default internal {@link SimpleSashWindowsContentProvider};
- * @param modelMngr
- */
- public SimpleSashWindowContainerTestFacade() {
- this.contentProvider = new SimpleSashWindowsContentProvider();
- initDisplay();
- sashContainer = createSashWindowsContainer(contentProvider);
- }
-
- /**
- * Constructor.
- *
- * @param modelMngr
- */
- public SimpleSashWindowContainerTestFacade(SimpleSashWindowsContentProvider contentProvider) {
- this.contentProvider = contentProvider;
- initDisplay();
- sashContainer = createSashWindowsContainer(contentProvider);
- }
-
- /**
- * Init the display object.
- */
- protected void initDisplay() {
- display = Display.getCurrent();
- if(display == null) {
- display = new Display();
- }
- }
- /**
- * Create a {@link SashWindowsContainer} to test. Initialize it with provided {@link ISashWindowsContentProvider}.
- *
- * @param contentProvider
- * @return
- */
- protected SashWindowsContainer createSashWindowsContainer(ISashWindowsContentProvider contentProvider) {
- Shell shell = new Shell(display);
- shell.setLayout(new FillLayout());
-
- //
- //new ShellEditor(shell);
- SashWindowsContainer sashWindowContainer = new SashWindowsContainer();
-
- sashWindowContainer.setContentProvider(contentProvider);
-
- sashWindowContainer.createPartControl(shell);
- // shell.open();
- return sashWindowContainer;
- }
-
-
- /**
- * @return the sashContainer
- */
- public SashWindowsContainer getSashContainer() {
- return sashContainer;
- }
-
- /**
- * @return the ISashWindowsContainer interface
- */
- public ISashWindowsContainer getISashWindowsContainer() {
- return sashContainer;
- }
-
- /**
- * @return the contentProvider
- */
- public ISashWindowsContentProvider getIContentProvider() {
- return contentProvider;
- }
-
- /**
- * Dispose the facade
- */
- public void dispose() {
- sashContainer.dispose();
- // display.dispose();
- if(namesMapping != null) {
- namesMapping.clear();
- }
- contentProvider = null;
- sashContainer = null;
- }
-
- /**
- * Reset the namesMapping context accordingly to the provided expr.
- * A side effect is that the internal structure is checked against the expr.
- * <br>
- * Reseting the names context allows to remove or add names to the context.
- * It is used to add names of newly created elements (created with addPage() or createFolder() )
-
- * @param expr
- * @throws PagesModelException
- */
- public void resetNamesContext(IModelExp expr) throws PagesModelException {
- namesMapping = queryModel(expr);
- }
-
- /**
- * Check if the internal {@link ISashWindowsContentProvider} is conformed to the specified expression.
- * @param expr
- * @throws QueryException
- */
- public void assertConform(IModelExp expr) throws PagesModelException {
-
- Object first;
- if( expr instanceof WindowTerm) {
- first = getFirstWindowModel();
- }
- else if( expr instanceof PanelTerm) {
- first = getFirstPanelModel();
- }
- else {
- throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + expr.toString() + ")");
- }
-
- CheckVisitor visitor = new CheckVisitor();
- expr.accept(visitor, first);
- }
-
- /**
- * Create an internal model conform to the specified expression.
- * Any previous model is disguarded.
- *
- * This method should only be called once on a {@link SimpleSashWindowsContentProvider}.
- * <br>
- * If an expr term have a name, this name is kept in the facade and can be used later in methods like move, delete, ...
- *
- * @param expr Expression denoting the configuration to create. Must be one of (Folder, HSash, VSash)
- * @throws QueryException
- *
- * TODO Ensure that the method can only be called once. For example,
- * let this class extends {@link SimpleSashWindowsContentProvider}, and the constructor
- * call this method.
- */
- public void createModel(IModelExp expr) throws PagesModelException {
-
- Object first ;
- if( expr instanceof PanelTerm) {
- first = getFirstWindowModel();
- }
- else {
- throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + expr.toString() + ")");
- }
-
- // Create a surrounding WindowTerm
- WindowTerm windowTerm = new WindowTerm((PanelTerm)expr);
-
- CreateModelInSimpleContentProviderVisitor visitor = new CreateModelInSimpleContentProviderVisitor(contentProvider);
- windowTerm.accept(visitor, first);
-
- // Fill mapping
- namesMapping = queryModel(expr);
- }
-
- /**
- * Get element in the model.
- * Each model element whose corresponding model query part as a name is added to the result map.
- * The element is then accessible with the name set in the query part.
- *
- * @param query
- * @return
- * @throws QueryException
- */
- public Map<String, Object> queryModel(IModelExp query) throws PagesModelException {
-
- Object first;
- if( query instanceof WindowTerm) {
- first = getFirstWindowModel();
- }
- else if( query instanceof PanelTerm) {
- first = getFirstPanelModel();
- }
- else {
- throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")");
- }
-
- QueryVisitor visitor = new QueryVisitor();
- query.accept(visitor, first);
-
- return visitor.getResult();
- }
-
- /**
- * Get the model of the first the first window (in actual implementation their is only one window).
- * @return
- */
- private RootModel getFirstWindowModel() {
- // Silly method to get the RootModel
- return (RootModel)((AbstractPanelModel)contentProvider.getRootModel()).getParent();
- }
-
- /**
- * Get the panel of the first window (in actual implementation their is only one window).
- * @return
- */
- private AbstractPanelModel getFirstPanelModel() {
- // In this implementation, the root is always of type AbstractPanelModel
- return (AbstractPanelModel)contentProvider.getRootModel();
- }
-
- /**
- * Add a page to the model
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.common.ISashWindowsContentProviderFacade#addPage(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page, java.lang.String, int)
- *
- * @param page
- * @param folderName
- * @param index
- * @throws PagesModelException
- */
- public void /*IPageModel*/ addPage(Page page, String folderName, int index) throws PagesModelException {
- // Get the folder
- TabFolderModel folderModel = getITabFolderModel( folderName );
-
- IPageModel pageModel = createPageModel(page);
-
- contentProvider.addPage(folderModel, index, pageModel);
-
-// return pageModel;
- }
-
- /**
- * Add a page to the model
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.common.ISashWindowsContentProviderFacade#addPage(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page, java.lang.String, int)
- *
- * @param page
- * @param folderName
- * @throws PagesModelException
- */
- public void /*IPageModel*/ addPage(Page page, String folderName) throws PagesModelException {
- // Get the folder
- TabFolderModel folderModel = getITabFolderModel( folderName );
-
- IPageModel pageModel = createPageModel(page);
-
- contentProvider.addPage(folderModel, pageModel);
-
-// return pageModel;
- }
-
- /**
- * Create a {@link IPageModel} for the specified {@link Page}.
- * @param page
- * @return
- */
- static public IPageModel createPageModel( Page page ) {
- return new MessagePartModel( page.getName(), page.getName() );
- }
-
- /**
- *
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.common.ISashWindowsContentProviderFacade#movePage(java.lang.String, int, int)
- *
- * @param folderName
- * @param oldIndex
- * @param newIndex
- * @throws NotFoundException
- */
- public void movePage(String folderName, int oldIndex, int newIndex) throws NotFoundException {
- // Get the folder
- ITabFolderModel folderModel = getITabFolderModel( folderName );
-
- contentProvider.movePage(folderModel, oldIndex, newIndex);
- }
-
- public void movePage(String srcFolderName, int sourceIndex, String targetFolderName, int targetIndex) throws NotFoundException {
- // Get the folders
- ITabFolderModel srcFolderModel = getITabFolderModel( srcFolderName );
- ITabFolderModel targetFolderModel = getITabFolderModel( targetFolderName );
-
- contentProvider.movePage(srcFolderModel, sourceIndex, targetFolderModel, targetIndex);
- }
-
- public void removePage(String pageName) throws NotFoundException {
- IPageModel pageModel = getIPageModel(pageName);
-
- contentProvider.removePage(pageModel);
-
- }
-
- public void removePage(String folderName, int tabIndex) throws NotFoundException {
- // Get the folder
- ITabFolderModel folderModel = getITabFolderModel( folderName );
-
- contentProvider.removePage(folderModel, tabIndex);
- // TODO remove page name from context
- }
-
- public void createFolder(String tabFolderName, int tabIndex, String targetFolderName, int side) throws PagesModelException {
- // Get the folders
- ITabFolderModel srcFolderModel = getITabFolderModel( tabFolderName );
- TabFolderModel targetFolderModel = getITabFolderModel( targetFolderName );
-
- contentProvider.createFolder(srcFolderModel, tabIndex, targetFolderModel, side);
-
- }
-
- /**
- * Add an element in namesMapping. Throw an exception if the name already exist or if the name is not correct.
- *
- * @param name
- * @param element
- * @throws BadNameException
- */
- protected void putNameMapping( String name, Object element) throws BadNameException {
-
- if( name == null || name.length() == 0 ) {
- throw new BadNameException("Name '" + name + "' is not valid.");
- }
-
- if(namesMapping.containsKey(name)) {
- throw new BadNameException("Name '" + name + "' already exist in the context. Can't add it (but element is created).");
- }
-
- }
- /**
- * Get the {@link ITabFolderModel} associated to the name.
- * In this implementation, this is the internal folder.
- * @param folderName
- * @return
- * @throws NotFoundException
- */
- public TabFolderModel getITabFolderModel(String folderName) throws NotFoundException {
-
-
- Object res = namesMapping.get(folderName);
- if(res == null)
- throw new NotFoundException("Folder named '" + folderName + "' not found in the context of the expression.");
-
- if( ! (res instanceof TabFolderModel) )
- throw new NotFoundException("An element named '" + folderName + "' is found but it is not of the expected type (ITabFolderModel). " );
-
- return (TabFolderModel)res;
- }
-
- /**
- * Get the {@link IPageModel} associated to the name.
- * In this implementation, this is the internal element.
- * @param pageName
- * @return
- * @throws NotFoundException
- */
- public IPageModel getIPageModel(String pageName) throws NotFoundException {
-
-
- Object res = namesMapping.get(pageName);
- if(res == null)
- throw new NotFoundException("Page named '" + pageName + "' not found in the context of the expression.");
-
- if( ! (res instanceof IPageModel) )
- throw new NotFoundException("An element named '" + pageName + "' is found but it is not of the expected type (IPageModel). " );
-
- return (IPageModel)res;
- }
-
- /**
- * Return the associated maps of (names, internal representation).
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade#getNamesToInternalMap()
- *
- * @return
- */
- public Map<String, Object> getNamesToInternalMap() {
- return namesMapping;
- }
-
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel; +import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer; +import org.eclipse.papyrus.infra.core.sasheditor.editor.MessagePartModel; +import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.BadNameException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NotFoundException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PanelTerm; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; + +/** + * Class providing a facade to test the {@link SashWindowsContainer} class. + * <br> + * This facade own a {@link SimpleSashWindowsContentProvider}, a {@link SashWindowsContainer} and + * provides methods to manipulate it with the help of names. + * <br> + * The facade allows to create pages and folders in the sashContainer, thru the ContentProvider. + * It also allows to check the resulting structure inside the SashContainer. + * The facade can also be used to create a particular configuration of the SashContainer, and apply + * tests on this configuration. + * <br> + * Each element in the {@link SimpleSashWindowsContentProvider} can be identified + * by a name (String). Then, the facade provide methods similar to {@link ISashWindowsContentProvider}, but using + * names rather than {@link IAbstractPanelModel} and {@link ITabFolderModel}. + * <br> + * The facade maintains a mapping between the names and the {@link ISashWindowsContentProvider} models. + * <br> + * The + * @author cedric dumoulin + * + */ +public class SimpleSashWindowContainerTestFacade implements ISashWindowsContentProviderFacade { + + /** + * The internal content provider this facade is for. + */ + protected SimpleSashWindowsContentProvider contentProvider; + + /** + * The associated SashContainer + */ + protected SashWindowsContainer sashContainer; + /** + * Display used to create windows. + */ + protected Display display; + + + /** + * Mapping between names provided in the expressions and internal implementations of the {@link SimpleSashWindowsContentProvider}. + * This mapping is maintained when elements are added or removed. + * + */ + protected Map<String, Object> namesMapping; + + /** + * Constructor. + * Create a default internal {@link SimpleSashWindowsContentProvider}; + * @param modelMngr + */ + public SimpleSashWindowContainerTestFacade() { + this.contentProvider = new SimpleSashWindowsContentProvider(); + initDisplay(); + sashContainer = createSashWindowsContainer(contentProvider); + } + + /** + * Constructor. + * + * @param modelMngr + */ + public SimpleSashWindowContainerTestFacade(SimpleSashWindowsContentProvider contentProvider) { + this.contentProvider = contentProvider; + initDisplay(); + sashContainer = createSashWindowsContainer(contentProvider); + } + + /** + * Init the display object. + */ + protected void initDisplay() { + display = Display.getCurrent(); + if(display == null) { + display = new Display(); + } + } + /** + * Create a {@link SashWindowsContainer} to test. Initialize it with provided {@link ISashWindowsContentProvider}. + * + * @param contentProvider + * @return + */ + protected SashWindowsContainer createSashWindowsContainer(ISashWindowsContentProvider contentProvider) { + Shell shell = new Shell(display); + shell.setLayout(new FillLayout()); + + // + //new ShellEditor(shell); + SashWindowsContainer sashWindowContainer = new SashWindowsContainer(); + + sashWindowContainer.setContentProvider(contentProvider); + + sashWindowContainer.createPartControl(shell); + // shell.open(); + return sashWindowContainer; + } + + + /** + * @return the sashContainer + */ + public SashWindowsContainer getSashContainer() { + return sashContainer; + } + + /** + * @return the ISashWindowsContainer interface + */ + public ISashWindowsContainer getISashWindowsContainer() { + return sashContainer; + } + + /** + * @return the contentProvider + */ + public ISashWindowsContentProvider getIContentProvider() { + return contentProvider; + } + + /** + * Dispose the facade + */ + public void dispose() { + sashContainer.dispose(); + // display.dispose(); + if(namesMapping != null) { + namesMapping.clear(); + } + contentProvider = null; + sashContainer = null; + } + + /** + * Reset the namesMapping context accordingly to the provided expr. + * A side effect is that the internal structure is checked against the expr. + * <br> + * Reseting the names context allows to remove or add names to the context. + * It is used to add names of newly created elements (created with addPage() or createFolder() ) + + * @param expr + * @throws PagesModelException + */ + public void resetNamesContext(IModelExp expr) throws PagesModelException { + namesMapping = queryModel(expr); + } + + /** + * Check if the internal {@link ISashWindowsContentProvider} is conformed to the specified expression. + * @param expr + * @throws QueryException + */ + public void assertConform(IModelExp expr) throws PagesModelException { + + Object first; + if( expr instanceof WindowTerm) { + first = getFirstWindowModel(); + } + else if( expr instanceof PanelTerm) { + first = getFirstPanelModel(); + } + else { + throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + expr.toString() + ")"); + } + + CheckVisitor visitor = new CheckVisitor(); + expr.accept(visitor, first); + } + + /** + * Create an internal model conform to the specified expression. + * Any previous model is disguarded. + * + * This method should only be called once on a {@link SimpleSashWindowsContentProvider}. + * <br> + * If an expr term have a name, this name is kept in the facade and can be used later in methods like move, delete, ... + * + * @param expr Expression denoting the configuration to create. Must be one of (Folder, HSash, VSash) + * @throws QueryException + * + * TODO Ensure that the method can only be called once. For example, + * let this class extends {@link SimpleSashWindowsContentProvider}, and the constructor + * call this method. + */ + public void createModel(IModelExp expr) throws PagesModelException { + + Object first ; + if( expr instanceof PanelTerm) { + first = getFirstWindowModel(); + } + else { + throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + expr.toString() + ")"); + } + + // Create a surrounding WindowTerm + WindowTerm windowTerm = new WindowTerm((PanelTerm)expr); + + CreateModelInSimpleContentProviderVisitor visitor = new CreateModelInSimpleContentProviderVisitor(contentProvider); + windowTerm.accept(visitor, first); + + // Fill mapping + namesMapping = queryModel(expr); + } + + /** + * Get element in the model. + * Each model element whose corresponding model query part as a name is added to the result map. + * The element is then accessible with the name set in the query part. + * + * @param query + * @return + * @throws QueryException + */ + public Map<String, Object> queryModel(IModelExp query) throws PagesModelException { + + Object first; + if( query instanceof WindowTerm) { + first = getFirstWindowModel(); + } + else if( query instanceof PanelTerm) { + first = getFirstPanelModel(); + } + else { + throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")"); + } + + QueryVisitor visitor = new QueryVisitor(); + query.accept(visitor, first); + + return visitor.getResult(); + } + + /** + * Get the model of the first the first window (in actual implementation their is only one window). + * @return + */ + private RootModel getFirstWindowModel() { + // Silly method to get the RootModel + return (RootModel)((AbstractPanelModel)contentProvider.getRootModel()).getParent(); + } + + /** + * Get the panel of the first window (in actual implementation their is only one window). + * @return + */ + private AbstractPanelModel getFirstPanelModel() { + // In this implementation, the root is always of type AbstractPanelModel + return (AbstractPanelModel)contentProvider.getRootModel(); + } + + /** + * Add a page to the model + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.common.ISashWindowsContentProviderFacade#addPage(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page, java.lang.String, int) + * + * @param page + * @param folderName + * @param index + * @throws PagesModelException + */ + public void /*IPageModel*/ addPage(Page page, String folderName, int index) throws PagesModelException { + // Get the folder + TabFolderModel folderModel = getITabFolderModel( folderName ); + + IPageModel pageModel = createPageModel(page); + + contentProvider.addPage(folderModel, index, pageModel); + +// return pageModel; + } + + /** + * Add a page to the model + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.common.ISashWindowsContentProviderFacade#addPage(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page, java.lang.String, int) + * + * @param page + * @param folderName + * @throws PagesModelException + */ + public void /*IPageModel*/ addPage(Page page, String folderName) throws PagesModelException { + // Get the folder + TabFolderModel folderModel = getITabFolderModel( folderName ); + + IPageModel pageModel = createPageModel(page); + + contentProvider.addPage(folderModel, pageModel); + +// return pageModel; + } + + /** + * Create a {@link IPageModel} for the specified {@link Page}. + * @param page + * @return + */ + static public IPageModel createPageModel( Page page ) { + return new MessagePartModel( page.getName(), page.getName() ); + } + + /** + * + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.common.ISashWindowsContentProviderFacade#movePage(java.lang.String, int, int) + * + * @param folderName + * @param oldIndex + * @param newIndex + * @throws NotFoundException + */ + public void movePage(String folderName, int oldIndex, int newIndex) throws NotFoundException { + // Get the folder + ITabFolderModel folderModel = getITabFolderModel( folderName ); + + contentProvider.movePage(folderModel, oldIndex, newIndex); + } + + public void movePage(String srcFolderName, int sourceIndex, String targetFolderName, int targetIndex) throws NotFoundException { + // Get the folders + ITabFolderModel srcFolderModel = getITabFolderModel( srcFolderName ); + ITabFolderModel targetFolderModel = getITabFolderModel( targetFolderName ); + + contentProvider.movePage(srcFolderModel, sourceIndex, targetFolderModel, targetIndex); + } + + public void removePage(String pageName) throws NotFoundException { + IPageModel pageModel = getIPageModel(pageName); + + contentProvider.removePage(pageModel); + + } + + public void removePage(String folderName, int tabIndex) throws NotFoundException { + // Get the folder + ITabFolderModel folderModel = getITabFolderModel( folderName ); + + contentProvider.removePage(folderModel, tabIndex); + // TODO remove page name from context + } + + public void createFolder(String tabFolderName, int tabIndex, String targetFolderName, int side) throws PagesModelException { + // Get the folders + ITabFolderModel srcFolderModel = getITabFolderModel( tabFolderName ); + TabFolderModel targetFolderModel = getITabFolderModel( targetFolderName ); + + contentProvider.createFolder(srcFolderModel, tabIndex, targetFolderModel, side); + + } + + /** + * Add an element in namesMapping. Throw an exception if the name already exist or if the name is not correct. + * + * @param name + * @param element + * @throws BadNameException + */ + protected void putNameMapping( String name, Object element) throws BadNameException { + + if( name == null || name.length() == 0 ) { + throw new BadNameException("Name '" + name + "' is not valid."); + } + + if(namesMapping.containsKey(name)) { + throw new BadNameException("Name '" + name + "' already exist in the context. Can't add it (but element is created)."); + } + + } + /** + * Get the {@link ITabFolderModel} associated to the name. + * In this implementation, this is the internal folder. + * @param folderName + * @return + * @throws NotFoundException + */ + public TabFolderModel getITabFolderModel(String folderName) throws NotFoundException { + + + Object res = namesMapping.get(folderName); + if(res == null) + throw new NotFoundException("Folder named '" + folderName + "' not found in the context of the expression."); + + if( ! (res instanceof TabFolderModel) ) + throw new NotFoundException("An element named '" + folderName + "' is found but it is not of the expected type (ITabFolderModel). " ); + + return (TabFolderModel)res; + } + + /** + * Get the {@link IPageModel} associated to the name. + * In this implementation, this is the internal element. + * @param pageName + * @return + * @throws NotFoundException + */ + public IPageModel getIPageModel(String pageName) throws NotFoundException { + + + Object res = namesMapping.get(pageName); + if(res == null) + throw new NotFoundException("Page named '" + pageName + "' not found in the context of the expression."); + + if( ! (res instanceof IPageModel) ) + throw new NotFoundException("An element named '" + pageName + "' is found but it is not of the expected type (IPageModel). " ); + + return (IPageModel)res; + } + + /** + * Return the associated maps of (names, internal representation). + * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade#getNamesToInternalMap() + * + * @return + */ + public Map<String, Object> getNamesToInternalMap() { + return namesMapping; + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContainerTestFacadeCommonTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContainerTestFacadeCommonTest.java index fe1c269c852..9a7db834273 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContainerTestFacadeCommonTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContainerTestFacadeCommonTest.java @@ -1,44 +1,44 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.AbstractSashWindowContentProviderFacadeTest;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade;
-
-
-/**
- * @author dumoulin
- *
- */
-public class SimpleSashWindowContainerTestFacadeCommonTest extends AbstractSashWindowContentProviderFacadeTest {
-
- /**
- * Constructor.
- *
- */
- public SimpleSashWindowContainerTestFacadeCommonTest() {
- super();
- }
-
- /**
- * Return the concrete implementation under test.
- * @return
- */
- @Override
- public ISashWindowsContentProviderFacade createISashWindowsContentProviderFacade() {
- return new SimpleSashWindowContainerTestFacade();
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.AbstractSashWindowContentProviderFacadeTest; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade; + + +/** + * @author dumoulin + * + */ +public class SimpleSashWindowContainerTestFacadeCommonTest extends AbstractSashWindowContentProviderFacadeTest { + + /** + * Constructor. + * + */ + public SimpleSashWindowContainerTestFacadeCommonTest() { + super(); + } + + /** + * Return the concrete implementation under test. + * @return + */ + @Override + public ISashWindowsContentProviderFacade createISashWindowsContentProviderFacade() { + return new SimpleSashWindowContainerTestFacade(); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContainerTestFacadeTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContainerTestFacadeTest.java index 255bdef7a26..6c730d71e54 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContainerTestFacadeTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContainerTestFacadeTest.java @@ -1,91 +1,91 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import static org.junit.Assert.*;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * @author dumoulin
- *
- */
-public class SimpleSashWindowContainerTestFacadeTest {
-
- /**
- * @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.core.sasheditor.contentprovider.simple.SimpleSashWindowContainerTestFacade#SimpleSashWindowContainerTestFacade()}.
- */
- @Test
- public void testSimpleSashWindowContainerTestFacade() {
- SimpleSashWindowContainerTestFacade facade = new SimpleSashWindowContainerTestFacade();
-
- assertNotNull("Facade created", facade);
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContainerTestFacade#getSashContainer()}.
- */
- @Test
- public void testGetSashContainer() {
- SimpleSashWindowContainerTestFacade facade = new SimpleSashWindowContainerTestFacade();
-
- assertNotNull("Facade created", facade);
- assertNotNull("container created", facade.getISashWindowsContainer() );
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContainerTestFacade#getIContentProvider()}.
- */
- @Test
- public void testGetIContentProvider() {
- SimpleSashWindowContainerTestFacade facade = new SimpleSashWindowContainerTestFacade();
-
- assertNotNull("Facade created", facade);
- assertNotNull("contentProvider created", facade.getIContentProvider() );
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContainerTestFacade#dispose()}.
- */
- @Test
- public void testDispose() {
- SimpleSashWindowContainerTestFacade facade = new SimpleSashWindowContainerTestFacade();
-
- assertNotNull("Facade created", facade);
-
- facade.dispose();
- assertNull("contentProvider deleted", facade.getIContentProvider() );
- assertNull("container deleted", facade.getISashWindowsContainer() );
-
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + + +/** + * @author dumoulin + * + */ +public class SimpleSashWindowContainerTestFacadeTest { + + /** + * @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.core.sasheditor.contentprovider.simple.SimpleSashWindowContainerTestFacade#SimpleSashWindowContainerTestFacade()}. + */ + @Test + public void testSimpleSashWindowContainerTestFacade() { + SimpleSashWindowContainerTestFacade facade = new SimpleSashWindowContainerTestFacade(); + + assertNotNull("Facade created", facade); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContainerTestFacade#getSashContainer()}. + */ + @Test + public void testGetSashContainer() { + SimpleSashWindowContainerTestFacade facade = new SimpleSashWindowContainerTestFacade(); + + assertNotNull("Facade created", facade); + assertNotNull("container created", facade.getISashWindowsContainer() ); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContainerTestFacade#getIContentProvider()}. + */ + @Test + public void testGetIContentProvider() { + SimpleSashWindowContainerTestFacade facade = new SimpleSashWindowContainerTestFacade(); + + assertNotNull("Facade created", facade); + assertNotNull("contentProvider created", facade.getIContentProvider() ); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContainerTestFacade#dispose()}. + */ + @Test + public void testDispose() { + SimpleSashWindowContainerTestFacade facade = new SimpleSashWindowContainerTestFacade(); + + assertNotNull("Facade created", facade); + + facade.dispose(); + assertNull("contentProvider deleted", facade.getIContentProvider() ); + assertNull("container deleted", facade.getISashWindowsContainer() ); + + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderFacade.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderFacade.java index bfc1716e58d..71442b938a0 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderFacade.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderFacade.java @@ -1,368 +1,368 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.MessagePartModel;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.BadNameException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NotFoundException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PanelTerm;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade;
-
-/**
- * Class providing a facade to test the {@link SimpleSashWindowsContentProvider} class.
- * <br>
- * This facade own a {@link SimpleSashWindowsContentProvider} and provide methods to manipulate it with
- * the help of names. Each element in the {@link SimpleSashWindowsContentProvider} can be identified
- * by a name (String). Then, the facade provide methods similar to {@link ISashWindowsContentProvider}, but using
- * names rather than {@link IAbstractPanelModel} and {@link ITabFolderModel}.
- * <br>
- * The facade maintains a mapping between the names and the {@link ISashWindowsContentProvider} models.
- *
- * @author cedric dumoulin
- *
- */
-public class SimpleSashWindowContentProviderFacade implements ISashWindowsContentProviderFacade {
-
- /**
- * The internal content provider this facade is for.
- */
- protected SimpleSashWindowsContentProvider contentProvider;
-
- /**
- * Mapping between names provided in the expressions and internal implementations of the {@link SimpleSashWindowsContentProvider}.
- * This mapping is maintained when elements are added or removed.
- *
- */
- protected Map<String, Object> namesMapping;
-
- /**
- * Constructor.
- * Create a default internal {@link SimpleSashWindowsContentProvider};
- * @param modelMngr
- */
- public SimpleSashWindowContentProviderFacade() {
- this.contentProvider = new SimpleSashWindowsContentProvider();
- }
-
- /**
- * Constructor.
- *
- * @param modelMngr
- */
- public SimpleSashWindowContentProviderFacade(SimpleSashWindowsContentProvider contentProvider) {
- this.contentProvider = contentProvider;
- }
-
- /**
- * @return the contentProvider
- */
- public ISashWindowsContentProvider getIContentProvider() {
- return contentProvider;
- }
-
-
- /**
- * Reset the namesMapping context accordingly to the provided expr.
- * A side effect is that the internal structure is checked against the expr.
- * <br>
- * Reseting the names context allows to remove or add names to the context.
- * It is used to add names of newly created elements (created with addPage() or createFolder() )
-
- * @param expr
- * @throws PagesModelException
- */
- public void resetNamesContext(IModelExp expr) throws PagesModelException {
- namesMapping = queryModel(expr);
- }
-
- /**
- * Check if the internal {@link ISashWindowsContentProvider} is conformed to the specified expression.
- * @param expr
- * @throws QueryException
- */
- public void assertConform(IModelExp expr) throws PagesModelException {
-
- Object first;
- if( expr instanceof WindowTerm) {
- first = getFirstWindowModel();
- }
- else if( expr instanceof PanelTerm) {
- first = getFirstPanelModel();
- }
- else {
- throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + expr.toString() + ")");
- }
-
- CheckVisitor visitor = new CheckVisitor();
- expr.accept(visitor, first);
- }
-
- /**
- * Create an internal model conform to the specified expression.
- * Any previous model is disguarded.
- *
- * This method should only be called once on a {@link SimpleSashWindowsContentProvider}.
- * <br>
- * If an expr term have a name, this name is kept in the facade and can be used later in methods like move, delete, ...
- *
- * @param expr Expression denoting the configuration to create. Must be one of (Folder, HSash, VSash)
- * @throws QueryException
- *
- * TODO Ensure that the method can only be called once. For example,
- * let this class extends {@link SimpleSashWindowsContentProvider}, and the constructor
- * call this method.
- */
- public void createModel(IModelExp expr) throws PagesModelException {
-
- Object first ;
- if( expr instanceof PanelTerm) {
- first = getFirstWindowModel();
- }
- else {
- throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + expr.toString() + ")");
- }
-
- // Create a surrounding WindowTerm
- WindowTerm windowTerm = new WindowTerm((PanelTerm)expr);
-
- CreateModelInSimpleContentProviderVisitor visitor = new CreateModelInSimpleContentProviderVisitor(contentProvider);
- windowTerm.accept(visitor, first);
-
- // Fill mapping
- namesMapping = queryModel(expr);
- }
-
- /**
- * Get element in the model.
- * Each model element whose corresponding model query part as a name is added to the result map.
- * The element is then accessible with the name set in the query part.
- *
- * @param query
- * @return
- * @throws QueryException
- */
- public Map<String, Object> queryModel(IModelExp query) throws PagesModelException {
-
- Object first;
- if( query instanceof WindowTerm) {
- first = getFirstWindowModel();
- }
- else if( query instanceof PanelTerm) {
- first = getFirstPanelModel();
- }
- else {
- throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")");
- }
-
- QueryVisitor visitor = new QueryVisitor();
- query.accept(visitor, first);
-
- return visitor.getResult();
- }
-
- /**
- * Get the model of the first the first window (in actual implementation their is only one window).
- * @return
- */
- private RootModel getFirstWindowModel() {
- // Silly method to get the RootModel
- return (RootModel)((AbstractPanelModel)contentProvider.getRootModel()).getParent();
- }
-
- /**
- * Get the panel of the first window (in actual implementation their is only one window).
- * @return
- */
- private AbstractPanelModel getFirstPanelModel() {
- // In this implementation, the root is always of type AbstractPanelModel
- return (AbstractPanelModel)contentProvider.getRootModel();
- }
-
- /**
- * Add a page to the model
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.common.ISashWindowsContentProviderFacade#addPage(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page, java.lang.String, int)
- *
- * @param page
- * @param folderName
- * @param index
- * @throws PagesModelException
- */
- public void /*IPageModel*/ addPage(Page page, String folderName, int index) throws PagesModelException {
- // Get the folder
- TabFolderModel folderModel = getITabFolderModel( folderName );
-
- IPageModel pageModel = createPageModel(page);
-
- contentProvider.addPage(folderModel, index, pageModel);
-
-// return pageModel;
- }
-
- /**
- * Add a page to the model
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.common.ISashWindowsContentProviderFacade#addPage(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page, java.lang.String, int)
- *
- * @param page
- * @param folderName
- * @throws PagesModelException
- */
- public void /*IPageModel*/ addPage(Page page, String folderName) throws PagesModelException {
- // Get the folder
- TabFolderModel folderModel = getITabFolderModel( folderName );
-
- IPageModel pageModel = createPageModel(page);
-
- contentProvider.addPage(folderModel, pageModel);
-
-// return pageModel;
- }
-
- /**
- * Create a {@link IPageModel} for the specified {@link Page}.
- * @param page
- * @return
- */
- static public IPageModel createPageModel( Page page ) {
- return new MessagePartModel( page.getName(), page.getName() );
- }
-
- /**
- *
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.common.ISashWindowsContentProviderFacade#movePage(java.lang.String, int, int)
- *
- * @param folderName
- * @param oldIndex
- * @param newIndex
- * @throws NotFoundException
- */
- public void movePage(String folderName, int oldIndex, int newIndex) throws NotFoundException {
- // Get the folder
- ITabFolderModel folderModel = getITabFolderModel( folderName );
-
- contentProvider.movePage(folderModel, oldIndex, newIndex);
- }
-
- public void movePage(String srcFolderName, int sourceIndex, String targetFolderName, int targetIndex) throws NotFoundException {
- // Get the folders
- ITabFolderModel srcFolderModel = getITabFolderModel( srcFolderName );
- ITabFolderModel targetFolderModel = getITabFolderModel( targetFolderName );
-
- contentProvider.movePage(srcFolderModel, sourceIndex, targetFolderModel, targetIndex);
- }
-
- public void removePage(String pageName) throws NotFoundException {
- IPageModel pageModel = getIPageModel(pageName);
-
- contentProvider.removePage(pageModel);
-
- }
-
- public void removePage(String folderName, int tabIndex) throws NotFoundException {
- // Get the folder
- ITabFolderModel folderModel = getITabFolderModel( folderName );
-
- contentProvider.removePage(folderModel, tabIndex);
- // TODO remove page name from context
- }
-
- public void createFolder(String tabFolderName, int tabIndex, String targetFolderName, int side) throws PagesModelException {
- // Get the folders
- ITabFolderModel srcFolderModel = getITabFolderModel( tabFolderName );
- TabFolderModel targetFolderModel = getITabFolderModel( targetFolderName );
-
- contentProvider.createFolder(srcFolderModel, tabIndex, targetFolderModel, side);
-
- }
-
- /**
- * Add an element in namesMapping. Throw an exception if the name already exist or if the name is not correct.
- *
- * @param name
- * @param element
- * @throws BadNameException
- */
- protected void putNameMapping( String name, Object element) throws BadNameException {
-
- if( name == null || name.length() == 0 ) {
- throw new BadNameException("Name '" + name + "' is not valid.");
- }
-
- if(namesMapping.containsKey(name)) {
- throw new BadNameException("Name '" + name + "' already exist in the context. Can't add it (but element is created).");
- }
-
- }
- /**
- * Get the {@link ITabFolderModel} associated to the name.
- * In this implementation, this is the internal folder.
- * @param folderName
- * @return
- * @throws NotFoundException
- */
- public TabFolderModel getITabFolderModel(String folderName) throws NotFoundException {
-
-
- Object res = namesMapping.get(folderName);
- if(res == null)
- throw new NotFoundException("Folder named '" + folderName + "' not found in the context of the expression.");
-
- if( ! (res instanceof TabFolderModel) )
- throw new NotFoundException("An element named '" + folderName + "' is found but it is not of the expected type (ITabFolderModel). " );
-
- return (TabFolderModel)res;
- }
-
- /**
- * Get the {@link IPageModel} associated to the name.
- * In this implementation, this is the internal element.
- * @param pageName
- * @return
- * @throws NotFoundException
- */
- public IPageModel getIPageModel(String pageName) throws NotFoundException {
-
-
- Object res = namesMapping.get(pageName);
- if(res == null)
- throw new NotFoundException("Page named '" + pageName + "' not found in the context of the expression.");
-
- if( ! (res instanceof IPageModel) )
- throw new NotFoundException("An element named '" + pageName + "' is found but it is not of the expected type (IPageModel). " );
-
- return (IPageModel)res;
- }
-
- /**
- * Return the associated maps of (names, internal representation).
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade#getNamesToInternalMap()
- *
- * @return
- */
- public Map<String, Object> getNamesToInternalMap() {
- return namesMapping;
- }
-
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel; +import org.eclipse.papyrus.infra.core.sasheditor.editor.MessagePartModel; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.BadNameException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.NotFoundException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PanelTerm; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade; + +/** + * Class providing a facade to test the {@link SimpleSashWindowsContentProvider} class. + * <br> + * This facade own a {@link SimpleSashWindowsContentProvider} and provide methods to manipulate it with + * the help of names. Each element in the {@link SimpleSashWindowsContentProvider} can be identified + * by a name (String). Then, the facade provide methods similar to {@link ISashWindowsContentProvider}, but using + * names rather than {@link IAbstractPanelModel} and {@link ITabFolderModel}. + * <br> + * The facade maintains a mapping between the names and the {@link ISashWindowsContentProvider} models. + * + * @author cedric dumoulin + * + */ +public class SimpleSashWindowContentProviderFacade implements ISashWindowsContentProviderFacade { + + /** + * The internal content provider this facade is for. + */ + protected SimpleSashWindowsContentProvider contentProvider; + + /** + * Mapping between names provided in the expressions and internal implementations of the {@link SimpleSashWindowsContentProvider}. + * This mapping is maintained when elements are added or removed. + * + */ + protected Map<String, Object> namesMapping; + + /** + * Constructor. + * Create a default internal {@link SimpleSashWindowsContentProvider}; + * @param modelMngr + */ + public SimpleSashWindowContentProviderFacade() { + this.contentProvider = new SimpleSashWindowsContentProvider(); + } + + /** + * Constructor. + * + * @param modelMngr + */ + public SimpleSashWindowContentProviderFacade(SimpleSashWindowsContentProvider contentProvider) { + this.contentProvider = contentProvider; + } + + /** + * @return the contentProvider + */ + public ISashWindowsContentProvider getIContentProvider() { + return contentProvider; + } + + + /** + * Reset the namesMapping context accordingly to the provided expr. + * A side effect is that the internal structure is checked against the expr. + * <br> + * Reseting the names context allows to remove or add names to the context. + * It is used to add names of newly created elements (created with addPage() or createFolder() ) + + * @param expr + * @throws PagesModelException + */ + public void resetNamesContext(IModelExp expr) throws PagesModelException { + namesMapping = queryModel(expr); + } + + /** + * Check if the internal {@link ISashWindowsContentProvider} is conformed to the specified expression. + * @param expr + * @throws QueryException + */ + public void assertConform(IModelExp expr) throws PagesModelException { + + Object first; + if( expr instanceof WindowTerm) { + first = getFirstWindowModel(); + } + else if( expr instanceof PanelTerm) { + first = getFirstPanelModel(); + } + else { + throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + expr.toString() + ")"); + } + + CheckVisitor visitor = new CheckVisitor(); + expr.accept(visitor, first); + } + + /** + * Create an internal model conform to the specified expression. + * Any previous model is disguarded. + * + * This method should only be called once on a {@link SimpleSashWindowsContentProvider}. + * <br> + * If an expr term have a name, this name is kept in the facade and can be used later in methods like move, delete, ... + * + * @param expr Expression denoting the configuration to create. Must be one of (Folder, HSash, VSash) + * @throws QueryException + * + * TODO Ensure that the method can only be called once. For example, + * let this class extends {@link SimpleSashWindowsContentProvider}, and the constructor + * call this method. + */ + public void createModel(IModelExp expr) throws PagesModelException { + + Object first ; + if( expr instanceof PanelTerm) { + first = getFirstWindowModel(); + } + else { + throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + expr.toString() + ")"); + } + + // Create a surrounding WindowTerm + WindowTerm windowTerm = new WindowTerm((PanelTerm)expr); + + CreateModelInSimpleContentProviderVisitor visitor = new CreateModelInSimpleContentProviderVisitor(contentProvider); + windowTerm.accept(visitor, first); + + // Fill mapping + namesMapping = queryModel(expr); + } + + /** + * Get element in the model. + * Each model element whose corresponding model query part as a name is added to the result map. + * The element is then accessible with the name set in the query part. + * + * @param query + * @return + * @throws QueryException + */ + public Map<String, Object> queryModel(IModelExp query) throws PagesModelException { + + Object first; + if( query instanceof WindowTerm) { + first = getFirstWindowModel(); + } + else if( query instanceof PanelTerm) { + first = getFirstPanelModel(); + } + else { + throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")"); + } + + QueryVisitor visitor = new QueryVisitor(); + query.accept(visitor, first); + + return visitor.getResult(); + } + + /** + * Get the model of the first the first window (in actual implementation their is only one window). + * @return + */ + private RootModel getFirstWindowModel() { + // Silly method to get the RootModel + return (RootModel)((AbstractPanelModel)contentProvider.getRootModel()).getParent(); + } + + /** + * Get the panel of the first window (in actual implementation their is only one window). + * @return + */ + private AbstractPanelModel getFirstPanelModel() { + // In this implementation, the root is always of type AbstractPanelModel + return (AbstractPanelModel)contentProvider.getRootModel(); + } + + /** + * Add a page to the model + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.common.ISashWindowsContentProviderFacade#addPage(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page, java.lang.String, int) + * + * @param page + * @param folderName + * @param index + * @throws PagesModelException + */ + public void /*IPageModel*/ addPage(Page page, String folderName, int index) throws PagesModelException { + // Get the folder + TabFolderModel folderModel = getITabFolderModel( folderName ); + + IPageModel pageModel = createPageModel(page); + + contentProvider.addPage(folderModel, index, pageModel); + +// return pageModel; + } + + /** + * Add a page to the model + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.common.ISashWindowsContentProviderFacade#addPage(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.Page, java.lang.String, int) + * + * @param page + * @param folderName + * @throws PagesModelException + */ + public void /*IPageModel*/ addPage(Page page, String folderName) throws PagesModelException { + // Get the folder + TabFolderModel folderModel = getITabFolderModel( folderName ); + + IPageModel pageModel = createPageModel(page); + + contentProvider.addPage(folderModel, pageModel); + +// return pageModel; + } + + /** + * Create a {@link IPageModel} for the specified {@link Page}. + * @param page + * @return + */ + static public IPageModel createPageModel( Page page ) { + return new MessagePartModel( page.getName(), page.getName() ); + } + + /** + * + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.common.ISashWindowsContentProviderFacade#movePage(java.lang.String, int, int) + * + * @param folderName + * @param oldIndex + * @param newIndex + * @throws NotFoundException + */ + public void movePage(String folderName, int oldIndex, int newIndex) throws NotFoundException { + // Get the folder + ITabFolderModel folderModel = getITabFolderModel( folderName ); + + contentProvider.movePage(folderModel, oldIndex, newIndex); + } + + public void movePage(String srcFolderName, int sourceIndex, String targetFolderName, int targetIndex) throws NotFoundException { + // Get the folders + ITabFolderModel srcFolderModel = getITabFolderModel( srcFolderName ); + ITabFolderModel targetFolderModel = getITabFolderModel( targetFolderName ); + + contentProvider.movePage(srcFolderModel, sourceIndex, targetFolderModel, targetIndex); + } + + public void removePage(String pageName) throws NotFoundException { + IPageModel pageModel = getIPageModel(pageName); + + contentProvider.removePage(pageModel); + + } + + public void removePage(String folderName, int tabIndex) throws NotFoundException { + // Get the folder + ITabFolderModel folderModel = getITabFolderModel( folderName ); + + contentProvider.removePage(folderModel, tabIndex); + // TODO remove page name from context + } + + public void createFolder(String tabFolderName, int tabIndex, String targetFolderName, int side) throws PagesModelException { + // Get the folders + ITabFolderModel srcFolderModel = getITabFolderModel( tabFolderName ); + TabFolderModel targetFolderModel = getITabFolderModel( targetFolderName ); + + contentProvider.createFolder(srcFolderModel, tabIndex, targetFolderModel, side); + + } + + /** + * Add an element in namesMapping. Throw an exception if the name already exist or if the name is not correct. + * + * @param name + * @param element + * @throws BadNameException + */ + protected void putNameMapping( String name, Object element) throws BadNameException { + + if( name == null || name.length() == 0 ) { + throw new BadNameException("Name '" + name + "' is not valid."); + } + + if(namesMapping.containsKey(name)) { + throw new BadNameException("Name '" + name + "' already exist in the context. Can't add it (but element is created)."); + } + + } + /** + * Get the {@link ITabFolderModel} associated to the name. + * In this implementation, this is the internal folder. + * @param folderName + * @return + * @throws NotFoundException + */ + public TabFolderModel getITabFolderModel(String folderName) throws NotFoundException { + + + Object res = namesMapping.get(folderName); + if(res == null) + throw new NotFoundException("Folder named '" + folderName + "' not found in the context of the expression."); + + if( ! (res instanceof TabFolderModel) ) + throw new NotFoundException("An element named '" + folderName + "' is found but it is not of the expected type (ITabFolderModel). " ); + + return (TabFolderModel)res; + } + + /** + * Get the {@link IPageModel} associated to the name. + * In this implementation, this is the internal element. + * @param pageName + * @return + * @throws NotFoundException + */ + public IPageModel getIPageModel(String pageName) throws NotFoundException { + + + Object res = namesMapping.get(pageName); + if(res == null) + throw new NotFoundException("Page named '" + pageName + "' not found in the context of the expression."); + + if( ! (res instanceof IPageModel) ) + throw new NotFoundException("An element named '" + pageName + "' is found but it is not of the expected type (IPageModel). " ); + + return (IPageModel)res; + } + + /** + * Return the associated maps of (names, internal representation). + * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade#getNamesToInternalMap() + * + * @return + */ + public Map<String, Object> getNamesToInternalMap() { + return namesMapping; + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderFacadeTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderFacadeTest.java index f633f705aa4..f69e3c1d34f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderFacadeTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderFacadeTest.java @@ -1,151 +1,151 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.folder;
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.page;
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.vSash;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-import org.eclipse.swt.SWT;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * @author dumoulin
- *
- */
-public class SimpleSashWindowContentProviderFacadeTest {
-
- /**
- * @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.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#assertConform(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}.
- * @throws PagesModelException
- */
- @Test
- public void testAssertConform() throws PagesModelException {
- SimpleSashWindowContentProviderFacade helper = new SimpleSashWindowContentProviderFacade();
-
- assertNotNull("helper created", helper);
- // Create a query
- IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2")));
- // Try to create the model
- helper.createModel(expr);
-
- // Try to check model
- helper.assertConform(expr);
-
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#createModel(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}.
- * @throws PagesModelException
- */
- @Test
- public void testCreateModel() throws PagesModelException {
- SimpleSashWindowContentProviderFacade helper = new SimpleSashWindowContentProviderFacade();
-
- assertNotNull("helper created", helper);
- // Create a query
- IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2")));
- // Try to create the model
- helper.createModel(expr);
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#queryModel(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}.
- * @throws PagesModelException
- */
- @Test
- public void testQueryModel() throws PagesModelException {
- SimpleSashWindowContentProviderFacade helper = new SimpleSashWindowContentProviderFacade();
-
- assertNotNull("helper created", helper);
- // Create a query
- IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2")));
- // Try to create the model
- helper.createModel(expr);
-
- // Query model
- Map<String, Object> res = helper.queryModel(expr);
- assertNotNull("found f1", res.get("f1"));
- assertTrue("right type", res.get("f1") instanceof TabFolderModel );
-
- assertNotNull("found f2", res.get("f2"));
- assertTrue("right type", res.get("f2") instanceof TabFolderModel );
-
- assertNotNull("found p2", res.get("p2"));
- assertTrue("right type", res.get("p2") instanceof IPageModel );
- }
-
- /**
- * Test folder creation.
- * Use the pagemodels utilities {@link SimpleSashWindowContentProviderUtils}.
- * @throws PagesModelException
- */
- @Test
- public void testCreateFolder() throws PagesModelException {
-
-
- SimpleSashWindowContentProviderFacade helper = new SimpleSashWindowContentProviderFacade();
-
- assertNotNull("helper created", helper);
- // Create a query
-// IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2")));
- IModelExp expr = folder( "f1", page("p1"), page("p2"), page("p3"), page("p4"),
- page("p5"), page("p6"), page("p7"), page("p8"));
- // Try to create the model
- helper.createModel(expr);
-
- // Create another folder
- helper.createFolder("f1", 0, "f1", SWT.UP);
- // Check the content configuration
- IModelExp conf1Expr = vSash(
- folder( "f2", page("p1") ),
- folder( "f1", page("p2"), page("p3"), page("p4"),
- page("p5"), page("p6"), page("p7"), page("p8") )
- );
- // Check if conform
- helper.assertConform(conf1Expr);
-
- // Check resetContext
- helper.resetNamesContext(conf1Expr);
-
- assertNotNull("new name found", helper.getITabFolderModel("f2"));
- }
-
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.folder; +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.page; +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.vSash; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; +import org.eclipse.swt.SWT; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + + +/** + * @author dumoulin + * + */ +public class SimpleSashWindowContentProviderFacadeTest { + + /** + * @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.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#assertConform(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}. + * @throws PagesModelException + */ + @Test + public void testAssertConform() throws PagesModelException { + SimpleSashWindowContentProviderFacade helper = new SimpleSashWindowContentProviderFacade(); + + assertNotNull("helper created", helper); + // Create a query + IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2"))); + // Try to create the model + helper.createModel(expr); + + // Try to check model + helper.assertConform(expr); + + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#createModel(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}. + * @throws PagesModelException + */ + @Test + public void testCreateModel() throws PagesModelException { + SimpleSashWindowContentProviderFacade helper = new SimpleSashWindowContentProviderFacade(); + + assertNotNull("helper created", helper); + // Create a query + IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2"))); + // Try to create the model + helper.createModel(expr); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#queryModel(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}. + * @throws PagesModelException + */ + @Test + public void testQueryModel() throws PagesModelException { + SimpleSashWindowContentProviderFacade helper = new SimpleSashWindowContentProviderFacade(); + + assertNotNull("helper created", helper); + // Create a query + IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2"))); + // Try to create the model + helper.createModel(expr); + + // Query model + Map<String, Object> res = helper.queryModel(expr); + assertNotNull("found f1", res.get("f1")); + assertTrue("right type", res.get("f1") instanceof TabFolderModel ); + + assertNotNull("found f2", res.get("f2")); + assertTrue("right type", res.get("f2") instanceof TabFolderModel ); + + assertNotNull("found p2", res.get("p2")); + assertTrue("right type", res.get("p2") instanceof IPageModel ); + } + + /** + * Test folder creation. + * Use the pagemodels utilities {@link SimpleSashWindowContentProviderUtils}. + * @throws PagesModelException + */ + @Test + public void testCreateFolder() throws PagesModelException { + + + SimpleSashWindowContentProviderFacade helper = new SimpleSashWindowContentProviderFacade(); + + assertNotNull("helper created", helper); + // Create a query +// IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2"))); + IModelExp expr = folder( "f1", page("p1"), page("p2"), page("p3"), page("p4"), + page("p5"), page("p6"), page("p7"), page("p8")); + // Try to create the model + helper.createModel(expr); + + // Create another folder + helper.createFolder("f1", 0, "f1", SWT.UP); + // Check the content configuration + IModelExp conf1Expr = vSash( + folder( "f2", page("p1") ), + folder( "f1", page("p2"), page("p3"), page("p4"), + page("p5"), page("p6"), page("p7"), page("p8") ) + ); + // Check if conform + helper.assertConform(conf1Expr); + + // Check resetContext + helper.resetNamesContext(conf1Expr); + + assertNotNull("new name found", helper.getITabFolderModel("f2")); + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderFacadeTest2.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderFacadeTest2.java index a27b626cd94..2e1e64ea1a3 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderFacadeTest2.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderFacadeTest2.java @@ -1,44 +1,44 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.AbstractSashWindowContentProviderFacadeTest;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade;
-
-
-/**
- * @author dumoulin
- *
- */
-public class SimpleSashWindowContentProviderFacadeTest2 extends AbstractSashWindowContentProviderFacadeTest {
-
- /**
- * Constructor.
- *
- */
- public SimpleSashWindowContentProviderFacadeTest2() {
- super();
- }
-
- /**
- * Return the concrete implementation under test.
- * @return
- */
- @Override
- public ISashWindowsContentProviderFacade createISashWindowsContentProviderFacade() {
- return new SimpleSashWindowContentProviderFacade();
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.AbstractSashWindowContentProviderFacadeTest; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProviderFacade; + + +/** + * @author dumoulin + * + */ +public class SimpleSashWindowContentProviderFacadeTest2 extends AbstractSashWindowContentProviderFacadeTest { + + /** + * Constructor. + * + */ + public SimpleSashWindowContentProviderFacadeTest2() { + super(); + } + + /** + * Return the concrete implementation under test. + * @return + */ + @Override + public ISashWindowsContentProviderFacade createISashWindowsContentProviderFacade() { + return new SimpleSashWindowContentProviderFacade(); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderUtils.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderUtils.java index 57e3a539b50..ad9c9982db0 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderUtils.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderUtils.java @@ -1,168 +1,168 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PanelTerm;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.ISashWindowsContentProviderTestUtils;
-
-/**
- * Class providing some utilities to check the {@link SimpleSashWindowsContentProvider} class.
- * <br>
- * This utilities allow to: populate a contentProvider, compare the contentProvider structure
- * query the contentProvider structure.
- *
- * @author cedric dumoulin
- *
- */
-public class SimpleSashWindowContentProviderUtils implements ISashWindowsContentProviderTestUtils {
-
- /**
- * ContentProvider used .
- */
- protected SimpleSashWindowsContentProvider contentProvider;
-
- /**
- * Constructor.
- * Create a default internal {@link SimpleSashWindowsContentProvider};
- * @param modelMngr
- */
- public SimpleSashWindowContentProviderUtils() {
- this.contentProvider = new SimpleSashWindowsContentProvider();
- }
-
- /**
- * Constructor.
- *
- * @param modelMngr
- */
- public SimpleSashWindowContentProviderUtils(SimpleSashWindowsContentProvider contentProvider) {
- this.contentProvider = contentProvider;
- }
-
-
-
- /**
- * @return the contentProvider
- */
- public ISashWindowsContentProvider getIContentProvider() {
- return contentProvider;
- }
-
-
- /**
- * Check if the sashModel is conformed to the specified query.
- * @param query
- * @throws QueryException
- */
- public void assertConform(IModelExp query) throws PagesModelException {
-
- Object first;
- if( query instanceof WindowTerm) {
- first = getFirstWindowModel();
- }
- else if( query instanceof PanelTerm) {
- first = getFirstPanelModel();
- }
- else {
- throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")");
- }
-
- CheckVisitor visitor = new CheckVisitor();
- query.accept(visitor, first);
- }
-
- /**
- * Create an internal model conform to the specified query.
- * Any previous model is disguarded.
- *
- * This method should only be called once on a {@link SimpleSashWindowsContentProvider}.
- *
- * @param query Should be a subtype PanelTerm (Folder, HSash, VSash)
- * @throws QueryException
- *
- * TODO Ensure that the method can only be called once. For example,
- * let this class extends {@link SimpleSashWindowsContentProvider}, and the constructor
- * call this method.
- */
- public void createModel(IModelExp query) throws PagesModelException {
-
- Object first ;
- if( query instanceof PanelTerm) {
- first = getFirstWindowModel();
- }
- else {
- throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")");
- }
-
- // Create a surrounding WindowTerm
- WindowTerm windowTerm = new WindowTerm((PanelTerm)query);
-
- CreateModelInSimpleContentProviderVisitor visitor = new CreateModelInSimpleContentProviderVisitor(contentProvider);
- windowTerm.accept(visitor, first);
- }
-
- /**
- * Get element in the model.
- * Each model element whose corresponding model query part as a name is added to the result map.
- * The element is then accessible with the name set in the query part.
- *
- * @param query
- * @return
- * @throws QueryException
- */
- public Map<String, Object> queryModel(IModelExp query) throws PagesModelException {
-
- Object first;
- if( query instanceof WindowTerm) {
- first = getFirstWindowModel();
- }
- else if( query instanceof PanelTerm) {
- first = getFirstPanelModel();
- }
- else {
- throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")");
- }
-
- QueryVisitor visitor = new QueryVisitor();
- query.accept(visitor, first);
-
- return visitor.getResult();
- }
-
- /**
- * Get the model of the first the first window (in actual implementation their is only one window).
- * @return
- */
- private RootModel getFirstWindowModel() {
- // Silly method to get the RootModel
- return (RootModel)((AbstractPanelModel)contentProvider.getRootModel()).getParent();
- }
-
- /**
- * Get the panel of the first window (in actual implementation their is only one window).
- * @return
- */
- private AbstractPanelModel getFirstPanelModel() {
- // In this implementation, the root is always of type AbstractPanelModel
- return (AbstractPanelModel)contentProvider.getRootModel();
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PanelTerm; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.WindowTerm; +import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.ISashWindowsContentProviderTestUtils; + +/** + * Class providing some utilities to check the {@link SimpleSashWindowsContentProvider} class. + * <br> + * This utilities allow to: populate a contentProvider, compare the contentProvider structure + * query the contentProvider structure. + * + * @author cedric dumoulin + * + */ +public class SimpleSashWindowContentProviderUtils implements ISashWindowsContentProviderTestUtils { + + /** + * ContentProvider used . + */ + protected SimpleSashWindowsContentProvider contentProvider; + + /** + * Constructor. + * Create a default internal {@link SimpleSashWindowsContentProvider}; + * @param modelMngr + */ + public SimpleSashWindowContentProviderUtils() { + this.contentProvider = new SimpleSashWindowsContentProvider(); + } + + /** + * Constructor. + * + * @param modelMngr + */ + public SimpleSashWindowContentProviderUtils(SimpleSashWindowsContentProvider contentProvider) { + this.contentProvider = contentProvider; + } + + + + /** + * @return the contentProvider + */ + public ISashWindowsContentProvider getIContentProvider() { + return contentProvider; + } + + + /** + * Check if the sashModel is conformed to the specified query. + * @param query + * @throws QueryException + */ + public void assertConform(IModelExp query) throws PagesModelException { + + Object first; + if( query instanceof WindowTerm) { + first = getFirstWindowModel(); + } + else if( query instanceof PanelTerm) { + first = getFirstPanelModel(); + } + else { + throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")"); + } + + CheckVisitor visitor = new CheckVisitor(); + query.accept(visitor, first); + } + + /** + * Create an internal model conform to the specified query. + * Any previous model is disguarded. + * + * This method should only be called once on a {@link SimpleSashWindowsContentProvider}. + * + * @param query Should be a subtype PanelTerm (Folder, HSash, VSash) + * @throws QueryException + * + * TODO Ensure that the method can only be called once. For example, + * let this class extends {@link SimpleSashWindowsContentProvider}, and the constructor + * call this method. + */ + public void createModel(IModelExp query) throws PagesModelException { + + Object first ; + if( query instanceof PanelTerm) { + first = getFirstWindowModel(); + } + else { + throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")"); + } + + // Create a surrounding WindowTerm + WindowTerm windowTerm = new WindowTerm((PanelTerm)query); + + CreateModelInSimpleContentProviderVisitor visitor = new CreateModelInSimpleContentProviderVisitor(contentProvider); + windowTerm.accept(visitor, first); + } + + /** + * Get element in the model. + * Each model element whose corresponding model query part as a name is added to the result map. + * The element is then accessible with the name set in the query part. + * + * @param query + * @return + * @throws QueryException + */ + public Map<String, Object> queryModel(IModelExp query) throws PagesModelException { + + Object first; + if( query instanceof WindowTerm) { + first = getFirstWindowModel(); + } + else if( query instanceof PanelTerm) { + first = getFirstPanelModel(); + } + else { + throw new PagesModelException("Don't know how to get the model associated to the first term of the expression (" + query.toString() + ")"); + } + + QueryVisitor visitor = new QueryVisitor(); + query.accept(visitor, first); + + return visitor.getResult(); + } + + /** + * Get the model of the first the first window (in actual implementation their is only one window). + * @return + */ + private RootModel getFirstWindowModel() { + // Silly method to get the RootModel + return (RootModel)((AbstractPanelModel)contentProvider.getRootModel()).getParent(); + } + + /** + * Get the panel of the first window (in actual implementation their is only one window). + * @return + */ + private AbstractPanelModel getFirstPanelModel() { + // In this implementation, the root is always of type AbstractPanelModel + return (AbstractPanelModel)contentProvider.getRootModel(); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderUtilsTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderUtilsTest.java index 2c3ee148e8d..d284b7c819c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderUtilsTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowContentProviderUtilsTest.java @@ -1,115 +1,115 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import static org.junit.Assert.*;
-
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.*;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * @author dumoulin
- *
- */
-public class SimpleSashWindowContentProviderUtilsTest {
-
- /**
- * @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.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#assertConform(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}.
- * @throws PagesModelException
- */
- @Test
- public void testAssertConform() throws PagesModelException {
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
- SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider);
-
- assertNotNull("helper created", helper);
- // Create a query
- IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2")));
- // Try to create the model
- helper.createModel(expr);
-
- // Try to check model
- helper.assertConform(expr);
-
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#createModel(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}.
- * @throws PagesModelException
- */
- @Test
- public void testCreateModel() throws PagesModelException {
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
- SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider);
-
- assertNotNull("helper created", helper);
- // Create a query
- IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2")));
- // Try to create the model
- helper.createModel(expr);
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#queryModel(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}.
- * @throws PagesModelException
- */
- @Test
- public void testQueryModel() throws PagesModelException {
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
- SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider);
-
- assertNotNull("helper created", helper);
- // Create a query
- IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2")));
- // Try to create the model
- helper.createModel(expr);
-
- // Query model
- Map<String, Object> res = helper.queryModel(expr);
- assertNotNull("found f1", res.get("f1"));
- assertTrue("right type", res.get("f1") instanceof TabFolderModel );
-
- assertNotNull("found f2", res.get("f2"));
- assertTrue("right type", res.get("f2") instanceof TabFolderModel );
-
- assertNotNull("found p2", res.get("p2"));
- assertTrue("right type", res.get("p2") instanceof IPageModel );
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import static org.junit.Assert.*; + +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; + +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + + +/** + * @author dumoulin + * + */ +public class SimpleSashWindowContentProviderUtilsTest { + + /** + * @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.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#assertConform(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}. + * @throws PagesModelException + */ + @Test + public void testAssertConform() throws PagesModelException { + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider); + + assertNotNull("helper created", helper); + // Create a query + IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2"))); + // Try to create the model + helper.createModel(expr); + + // Try to check model + helper.assertConform(expr); + + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#createModel(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}. + * @throws PagesModelException + */ + @Test + public void testCreateModel() throws PagesModelException { + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider); + + assertNotNull("helper created", helper); + // Create a query + IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2"))); + // Try to create the model + helper.createModel(expr); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils#queryModel(org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp)}. + * @throws PagesModelException + */ + @Test + public void testQueryModel() throws PagesModelException { + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider); + + assertNotNull("helper created", helper); + // Create a query + IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2"))); + // Try to create the model + helper.createModel(expr); + + // Query model + Map<String, Object> res = helper.queryModel(expr); + assertNotNull("found f1", res.get("f1")); + assertTrue("right type", res.get("f1") instanceof TabFolderModel ); + + assertNotNull("found f2", res.get("f2")); + assertTrue("right type", res.get("f2") instanceof TabFolderModel ); + + assertNotNull("found p2", res.get("p2")); + assertTrue("right type", res.get("p2") instanceof IPageModel ); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProviderTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProviderTest.java index 9c7e183c644..e4568089266 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProviderTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProviderTest.java @@ -1,326 +1,326 @@ -/*****************************************************************************
- * Copyright (c) 2009 CEA LIST & LIFL
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.folder;
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.hSash;
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.page;
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.vSash;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-import org.eclipse.swt.SWT;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * @author cedric dumoulin
- */
-public class SimpleSashWindowsContentProviderTest /* extends AbstractPapyrusTest */{
-
- protected SimpleSashWindowsContentProvider contentProvider;
-
- /**
- * Initialize the tree {@inheritDoc}
- */
- @Before
- public void setUp() throws Exception {
- createContentProvider();
- }
-
- /**
- * Create a tree
- */
- private void createContentProvider() {
- contentProvider = new SimpleSashWindowsContentProvider();
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#addPage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel)}
- * .
- */
- @Test
- public void testAddTabIPageModel() {
- IPageModel newModel = new FakePageModel();
- contentProvider.addPage(newModel);
-
- assertTrue("Folder contains added item", contentProvider.getCurrentTabFolder().getChildren().contains(newModel));
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, int)}
- * .
- */
- // public void testMoveTabITabFolderModelIntInt() {
- // fail("Not yet implemented");
- // }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)}
- * .
- */
- // public void testMoveTabITabFolderModelIntITabFolderModelInt() {
- // fail("Not yet implemented");
- // }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)}
- * .
- */
- @Test
- public void testCreateFolder() {
-
- // Create pages and add them to the default folder
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < 8; i++) {
- IPageModel newModel = new FakePageModel("model" + i);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
- ITabFolderModel folder = contentProvider.getCurrentTabFolder();
-
- // // Do move tab 0 to right
- // ITabFolderModel newFolder = contentProvider.createFolder(folder, 0, folder, SWT.RIGHT);
- // // Check creation
- // assertNotNull("Folder created", newFolder);
- // // Check if correctly attached and reachable
- // assertEquals("Tab 2 added in correct folder", folder, contentProvider.getParentFolder(newModel2));
- // assertEquals("Tab 1 added in correct folder", newFolder, contentProvider.getParentFolder(newModel1));
- //
- //// assertNotNull("folder attached", contentProvider.getParentFolder(newModel1));
- //// assertNotNull("folder attached", contentProvider.getParentFolder(newModel1));
- //
- // assertTrue("Folder contains added item", newFolder.getChildren().contains(newModel1));
- // assertTrue("Folder contains added item", folder.getChildren().contains(newModel2));
-
-
- //
- // Create another folder
- int index = 0;
- IPageModel movedTab = models.get(index++);
- assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0));
- contentProvider.createFolder(folder, 0, folder, SWT.UP);
- // Find created folder
- ITabFolderModel newFolder2 = contentProvider.getParentFolder(movedTab);
- assertFolderCreated(folder, newFolder2, movedTab);
-
- movedTab = models.get(index++);
- assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0));
- contentProvider.createFolder(folder, 0, newFolder2, SWT.UP);
- ITabFolderModel newFolder3 = contentProvider.getParentFolder(movedTab);
- assertFolderCreated(folder, newFolder3, movedTab);
-
- movedTab = models.get(index++);
- assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0));
- contentProvider.createFolder(folder, 0, newFolder2, SWT.DOWN);
- ITabFolderModel newFolder4 = contentProvider.getParentFolder(movedTab);
- assertFolderCreated(folder, newFolder4, movedTab);
-
- movedTab = models.get(index++);
- assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0));
- contentProvider.createFolder(folder, 0, folder, SWT.LEFT);
- ITabFolderModel newFolder5 = contentProvider.getParentFolder(movedTab);
- assertFolderCreated(folder, newFolder5, movedTab);
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)}
- * .
- */
- @Test
- public void testCreateFolder_ITabFolderModel_int() {
-
- // Create pages and add them to the default folder
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < 8; i++) {
- IPageModel newModel = new FakePageModel("model" + i);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
- ITabFolderModel referenceFolder = contentProvider.getCurrentTabFolder();
-
- assertNotNull("referenceFolder exist", referenceFolder);
-
- // Create a new folder.
- ITabFolderModel createdFolder = contentProvider.createFolder(referenceFolder, SWT.TOP);
-
- assertNotNull("folder created", createdFolder);
-
- }
-
- /**
- * Assert folder is correctly created
- *
- * @param srcFolder
- * @param newFolder
- * @param movedTab
- */
- protected void assertFolderCreated(ITabFolderModel srcFolder, ITabFolderModel newFolder, IPageModel movedTab) {
- // Check creation
- assertNotNull("Folder exist", newFolder);
-
- // Check if it is really a new folder
- assertNotSame("Old folder and new folder are differents", srcFolder, newFolder);
-
- // Check removed from source
- assertFalse("item removed from source folder", srcFolder.getChildren().contains(movedTab));
- // Check contained in created folder
- assertTrue("Folder contains added item", newFolder.getChildren().contains(movedTab));
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#removePage(int)}.
- */
- // public void testRemoveTabInt() {
- // fail("Not yet implemented");
- // }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, int)}
- * .
- */
- // public void testMoveTabITabFolderModelIntInt() {
- // fail("Not yet implemented");
- // }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)}
- * .
- */
- // public void testMoveTabITabFolderModelIntITabFolderModelInt() {
- // fail("Not yet implemented");
- // }
-
- /**
- * Test folder creation.
- * Use the pagemodels utilities {@link SimpleSashWindowContentProviderUtils}.
- *
- * @throws PagesModelException
- */
- @Test
- public void testCreateFolder2() throws PagesModelException {
-
-
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
- SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider);
-
- assertNotNull("helper created", helper);
- // Create a query
- // IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2")));
- IModelExp expr = folder("f1", page("p1"), page("p2"), page("p3"), page("p4"), page("p5"), page("p6"), page("p7"), page("p8"));
- // Try to create the model
- helper.createModel(expr);
-
- // Query model
- Map<String, Object> res = helper.queryModel(expr);
- // Get a folder
- ITabFolderModel folder = (ITabFolderModel)res.get("f1");
-
- // Create another folder
- IPageModel movedTab = (IPageModel)res.get("p1");
- assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0));
- contentProvider.createFolder(folder, 0, folder, SWT.UP);
- // Find created folder
- ITabFolderModel newFolder2 = contentProvider.getParentFolder(movedTab);
- assertFolderCreated(folder, newFolder2, movedTab);
-
- // Check the content configuration
- IModelExp conf1Expr = vSash(folder("f2", page("p1")), folder("f1", page("p2"), page("p3"), page("p4"), page("p5"), page("p6"), page("p7"), page("p8")));
- // Check if conform
- helper.assertConform(conf1Expr);
-
- Map<String, Object> conf1 = helper.queryModel(conf1Expr);
- assertEquals("right page moved", res.get("p1"), conf1.get("p1"));
-
-
-
- movedTab = (IPageModel)res.get("p2");
- assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0));
- contentProvider.createFolder(folder, 0, newFolder2, SWT.UP);
- ITabFolderModel newFolder3 = contentProvider.getParentFolder(movedTab);
- assertFolderCreated(folder, newFolder3, movedTab);
-
- // Check the content configuration
- IModelExp conf2Expr = vSash(vSash(folder("f3", page("p2")), folder("f2", page("p1"))), folder("f1", page("p3"), page("p4"), page("p5"), page("p6"), page("p7"), page("p8")));
- // Check if conform
- helper.assertConform(conf2Expr);
-
- Map<String, Object> conf2 = helper.queryModel(conf2Expr);
- assertEquals("right page moved", res.get("p2"), conf2.get("p2"));
-
-
- // Next move
- movedTab = (IPageModel)res.get("p3");
- assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0));
- contentProvider.createFolder(folder, 0, newFolder2, SWT.DOWN);
- ITabFolderModel newFolder4 = contentProvider.getParentFolder(movedTab);
- assertFolderCreated(folder, newFolder4, movedTab);
-
- // Check the content configuration
- IModelExp conf3Expr = vSash(vSash(folder("f3", page("p2")), vSash(folder("f2", page("p1")), folder("f4", page("p3")))), folder("f1", page("p4"), page("p5"), page("p6"), page("p7"), page("p8")));
- // Check if conform
- helper.assertConform(conf3Expr);
-
- Map<String, Object> conf3 = helper.queryModel(conf3Expr);
- assertEquals("right page moved", res.get("p3"), conf3.get("p3"));
-
- // Move next folder
- movedTab = (IPageModel)res.get("p4");
- assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0));
- contentProvider.createFolder(folder, 0, folder, SWT.LEFT);
- ITabFolderModel newFolder5 = contentProvider.getParentFolder(movedTab);
- assertFolderCreated(folder, newFolder5, movedTab);
-
- // Check the content configuration
- IModelExp conf4Expr = vSash(vSash(folder("f3", page("p2")), vSash(folder("f2", page("p1")), folder("f4", page("p3")))), hSash(folder("f5", page("p4")), folder("f1", page("p5"), page("p6"), page("p7"), page("p8"))));
- // Check if conform
- helper.assertConform(conf4Expr);
-
- Map<String, Object> conf4 = helper.queryModel(conf4Expr);
- assertEquals("right page moved", res.get("p4"), conf4.get("p4"));
-
-
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel)}
- * .
- */
- // public void testRemoveTabIPageModel() {
- // fail("Not yet implemented");
- // }
-
-}
+/***************************************************************************** + * Copyright (c) 2009 CEA LIST & LIFL + * + * + * 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 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple; + +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.folder; +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.hSash; +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.page; +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.vSash; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; +import org.eclipse.swt.SWT; +import org.junit.Before; +import org.junit.Test; + + +/** + * @author cedric dumoulin + */ +public class SimpleSashWindowsContentProviderTest /* extends AbstractPapyrusTest */{ + + protected SimpleSashWindowsContentProvider contentProvider; + + /** + * Initialize the tree {@inheritDoc} + */ + @Before + public void setUp() throws Exception { + createContentProvider(); + } + + /** + * Create a tree + */ + private void createContentProvider() { + contentProvider = new SimpleSashWindowsContentProvider(); + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#addPage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel)} + * . + */ + @Test + public void testAddTabIPageModel() { + IPageModel newModel = new FakePageModel(); + contentProvider.addPage(newModel); + + assertTrue("Folder contains added item", contentProvider.getCurrentTabFolder().getChildren().contains(newModel)); + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, int)} + * . + */ + // public void testMoveTabITabFolderModelIntInt() { + // fail("Not yet implemented"); + // } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)} + * . + */ + // public void testMoveTabITabFolderModelIntITabFolderModelInt() { + // fail("Not yet implemented"); + // } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)} + * . + */ + @Test + public void testCreateFolder() { + + // Create pages and add them to the default folder + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < 8; i++) { + IPageModel newModel = new FakePageModel("model" + i); + contentProvider.addPage(newModel); + models.add(newModel); + } + + ITabFolderModel folder = contentProvider.getCurrentTabFolder(); + + // // Do move tab 0 to right + // ITabFolderModel newFolder = contentProvider.createFolder(folder, 0, folder, SWT.RIGHT); + // // Check creation + // assertNotNull("Folder created", newFolder); + // // Check if correctly attached and reachable + // assertEquals("Tab 2 added in correct folder", folder, contentProvider.getParentFolder(newModel2)); + // assertEquals("Tab 1 added in correct folder", newFolder, contentProvider.getParentFolder(newModel1)); + // + //// assertNotNull("folder attached", contentProvider.getParentFolder(newModel1)); + //// assertNotNull("folder attached", contentProvider.getParentFolder(newModel1)); + // + // assertTrue("Folder contains added item", newFolder.getChildren().contains(newModel1)); + // assertTrue("Folder contains added item", folder.getChildren().contains(newModel2)); + + + // + // Create another folder + int index = 0; + IPageModel movedTab = models.get(index++); + assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0)); + contentProvider.createFolder(folder, 0, folder, SWT.UP); + // Find created folder + ITabFolderModel newFolder2 = contentProvider.getParentFolder(movedTab); + assertFolderCreated(folder, newFolder2, movedTab); + + movedTab = models.get(index++); + assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0)); + contentProvider.createFolder(folder, 0, newFolder2, SWT.UP); + ITabFolderModel newFolder3 = contentProvider.getParentFolder(movedTab); + assertFolderCreated(folder, newFolder3, movedTab); + + movedTab = models.get(index++); + assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0)); + contentProvider.createFolder(folder, 0, newFolder2, SWT.DOWN); + ITabFolderModel newFolder4 = contentProvider.getParentFolder(movedTab); + assertFolderCreated(folder, newFolder4, movedTab); + + movedTab = models.get(index++); + assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0)); + contentProvider.createFolder(folder, 0, folder, SWT.LEFT); + ITabFolderModel newFolder5 = contentProvider.getParentFolder(movedTab); + assertFolderCreated(folder, newFolder5, movedTab); + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)} + * . + */ + @Test + public void testCreateFolder_ITabFolderModel_int() { + + // Create pages and add them to the default folder + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < 8; i++) { + IPageModel newModel = new FakePageModel("model" + i); + contentProvider.addPage(newModel); + models.add(newModel); + } + + ITabFolderModel referenceFolder = contentProvider.getCurrentTabFolder(); + + assertNotNull("referenceFolder exist", referenceFolder); + + // Create a new folder. + ITabFolderModel createdFolder = contentProvider.createFolder(referenceFolder, SWT.TOP); + + assertNotNull("folder created", createdFolder); + + } + + /** + * Assert folder is correctly created + * + * @param srcFolder + * @param newFolder + * @param movedTab + */ + protected void assertFolderCreated(ITabFolderModel srcFolder, ITabFolderModel newFolder, IPageModel movedTab) { + // Check creation + assertNotNull("Folder exist", newFolder); + + // Check if it is really a new folder + assertNotSame("Old folder and new folder are differents", srcFolder, newFolder); + + // Check removed from source + assertFalse("item removed from source folder", srcFolder.getChildren().contains(movedTab)); + // Check contained in created folder + assertTrue("Folder contains added item", newFolder.getChildren().contains(movedTab)); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#removePage(int)}. + */ + // public void testRemoveTabInt() { + // fail("Not yet implemented"); + // } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, int)} + * . + */ + // public void testMoveTabITabFolderModelIntInt() { + // fail("Not yet implemented"); + // } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)} + * . + */ + // public void testMoveTabITabFolderModelIntITabFolderModelInt() { + // fail("Not yet implemented"); + // } + + /** + * Test folder creation. + * Use the pagemodels utilities {@link SimpleSashWindowContentProviderUtils}. + * + * @throws PagesModelException + */ + @Test + public void testCreateFolder2() throws PagesModelException { + + + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider); + + assertNotNull("helper created", helper); + // Create a query + // IModelExp expr = vSash( folder( "f1", page("p1")), folder( "f2", page("p2"))); + IModelExp expr = folder("f1", page("p1"), page("p2"), page("p3"), page("p4"), page("p5"), page("p6"), page("p7"), page("p8")); + // Try to create the model + helper.createModel(expr); + + // Query model + Map<String, Object> res = helper.queryModel(expr); + // Get a folder + ITabFolderModel folder = (ITabFolderModel)res.get("f1"); + + // Create another folder + IPageModel movedTab = (IPageModel)res.get("p1"); + assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0)); + contentProvider.createFolder(folder, 0, folder, SWT.UP); + // Find created folder + ITabFolderModel newFolder2 = contentProvider.getParentFolder(movedTab); + assertFolderCreated(folder, newFolder2, movedTab); + + // Check the content configuration + IModelExp conf1Expr = vSash(folder("f2", page("p1")), folder("f1", page("p2"), page("p3"), page("p4"), page("p5"), page("p6"), page("p7"), page("p8"))); + // Check if conform + helper.assertConform(conf1Expr); + + Map<String, Object> conf1 = helper.queryModel(conf1Expr); + assertEquals("right page moved", res.get("p1"), conf1.get("p1")); + + + + movedTab = (IPageModel)res.get("p2"); + assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0)); + contentProvider.createFolder(folder, 0, newFolder2, SWT.UP); + ITabFolderModel newFolder3 = contentProvider.getParentFolder(movedTab); + assertFolderCreated(folder, newFolder3, movedTab); + + // Check the content configuration + IModelExp conf2Expr = vSash(vSash(folder("f3", page("p2")), folder("f2", page("p1"))), folder("f1", page("p3"), page("p4"), page("p5"), page("p6"), page("p7"), page("p8"))); + // Check if conform + helper.assertConform(conf2Expr); + + Map<String, Object> conf2 = helper.queryModel(conf2Expr); + assertEquals("right page moved", res.get("p2"), conf2.get("p2")); + + + // Next move + movedTab = (IPageModel)res.get("p3"); + assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0)); + contentProvider.createFolder(folder, 0, newFolder2, SWT.DOWN); + ITabFolderModel newFolder4 = contentProvider.getParentFolder(movedTab); + assertFolderCreated(folder, newFolder4, movedTab); + + // Check the content configuration + IModelExp conf3Expr = vSash(vSash(folder("f3", page("p2")), vSash(folder("f2", page("p1")), folder("f4", page("p3")))), folder("f1", page("p4"), page("p5"), page("p6"), page("p7"), page("p8"))); + // Check if conform + helper.assertConform(conf3Expr); + + Map<String, Object> conf3 = helper.queryModel(conf3Expr); + assertEquals("right page moved", res.get("p3"), conf3.get("p3")); + + // Move next folder + movedTab = (IPageModel)res.get("p4"); + assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0)); + contentProvider.createFolder(folder, 0, folder, SWT.LEFT); + ITabFolderModel newFolder5 = contentProvider.getParentFolder(movedTab); + assertFolderCreated(folder, newFolder5, movedTab); + + // Check the content configuration + IModelExp conf4Expr = vSash(vSash(folder("f3", page("p2")), vSash(folder("f2", page("p1")), folder("f4", page("p3")))), hSash(folder("f5", page("p4")), folder("f1", page("p5"), page("p6"), page("p7"), page("p8")))); + // Check if conform + helper.assertConform(conf4Expr); + + Map<String, Object> conf4 = helper.queryModel(conf4Expr); + assertEquals("right page moved", res.get("p4"), conf4.get("p4")); + + + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel)} + * . + */ + // public void testRemoveTabIPageModel() { + // fail("Not yet implemented"); + // } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/AllTests.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/AllTests.java index a0a4f43ac66..9b09af8ce8e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/AllTests.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/AllTests.java @@ -1,26 +1,26 @@ -/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.editor;
-
-import org.junit.runner.RunWith;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
-import org.junit.runners.Suite.SuiteClasses;
-
-
-/**
- * All tests for package org.eclipse.papyrus.infra.core.sasheditor.editor
- */
-@RunWith(ClassificationSuite.class)
-@SuiteClasses({ SashMultiPageEditorTest.class })
-public class AllTests {
-
-}
+/***************************************************************************** + * Copyright (c) 2010 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.editor; + +import org.junit.runner.RunWith; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; +import org.junit.runners.Suite.SuiteClasses; + + +/** + * All tests for package org.eclipse.papyrus.infra.core.sasheditor.editor + */ +@RunWith(ClassificationSuite.class) +@SuiteClasses({ SashMultiPageEditorTest.class }) +public class AllTests { + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/FakeEditorModel.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/FakeEditorModel.java index 48743bbda55..892cb0522b2 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/FakeEditorModel.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/FakeEditorModel.java @@ -1,137 +1,137 @@ -/*****************************************************************************
- * Copyright (c) 2010, 2014 LIFL, CEA LIST, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- * LIFL - Initial API and implementation
- * Christian W. Damus (CEA) - bug 392301
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.editor;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.ui.part.EditorPart;
-
-
-/**
- * A simple model that can be used as editor in tests.
- * @author cedric dumoulin
- *
- */
-public class FakeEditorModel implements IEditorModel {
-
-
- private String name;
-
- public FakeEditorModel() {
- name = "noname";
- }
-
- public void dispose() {
- // Pass
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabTitle()
- *
- * @return
- */
- public String getTabTitle() {
- return name;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabIcon()
- *
- * @return
- */
- public Image getTabIcon() {
- return null;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getRawModel()
- *
- * @return
- */
- public Object getRawModel() {
- // TODO Auto-generated method stub
- return this;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#createIEditorPart()
- *
- * @return
- * @throws PartInitException
- */
- public IEditorPart createIEditorPart() throws PartInitException {
- return new FakeEditorPart();
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#getActionBarContributor()
- *
- * @return
- */
- public EditorActionBarContributor getActionBarContributor() {
- return null;
- }
-
- /**
- * A class implementing a fake editor.
- * @author dumoulin
- *
- */
- public class FakeEditorPart extends EditorPart {
-
- @Override
- public void doSave(IProgressMonitor monitor) {
- }
-
- @Override
- public void doSaveAs() {
- }
-
- @Override
- public void init(IEditorSite site, IEditorInput input) throws PartInitException {
- setSite(site);
- setInput(input);
- setPartName(input.getName());
- }
-
- @Override
- public boolean isDirty() {
- return false;
- }
-
- @Override
- public boolean isSaveAsAllowed() {
- return false;
- }
-
- @Override
- public void createPartControl(Composite parent) {
- // do nothing
-
- }
-
- @Override
- public void setFocus() {
- }
-
- }
-}
+/***************************************************************************** + * Copyright (c) 2010, 2014 LIFL, CEA LIST, and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * + * LIFL - Initial API and implementation + * Christian W. Damus (CEA) - bug 392301 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.editor; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IEditorSite; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.part.EditorActionBarContributor; +import org.eclipse.ui.part.EditorPart; + + +/** + * A simple model that can be used as editor in tests. + * @author cedric dumoulin + * + */ +public class FakeEditorModel implements IEditorModel { + + + private String name; + + public FakeEditorModel() { + name = "noname"; + } + + public void dispose() { + // Pass + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabTitle() + * + * @return + */ + public String getTabTitle() { + return name; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabIcon() + * + * @return + */ + public Image getTabIcon() { + return null; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getRawModel() + * + * @return + */ + public Object getRawModel() { + // TODO Auto-generated method stub + return this; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#createIEditorPart() + * + * @return + * @throws PartInitException + */ + public IEditorPart createIEditorPart() throws PartInitException { + return new FakeEditorPart(); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#getActionBarContributor() + * + * @return + */ + public EditorActionBarContributor getActionBarContributor() { + return null; + } + + /** + * A class implementing a fake editor. + * @author dumoulin + * + */ + public class FakeEditorPart extends EditorPart { + + @Override + public void doSave(IProgressMonitor monitor) { + } + + @Override + public void doSaveAs() { + } + + @Override + public void init(IEditorSite site, IEditorInput input) throws PartInitException { + setSite(site); + setInput(input); + setPartName(input.getName()); + } + + @Override + public boolean isDirty() { + return false; + } + + @Override + public boolean isSaveAsAllowed() { + return false; + } + + @Override + public void createPartControl(Composite parent) { + // do nothing + + } + + @Override + public void setFocus() { + } + + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/MessagePartModel.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/MessagePartModel.java index 89961918174..01d9aae5267 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/MessagePartModel.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/MessagePartModel.java @@ -1,90 +1,90 @@ -/*****************************************************************************
- * Copyright (c) 2009, 2014 LIFL, CEA LIST, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- * LIFL - Initial API and implementation
- * Christian W. Damus (CEA) - bug 392301
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.editor;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IComponentModel;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Description of the first page
- *
- * @author dumoulin
- */
-
-public class MessagePartModel implements IComponentModel {
-
- private String title;
-
- private String msg;
-
- static private int count = 0;
-
-
- /**
- *
- */
- public MessagePartModel(String msg) {
- title = "newMsg " + count++;
- this.msg = msg;
- }
-
- /**
- * @param title
- */
- public MessagePartModel(String title, String msg) {
- this.title = title;
- this.msg = msg;
- }
-
- /**
- * Return the control to be shown. {@inheritDoc}
- */
- public Composite createPartControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- FillLayout layout = new FillLayout();
- composite.setLayout(layout);
- StyledText text;
-
- text = new StyledText(composite, SWT.H_SCROLL | SWT.V_SCROLL);
- text.setEditable(false);
-
- text.setText(" " + msg + " - " + getTabTitle());
- return composite;
- }
-
- public Image getTabIcon() {
- return null;
- }
-
- public String getTabTitle() {
- return title;
- }
-
- /**
- * Return this. In this implementation, the rawModel and the IEditorModel are the same.
- *
- */
- public Object getRawModel() {
- return this;
- }
-
- public void dispose() {
- // Pass
- }
-}
+/***************************************************************************** + * Copyright (c) 2009, 2014 LIFL, CEA LIST, and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * + * LIFL - Initial API and implementation + * Christian W. Damus (CEA) - bug 392301 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.editor; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IComponentModel; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Composite; + +/** + * Description of the first page + * + * @author dumoulin + */ + +public class MessagePartModel implements IComponentModel { + + private String title; + + private String msg; + + static private int count = 0; + + + /** + * + */ + public MessagePartModel(String msg) { + title = "newMsg " + count++; + this.msg = msg; + } + + /** + * @param title + */ + public MessagePartModel(String title, String msg) { + this.title = title; + this.msg = msg; + } + + /** + * Return the control to be shown. {@inheritDoc} + */ + public Composite createPartControl(Composite parent) { + Composite composite = new Composite(parent, SWT.NONE); + FillLayout layout = new FillLayout(); + composite.setLayout(layout); + StyledText text; + + text = new StyledText(composite, SWT.H_SCROLL | SWT.V_SCROLL); + text.setEditable(false); + + text.setText(" " + msg + " - " + getTabTitle()); + return composite; + } + + public Image getTabIcon() { + return null; + } + + public String getTabTitle() { + return title; + } + + /** + * Return this. In this implementation, the rawModel and the IEditorModel are the same. + * + */ + public Object getRawModel() { + return this; + } + + public void dispose() { + // Pass + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/SashMultiPageEditorTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/SashMultiPageEditorTest.java index b6d7bf23fd9..f890f5c2917 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/SashMultiPageEditorTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/SashMultiPageEditorTest.java @@ -1,25 +1,25 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.sasheditor.editor;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-
-/**
- * @author dumoulin
- */
-public class SashMultiPageEditorTest {
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.editor.AbstractMultiPageSashEditor#refreshTabs()}.
- */
- @Ignore("Not yet implemented")
- @Test
- public void testRefreshTabs() {
- // fail("Not yet implemented"); // TODO
- }
-
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.sasheditor.editor; + +import org.junit.Ignore; +import org.junit.Test; + + + +/** + * @author dumoulin + */ +public class SashMultiPageEditorTest { + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.editor.AbstractMultiPageSashEditor#refreshTabs()}. + */ + @Ignore("Not yet implemented") + @Test + public void testRefreshTabs() { + // fail("Not yet implemented"); // TODO + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/ShellEditor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/ShellEditor.java index 9d9f754fda6..f341e974d21 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/ShellEditor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/ShellEditor.java @@ -1,113 +1,113 @@ -/*****************************************************************************
- * Copyright (c) 2009 CEA LIST & LIFL
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.editor;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * A standalone application testing the Sash system.
- * It must be run as Java program.
- *
- * @author dumoulin
- */
-public class ShellEditor {
-
- protected SashWindowsContainer sashContainer;
-
- protected ISashWindowsContentProvider contentProvider;
-
- /**
- * Constructor.
- *
- * @param parent
- */
- public ShellEditor(Shell parent) {
- parent.setText(this.getClass().getSimpleName());
- init();
- createPartControl(parent);
-
- // add tabItem
- int count = 0;
- IPageModel tabItem = new MessagePartModel("msg" + count++);
- contentProvider.addPage(tabItem);
- tabItem = new MessagePartModel("msg" + count++);
- contentProvider.addPage(tabItem);
-
- sashContainer.refreshTabs();
- }
-
- /**
- * init th class
- */
- protected void init() {
- contentProvider = new SimpleSashWindowsContentProvider();
- sashContainer = new SashWindowsContainer();
-
- initContentProvider();
- sashContainer.setContentProvider(contentProvider);
-
- }
-
- /**
- * Create some windows.
- */
- protected void initContentProvider() {
- int count = 0;
- IPageModel tabItem = new MessagePartModel("msg" + count++);
- contentProvider.addPage(tabItem);
-
- tabItem = new MessagePartModel("msg0" + count++);
- contentProvider.addPage(tabItem);
- }
-
- /**
- * Create SWT control of this class
- *
- * @param parent
- */
- protected void createPartControl(Composite parent) {
- // Text newText = new Text(parent, SWT.BORDER & SWT.SCROLL_PAGE);
-
- sashContainer.createPartControl(parent);
- }
-
- /**
- * @param args
- */
- public static void main(String[] args) {
- Display display = new Display();
-
- Shell shell = new Shell(display);
- shell.setLayout(new FillLayout());
- new ShellEditor(shell);
-
- shell.open();
-
- while(!shell.isDisposed()) {
- if(!display.readAndDispatch())
- display.sleep();
- }
-
- display.dispose();
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2009 CEA LIST & LIFL + * + * + * 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 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.editor; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; + + +/** + * A standalone application testing the Sash system. + * It must be run as Java program. + * + * @author dumoulin + */ +public class ShellEditor { + + protected SashWindowsContainer sashContainer; + + protected ISashWindowsContentProvider contentProvider; + + /** + * Constructor. + * + * @param parent + */ + public ShellEditor(Shell parent) { + parent.setText(this.getClass().getSimpleName()); + init(); + createPartControl(parent); + + // add tabItem + int count = 0; + IPageModel tabItem = new MessagePartModel("msg" + count++); + contentProvider.addPage(tabItem); + tabItem = new MessagePartModel("msg" + count++); + contentProvider.addPage(tabItem); + + sashContainer.refreshTabs(); + } + + /** + * init th class + */ + protected void init() { + contentProvider = new SimpleSashWindowsContentProvider(); + sashContainer = new SashWindowsContainer(); + + initContentProvider(); + sashContainer.setContentProvider(contentProvider); + + } + + /** + * Create some windows. + */ + protected void initContentProvider() { + int count = 0; + IPageModel tabItem = new MessagePartModel("msg" + count++); + contentProvider.addPage(tabItem); + + tabItem = new MessagePartModel("msg0" + count++); + contentProvider.addPage(tabItem); + } + + /** + * Create SWT control of this class + * + * @param parent + */ + protected void createPartControl(Composite parent) { + // Text newText = new Text(parent, SWT.BORDER & SWT.SCROLL_PAGE); + + sashContainer.createPartControl(parent); + } + + /** + * @param args + */ + public static void main(String[] args) { + Display display = new Display(); + + Shell shell = new Shell(display); + shell.setLayout(new FillLayout()); + new ShellEditor(shell); + + shell.open(); + + while(!shell.isDisposed()) { + if(!display.readAndDispatch()) + display.sleep(); + } + + display.dispose(); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/AllTests.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/AllTests.java index 3a9596c2010..1bd8986172b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/AllTests.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/AllTests.java @@ -1,31 +1,31 @@ -/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.internal;
-
-import org.junit.runner.RunWith;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
-import org.junit.runners.Suite.SuiteClasses;
-
-
-/**
- * All tests for package org.eclipse.papyrus.infra.core.sasheditor.internal
- */
-@RunWith(ClassificationSuite.class)
-@SuiteClasses({ SashContainerEventsProviderTest.class,
- PageLifeCycleEventsThrownFromContainerTest.class,
- SashWindowsContainerTest.class ,
- SashWindowsContainerDisposeCalledTest.class,
- SashWindowsContainerMemoryLeakTest.class
- })
-public class AllTests {
-
-}
+/***************************************************************************** + * Copyright (c) 2010 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.internal; + +import org.junit.runner.RunWith; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; +import org.junit.runners.Suite.SuiteClasses; + + +/** + * All tests for package org.eclipse.papyrus.infra.core.sasheditor.internal + */ +@RunWith(ClassificationSuite.class) +@SuiteClasses({ SashContainerEventsProviderTest.class, + PageLifeCycleEventsThrownFromContainerTest.class, + SashWindowsContainerTest.class , + SashWindowsContainerDisposeCalledTest.class, + SashWindowsContainerMemoryLeakTest.class + }) +public class AllTests { + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakeFolderLifeCycleEventsListener.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakeFolderLifeCycleEventsListener.java index 5dbff211240..699885a9148 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakeFolderLifeCycleEventsListener.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakeFolderLifeCycleEventsListener.java @@ -1,143 +1,143 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * A fake listener implementation for testing purpose.
- * @author cedric dumoulin
- *
- */
-public class FakeFolderLifeCycleEventsListener implements ITabFolderPartLifeCycleEventsListener {
-
- public static final String FOLDER_CREATED = "folderCreated";
-
- public static final String FOLDER_DISPOSED = "folderDisposed";
-
-
- /** */
- public int eventCount = 0;
-
- /** */
- public List<String> traces;
-
- /** */
- public List<TabFolderPart> events;
-
- /**
- *
- * Constructor.
- *
- */
- public FakeFolderLifeCycleEventsListener() {
- traces = new ArrayList<String>();
- events = new ArrayList<TabFolderPart>();
- }
-
-
- /**
- * @return the eventCount
- */
- public int getEventCount() {
- return eventCount;
- }
-
-
- /**
- * @return the trace
- */
- public List<String> getTraces() {
- return traces;
- }
-
- /**
- * @return the trace
- */
- public String getTrace(int index) {
- return traces.get(index);
- }
-
- /**
- * @return the trace
- */
- public List<TabFolderPart> getEvents() {
- return events;
- }
-
- /**
- * @return the trace
- */
- public TabFolderPart getEvent(int index) {
- return events.get(index);
- }
-
- /**
- *
- */
- public void resetChangeCount() {
- eventCount = 0;
- }
-
- /**
- *
- */
- public void resetTraces() {
- traces.clear();
- events.clear();
- }
-
- /* ************************** */
- /* Methods */
- /* ************************** */
-
-
- public void folderCreated(TabFolderPart folder) {
- traces.add(FOLDER_CREATED);
- events.add(folder);
- eventCount++;
- }
-
-
- public void folderDisposed(TabFolderPart folder) {
- traces.add(FOLDER_DISPOSED);
- events.add(folder);
- eventCount++;
- }
-
- @Override
- public String toString() {
-
- StringBuffer buf = new StringBuffer();
- buf.append("{");
- for( int i=0; i<events.size(); i++) {
- buf.append("[")
- .append(traces.get(i) )
- .append("-")
- .append( events.get(i).getClass().getSimpleName())
- .append("]");
-
- if(i<events.size()) {
- buf.append(",");
- }
- }
- buf.append("}");
-
- return buf.toString();
- }
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.internal; + +import java.util.ArrayList; +import java.util.List; + + +/** + * A fake listener implementation for testing purpose. + * @author cedric dumoulin + * + */ +public class FakeFolderLifeCycleEventsListener implements ITabFolderPartLifeCycleEventsListener { + + public static final String FOLDER_CREATED = "folderCreated"; + + public static final String FOLDER_DISPOSED = "folderDisposed"; + + + /** */ + public int eventCount = 0; + + /** */ + public List<String> traces; + + /** */ + public List<TabFolderPart> events; + + /** + * + * Constructor. + * + */ + public FakeFolderLifeCycleEventsListener() { + traces = new ArrayList<String>(); + events = new ArrayList<TabFolderPart>(); + } + + + /** + * @return the eventCount + */ + public int getEventCount() { + return eventCount; + } + + + /** + * @return the trace + */ + public List<String> getTraces() { + return traces; + } + + /** + * @return the trace + */ + public String getTrace(int index) { + return traces.get(index); + } + + /** + * @return the trace + */ + public List<TabFolderPart> getEvents() { + return events; + } + + /** + * @return the trace + */ + public TabFolderPart getEvent(int index) { + return events.get(index); + } + + /** + * + */ + public void resetChangeCount() { + eventCount = 0; + } + + /** + * + */ + public void resetTraces() { + traces.clear(); + events.clear(); + } + + /* ************************** */ + /* Methods */ + /* ************************** */ + + + public void folderCreated(TabFolderPart folder) { + traces.add(FOLDER_CREATED); + events.add(folder); + eventCount++; + } + + + public void folderDisposed(TabFolderPart folder) { + traces.add(FOLDER_DISPOSED); + events.add(folder); + eventCount++; + } + + @Override + public String toString() { + + StringBuffer buf = new StringBuffer(); + buf.append("{"); + for( int i=0; i<events.size(); i++) { + buf.append("[") + .append(traces.get(i) ) + .append("-") + .append( events.get(i).getClass().getSimpleName()) + .append("]"); + + if(i<events.size()) { + buf.append(","); + } + } + buf.append("}"); + + return buf.toString(); + } +}
\ No newline at end of file diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakePageLifeCycleEventsListener.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakePageLifeCycleEventsListener.java index 1623d3f843e..0fde147690b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakePageLifeCycleEventsListener.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakePageLifeCycleEventsListener.java @@ -1,186 +1,186 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.sasheditor.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener;
-
-
-/**
- * A fake listener implementation for testing purpose.
- * @author cedric dumoulin
- *
- */
-public class FakePageLifeCycleEventsListener implements IPageLifeCycleEventsListener {
-
- public static final String PAGE_CHANGED = "pageChanged";
-
- public static final String PAGE_OPENED = "pageOpened";
-
- public static final String PAGE_CLOSED = "pageClosed";
-
- public static final String PAGE_ACTIVATED = "pageActivated";
-
- public static final String PAGE_DEACTIVATED = "pageDeactivated";
-
- public static final String PAGE_ABOUTTOBECLOSED = "pageAboutToBeClosed";
-
- public static final String PAGE_ABOUTTOBEOPENED = "pageAboutToBeOpened";
-
- /** */
- public int eventCount = 0;
-
- /** */
- public List<String> traces;
-
- /** */
- public List<IPage> events;
-
- /**
- *
- * Constructor.
- *
- */
- public FakePageLifeCycleEventsListener() {
- traces = new ArrayList<String>();
- events = new ArrayList<IPage>();
- }
-
-
- /**
- * @return the eventCount
- */
- public int getEventCount() {
- return eventCount;
- }
-
-
- /**
- * @return the trace
- */
- public List<String> getTraces() {
- return traces;
- }
-
- /**
- * @return the trace
- */
- public String getTrace(int index) {
- return traces.get(index);
- }
-
- /**
- * @return the trace
- */
- public List<IPage> getEvents() {
- return events;
- }
-
- /**
- * @return the trace
- */
- public IPage getEvent(int index) {
- return events.get(index);
- }
-
- /**
- *
- */
- public void resetChangeCount() {
- eventCount = 0;
- }
-
- /**
- *
- */
- public void resetTraces() {
- traces.clear();
- events.clear();
- }
-
- /* ************************** */
- /* Methods */
- /* ************************** */
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener#pageChanged(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
- *
- * @param newPage
- */
- public void pageChanged(IPage newPage) {
- traces.add(PAGE_CHANGED);
- events.add(newPage);
- eventCount++;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.IPageLifeCycleEventsListener#pageOpened(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
- *
- * @param page
- */
- public void pageOpened(IPage page) {
- traces.add(PAGE_OPENED);
- events.add(page);
- eventCount++;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.IPageLifeCycleEventsListener#pageClosed(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
- *
- * @param page
- */
- public void pageClosed(IPage page) {
- traces.add(PAGE_CLOSED);
- events.add(page);
- eventCount++;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.IPageLifeCycleEventsListener#pageActivated(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
- *
- * @param page
- */
- public void pageActivated(IPage page) {
- traces.add(PAGE_ACTIVATED);
- events.add(page);
- eventCount++;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.IPageLifeCycleEventsListener#pageDeactivated(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
- *
- * @param page
- */
- public void pageDeactivated(IPage page) {
- traces.add(PAGE_DEACTIVATED);
- events.add(page);
- eventCount++;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.IPageLifeCycleEventsListener#pageAboutToBeOpened(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
- *
- * @param page
- */
- public void pageAboutToBeOpened(IPage page) {
- traces.add(PAGE_ABOUTTOBEOPENED);
- events.add(page);
- eventCount++;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.IPageLifeCycleEventsListener#pageAboutToBeClosed(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
- *
- * @param page
- */
- public void pageAboutToBeClosed(IPage page) {
- traces.add(PAGE_ABOUTTOBECLOSED);
- events.add(page);
- eventCount++;
- }
-
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.sasheditor.internal; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage; +import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener; + + +/** + * A fake listener implementation for testing purpose. + * @author cedric dumoulin + * + */ +public class FakePageLifeCycleEventsListener implements IPageLifeCycleEventsListener { + + public static final String PAGE_CHANGED = "pageChanged"; + + public static final String PAGE_OPENED = "pageOpened"; + + public static final String PAGE_CLOSED = "pageClosed"; + + public static final String PAGE_ACTIVATED = "pageActivated"; + + public static final String PAGE_DEACTIVATED = "pageDeactivated"; + + public static final String PAGE_ABOUTTOBECLOSED = "pageAboutToBeClosed"; + + public static final String PAGE_ABOUTTOBEOPENED = "pageAboutToBeOpened"; + + /** */ + public int eventCount = 0; + + /** */ + public List<String> traces; + + /** */ + public List<IPage> events; + + /** + * + * Constructor. + * + */ + public FakePageLifeCycleEventsListener() { + traces = new ArrayList<String>(); + events = new ArrayList<IPage>(); + } + + + /** + * @return the eventCount + */ + public int getEventCount() { + return eventCount; + } + + + /** + * @return the trace + */ + public List<String> getTraces() { + return traces; + } + + /** + * @return the trace + */ + public String getTrace(int index) { + return traces.get(index); + } + + /** + * @return the trace + */ + public List<IPage> getEvents() { + return events; + } + + /** + * @return the trace + */ + public IPage getEvent(int index) { + return events.get(index); + } + + /** + * + */ + public void resetChangeCount() { + eventCount = 0; + } + + /** + * + */ + public void resetTraces() { + traces.clear(); + events.clear(); + } + + /* ************************** */ + /* Methods */ + /* ************************** */ + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener#pageChanged(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage) + * + * @param newPage + */ + public void pageChanged(IPage newPage) { + traces.add(PAGE_CHANGED); + events.add(newPage); + eventCount++; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.IPageLifeCycleEventsListener#pageOpened(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage) + * + * @param page + */ + public void pageOpened(IPage page) { + traces.add(PAGE_OPENED); + events.add(page); + eventCount++; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.IPageLifeCycleEventsListener#pageClosed(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage) + * + * @param page + */ + public void pageClosed(IPage page) { + traces.add(PAGE_CLOSED); + events.add(page); + eventCount++; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.IPageLifeCycleEventsListener#pageActivated(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage) + * + * @param page + */ + public void pageActivated(IPage page) { + traces.add(PAGE_ACTIVATED); + events.add(page); + eventCount++; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.IPageLifeCycleEventsListener#pageDeactivated(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage) + * + * @param page + */ + public void pageDeactivated(IPage page) { + traces.add(PAGE_DEACTIVATED); + events.add(page); + eventCount++; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.IPageLifeCycleEventsListener#pageAboutToBeOpened(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage) + * + * @param page + */ + public void pageAboutToBeOpened(IPage page) { + traces.add(PAGE_ABOUTTOBEOPENED); + events.add(page); + eventCount++; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.IPageLifeCycleEventsListener#pageAboutToBeClosed(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage) + * + * @param page + */ + public void pageAboutToBeClosed(IPage page) { + traces.add(PAGE_ABOUTTOBECLOSED); + events.add(page); + eventCount++; + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakePagePart.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakePagePart.java index e75eddb62b7..5846412e14b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakePagePart.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakePagePart.java @@ -1,69 +1,69 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.sasheditor.internal;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-
-/**
- * A Page part for testing purpose. This page cannot be used in the SashContainer.
- * @author cedric dumoulin
- *
- */
-public class FakePagePart extends PagePart {
-
- public FakePagePart() {
- super(null, null);
- }
-
- @Override
- boolean visit(IPartVisitor visitor) {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public void createPartControl(Composite parent) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public Control getControl() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void reparent(TabFolderPart parent) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void setFocus() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void garbage() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void dispose() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void disposeThisAndChildren() {
- // TODO Auto-generated method stub
-
- }
-
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.sasheditor.internal; + +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; + + +/** + * A Page part for testing purpose. This page cannot be used in the SashContainer. + * @author cedric dumoulin + * + */ +public class FakePagePart extends PagePart { + + public FakePagePart() { + super(null, null); + } + + @Override + boolean visit(IPartVisitor visitor) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void createPartControl(Composite parent) { + // TODO Auto-generated method stub + + } + + @Override + public Control getControl() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void reparent(TabFolderPart parent) { + // TODO Auto-generated method stub + + } + + @Override + public void setFocus() { + // TODO Auto-generated method stub + + } + + @Override + public void garbage() { + // TODO Auto-generated method stub + + } + + @Override + public void dispose() { + // TODO Auto-generated method stub + + } + + @Override + public void disposeThisAndChildren() { + // TODO Auto-generated method stub + + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakeTabFolderPart.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakeTabFolderPart.java index f1f823a595e..a625663023f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakeTabFolderPart.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FakeTabFolderPart.java @@ -1,36 +1,36 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.internal;
-
-
-/**
- * A fake {@link TabFolderPart} for testing purpose.
- * Do not use in a SashContainer.
- * This class allows to instanciate a {@link TabFolderPart}.
- *
- * @author cedric dumoulin
- *
- */
-public class FakeTabFolderPart extends TabFolderPart {
-
- /**
- * Create a fake {@link TabFolderPart}
- * Constructor.
- *
- */
- public FakeTabFolderPart() {
- super( new RootPart(null), null, null);
- }
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.internal; + + +/** + * A fake {@link TabFolderPart} for testing purpose. + * Do not use in a SashContainer. + * This class allows to instanciate a {@link TabFolderPart}. + * + * @author cedric dumoulin + * + */ +public class FakeTabFolderPart extends TabFolderPart { + + /** + * Create a fake {@link TabFolderPart} + * Constructor. + * + */ + public FakeTabFolderPart() { + super( new RootPart(null), null, null); + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FolderLifeCycleEventsThrownFromContainerTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FolderLifeCycleEventsThrownFromContainerTest.java index 1cb877459b3..d2afc1766ee 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FolderLifeCycleEventsThrownFromContainerTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/FolderLifeCycleEventsThrownFromContainerTest.java @@ -1,163 +1,163 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.internal;
-
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.folder;
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.page;
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.vSash;
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContainerTestFacade;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-import org.eclipse.swt.SWT;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * Test if the {@link SashWindowsContainer} send the events of a folder lifecycle.
- * Test if the folder lifecycle events are correctly thrown by the {@link SashWindowsContainer} when
- * folder are added/removed, ...
- *
- * @author cedric dumoulin
- *
- */
-public class FolderLifeCycleEventsThrownFromContainerTest {
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- }
-
-
- /**
- * Lookup a page by its raw model.
- * @param container
- * @param rawModel
- * @return
- */
- protected IPage lookupTabFolderPart(SashWindowsContainer container, Object rawModel) {
-
- LookupModelPageVisitor visitor = new LookupModelPageVisitor(rawModel);
- container.visit(visitor);
- return visitor.result();
- }
-
-
- /**
- * Test if the FOLDER_ADDED event is sent when a folder is added.
- * @throws PagesModelException
- */
- @Test
- public void testFolderAddedEvent() throws PagesModelException {
-
- SimpleSashWindowContainerTestFacade containerFacade = new SimpleSashWindowContainerTestFacade();
- // get container and contentProvider
- ISashWindowsContentProvider contentProvider = containerFacade.getIContentProvider();
- SashWindowsContainer container = containerFacade.getSashContainer();
-
- // Create listener and attach it
- FakeFolderLifeCycleEventsListener listener = new FakeFolderLifeCycleEventsListener();
- container.getFolderLifeCycleEventProvider().addListener(listener);
-
- // init the container
- IModelExp expr = vSash(
- folder( "f1", page("p2"), page("p3"), page("p4") ),
- folder( "f2", page("p1") )
- );
- containerFacade.createModel(expr);
-
- // Do refresh. This fire events
- container.refreshTabs();
- // Check events
- assertEquals("event fired. listener=" + listener.toString(), 3, listener.getEventCount());
- int i=0;
- assertEquals("right event", FakeFolderLifeCycleEventsListener.FOLDER_CREATED, listener.getTraces().get(i));
- assertEquals("right object", containerFacade.getNamesToInternalMap().get("f1"), listener.getEvents().get(i++).getRawModel());
- assertEquals("right event", FakeFolderLifeCycleEventsListener.FOLDER_CREATED, listener.getTraces().get(i));
- assertEquals("right object", containerFacade.getNamesToInternalMap().get("f2"), listener.getEvents().get(i++).getRawModel());
- // There is 3 events. The last one is the disposal of the folder that exist before the refresh, and replaced by
- // two other folders.
- assertEquals("right event", FakeFolderLifeCycleEventsListener.FOLDER_DISPOSED, listener.getTraces().get(i));
-
-
- // Reset the listener
- listener.resetChangeCount();
- listener.resetTraces();
-
- // Add a folder
- containerFacade.createFolder("f1", 0, "f1", SWT.RIGHT);
- container.refreshTabs();
-
- // check events
- assertEquals("event fired", 1, listener.getEventCount());
- i=0;
- assertEquals("right event", FakeFolderLifeCycleEventsListener.FOLDER_CREATED, listener.getTraces().get(i++));
- }
-
- /**
- * Test if the FOLDER_DISPOSED event is sent when a folder is added.
- * @throws PagesModelException
- */
- @Test
- public void testFolderDisposedEvent() throws PagesModelException {
-
- SimpleSashWindowContainerTestFacade containerFacade = new SimpleSashWindowContainerTestFacade();
- // get container and contentProvider
- ISashWindowsContentProvider contentProvider = containerFacade.getIContentProvider();
- SashWindowsContainer container = containerFacade.getSashContainer();
-
- // Create listener and attach it
- FakeFolderLifeCycleEventsListener listener = new FakeFolderLifeCycleEventsListener();
- container.getFolderLifeCycleEventProvider().addListener(listener);
-
- // init the container
- IModelExp expr = vSash(
- folder( "f1", page("p2"), page("p3"), page("p4") ),
- folder( "f2", page("p1") )
- );
- containerFacade.createModel(expr);
-
- // Do refresh. This fire events
- container.refreshTabs();
-
- // Reset the listener
- listener.resetChangeCount();
- listener.resetTraces();
-
- // Remove page. This should remove the folder
- containerFacade.removePage("p1");
- container.refreshTabs();
-
- // check events
- assertEquals("event fired " + listener.toString(), 1, listener.getEventCount());
- int i=0;
- assertEquals("right event", FakeFolderLifeCycleEventsListener.FOLDER_DISPOSED, listener.getTraces().get(i));
- assertEquals("right object", containerFacade.getNamesToInternalMap().get("f2"), listener.getEvents().get(i++).getRawModel());
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.internal; + +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.folder; +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.page; +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.vSash; +import static org.junit.Assert.assertEquals; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContainerTestFacade; +import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; +import org.eclipse.swt.SWT; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + + +/** + * Test if the {@link SashWindowsContainer} send the events of a folder lifecycle. + * Test if the folder lifecycle events are correctly thrown by the {@link SashWindowsContainer} when + * folder are added/removed, ... + * + * @author cedric dumoulin + * + */ +public class FolderLifeCycleEventsThrownFromContainerTest { + + /** + * @throws java.lang.Exception + */ + @Before + public void setUp() throws Exception { + } + + /** + * @throws java.lang.Exception + */ + @After + public void tearDown() throws Exception { + } + + + /** + * Lookup a page by its raw model. + * @param container + * @param rawModel + * @return + */ + protected IPage lookupTabFolderPart(SashWindowsContainer container, Object rawModel) { + + LookupModelPageVisitor visitor = new LookupModelPageVisitor(rawModel); + container.visit(visitor); + return visitor.result(); + } + + + /** + * Test if the FOLDER_ADDED event is sent when a folder is added. + * @throws PagesModelException + */ + @Test + public void testFolderAddedEvent() throws PagesModelException { + + SimpleSashWindowContainerTestFacade containerFacade = new SimpleSashWindowContainerTestFacade(); + // get container and contentProvider + ISashWindowsContentProvider contentProvider = containerFacade.getIContentProvider(); + SashWindowsContainer container = containerFacade.getSashContainer(); + + // Create listener and attach it + FakeFolderLifeCycleEventsListener listener = new FakeFolderLifeCycleEventsListener(); + container.getFolderLifeCycleEventProvider().addListener(listener); + + // init the container + IModelExp expr = vSash( + folder( "f1", page("p2"), page("p3"), page("p4") ), + folder( "f2", page("p1") ) + ); + containerFacade.createModel(expr); + + // Do refresh. This fire events + container.refreshTabs(); + // Check events + assertEquals("event fired. listener=" + listener.toString(), 3, listener.getEventCount()); + int i=0; + assertEquals("right event", FakeFolderLifeCycleEventsListener.FOLDER_CREATED, listener.getTraces().get(i)); + assertEquals("right object", containerFacade.getNamesToInternalMap().get("f1"), listener.getEvents().get(i++).getRawModel()); + assertEquals("right event", FakeFolderLifeCycleEventsListener.FOLDER_CREATED, listener.getTraces().get(i)); + assertEquals("right object", containerFacade.getNamesToInternalMap().get("f2"), listener.getEvents().get(i++).getRawModel()); + // There is 3 events. The last one is the disposal of the folder that exist before the refresh, and replaced by + // two other folders. + assertEquals("right event", FakeFolderLifeCycleEventsListener.FOLDER_DISPOSED, listener.getTraces().get(i)); + + + // Reset the listener + listener.resetChangeCount(); + listener.resetTraces(); + + // Add a folder + containerFacade.createFolder("f1", 0, "f1", SWT.RIGHT); + container.refreshTabs(); + + // check events + assertEquals("event fired", 1, listener.getEventCount()); + i=0; + assertEquals("right event", FakeFolderLifeCycleEventsListener.FOLDER_CREATED, listener.getTraces().get(i++)); + } + + /** + * Test if the FOLDER_DISPOSED event is sent when a folder is added. + * @throws PagesModelException + */ + @Test + public void testFolderDisposedEvent() throws PagesModelException { + + SimpleSashWindowContainerTestFacade containerFacade = new SimpleSashWindowContainerTestFacade(); + // get container and contentProvider + ISashWindowsContentProvider contentProvider = containerFacade.getIContentProvider(); + SashWindowsContainer container = containerFacade.getSashContainer(); + + // Create listener and attach it + FakeFolderLifeCycleEventsListener listener = new FakeFolderLifeCycleEventsListener(); + container.getFolderLifeCycleEventProvider().addListener(listener); + + // init the container + IModelExp expr = vSash( + folder( "f1", page("p2"), page("p3"), page("p4") ), + folder( "f2", page("p1") ) + ); + containerFacade.createModel(expr); + + // Do refresh. This fire events + container.refreshTabs(); + + // Reset the listener + listener.resetChangeCount(); + listener.resetTraces(); + + // Remove page. This should remove the folder + containerFacade.removePage("p1"); + container.refreshTabs(); + + // check events + assertEquals("event fired " + listener.toString(), 1, listener.getEventCount()); + int i=0; + assertEquals("right event", FakeFolderLifeCycleEventsListener.FOLDER_DISPOSED, listener.getTraces().get(i)); + assertEquals("right object", containerFacade.getNamesToInternalMap().get("f2"), listener.getEvents().get(i++).getRawModel()); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/PageLifeCycleEventsThrownFromContainerTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/PageLifeCycleEventsThrownFromContainerTest.java index 7dca3c11dfc..39ed1ba71e7 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/PageLifeCycleEventsThrownFromContainerTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/PageLifeCycleEventsThrownFromContainerTest.java @@ -1,336 +1,336 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.sasheditor.internal;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.MessagePartModel;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Test if the {@link SashWindowsContainer} send the events of a page lifecycle.
- * Test if the page lifecycle events are correctly thrown by the {@link SashWindowsContainer} when
- * page are added/removed, ...
- *
- * @author cedric dumoulin
- *
- */
-public class PageLifeCycleEventsThrownFromContainerTest /* extends AbstractPapyrusTest */{
-
- protected Display display;
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- if(display == null || display.isDisposed()) {
- display = Display.getCurrent();
- }
- if(display == null) {
- display = new Display();
- }
- }
-
- /**
- *
- * @return
- */
- private Display getDisplay() {
- return display;
- }
-
- /**
- * Create a {@link SashWindowsContainer} to test. Initialize it with provided {@link ISashWindowsContentProvider}.
- *
- * @param contentProvider
- * @return
- */
- protected SashWindowsContainer createSashWindowsContainer(ISashWindowsContentProvider contentProvider) {
-
- display = getDisplay();
- Shell shell = new Shell(display);
- shell.setLayout(new FillLayout());
-
- //
- //new ShellEditor(shell);
- SashWindowsContainer sashWindowContainer = new SashWindowsContainer();
-
- sashWindowContainer.setContentProvider(contentProvider);
-
- sashWindowContainer.createPartControl(shell);
- // shell.open();
- return sashWindowContainer;
- }
-
- /**
- * Create a contentProvider.
- *
- * @return
- */
- protected SimpleSashWindowsContentProvider createContentProvider() {
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
- // Create pages and add them to the default folder
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < 8; i++) {
- IPageModel newModel = new MessagePartModel("model" + i);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
- return contentProvider;
- }
-
- /**
- * Lookup a page by its raw model.
- *
- * @param container
- * @param rawModel
- * @return
- */
- protected IPage lookupTabFolderPart(SashWindowsContainer container, Object rawModel) {
-
- LookupModelPageVisitor visitor = new LookupModelPageVisitor(rawModel);
- container.visit(visitor);
- return visitor.result();
- }
-
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#addListener(org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener)}
- * .
- */
- @Ignore("TODO")
- @Test
- public void testAddActiveEditorChangedListener() {
- //TODO
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#removeListener(org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener)}
- * .
- */
- @Ignore("TODO")
- @Test
- public void testRemoveActiveEditorChangedListener() {
- //TODO
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageOpenedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}
- * .
- */
- @Test
- public void testFirePageOpenedEvent() {
-
- // Create container and contentProvider
- ISashWindowsContentProvider contentProvider = createContentProvider();
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
-
- // Create listener and attach it
- FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener();
- container.addPageLifeCycleListener(listener);
-
- // Do refresh. This fire events
- container.refreshTabs();
- listener.resetChangeCount();
- listener.resetTraces();
-
-
- // Add an editor
- contentProvider.addPage(new MessagePartModel("newPage"));
- container.refreshTabs();
-
- // check events (there is more than the 2 expected)
- assertTrue("event fired", 2 <= listener.getEventCount());
- int i = 0;
- assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ABOUTTOBEOPENED, listener.getTraces().get(i++));
- assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_OPENED, listener.getTraces().get(i++));
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageClosedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}
- * .
- */
- @Test
- public void testFirePageClosedEvent() {
- // Create container and contentProvider
- ISashWindowsContentProvider contentProvider = createContentProvider();
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
-
- // Create listener and attach it
- FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener();
- container.addPageLifeCycleListener(listener);
-
- // Do refresh. This fire events
- container.refreshTabs();
-
-
- // Add an editor
- IPageModel model = new MessagePartModel("newPage");
- contentProvider.addPage(model);
- container.refreshTabs();
- listener.resetChangeCount();
- listener.resetTraces();
-
- IPage page1 = lookupTabFolderPart(container, model);
- assertNotNull("Page found", page1);
-
- // Close page
- contentProvider.removePage(model);
- container.refreshTabs();
-
- // check events (there is more than the 2 expected)
- assertTrue("event fired", 2 <= listener.getEventCount());
-
- assertTrue("close event fired", listener.getEvents().contains(page1));
- assertTrue("close event fired", listener.getTraces().contains(FakePageLifeCycleEventsListener.PAGE_CLOSED));
- int index = listener.getTraces().indexOf(FakePageLifeCycleEventsListener.PAGE_CLOSED);
- assertEquals("right page closed", page1, listener.getEvent(index));
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeOpenedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}
- * .
- */
- @Test
- public void testFirePageAboutToBeOpenedEvent() {
- // Create container and contentProvider
- ISashWindowsContentProvider contentProvider = createContentProvider();
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
-
- // Create listener and attach it
- FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener();
- container.addPageLifeCycleListener(listener);
-
- // Do refresh. This fire events
- container.refreshTabs();
- listener.resetChangeCount();
- listener.resetTraces();
-
-
- // Add an editor
- contentProvider.addPage(new MessagePartModel("newPage"));
- container.refreshTabs();
-
- // check events (there is more than the 2 expected)
- assertTrue("event fired", 2 <= listener.getEventCount());
- int i = 0;
- assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ABOUTTOBEOPENED, listener.getTraces().get(i++));
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeClosedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}
- * .
- */
- @Test
- public void testFirePageAboutToBeClosedEvent() {
- // no such event anymore
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageActivatedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}
- * .
- */
- @Test
- public void testFirePageActivatedEvent() {
- // Create container and contentProvider
- SimpleSashWindowsContentProvider contentProvider = createContentProvider();
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
-
- // Create listener and attach it
- FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener();
- container.addPageLifeCycleListener(listener);
-
- container.refreshTabs();
-
-
- // Add two pages
- IPageModel pageModel1 = new MessagePartModel("newPage1");
- IPageModel pageModel2 = new MessagePartModel("newPage2");
- contentProvider.addPage(pageModel1);
- contentProvider.addPage(pageModel2);
-
-
- // Do refresh. This fire events
- container.refreshTabs();
- listener.resetChangeCount();
- listener.resetTraces();
-
- // Activate page 2 (1 is already active, and activate it
- // do not throw events)
- IPage page1 = lookupTabFolderPart(container, pageModel2);
- container.selectPage(page1);
-
- // check events (1 expected)
- assertEquals("event fired", 1, listener.getEventCount());
- int i = 0;
- assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ACTIVATED, listener.getTraces().get(i++));
-
- // ****************
- // Check with a move
- listener.resetChangeCount();
- listener.resetTraces();
-
- ITabFolderModel folderModel = contentProvider.getCurrentTabFolder();
- contentProvider.createFolder(folderModel, 0, folderModel, SWT.TOP);
-
- // Do refresh. This fire events
- container.refreshTabs();
- // check events (there is none, as active page does not change)
- // assertEquals("event fired", 3, listener.getEventCount());
- // i=0;
- // assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ACTIVATED, listener.getTraces().get(i++));
-
- // Create a new page
- IPageModel pageModel3 = new MessagePartModel("newPage3");
- contentProvider.addPage(pageModel3);
- // Do refresh. This fire events
- container.refreshTabs();
-
- // check events (there is more than the 2 expected)
- assertEquals("event fired", 3, listener.getEventCount());
- i = 0;
- assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ABOUTTOBEOPENED, listener.getTraces().get(i++));
- assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_OPENED, listener.getTraces().get(i++));
- assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ACTIVATED, listener.getTraces().get(i++));
-
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageDeactivatedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}
- * .
- */
- @Test
- public void testFirePageDeactivatedEvent() {
- // Deactivated is no sent
- }
-
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.sasheditor.internal; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage; +import org.eclipse.papyrus.infra.core.sasheditor.editor.MessagePartModel; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + + +/** + * Test if the {@link SashWindowsContainer} send the events of a page lifecycle. + * Test if the page lifecycle events are correctly thrown by the {@link SashWindowsContainer} when + * page are added/removed, ... + * + * @author cedric dumoulin + * + */ +public class PageLifeCycleEventsThrownFromContainerTest /* extends AbstractPapyrusTest */{ + + protected Display display; + + /** + * @throws java.lang.Exception + */ + @Before + public void setUp() throws Exception { + if(display == null || display.isDisposed()) { + display = Display.getCurrent(); + } + if(display == null) { + display = new Display(); + } + } + + /** + * + * @return + */ + private Display getDisplay() { + return display; + } + + /** + * Create a {@link SashWindowsContainer} to test. Initialize it with provided {@link ISashWindowsContentProvider}. + * + * @param contentProvider + * @return + */ + protected SashWindowsContainer createSashWindowsContainer(ISashWindowsContentProvider contentProvider) { + + display = getDisplay(); + Shell shell = new Shell(display); + shell.setLayout(new FillLayout()); + + // + //new ShellEditor(shell); + SashWindowsContainer sashWindowContainer = new SashWindowsContainer(); + + sashWindowContainer.setContentProvider(contentProvider); + + sashWindowContainer.createPartControl(shell); + // shell.open(); + return sashWindowContainer; + } + + /** + * Create a contentProvider. + * + * @return + */ + protected SimpleSashWindowsContentProvider createContentProvider() { + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + // Create pages and add them to the default folder + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < 8; i++) { + IPageModel newModel = new MessagePartModel("model" + i); + contentProvider.addPage(newModel); + models.add(newModel); + } + + return contentProvider; + } + + /** + * Lookup a page by its raw model. + * + * @param container + * @param rawModel + * @return + */ + protected IPage lookupTabFolderPart(SashWindowsContainer container, Object rawModel) { + + LookupModelPageVisitor visitor = new LookupModelPageVisitor(rawModel); + container.visit(visitor); + return visitor.result(); + } + + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#addListener(org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener)} + * . + */ + @Ignore("TODO") + @Test + public void testAddActiveEditorChangedListener() { + //TODO + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#removeListener(org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener)} + * . + */ + @Ignore("TODO") + @Test + public void testRemoveActiveEditorChangedListener() { + //TODO + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageOpenedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)} + * . + */ + @Test + public void testFirePageOpenedEvent() { + + // Create container and contentProvider + ISashWindowsContentProvider contentProvider = createContentProvider(); + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + + // Create listener and attach it + FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener(); + container.addPageLifeCycleListener(listener); + + // Do refresh. This fire events + container.refreshTabs(); + listener.resetChangeCount(); + listener.resetTraces(); + + + // Add an editor + contentProvider.addPage(new MessagePartModel("newPage")); + container.refreshTabs(); + + // check events (there is more than the 2 expected) + assertTrue("event fired", 2 <= listener.getEventCount()); + int i = 0; + assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ABOUTTOBEOPENED, listener.getTraces().get(i++)); + assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_OPENED, listener.getTraces().get(i++)); + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageClosedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)} + * . + */ + @Test + public void testFirePageClosedEvent() { + // Create container and contentProvider + ISashWindowsContentProvider contentProvider = createContentProvider(); + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + + // Create listener and attach it + FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener(); + container.addPageLifeCycleListener(listener); + + // Do refresh. This fire events + container.refreshTabs(); + + + // Add an editor + IPageModel model = new MessagePartModel("newPage"); + contentProvider.addPage(model); + container.refreshTabs(); + listener.resetChangeCount(); + listener.resetTraces(); + + IPage page1 = lookupTabFolderPart(container, model); + assertNotNull("Page found", page1); + + // Close page + contentProvider.removePage(model); + container.refreshTabs(); + + // check events (there is more than the 2 expected) + assertTrue("event fired", 2 <= listener.getEventCount()); + + assertTrue("close event fired", listener.getEvents().contains(page1)); + assertTrue("close event fired", listener.getTraces().contains(FakePageLifeCycleEventsListener.PAGE_CLOSED)); + int index = listener.getTraces().indexOf(FakePageLifeCycleEventsListener.PAGE_CLOSED); + assertEquals("right page closed", page1, listener.getEvent(index)); + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeOpenedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)} + * . + */ + @Test + public void testFirePageAboutToBeOpenedEvent() { + // Create container and contentProvider + ISashWindowsContentProvider contentProvider = createContentProvider(); + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + + // Create listener and attach it + FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener(); + container.addPageLifeCycleListener(listener); + + // Do refresh. This fire events + container.refreshTabs(); + listener.resetChangeCount(); + listener.resetTraces(); + + + // Add an editor + contentProvider.addPage(new MessagePartModel("newPage")); + container.refreshTabs(); + + // check events (there is more than the 2 expected) + assertTrue("event fired", 2 <= listener.getEventCount()); + int i = 0; + assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ABOUTTOBEOPENED, listener.getTraces().get(i++)); + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeClosedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)} + * . + */ + @Test + public void testFirePageAboutToBeClosedEvent() { + // no such event anymore + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageActivatedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)} + * . + */ + @Test + public void testFirePageActivatedEvent() { + // Create container and contentProvider + SimpleSashWindowsContentProvider contentProvider = createContentProvider(); + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + + // Create listener and attach it + FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener(); + container.addPageLifeCycleListener(listener); + + container.refreshTabs(); + + + // Add two pages + IPageModel pageModel1 = new MessagePartModel("newPage1"); + IPageModel pageModel2 = new MessagePartModel("newPage2"); + contentProvider.addPage(pageModel1); + contentProvider.addPage(pageModel2); + + + // Do refresh. This fire events + container.refreshTabs(); + listener.resetChangeCount(); + listener.resetTraces(); + + // Activate page 2 (1 is already active, and activate it + // do not throw events) + IPage page1 = lookupTabFolderPart(container, pageModel2); + container.selectPage(page1); + + // check events (1 expected) + assertEquals("event fired", 1, listener.getEventCount()); + int i = 0; + assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ACTIVATED, listener.getTraces().get(i++)); + + // **************** + // Check with a move + listener.resetChangeCount(); + listener.resetTraces(); + + ITabFolderModel folderModel = contentProvider.getCurrentTabFolder(); + contentProvider.createFolder(folderModel, 0, folderModel, SWT.TOP); + + // Do refresh. This fire events + container.refreshTabs(); + // check events (there is none, as active page does not change) + // assertEquals("event fired", 3, listener.getEventCount()); + // i=0; + // assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ACTIVATED, listener.getTraces().get(i++)); + + // Create a new page + IPageModel pageModel3 = new MessagePartModel("newPage3"); + contentProvider.addPage(pageModel3); + // Do refresh. This fire events + container.refreshTabs(); + + // check events (there is more than the 2 expected) + assertEquals("event fired", 3, listener.getEventCount()); + i = 0; + assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ABOUTTOBEOPENED, listener.getTraces().get(i++)); + assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_OPENED, listener.getTraces().get(i++)); + assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ACTIVATED, listener.getTraces().get(i++)); + + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageDeactivatedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)} + * . + */ + @Test + public void testFirePageDeactivatedEvent() { + // Deactivated is no sent + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProviderTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProviderTest.java index 913d54bc1e4..30b7473084d 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProviderTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProviderTest.java @@ -1,186 +1,186 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.sasheditor.internal;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-
-/**
- * Tests for the class {@link SashContainerEventsProvider}.
- *
- * @author dumoulin
- *
- */
-public class SashContainerEventsProviderTest /* extends AbstractPapyrusTest */{
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#addListener(org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener)}
- * .
- */
- @Test
- public void testAddActiveEditorChangedListener() {
- SashContainerEventsProvider provider = new SashContainerEventsProvider();
-
- FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener();
- provider.addListener(listener);
-
- // Use a null page, as it is not possible to instanciate a fake page.
- PagePart page = null;
-
- // Send an event and check that it is received. If received, the listener is register !
- provider.firePageAboutToBeClosedEvent(page);
- assertEquals("event fired", 1, listener.getEventCount());
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#removeListener(org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener)}
- * .
- */
- @Test
- public void testRemoveActiveEditorChangedListener() {
- SashContainerEventsProvider provider = new SashContainerEventsProvider();
-
- FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener();
- provider.addListener(listener);
- provider.removeListener(listener);
-
- // Use a null page, as it is not possible to instanciate a fake page.
- PagePart page = null;
-
- // Send an event and check that it is received. If received, the listener is register !
- provider.firePageAboutToBeClosedEvent(page);
- assertEquals("event not fired", 0, listener.getEventCount());
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageOpenedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}
- * .
- */
- @Test
- public void testFirePageOpenedEvent() {
- SashContainerEventsProvider provider = new SashContainerEventsProvider();
-
- FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener();
- provider.addListener(listener);
-
- // Use a null page, as it is not possible to instanciate a fake page.
- PagePart page = null;
-
- // Send an event and check that it is received. If received, the listener is register !
- provider.firePageOpenedEvent(page);
- assertEquals("event fired", 1, listener.getEventCount());
- assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_OPENED, listener.getTraces().get(0));
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageClosedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}
- * .
- */
- @Test
- public void testFirePageClosedEvent() {
- SashContainerEventsProvider provider = new SashContainerEventsProvider();
-
- FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener();
- provider.addListener(listener);
-
- // Use a null page, as it is not possible to instanciate a fake page.
- PagePart page = null;
-
- // Send an event and check that it is received. If received, the listener is register !
- provider.firePageClosedEvent(page);
- assertEquals("event fired", 1, listener.getEventCount());
- assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_CLOSED, listener.getTraces().get(0));
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeOpenedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}
- * .
- */
- @Test
- public void testFirePageAboutToBeOpenedEvent() {
- SashContainerEventsProvider provider = new SashContainerEventsProvider();
-
- FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener();
- provider.addListener(listener);
-
- // Use a null page, as it is not possible to instanciate a fake page.
- PagePart page = null;
-
- // Send an event and check that it is received. If received, the listener is register !
- provider.firePageAboutToBeOpenedEvent(page);
- assertEquals("event fired", 1, listener.getEventCount());
- assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ABOUTTOBEOPENED, listener.getTraces().get(0));
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeClosedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}
- * .
- */
- @Test
- public void testFirePageAboutToBeClosedEvent() {
- SashContainerEventsProvider provider = new SashContainerEventsProvider();
-
- FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener();
- provider.addListener(listener);
-
- // Use a null page, as it is not possible to instanciate a fake page.
- PagePart page = null;
-
- // Send an event and check that it is received. If received, the listener is register !
- provider.firePageAboutToBeClosedEvent(page);
- assertEquals("event fired", 1, listener.getEventCount());
- assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ABOUTTOBECLOSED, listener.getTraces().get(0));
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageActivatedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}
- * .
- */
- @Test
- public void testFirePageActivatedEvent() {
- SashContainerEventsProvider provider = new SashContainerEventsProvider();
-
- FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener();
- provider.addListener(listener);
-
- // Use a null page, as it is not possible to instanciate a fake page.
- PagePart page = null;
-
- // Send an event and check that it is received. If received, the listener is register !
- provider.firePageActivatedEvent(page);
- assertEquals("event fired", 1, listener.getEventCount());
- assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ACTIVATED, listener.getTraces().get(0));
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageDeactivatedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)}
- * .
- */
- @Test
- public void testFirePageDeactivatedEvent() {
- SashContainerEventsProvider provider = new SashContainerEventsProvider();
-
- FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener();
- provider.addListener(listener);
-
- // Use a null page, as it is not possible to instanciate a fake page.
- PagePart page = null;
-
- // Send an event and check that it is received. If received, the listener is register !
- provider.firePageDeactivatedEvent(page);
- assertEquals("event fired", 1, listener.getEventCount());
- assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_DEACTIVATED, listener.getTraces().get(0));
- }
-
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.sasheditor.internal; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + + +/** + * Tests for the class {@link SashContainerEventsProvider}. + * + * @author dumoulin + * + */ +public class SashContainerEventsProviderTest /* extends AbstractPapyrusTest */{ + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#addListener(org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener)} + * . + */ + @Test + public void testAddActiveEditorChangedListener() { + SashContainerEventsProvider provider = new SashContainerEventsProvider(); + + FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener(); + provider.addListener(listener); + + // Use a null page, as it is not possible to instanciate a fake page. + PagePart page = null; + + // Send an event and check that it is received. If received, the listener is register ! + provider.firePageAboutToBeClosedEvent(page); + assertEquals("event fired", 1, listener.getEventCount()); + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#removeListener(org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsListener)} + * . + */ + @Test + public void testRemoveActiveEditorChangedListener() { + SashContainerEventsProvider provider = new SashContainerEventsProvider(); + + FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener(); + provider.addListener(listener); + provider.removeListener(listener); + + // Use a null page, as it is not possible to instanciate a fake page. + PagePart page = null; + + // Send an event and check that it is received. If received, the listener is register ! + provider.firePageAboutToBeClosedEvent(page); + assertEquals("event not fired", 0, listener.getEventCount()); + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageOpenedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)} + * . + */ + @Test + public void testFirePageOpenedEvent() { + SashContainerEventsProvider provider = new SashContainerEventsProvider(); + + FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener(); + provider.addListener(listener); + + // Use a null page, as it is not possible to instanciate a fake page. + PagePart page = null; + + // Send an event and check that it is received. If received, the listener is register ! + provider.firePageOpenedEvent(page); + assertEquals("event fired", 1, listener.getEventCount()); + assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_OPENED, listener.getTraces().get(0)); + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageClosedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)} + * . + */ + @Test + public void testFirePageClosedEvent() { + SashContainerEventsProvider provider = new SashContainerEventsProvider(); + + FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener(); + provider.addListener(listener); + + // Use a null page, as it is not possible to instanciate a fake page. + PagePart page = null; + + // Send an event and check that it is received. If received, the listener is register ! + provider.firePageClosedEvent(page); + assertEquals("event fired", 1, listener.getEventCount()); + assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_CLOSED, listener.getTraces().get(0)); + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeOpenedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)} + * . + */ + @Test + public void testFirePageAboutToBeOpenedEvent() { + SashContainerEventsProvider provider = new SashContainerEventsProvider(); + + FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener(); + provider.addListener(listener); + + // Use a null page, as it is not possible to instanciate a fake page. + PagePart page = null; + + // Send an event and check that it is received. If received, the listener is register ! + provider.firePageAboutToBeOpenedEvent(page); + assertEquals("event fired", 1, listener.getEventCount()); + assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ABOUTTOBEOPENED, listener.getTraces().get(0)); + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeClosedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)} + * . + */ + @Test + public void testFirePageAboutToBeClosedEvent() { + SashContainerEventsProvider provider = new SashContainerEventsProvider(); + + FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener(); + provider.addListener(listener); + + // Use a null page, as it is not possible to instanciate a fake page. + PagePart page = null; + + // Send an event and check that it is received. If received, the listener is register ! + provider.firePageAboutToBeClosedEvent(page); + assertEquals("event fired", 1, listener.getEventCount()); + assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ABOUTTOBECLOSED, listener.getTraces().get(0)); + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageActivatedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)} + * . + */ + @Test + public void testFirePageActivatedEvent() { + SashContainerEventsProvider provider = new SashContainerEventsProvider(); + + FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener(); + provider.addListener(listener); + + // Use a null page, as it is not possible to instanciate a fake page. + PagePart page = null; + + // Send an event and check that it is received. If received, the listener is register ! + provider.firePageActivatedEvent(page); + assertEquals("event fired", 1, listener.getEventCount()); + assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_ACTIVATED, listener.getTraces().get(0)); + } + + /** + * Test method for + * {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashContainerEventsProvider#firePageDeactivatedEvent(org.eclipse.papyrus.infra.core.sasheditor.internal.PagePart)} + * . + */ + @Test + public void testFirePageDeactivatedEvent() { + SashContainerEventsProvider provider = new SashContainerEventsProvider(); + + FakePageLifeCycleEventsListener listener = new FakePageLifeCycleEventsListener(); + provider.addListener(listener); + + // Use a null page, as it is not possible to instanciate a fake page. + PagePart page = null; + + // Send an event and check that it is received. If received, the listener is register ! + provider.firePageDeactivatedEvent(page); + assertEquals("event fired", 1, listener.getEventCount()); + assertEquals("right event", FakePageLifeCycleEventsListener.PAGE_DEACTIVATED, listener.getTraces().get(0)); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerDisposeCalledTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerDisposeCalledTest.java index 1473bde4420..880e10c5008 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerDisposeCalledTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerDisposeCalledTest.java @@ -1,177 +1,177 @@ -/*****************************************************************************
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.internal;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.FakeMultiSashPageEditor;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.TestTextEditor;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.TextEditorPartModel;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Tests to check memory leak and dispose() calls.
- *
- * @author Cedric Dumoulin
- *
- */
-public class SashWindowsContainerDisposeCalledTest /* extends AbstractPapyrusTest */{
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- Display.getDefault().syncExec(new Runnable() {
-
- public void run() {
- // Close all remaining opened editors
- IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = window.getActivePage();
- page.closeAllEditors(false);
- }
- });
- }
-
- /**
- * Test the call of dispose() on nestedEditor when the editor is
- * closed independently
- *
- * * @throws PartInitException
- *
- * @throws Exception
- */
- @Test
- public void testDisposeCallOnNestedEditorRemoval() throws Exception {
- // Create
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
- // Create pages and add them to the default folder
- int pageCount = 3;
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < pageCount; i++) {
- IPageModel newModel = new TextEditorPartModel("model" + i, true);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
-
- FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(contentProvider);
- // Get the container
- final SashWindowsContainer container = editor.getSashWindowsContainer();
-
- // Check if nested editor creation work
- IEditorPart activeNestedEditor = editor.getActiveEditor();
- assertEquals("nested editor is of right type", TestTextEditor.class, activeNestedEditor.getClass());
-
- // // Close the editor by removing its model
- // contentProvider.removePage(models.get(0));
- // // Refresh the container: this should close the editor
- // container.refreshTabs();
- // assertNull( "No more active editor", container.getActiveEditor() );
- // // Check if dispose() is called
- // ITraceRecords traces = ((TextEditorPartModel)models.get(0)).getTraceRecords();
- // assertTrue("dispose is called", traces.contains(null, "dispose"));
-
- // Close each container and check dispose call
- for(IPageModel model : models) {
- // Close the editor by removing its model
- contentProvider.removePage(model);
- // Refresh the container: this should close the editor
- Display.getDefault().syncExec(new Runnable() {
-
- public void run() {
- container.refreshTabs();
- }
- });
-
- // Check if dispose() is called
- ITraceRecords traces = ((TextEditorPartModel)model).getTraceRecords();
- assertTrue("dispose is called", traces.contains(null, "dispose"));
-
- }
-
- FakeMultiSashPageEditor.closeEditor(editor);
-
- }
-
- /**
- * Test if dispose can be called twice without errors.
- *
- * * @throws PartInitException
- */
- @Ignore("TODO")
- @Test
- public void testCallingDisposeTwice() throws PartInitException {
- //TODO
- }
-
- /**
- * Test the call of dispose() on nestedEditor when the main editor is
- * closed. Normally, each nested editor should be disposed.
- *
- * * @throws PartInitException
- */
- @Test
- public void testDisposeCallOnMainEditorClose() throws PartInitException {
- // Create
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
- // Create pages and add them to the default folder
- int pageCount = 3;
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < pageCount; i++) {
- IPageModel newModel = new TextEditorPartModel("model" + i, true);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
-
- FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(contentProvider);
-
- // Check if nested editor creation work
- IEditorPart activeNestedEditor = editor.getActiveEditor();
- assertEquals("nested editor is of right type", TestTextEditor.class, activeNestedEditor.getClass());
-
- // Close the main editor
- FakeMultiSashPageEditor.closeEditor(editor);
-
- // for each container check dispose call
- assertEquals("list of model is alive", pageCount, models.size());
- for(IPageModel model : models) {
- // Check if dispose() is called
- ITraceRecords traces = ((TextEditorPartModel)model).getTraceRecords();
- assertTrue("dispose nested editor is called when main editor close", traces.contains(null, "dispose"));
- }
-
- }
-
-
-}
+/***************************************************************************** + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.internal; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.FakeMultiSashPageEditor; +import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.TestTextEditor; +import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.TextEditorPartModel; +import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.junit.After; +import org.junit.Ignore; +import org.junit.Test; + +/** + * Tests to check memory leak and dispose() calls. + * + * @author Cedric Dumoulin + * + */ +public class SashWindowsContainerDisposeCalledTest /* extends AbstractPapyrusTest */{ + + /** + * @throws java.lang.Exception + */ + @After + public void tearDown() throws Exception { + Display.getDefault().syncExec(new Runnable() { + + public void run() { + // Close all remaining opened editors + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchPage page = window.getActivePage(); + page.closeAllEditors(false); + } + }); + } + + /** + * Test the call of dispose() on nestedEditor when the editor is + * closed independently + * + * * @throws PartInitException + * + * @throws Exception + */ + @Test + public void testDisposeCallOnNestedEditorRemoval() throws Exception { + // Create + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + // Create pages and add them to the default folder + int pageCount = 3; + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < pageCount; i++) { + IPageModel newModel = new TextEditorPartModel("model" + i, true); + contentProvider.addPage(newModel); + models.add(newModel); + } + + + FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(contentProvider); + // Get the container + final SashWindowsContainer container = editor.getSashWindowsContainer(); + + // Check if nested editor creation work + IEditorPart activeNestedEditor = editor.getActiveEditor(); + assertEquals("nested editor is of right type", TestTextEditor.class, activeNestedEditor.getClass()); + + // // Close the editor by removing its model + // contentProvider.removePage(models.get(0)); + // // Refresh the container: this should close the editor + // container.refreshTabs(); + // assertNull( "No more active editor", container.getActiveEditor() ); + // // Check if dispose() is called + // ITraceRecords traces = ((TextEditorPartModel)models.get(0)).getTraceRecords(); + // assertTrue("dispose is called", traces.contains(null, "dispose")); + + // Close each container and check dispose call + for(IPageModel model : models) { + // Close the editor by removing its model + contentProvider.removePage(model); + // Refresh the container: this should close the editor + Display.getDefault().syncExec(new Runnable() { + + public void run() { + container.refreshTabs(); + } + }); + + // Check if dispose() is called + ITraceRecords traces = ((TextEditorPartModel)model).getTraceRecords(); + assertTrue("dispose is called", traces.contains(null, "dispose")); + + } + + FakeMultiSashPageEditor.closeEditor(editor); + + } + + /** + * Test if dispose can be called twice without errors. + * + * * @throws PartInitException + */ + @Ignore("TODO") + @Test + public void testCallingDisposeTwice() throws PartInitException { + //TODO + } + + /** + * Test the call of dispose() on nestedEditor when the main editor is + * closed. Normally, each nested editor should be disposed. + * + * * @throws PartInitException + */ + @Test + public void testDisposeCallOnMainEditorClose() throws PartInitException { + // Create + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + // Create pages and add them to the default folder + int pageCount = 3; + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < pageCount; i++) { + IPageModel newModel = new TextEditorPartModel("model" + i, true); + contentProvider.addPage(newModel); + models.add(newModel); + } + + + FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(contentProvider); + + // Check if nested editor creation work + IEditorPart activeNestedEditor = editor.getActiveEditor(); + assertEquals("nested editor is of right type", TestTextEditor.class, activeNestedEditor.getClass()); + + // Close the main editor + FakeMultiSashPageEditor.closeEditor(editor); + + // for each container check dispose call + assertEquals("list of model is alive", pageCount, models.size()); + for(IPageModel model : models) { + // Check if dispose() is called + ITraceRecords traces = ((TextEditorPartModel)model).getTraceRecords(); + assertTrue("dispose nested editor is called when main editor close", traces.contains(null, "dispose")); + } + + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerMemoryLeakTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerMemoryLeakTest.java index 1cec9c76af5..7fa80e94860 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerMemoryLeakTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerMemoryLeakTest.java @@ -1,207 +1,207 @@ -/*****************************************************************************
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.internal;
-
-import static org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak.MemoryLeakUtil.assertIsGarbageCollected;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.FakeMultiSashPageEditor;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.TestTextEditor;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.TextEditorPartModel;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Tests to check memory leak and dispose() calls.
- *
- * The test do not work because the {@link TestTextEditor} don not dispose properly. We need to find
- * how to dispose it properly, or use another editor.
- *
- * @author Cedric Dumoulin
- *
- */
-@Ignore
-public class SashWindowsContainerMemoryLeakTest {
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
-
- if (PlatformUI.isWorkbenchRunning()) {
-
- // Close all remaining opened editors
- IWorkbenchWindow window=PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = window.getActivePage();
- page.closeAllEditors(false);
- }
- }
-
- /**
- * Test if calling dispose on TestEditor do not induce memory leak.
- *
- * * @throws PartInitException
- * @throws Exception
- */
- @Test
- public void testDisposeOnTestEditor() throws Exception {
-
- TestTextEditor editor = TestTextEditor.openEditor();
-
- TestTextEditor.closeEditor(editor);
- // Check memory leak
- WeakReference<IEditorPart> ref = new WeakReference<IEditorPart>(editor);
- editor = null;
- assertIsGarbageCollected(ref, 10*1000);
-
-
- }
-
-
- /**
- * Test the call of dispose() on nestedEditor when the editor is
- * closed independently
- *
- * * @throws PartInitException
- * @throws Exception
- */
- @Test
- @Ignore
- public void testDisposeCallOnNestedEditorRemoval() throws Exception {
- // Create
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
- // Create pages and add them to the default folder
- int pageCount = 3;
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < pageCount; i++) {
- IPageModel newModel = new TextEditorPartModel("model" + i, true);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
-
- FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(contentProvider);
- // Get the container
- SashWindowsContainer container = editor.getSashWindowsContainer();
-
- // Check if nested editor creation work
- IEditorPart activeNestedEditor = editor.getActiveEditor();
- assertEquals("nested editor is of right type", TestTextEditor.class, activeNestedEditor.getClass());
-
-// // Close the editor by removing its model
-// contentProvider.removePage(models.get(0));
-// // Refresh the container: this should close the editor
-// container.refreshTabs();
-// assertNull( "No more active editor", container.getActiveEditor() );
-// // Check if dispose() is called
-// ITraceRecords traces = ((TextEditorPartModel)models.get(0)).getTraceRecords();
-// assertTrue("dispose is called", traces.contains(null, "dispose"));
-
- // Close each container and check dispose call
- for(IPageModel model : models) {
- // Close the editor by removing its model
- contentProvider.removePage(model);
- // Refresh the container: this should close the editor
- container.refreshTabs();
- // Check if dispose() is called
- ITraceRecords traces = ((TextEditorPartModel)model).getTraceRecords();
- assertTrue("dispose is called", traces.contains(null, "dispose"));
-
- }
-
- // Check memory leak
- editor = null;
- WeakReference<IEditorPart> ref = new WeakReference<IEditorPart>(activeNestedEditor);
- activeNestedEditor = null;
- assertIsGarbageCollected(ref, 10*1000);
-
- FakeMultiSashPageEditor.closeEditor(editor);
-
- }
-
- /**
- * Test the call of dispose() on nestedEditor when the main editor is
- * closed. Normally, each nested editor should be disposed.
- *
- * * @throws PartInitException
- */
- @Test
- @Ignore
- public void testDisposeCallOnMainEditorClose() throws PartInitException {
- // Create
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
- // Create pages and add them to the default folder
- int pageCount = 3;
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < pageCount; i++) {
- IPageModel newModel = new TextEditorPartModel("model" + i, true);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
-
- FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(contentProvider);
-
- // Check if nested editor creation work
- IEditorPart activeNestedEditor = editor.getActiveEditor();
- assertEquals("nested editor is of right type", TestTextEditor.class, activeNestedEditor.getClass());
-
- // Close the main editor
- FakeMultiSashPageEditor.closeEditor(editor);
- editor = null;
-
- // for each container check dispose call
- assertEquals("list of model is alive", pageCount, models.size());
- for(IPageModel model : models) {
- // Check if dispose() is called
- ITraceRecords traces = ((TextEditorPartModel)model).getTraceRecords();
- assertTrue("dispose is called", traces.contains(null, "dispose"));
- }
-
- // Check memory leak
- WeakReference<IEditorPart> ref = new WeakReference<IEditorPart>(activeNestedEditor);
- activeNestedEditor = null;
- assertIsGarbageCollected(ref, 10*1000);
-
-
- }
-
-
-}
+/***************************************************************************** + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.internal; + +import static org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak.MemoryLeakUtil.assertIsGarbageCollected; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.FakeMultiSashPageEditor; +import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.TestTextEditor; +import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.TextEditorPartModel; +import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +/** + * Tests to check memory leak and dispose() calls. + * + * The test do not work because the {@link TestTextEditor} don not dispose properly. We need to find + * how to dispose it properly, or use another editor. + * + * @author Cedric Dumoulin + * + */ +@Ignore +public class SashWindowsContainerMemoryLeakTest { + + /** + * @throws java.lang.Exception + */ + @Before + public void setUp() throws Exception { + } + + /** + * @throws java.lang.Exception + */ + @After + public void tearDown() throws Exception { + + if (PlatformUI.isWorkbenchRunning()) { + + // Close all remaining opened editors + IWorkbenchWindow window=PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchPage page = window.getActivePage(); + page.closeAllEditors(false); + } + } + + /** + * Test if calling dispose on TestEditor do not induce memory leak. + * + * * @throws PartInitException + * @throws Exception + */ + @Test + public void testDisposeOnTestEditor() throws Exception { + + TestTextEditor editor = TestTextEditor.openEditor(); + + TestTextEditor.closeEditor(editor); + // Check memory leak + WeakReference<IEditorPart> ref = new WeakReference<IEditorPart>(editor); + editor = null; + assertIsGarbageCollected(ref, 10*1000); + + + } + + + /** + * Test the call of dispose() on nestedEditor when the editor is + * closed independently + * + * * @throws PartInitException + * @throws Exception + */ + @Test + @Ignore + public void testDisposeCallOnNestedEditorRemoval() throws Exception { + // Create + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + // Create pages and add them to the default folder + int pageCount = 3; + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < pageCount; i++) { + IPageModel newModel = new TextEditorPartModel("model" + i, true); + contentProvider.addPage(newModel); + models.add(newModel); + } + + + FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(contentProvider); + // Get the container + SashWindowsContainer container = editor.getSashWindowsContainer(); + + // Check if nested editor creation work + IEditorPart activeNestedEditor = editor.getActiveEditor(); + assertEquals("nested editor is of right type", TestTextEditor.class, activeNestedEditor.getClass()); + +// // Close the editor by removing its model +// contentProvider.removePage(models.get(0)); +// // Refresh the container: this should close the editor +// container.refreshTabs(); +// assertNull( "No more active editor", container.getActiveEditor() ); +// // Check if dispose() is called +// ITraceRecords traces = ((TextEditorPartModel)models.get(0)).getTraceRecords(); +// assertTrue("dispose is called", traces.contains(null, "dispose")); + + // Close each container and check dispose call + for(IPageModel model : models) { + // Close the editor by removing its model + contentProvider.removePage(model); + // Refresh the container: this should close the editor + container.refreshTabs(); + // Check if dispose() is called + ITraceRecords traces = ((TextEditorPartModel)model).getTraceRecords(); + assertTrue("dispose is called", traces.contains(null, "dispose")); + + } + + // Check memory leak + editor = null; + WeakReference<IEditorPart> ref = new WeakReference<IEditorPart>(activeNestedEditor); + activeNestedEditor = null; + assertIsGarbageCollected(ref, 10*1000); + + FakeMultiSashPageEditor.closeEditor(editor); + + } + + /** + * Test the call of dispose() on nestedEditor when the main editor is + * closed. Normally, each nested editor should be disposed. + * + * * @throws PartInitException + */ + @Test + @Ignore + public void testDisposeCallOnMainEditorClose() throws PartInitException { + // Create + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + // Create pages and add them to the default folder + int pageCount = 3; + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < pageCount; i++) { + IPageModel newModel = new TextEditorPartModel("model" + i, true); + contentProvider.addPage(newModel); + models.add(newModel); + } + + + FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(contentProvider); + + // Check if nested editor creation work + IEditorPart activeNestedEditor = editor.getActiveEditor(); + assertEquals("nested editor is of right type", TestTextEditor.class, activeNestedEditor.getClass()); + + // Close the main editor + FakeMultiSashPageEditor.closeEditor(editor); + editor = null; + + // for each container check dispose call + assertEquals("list of model is alive", pageCount, models.size()); + for(IPageModel model : models) { + // Check if dispose() is called + ITraceRecords traces = ((TextEditorPartModel)model).getTraceRecords(); + assertTrue("dispose is called", traces.contains(null, "dispose")); + } + + // Check memory leak + WeakReference<IEditorPart> ref = new WeakReference<IEditorPart>(activeNestedEditor); + activeNestedEditor = null; + assertIsGarbageCollected(ref, 10*1000); + + + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerRefreshTabsTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerRefreshTabsTest.java index 20b2b8562a9..96e2083fd1b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerRefreshTabsTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerRefreshTabsTest.java @@ -1,119 +1,119 @@ -/*****************************************************************************
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.internal;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.FakeMultiSashPageEditor;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.TextEditorPartModel;
-import org.eclipse.swt.SWT;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests the correct execution of {@link SashWindowsContainer#refreshTabs()} on particular
- * configuration of the model.
- *
- * @author Cedric Dumoulin
- *
- */
-public class SashWindowsContainerRefreshTabsTest {
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
-
- // Close all remaining opened editors
- IWorkbenchWindow window=PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = window.getActivePage();
- page.closeAllEditors(false);
- }
-
- /**
- * Test that closing the last editor in a second folder correctly close the folder.
- *
- * * @throws PartInitException
- * @throws Exception
- */
- @Test
- public void testCloseLastEditorInSecondFolder() throws Exception {
- // Create
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
- // Create pages and add them to the default folder
- int pageCount = 3;
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < pageCount; i++) {
- IPageModel newModel = new TextEditorPartModel("model" + i, true);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
- // Create the Main editor
- FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(contentProvider);
- // Get the container
- SashWindowsContainer container = editor.getSashWindowsContainer();
-
- // Index of the model of the editor to move and close
- int movedEditorModelIndex = 0;
- // Create a new folder by moving an editor
- ITabFolderModel firstFolder = contentProvider.getCurrentTabFolder();
- contentProvider.createFolder(firstFolder, movedEditorModelIndex, firstFolder, SWT.TOP);
-
- // Refresh
- container.refreshTabs();
-
- // Check if nested editor is the moved one
- IPage page = container.getActiveSashWindowsPage();
- assertEquals("nested editor is of right type", models.get(movedEditorModelIndex), page.getRawModel());
-
-
- // Close the editor
- contentProvider.removePage(models.get(movedEditorModelIndex));
-
- // Refresh
- try {
- container.refreshTabs();
- } catch (Exception e) {
- fail("refreshTabs() work correctly");
- }
-
- FakeMultiSashPageEditor.closeEditor(editor);
-
- }
-
-
-}
+/***************************************************************************** + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.internal; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage; +import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.FakeMultiSashPageEditor; +import org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.TextEditorPartModel; +import org.eclipse.swt.SWT; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * Tests the correct execution of {@link SashWindowsContainer#refreshTabs()} on particular + * configuration of the model. + * + * @author Cedric Dumoulin + * + */ +public class SashWindowsContainerRefreshTabsTest { + + /** + * @throws java.lang.Exception + */ + @Before + public void setUp() throws Exception { + } + + /** + * @throws java.lang.Exception + */ + @After + public void tearDown() throws Exception { + + // Close all remaining opened editors + IWorkbenchWindow window=PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchPage page = window.getActivePage(); + page.closeAllEditors(false); + } + + /** + * Test that closing the last editor in a second folder correctly close the folder. + * + * * @throws PartInitException + * @throws Exception + */ + @Test + public void testCloseLastEditorInSecondFolder() throws Exception { + // Create + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + // Create pages and add them to the default folder + int pageCount = 3; + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < pageCount; i++) { + IPageModel newModel = new TextEditorPartModel("model" + i, true); + contentProvider.addPage(newModel); + models.add(newModel); + } + + // Create the Main editor + FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(contentProvider); + // Get the container + SashWindowsContainer container = editor.getSashWindowsContainer(); + + // Index of the model of the editor to move and close + int movedEditorModelIndex = 0; + // Create a new folder by moving an editor + ITabFolderModel firstFolder = contentProvider.getCurrentTabFolder(); + contentProvider.createFolder(firstFolder, movedEditorModelIndex, firstFolder, SWT.TOP); + + // Refresh + container.refreshTabs(); + + // Check if nested editor is the moved one + IPage page = container.getActiveSashWindowsPage(); + assertEquals("nested editor is of right type", models.get(movedEditorModelIndex), page.getRawModel()); + + + // Close the editor + contentProvider.removePage(models.get(movedEditorModelIndex)); + + // Refresh + try { + container.refreshTabs(); + } catch (Exception e) { + fail("refreshTabs() work correctly"); + } + + FakeMultiSashPageEditor.closeEditor(editor); + + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerTest.java index fdf3c67b4d0..486e1b41961 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainerTest.java @@ -1,643 +1,643 @@ -/*****************************************************************************
- * Copyright (c) 2009-2013 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.internal;
-
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.folder;
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.page;
-import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.vSash;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContainerTestFacade;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IComponentPage;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IFolder;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.MessagePartModel;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-import org.eclipse.papyrus.infra.core.sasheditor.utils.FakeObservableListener;
-import org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableList;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Run as normal test.
- *
- * @author cedric dumoulin
- *
- */
-public class SashWindowsContainerTest /* extends AbstractPapyrusTest */{
-
-
- protected Display display;
-
- /**
- * Constructor.
- *
- * @param name
- */
- public SashWindowsContainerTest() {
- }
-
- /**
- * @see junit.framework.TestCase#setUp()
- * @throws java.lang.Exception
- *
- */
- @Before
- public void setUp() throws Exception {
- display = Display.getCurrent();
- if(display == null) {
- display = new Display();
- }
- }
-
- /**
- * Create a {@link SashWindowsContainer} to test. Initialize it with provided {@link ISashWindowsContentProvider}.
- *
- * @param contentProvider
- * @return
- */
- protected SashWindowsContainer createSashWindowsContainer(ISashWindowsContentProvider contentProvider) {
- Shell shell = new Shell(display);
- shell.setLayout(new FillLayout());
-
- //
- //new ShellEditor(shell);
- SashWindowsContainer sashWindowContainer = new SashWindowsContainer();
-
- sashWindowContainer.setContentProvider(contentProvider);
-
- sashWindowContainer.createPartControl(shell);
- // shell.open();
- return sashWindowContainer;
- }
-
- /**
- * Create a contentProvider.
- *
- * @return
- */
- protected ISashWindowsContentProvider createContentProvider() {
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
- // Create pages and add them to the default folder
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < 8; i++) {
- IPageModel newModel = new MessagePartModel("model" + i);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
- return contentProvider;
- }
-
- /**
- * Test the method on a model with several folders and page.
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}.
- */
- @Test
- public void testGetActiveEditor() {
- // Create
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
- // Create pages and add them to the default folder
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < 2; i++) {
- IPageModel newModel = new MessagePartModel("model" + i);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
- // Create new folder
- ITabFolderModel folder = contentProvider.getCurrentTabFolder();
- contentProvider.createFolder(folder, 1, folder, SWT.TOP);
-
- // Get the active editor
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
- IPage page = container.getActiveSashWindowsPage();
- assertNotNull("Page exist", page);
- }
-
- /**
- * Test the method on a model with several folders and page.
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}.
- * Use new implementation to populate contentProvider
- *
- * @throws PagesModelException
- */
- @Test
- public void testGetActiveEditor2() throws PagesModelException {
-
- // Create populated content provider
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
- SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider);
-
- // define how to populate contentProvider
- IModelExp expr = vSash(folder("f1", page("p11"), page("p12")), folder("f2", page("p21")));
- // Try to create the model
- helper.createModel(expr);
-
-
- // Get the active editor
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
- IPage page = container.getActiveSashWindowsPage();
- assertNotNull("Page exist", page);
- }
-
- /**
- * Test the method on a model with several folders and page.
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}.
- */
- @Test
- public void testGetVisiblePages() {
- // Create
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
- // Create pages and add them to the default folder
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < 2; i++) {
- IPageModel newModel = new MessagePartModel("model" + i);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
- // Create new folder
- ITabFolderModel folder = contentProvider.getCurrentTabFolder();
- contentProvider.createFolder(folder, 1, folder, SWT.TOP);
- // Add pages
- List<IPageModel> modelsInFolder2 = new ArrayList<IPageModel>();
- for(int i = 0; i < 2; i++) {
- IPageModel newModel = new MessagePartModel("modelInFolder2" + i);
- contentProvider.addPage(newModel);
- modelsInFolder2.add(newModel);
- }
-
- // Build a list of expected visible models
- List<IPageModel> expectedVisibleModel = new ArrayList<IPageModel>();
- expectedVisibleModel.add(models.get(models.size() - 1));
- expectedVisibleModel.add(modelsInFolder2.get(models.size() - 1));
-
- // Get the active editor
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
- List<IPage> pages = container.getVisiblePages();
-
- assertEquals("2 pages visible", 2, pages.size());
- assertTrue("contains active from folder 1", expectedVisibleModel.contains(pages.get(0).getRawModel()));
- assertTrue("contains active from folder 1", expectedVisibleModel.contains(pages.get(1).getRawModel()));
- // assertNotNull("Page exist", page);
- }
-
- /**
- * Test the method on a model with several folders and page.
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}.
- * Use new implementation to populate contentProvider
- *
- * @throws PagesModelException
- */
- @Test
- public void testGetVisiblePages2() throws PagesModelException {
- // Create populated content provider
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
- SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider);
-
- // define how to populate contentProvider
- IModelExp expr = vSash(folder("f1", page("p11"), page("p12")), folder("f2", page("p21"), page("p22")));
- // Try to create the model
- helper.createModel(expr);
- // Get the references
- Map<String, Object> models = helper.queryModel(expr);
-
-
- // Create the container
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
- // Get visible pages
- List<IPage> pages = container.getVisiblePages();
- // Build a list of raw models
- List<Object> visibleModels = new ArrayList<Object>();
- for(IPage page : pages) {
- visibleModels.add(page.getRawModel());
- }
-
- assertEquals("2 pages visible", 2, pages.size());
- assertTrue("contains active page from folder 1", visibleModels.contains(models.get("p11")));
- assertTrue("contains active page from folder 2", visibleModels.contains(models.get("p22")));
-
- // Check orders
- assertEquals(models.get("p11"), pages.get(0).getRawModel());
- assertEquals(models.get("p22"), pages.get(1).getRawModel());
- }
-
- /**
- * Test the method on a model with only one folder.
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}.
- * Use new implementation to populate contentProvider
- *
- * @throws PagesModelException
- */
- @Test
- public void testGetVisiblePagesOneFoler() throws PagesModelException {
- // Create populated content provider
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
- SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider);
-
- // define how to populate contentProvider
- IModelExp expr = folder("f1", page("p11"), page("p12"), page("p13"));
- // Try to create the model
- helper.createModel(expr);
- // Get the references
- Map<String, Object> models = helper.queryModel(expr);
-
-
- // Create the container
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
- // Get visible pages
- List<IPage> pages = container.getVisiblePages();
- // Build a list of raw models
- List<Object> visibleModels = new ArrayList<Object>();
- for(IPage page : pages) {
- visibleModels.add(page.getRawModel());
- }
-
- assertEquals("1 pages visible", 1, pages.size());
- assertTrue("contains active page from folder 1", visibleModels.contains(models.get("p11")));
-
- // Check orders
- assertEquals(models.get("p11"), pages.get(0).getRawModel());
- }
-
- /**
- * Test the method on a model with no pages.
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}.
- */
- @Test
- public void testGetActiveEditorNoPage() {
- // Create
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
-
- // Get the active editor
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
- IPage page = container.getActiveSashWindowsPage();
- assertNull("No Page exist", page);
- }
-
- /**
- * Test the method on a model with several folders and page.
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#selectPage(IPage)}.
- * Use new implementation to populate contentProvider
- *
- * @throws PagesModelException
- */
- @Test
- public void testSelectPage() throws PagesModelException {
- // Create populated content provider
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
- SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider);
-
- // define how to populate contentProvider
- IModelExp expr = vSash(folder("f1", page("p11"), page("p12"), page("p13"), page("p14")), folder("f2", page("p21"), page("p22")));
- // Try to create the model
- helper.createModel(expr);
- // Get the references
- Map<String, Object> models = helper.queryModel(expr);
-
-
- // Create the container
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
-
- // Check if we have an active page
- assertNotNull("active page set", container.getActiveSashWindowsPage());
-
- // Try to set active page
- IPage p12 = container.lookupModelPage(models.get("p12"));
- container.selectPage(p12);
- assertEquals("page selected", p12, container.getActiveSashWindowsPage());
-
- // Try to set active page
- IPage p22 = container.lookupModelPage(models.get("p22"));
- container.selectPage(p22);
- assertEquals("page selected", p22, container.getActiveSashWindowsPage());
-
- // Try to set active page
- IPage p11 = container.lookupModelPage(models.get("p11"));
- container.selectPage(p11);
- assertEquals("page selected", p11, container.getActiveSashWindowsPage());
- }
-
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#refreshTabs()}.
- */
- @Test
- public void testRefreshTabs() {
-
- ISashWindowsContentProvider contentProvider = createContentProvider();
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
-
- container.refreshTabs();
- assertNotNull("container is set", container);
-
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#refreshTabs()}.
- */
- @Test
- public void testRefreshTabs2() {
-
- // Test 2 folders, one tab each. Then supress one tabs.
- // 1 folder with one tab should remain.
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
- // Create pages and add them to the default folder
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < 2; i++) {
- IPageModel newModel = new MessagePartModel("model" + i);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
- // Create new folder
- ITabFolderModel folder = contentProvider.getCurrentTabFolder();
- contentProvider.createFolder(folder, 1, folder, SWT.TOP);
-
- // Create the container
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
- container.refreshTabs();
- assertNotNull("container is set", container);
-
- }
-
- /**
- * Test method for {@link SashWindowsContainer#visit(org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor)}
- */
- @Test
- public void testVisit() {
- // Create
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
- // Create pages and add them to the default folder
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < 2; i++) {
- IPageModel newModel = new MessagePartModel("model" + i);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
- // Create new folder
- ITabFolderModel folder = contentProvider.getCurrentTabFolder();
- contentProvider.createFolder(folder, 1, folder, SWT.TOP);
-
- // Get the active editor
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
-
- CollectRawModelVisitor pageVisitor = new CollectRawModelVisitor();
- container.visit(pageVisitor);
-
- // Check each elements
- Collection<Object> results = pageVisitor.collected;
- assertEquals("list are of same size", models.size(), results.size());
- for(Object model : models) {
- assertTrue("model is in the collected list", results.contains(model));
- }
- }
-
- protected class CollectRawModelVisitor implements IPageVisitor {
-
- Collection<Object> collected = new ArrayList<Object>();
-
- public void accept(IComponentPage page) {
- collected.add(page.getRawModel());
- }
-
- public void accept(IEditorPage page) {
- collected.add(page.getRawModel());
- }
- }
-
- /**
- * Test the lookup of a page by its raw model
- * Test method for {@link SashWindowsContainer#lookupModelPage(Object)}
- */
- @Test
- public void testlookupModelPage() {
- // Create
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
- // Create pages and add them to the default folder
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < 2; i++) {
- IPageModel newModel = new MessagePartModel("model" + i);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
- // Create new folder
- ITabFolderModel folder = contentProvider.getCurrentTabFolder();
- contentProvider.createFolder(folder, 1, folder, SWT.TOP);
-
- // Get the active editor
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
-
- Object model = models.get(1);
- IPage foundPage = container.lookupModelPage(model);
- assertEquals("Corresponding page is found", foundPage.getRawModel(), model);
- }
-
- /**
- * Test method for {@link SashWindowsContainer#setFolderTabMenuManager(MenuManager)}
- */
- @Test
- public void testSetFolderTabMenuManager_MenuManager() {
- // Create
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
- // Create pages and add them to the default folder
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < 2; i++) {
- IPageModel newModel = new MessagePartModel("model" + i);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
- // Create new folders
- ITabFolderModel referenceFolder = contentProvider.getCurrentTabFolder();
- ITabFolderModel folder1 = contentProvider.createFolder(referenceFolder, SWT.TOP);
- ITabFolderModel folder2 = contentProvider.createFolder(referenceFolder, SWT.DOWN);
- ITabFolderModel folder3 = contentProvider.createFolder(referenceFolder, SWT.LEFT);
-
- // Create SashWindowsContainer
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
- // Set a MenuManager
- MenuManager menuManager = new MenuManager();
- container.setFolderTabMenuManager(menuManager);
-
- // Test if the menu has been set in already created folders.
- TabFolderPart folderPart = lookupTabFolderPart(container, referenceFolder);
- assertNotNull("menu exist", folderPart.getControl().getMenu());
-
- folderPart = lookupTabFolderPart(container, folder1);
- assertNotNull("menu exist", folderPart.getControl().getMenu());
-
- folderPart = lookupTabFolderPart(container, folder2);
- assertNotNull("menu exist", folderPart.getControl().getMenu());
-
- folderPart = lookupTabFolderPart(container, folder3);
- assertNotNull("menu exist", folderPart.getControl().getMenu());
-
-
- // Now create another tab, refresh the container in order that the part is created,
- // ant test it
- ITabFolderModel folder4 = contentProvider.createFolder(referenceFolder, SWT.RIGHT);
- container.refreshTabs();
-
- folderPart = lookupTabFolderPart(container, folder4);
- assertNotNull("menu exist", folderPart.getControl().getMenu());
-
- }
-
- @Ignore("TODO")
- @Test
- public void testSelectPagePageId() {
- //TODO
- }
-
- protected TabFolderPart lookupTabFolderPart(SashWindowsContainer container, Object rawModel) {
-
- LookupFolderPartByRawModelVisitor visitor = new LookupFolderPartByRawModelVisitor(rawModel);
- container.visit(visitor);
- return visitor.result();
- }
-
- /**
- * Test If the FolderList is properly populated.
- *
- * * @throws PagesModelException
- */
- @Test
- public void testFolderList() throws PagesModelException {
- // Create populated content provider
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
- SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider);
-
- // define how to populate contentProvider
- IModelExp expr = vSash(folder("f1", page("p11"), page("p12")), folder("f2", page("p21"), page("p22")));
- // Try to create the model
- helper.createModel(expr);
- // Get the references
- Map<String, Object> models = helper.queryModel(expr);
-
- // Create the container
- SashWindowsContainer container = createSashWindowsContainer(contentProvider);
-
- // Check the folder list
- IObservableList<IFolder> list = container.getIFolderList();
- // Listener on the list
- FakeObservableListener<IFolder> listener = new FakeObservableListener<IFolder>();
- list.addListener(listener);
-
- // Check list before
- assertNotNull("List exist", list);
- assertEquals("list size", 2, list.size());
-
- // create a folder
- ITabFolderModel folder = (ITabFolderModel)models.get("f2");
- assertNotNull("folder found", folder);
- contentProvider.createFolder(folder, 0, folder, SWT.UP);
- // Refresh tabs, so that tabfolder is created.
- container.refreshTabs();
-
- // Check if the list contains the new folder
- assertEquals("list size", 3, list.size());
- // check event fired
- assertNotNull("event sent", listener.getLastAddEvents());
- // assertEquals( "event sent", folder, listener.getLastAddEvents().getRawModel() );
-
- }
-
- /**
- * Test If the FolderList is properly populated.
- *
- * * @throws PagesModelException
- */
- @Test
- public void testFolderList2() throws PagesModelException {
-
- SimpleSashWindowContainerTestFacade containerFacade = new SimpleSashWindowContainerTestFacade();
-
- // define how to populate contentProvider
- IModelExp expr = vSash(folder("f1", page("p11"), page("p12")), folder("f2", page("p21"), page("p22")));
- // Try to create the model
- containerFacade.createModel(expr);
-
- // Create the container
- SashWindowsContainer container = containerFacade.getSashContainer();
-
- // Refresh container, so that pages are created.
- container.refreshTabs();
-
- // Check the folder list
- IObservableList<IFolder> list = container.getIFolderList();
- // Listener on the list
- FakeObservableListener<IFolder> listener = new FakeObservableListener<IFolder>();
- list.addListener(listener);
-
- // Check list before
- assertNotNull("List exist", list);
- assertEquals("list size", 2, list.size());
-
- // create a folder
- containerFacade.createFolder("f2", 0, "f2", SWT.UP);
- // Refresh tabs, so that tabfolder is created.
- container.refreshTabs();
-
- // build expr corresponding to new configuration
- IModelExp newExpr = vSash(folder("f1", page("p11"), page("p12")), vSash(folder("f3", page("p21")), folder("f2", page("p22"))));
- // Reset facade names to correspond to new configuration.
- containerFacade.resetNamesContext(newExpr);
- ITabFolderModel folder = containerFacade.getITabFolderModel("f3");
-
- // Check if the list contains the new folder
- assertEquals("list size", 3, list.size());
-
-
- // check event fired
- assertNotNull("event sent", listener.getLastAddEvents());
- assertEquals("event sent", folder, listener.getLastAddEvents().getRawModel());
-
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2009-2013 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 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.internal; + +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.folder; +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.page; +import static org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.SashPagesModelFactory.vSash; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import org.eclipse.jface.action.MenuManager; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContainerTestFacade; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowContentProviderUtils; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.editor.IComponentPage; +import org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage; +import org.eclipse.papyrus.infra.core.sasheditor.editor.IFolder; +import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage; +import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor; +import org.eclipse.papyrus.infra.core.sasheditor.editor.MessagePartModel; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; +import org.eclipse.papyrus.infra.core.sasheditor.utils.FakeObservableListener; +import org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableList; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + + +/** + * Run as normal test. + * + * @author cedric dumoulin + * + */ +public class SashWindowsContainerTest /* extends AbstractPapyrusTest */{ + + + protected Display display; + + /** + * Constructor. + * + * @param name + */ + public SashWindowsContainerTest() { + } + + /** + * @see junit.framework.TestCase#setUp() + * @throws java.lang.Exception + * + */ + @Before + public void setUp() throws Exception { + display = Display.getCurrent(); + if(display == null) { + display = new Display(); + } + } + + /** + * Create a {@link SashWindowsContainer} to test. Initialize it with provided {@link ISashWindowsContentProvider}. + * + * @param contentProvider + * @return + */ + protected SashWindowsContainer createSashWindowsContainer(ISashWindowsContentProvider contentProvider) { + Shell shell = new Shell(display); + shell.setLayout(new FillLayout()); + + // + //new ShellEditor(shell); + SashWindowsContainer sashWindowContainer = new SashWindowsContainer(); + + sashWindowContainer.setContentProvider(contentProvider); + + sashWindowContainer.createPartControl(shell); + // shell.open(); + return sashWindowContainer; + } + + /** + * Create a contentProvider. + * + * @return + */ + protected ISashWindowsContentProvider createContentProvider() { + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + // Create pages and add them to the default folder + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < 8; i++) { + IPageModel newModel = new MessagePartModel("model" + i); + contentProvider.addPage(newModel); + models.add(newModel); + } + + return contentProvider; + } + + /** + * Test the method on a model with several folders and page. + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}. + */ + @Test + public void testGetActiveEditor() { + // Create + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + // Create pages and add them to the default folder + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < 2; i++) { + IPageModel newModel = new MessagePartModel("model" + i); + contentProvider.addPage(newModel); + models.add(newModel); + } + + // Create new folder + ITabFolderModel folder = contentProvider.getCurrentTabFolder(); + contentProvider.createFolder(folder, 1, folder, SWT.TOP); + + // Get the active editor + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + IPage page = container.getActiveSashWindowsPage(); + assertNotNull("Page exist", page); + } + + /** + * Test the method on a model with several folders and page. + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}. + * Use new implementation to populate contentProvider + * + * @throws PagesModelException + */ + @Test + public void testGetActiveEditor2() throws PagesModelException { + + // Create populated content provider + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider); + + // define how to populate contentProvider + IModelExp expr = vSash(folder("f1", page("p11"), page("p12")), folder("f2", page("p21"))); + // Try to create the model + helper.createModel(expr); + + + // Get the active editor + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + IPage page = container.getActiveSashWindowsPage(); + assertNotNull("Page exist", page); + } + + /** + * Test the method on a model with several folders and page. + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}. + */ + @Test + public void testGetVisiblePages() { + // Create + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + // Create pages and add them to the default folder + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < 2; i++) { + IPageModel newModel = new MessagePartModel("model" + i); + contentProvider.addPage(newModel); + models.add(newModel); + } + + // Create new folder + ITabFolderModel folder = contentProvider.getCurrentTabFolder(); + contentProvider.createFolder(folder, 1, folder, SWT.TOP); + // Add pages + List<IPageModel> modelsInFolder2 = new ArrayList<IPageModel>(); + for(int i = 0; i < 2; i++) { + IPageModel newModel = new MessagePartModel("modelInFolder2" + i); + contentProvider.addPage(newModel); + modelsInFolder2.add(newModel); + } + + // Build a list of expected visible models + List<IPageModel> expectedVisibleModel = new ArrayList<IPageModel>(); + expectedVisibleModel.add(models.get(models.size() - 1)); + expectedVisibleModel.add(modelsInFolder2.get(models.size() - 1)); + + // Get the active editor + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + List<IPage> pages = container.getVisiblePages(); + + assertEquals("2 pages visible", 2, pages.size()); + assertTrue("contains active from folder 1", expectedVisibleModel.contains(pages.get(0).getRawModel())); + assertTrue("contains active from folder 1", expectedVisibleModel.contains(pages.get(1).getRawModel())); + // assertNotNull("Page exist", page); + } + + /** + * Test the method on a model with several folders and page. + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}. + * Use new implementation to populate contentProvider + * + * @throws PagesModelException + */ + @Test + public void testGetVisiblePages2() throws PagesModelException { + // Create populated content provider + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider); + + // define how to populate contentProvider + IModelExp expr = vSash(folder("f1", page("p11"), page("p12")), folder("f2", page("p21"), page("p22"))); + // Try to create the model + helper.createModel(expr); + // Get the references + Map<String, Object> models = helper.queryModel(expr); + + + // Create the container + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + // Get visible pages + List<IPage> pages = container.getVisiblePages(); + // Build a list of raw models + List<Object> visibleModels = new ArrayList<Object>(); + for(IPage page : pages) { + visibleModels.add(page.getRawModel()); + } + + assertEquals("2 pages visible", 2, pages.size()); + assertTrue("contains active page from folder 1", visibleModels.contains(models.get("p11"))); + assertTrue("contains active page from folder 2", visibleModels.contains(models.get("p22"))); + + // Check orders + assertEquals(models.get("p11"), pages.get(0).getRawModel()); + assertEquals(models.get("p22"), pages.get(1).getRawModel()); + } + + /** + * Test the method on a model with only one folder. + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}. + * Use new implementation to populate contentProvider + * + * @throws PagesModelException + */ + @Test + public void testGetVisiblePagesOneFoler() throws PagesModelException { + // Create populated content provider + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider); + + // define how to populate contentProvider + IModelExp expr = folder("f1", page("p11"), page("p12"), page("p13")); + // Try to create the model + helper.createModel(expr); + // Get the references + Map<String, Object> models = helper.queryModel(expr); + + + // Create the container + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + // Get visible pages + List<IPage> pages = container.getVisiblePages(); + // Build a list of raw models + List<Object> visibleModels = new ArrayList<Object>(); + for(IPage page : pages) { + visibleModels.add(page.getRawModel()); + } + + assertEquals("1 pages visible", 1, pages.size()); + assertTrue("contains active page from folder 1", visibleModels.contains(models.get("p11"))); + + // Check orders + assertEquals(models.get("p11"), pages.get(0).getRawModel()); + } + + /** + * Test the method on a model with no pages. + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#getActiveEditor()}. + */ + @Test + public void testGetActiveEditorNoPage() { + // Create + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + + // Get the active editor + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + IPage page = container.getActiveSashWindowsPage(); + assertNull("No Page exist", page); + } + + /** + * Test the method on a model with several folders and page. + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#selectPage(IPage)}. + * Use new implementation to populate contentProvider + * + * @throws PagesModelException + */ + @Test + public void testSelectPage() throws PagesModelException { + // Create populated content provider + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider); + + // define how to populate contentProvider + IModelExp expr = vSash(folder("f1", page("p11"), page("p12"), page("p13"), page("p14")), folder("f2", page("p21"), page("p22"))); + // Try to create the model + helper.createModel(expr); + // Get the references + Map<String, Object> models = helper.queryModel(expr); + + + // Create the container + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + + // Check if we have an active page + assertNotNull("active page set", container.getActiveSashWindowsPage()); + + // Try to set active page + IPage p12 = container.lookupModelPage(models.get("p12")); + container.selectPage(p12); + assertEquals("page selected", p12, container.getActiveSashWindowsPage()); + + // Try to set active page + IPage p22 = container.lookupModelPage(models.get("p22")); + container.selectPage(p22); + assertEquals("page selected", p22, container.getActiveSashWindowsPage()); + + // Try to set active page + IPage p11 = container.lookupModelPage(models.get("p11")); + container.selectPage(p11); + assertEquals("page selected", p11, container.getActiveSashWindowsPage()); + } + + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#refreshTabs()}. + */ + @Test + public void testRefreshTabs() { + + ISashWindowsContentProvider contentProvider = createContentProvider(); + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + + container.refreshTabs(); + assertNotNull("container is set", container); + + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer#refreshTabs()}. + */ + @Test + public void testRefreshTabs2() { + + // Test 2 folders, one tab each. Then supress one tabs. + // 1 folder with one tab should remain. + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + // Create pages and add them to the default folder + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < 2; i++) { + IPageModel newModel = new MessagePartModel("model" + i); + contentProvider.addPage(newModel); + models.add(newModel); + } + + // Create new folder + ITabFolderModel folder = contentProvider.getCurrentTabFolder(); + contentProvider.createFolder(folder, 1, folder, SWT.TOP); + + // Create the container + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + container.refreshTabs(); + assertNotNull("container is set", container); + + } + + /** + * Test method for {@link SashWindowsContainer#visit(org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor)} + */ + @Test + public void testVisit() { + // Create + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + // Create pages and add them to the default folder + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < 2; i++) { + IPageModel newModel = new MessagePartModel("model" + i); + contentProvider.addPage(newModel); + models.add(newModel); + } + + // Create new folder + ITabFolderModel folder = contentProvider.getCurrentTabFolder(); + contentProvider.createFolder(folder, 1, folder, SWT.TOP); + + // Get the active editor + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + + CollectRawModelVisitor pageVisitor = new CollectRawModelVisitor(); + container.visit(pageVisitor); + + // Check each elements + Collection<Object> results = pageVisitor.collected; + assertEquals("list are of same size", models.size(), results.size()); + for(Object model : models) { + assertTrue("model is in the collected list", results.contains(model)); + } + } + + protected class CollectRawModelVisitor implements IPageVisitor { + + Collection<Object> collected = new ArrayList<Object>(); + + public void accept(IComponentPage page) { + collected.add(page.getRawModel()); + } + + public void accept(IEditorPage page) { + collected.add(page.getRawModel()); + } + } + + /** + * Test the lookup of a page by its raw model + * Test method for {@link SashWindowsContainer#lookupModelPage(Object)} + */ + @Test + public void testlookupModelPage() { + // Create + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + // Create pages and add them to the default folder + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < 2; i++) { + IPageModel newModel = new MessagePartModel("model" + i); + contentProvider.addPage(newModel); + models.add(newModel); + } + + // Create new folder + ITabFolderModel folder = contentProvider.getCurrentTabFolder(); + contentProvider.createFolder(folder, 1, folder, SWT.TOP); + + // Get the active editor + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + + Object model = models.get(1); + IPage foundPage = container.lookupModelPage(model); + assertEquals("Corresponding page is found", foundPage.getRawModel(), model); + } + + /** + * Test method for {@link SashWindowsContainer#setFolderTabMenuManager(MenuManager)} + */ + @Test + public void testSetFolderTabMenuManager_MenuManager() { + // Create + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + // Create pages and add them to the default folder + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < 2; i++) { + IPageModel newModel = new MessagePartModel("model" + i); + contentProvider.addPage(newModel); + models.add(newModel); + } + + // Create new folders + ITabFolderModel referenceFolder = contentProvider.getCurrentTabFolder(); + ITabFolderModel folder1 = contentProvider.createFolder(referenceFolder, SWT.TOP); + ITabFolderModel folder2 = contentProvider.createFolder(referenceFolder, SWT.DOWN); + ITabFolderModel folder3 = contentProvider.createFolder(referenceFolder, SWT.LEFT); + + // Create SashWindowsContainer + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + // Set a MenuManager + MenuManager menuManager = new MenuManager(); + container.setFolderTabMenuManager(menuManager); + + // Test if the menu has been set in already created folders. + TabFolderPart folderPart = lookupTabFolderPart(container, referenceFolder); + assertNotNull("menu exist", folderPart.getControl().getMenu()); + + folderPart = lookupTabFolderPart(container, folder1); + assertNotNull("menu exist", folderPart.getControl().getMenu()); + + folderPart = lookupTabFolderPart(container, folder2); + assertNotNull("menu exist", folderPart.getControl().getMenu()); + + folderPart = lookupTabFolderPart(container, folder3); + assertNotNull("menu exist", folderPart.getControl().getMenu()); + + + // Now create another tab, refresh the container in order that the part is created, + // ant test it + ITabFolderModel folder4 = contentProvider.createFolder(referenceFolder, SWT.RIGHT); + container.refreshTabs(); + + folderPart = lookupTabFolderPart(container, folder4); + assertNotNull("menu exist", folderPart.getControl().getMenu()); + + } + + @Ignore("TODO") + @Test + public void testSelectPagePageId() { + //TODO + } + + protected TabFolderPart lookupTabFolderPart(SashWindowsContainer container, Object rawModel) { + + LookupFolderPartByRawModelVisitor visitor = new LookupFolderPartByRawModelVisitor(rawModel); + container.visit(visitor); + return visitor.result(); + } + + /** + * Test If the FolderList is properly populated. + * + * * @throws PagesModelException + */ + @Test + public void testFolderList() throws PagesModelException { + // Create populated content provider + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + SimpleSashWindowContentProviderUtils helper = new SimpleSashWindowContentProviderUtils(contentProvider); + + // define how to populate contentProvider + IModelExp expr = vSash(folder("f1", page("p11"), page("p12")), folder("f2", page("p21"), page("p22"))); + // Try to create the model + helper.createModel(expr); + // Get the references + Map<String, Object> models = helper.queryModel(expr); + + // Create the container + SashWindowsContainer container = createSashWindowsContainer(contentProvider); + + // Check the folder list + IObservableList<IFolder> list = container.getIFolderList(); + // Listener on the list + FakeObservableListener<IFolder> listener = new FakeObservableListener<IFolder>(); + list.addListener(listener); + + // Check list before + assertNotNull("List exist", list); + assertEquals("list size", 2, list.size()); + + // create a folder + ITabFolderModel folder = (ITabFolderModel)models.get("f2"); + assertNotNull("folder found", folder); + contentProvider.createFolder(folder, 0, folder, SWT.UP); + // Refresh tabs, so that tabfolder is created. + container.refreshTabs(); + + // Check if the list contains the new folder + assertEquals("list size", 3, list.size()); + // check event fired + assertNotNull("event sent", listener.getLastAddEvents()); + // assertEquals( "event sent", folder, listener.getLastAddEvents().getRawModel() ); + + } + + /** + * Test If the FolderList is properly populated. + * + * * @throws PagesModelException + */ + @Test + public void testFolderList2() throws PagesModelException { + + SimpleSashWindowContainerTestFacade containerFacade = new SimpleSashWindowContainerTestFacade(); + + // define how to populate contentProvider + IModelExp expr = vSash(folder("f1", page("p11"), page("p12")), folder("f2", page("p21"), page("p22"))); + // Try to create the model + containerFacade.createModel(expr); + + // Create the container + SashWindowsContainer container = containerFacade.getSashContainer(); + + // Refresh container, so that pages are created. + container.refreshTabs(); + + // Check the folder list + IObservableList<IFolder> list = container.getIFolderList(); + // Listener on the list + FakeObservableListener<IFolder> listener = new FakeObservableListener<IFolder>(); + list.addListener(listener); + + // Check list before + assertNotNull("List exist", list); + assertEquals("list size", 2, list.size()); + + // create a folder + containerFacade.createFolder("f2", 0, "f2", SWT.UP); + // Refresh tabs, so that tabfolder is created. + container.refreshTabs(); + + // build expr corresponding to new configuration + IModelExp newExpr = vSash(folder("f1", page("p11"), page("p12")), vSash(folder("f3", page("p21")), folder("f2", page("p22")))); + // Reset facade names to correspond to new configuration. + containerFacade.resetNamesContext(newExpr); + ITabFolderModel folder = containerFacade.getITabFolderModel("f3"); + + // Check if the list contains the new folder + assertEquals("list size", 3, list.size()); + + + // check event fired + assertNotNull("event sent", listener.getLastAddEvents()); + assertEquals("event sent", folder, listener.getLastAddEvents().getRawModel()); + + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderListManagerTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderListManagerTest.java index 227aa9c6949..5b993121155 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderListManagerTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderListManagerTest.java @@ -1,95 +1,95 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.internal;
-
-import static org.junit.Assert.*;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * Tests for the {@link SashContainerFolderEventsProvider} class.
- * @author cedric dumoulin
- *
- */
-public class TabFolderListManagerTest {
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- }
-
- /**
- * Test addition of a folder. Check if the folder is added to the list, and event added.
- *
- */
- @Test
- public void testFolderAdded() {
-
- // Create listManager and folder event provider
- TabFolderListManager listManager = new TabFolderListManager();
- SashContainerFolderEventsProvider folderEventProvider = new SashContainerFolderEventsProvider();
- folderEventProvider.addListener(listManager);
-
- // fire folder added event
- TabFolderPart folder1= new FakeTabFolderPart();
- folderEventProvider.fireFolderCreatedEvent(folder1);
-
- // Check the list
- assertTrue( "folder added", listManager.getFolderList().contains(folder1) );
-
- }
-
- /**
- * Test addition of a folder. Check if the folder is added to the list, and event added.
- */
- @Test
- public void testFolderRemoved() {
- // Create listManager and folder event provider
- TabFolderListManager listManager = new TabFolderListManager();
- SashContainerFolderEventsProvider folderEventProvider = new SashContainerFolderEventsProvider();
- folderEventProvider.addListener(listManager);
-
- // fire folder added event
- TabFolderPart folder1= new FakeTabFolderPart();
- folderEventProvider.fireFolderCreatedEvent(folder1);
-
- TabFolderPart folder2= new FakeTabFolderPart();
- folderEventProvider.fireFolderCreatedEvent(folder2);
-
- // Check the list
- assertTrue( "folder added", listManager.getFolderList().contains(folder1) );
- assertTrue( "folder added", listManager.getFolderList().contains(folder2) );
-
- // remove the folder
- folderEventProvider.fireFolderDisposedEvent(folder1);
- assertFalse( "folder removed", listManager.getFolderList().contains(folder1) );
- assertTrue( "folder added", listManager.getFolderList().contains(folder2) );
-
-
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.internal; + +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + + +/** + * Tests for the {@link SashContainerFolderEventsProvider} class. + * @author cedric dumoulin + * + */ +public class TabFolderListManagerTest { + + /** + * @throws java.lang.Exception + */ + @Before + public void setUp() throws Exception { + } + + /** + * @throws java.lang.Exception + */ + @After + public void tearDown() throws Exception { + } + + /** + * Test addition of a folder. Check if the folder is added to the list, and event added. + * + */ + @Test + public void testFolderAdded() { + + // Create listManager and folder event provider + TabFolderListManager listManager = new TabFolderListManager(); + SashContainerFolderEventsProvider folderEventProvider = new SashContainerFolderEventsProvider(); + folderEventProvider.addListener(listManager); + + // fire folder added event + TabFolderPart folder1= new FakeTabFolderPart(); + folderEventProvider.fireFolderCreatedEvent(folder1); + + // Check the list + assertTrue( "folder added", listManager.getFolderList().contains(folder1) ); + + } + + /** + * Test addition of a folder. Check if the folder is added to the list, and event added. + */ + @Test + public void testFolderRemoved() { + // Create listManager and folder event provider + TabFolderListManager listManager = new TabFolderListManager(); + SashContainerFolderEventsProvider folderEventProvider = new SashContainerFolderEventsProvider(); + folderEventProvider.addListener(listManager); + + // fire folder added event + TabFolderPart folder1= new FakeTabFolderPart(); + folderEventProvider.fireFolderCreatedEvent(folder1); + + TabFolderPart folder2= new FakeTabFolderPart(); + folderEventProvider.fireFolderCreatedEvent(folder2); + + // Check the list + assertTrue( "folder added", listManager.getFolderList().contains(folder1) ); + assertTrue( "folder added", listManager.getFolderList().contains(folder2) ); + + // remove the folder + folderEventProvider.fireFolderDisposedEvent(folder1); + assertFalse( "folder removed", listManager.getFolderList().contains(folder1) ); + assertTrue( "folder added", listManager.getFolderList().contains(folder2) ); + + + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/AbstractSash.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/AbstractSash.java index 0d1cfcd8c1c..57e22ecce0d 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/AbstractSash.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/AbstractSash.java @@ -1,95 +1,95 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-
-/**
- * Base class for structure representing sash in Checker
- * @author cedric dumoulin
- *
- */
-public abstract class AbstractSash extends PanelTerm {
-
- protected PanelTerm leftup;
- protected PanelTerm rightdown;
-
- /**
- * Constructor.
- *
- */
- public AbstractSash(PanelTerm left, PanelTerm right) {
- this.leftup = left;
- this.rightdown = right;
- }
-
- /**
- * Constructor.
- *
- * @param name
- * @param up
- * @param down
- */
- public AbstractSash(String name, PanelTerm left, PanelTerm right) {
- super(name);
- this.leftup = left;
- this.rightdown = right;
- }
-
- /**
- * @return the leftup
- */
- public PanelTerm getLeftup() {
- return leftup;
- }
-
- /**
- * @return the rightdown
- */
- public PanelTerm getRightdown() {
- return rightdown;
- }
-
- /**
- *
- * @param visitor
- * @throws PagesModelException
- */
- abstract public <M> void accept(IPagesModelVisitor<M> visitor, M modelObject) throws PagesModelException ;
-
- /**
- * @return The name used in toString
- */
- protected abstract String getStringName();
-
- /**
- * @see java.lang.Object#toString()
- *
- * @return
- */
- @Override
- public String toString() {
-
- StringBuffer buff = new StringBuffer(getStringName());
-
- buff.append("(");
- buff.append(leftup.toString());
- buff.append(", ");
- buff.append(rightdown.toString());
- buff.append(")");
-
- return buff.toString();
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + + +/** + * Base class for structure representing sash in Checker + * @author cedric dumoulin + * + */ +public abstract class AbstractSash extends PanelTerm { + + protected PanelTerm leftup; + protected PanelTerm rightdown; + + /** + * Constructor. + * + */ + public AbstractSash(PanelTerm left, PanelTerm right) { + this.leftup = left; + this.rightdown = right; + } + + /** + * Constructor. + * + * @param name + * @param up + * @param down + */ + public AbstractSash(String name, PanelTerm left, PanelTerm right) { + super(name); + this.leftup = left; + this.rightdown = right; + } + + /** + * @return the leftup + */ + public PanelTerm getLeftup() { + return leftup; + } + + /** + * @return the rightdown + */ + public PanelTerm getRightdown() { + return rightdown; + } + + /** + * + * @param visitor + * @throws PagesModelException + */ + abstract public <M> void accept(IPagesModelVisitor<M> visitor, M modelObject) throws PagesModelException ; + + /** + * @return The name used in toString + */ + protected abstract String getStringName(); + + /** + * @see java.lang.Object#toString() + * + * @return + */ + @Override + public String toString() { + + StringBuffer buff = new StringBuffer(getStringName()); + + buff.append("("); + buff.append(leftup.toString()); + buff.append(", "); + buff.append(rightdown.toString()); + buff.append(")"); + + return buff.toString(); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/BadNameException.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/BadNameException.java index 3c5c56528aa..7bc18bbf52f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/BadNameException.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/BadNameException.java @@ -1,82 +1,82 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-
-
-/**
- * @author cedric dumoulin
- *
- */
-public class BadNameException extends PagesModelException {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructor.
- *
- */
- public BadNameException() {
- // TODO Auto-generated constructor stub
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- */
- public BadNameException(String arg0) {
- super(arg0);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- */
- public BadNameException(Throwable arg0) {
- super(arg0);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- * @param arg1
- */
- public BadNameException(String arg0, Throwable arg1) {
- super(arg0, arg1);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- * @param arg1
- * @param arg2
- * @param arg3
- */
- public BadNameException(String arg0, Throwable arg1, boolean arg2, boolean arg3) {
- super(arg0, arg1, arg2, arg3);
- // TODO Auto-generated constructor stub
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + + + +/** + * @author cedric dumoulin + * + */ +public class BadNameException extends PagesModelException { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * Constructor. + * + */ + public BadNameException() { + // TODO Auto-generated constructor stub + } + + /** + * Constructor. + * + * @param arg0 + */ + public BadNameException(String arg0) { + super(arg0); + // TODO Auto-generated constructor stub + } + + /** + * Constructor. + * + * @param arg0 + */ + public BadNameException(Throwable arg0) { + super(arg0); + // TODO Auto-generated constructor stub + } + + /** + * Constructor. + * + * @param arg0 + * @param arg1 + */ + public BadNameException(String arg0, Throwable arg1) { + super(arg0, arg1); + // TODO Auto-generated constructor stub + } + + /** + * Constructor. + * + * @param arg0 + * @param arg1 + * @param arg2 + * @param arg3 + */ + public BadNameException(String arg0, Throwable arg1, boolean arg2, boolean arg3) { + super(arg0, arg1, arg2, arg3); + // TODO Auto-generated constructor stub + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/Folder.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/Folder.java index abcae95d7db..9bde0efcfa4 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/Folder.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/Folder.java @@ -1,90 +1,90 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * This represent a Folder in the Checker query.
- *
- * @author cedric dumoulin
- */
-public class Folder extends PanelTerm implements IModelObject {
-
- protected List<Page> pages;
-
- /**
- * Constructor.
- *
- */
- public Folder(Page ... pages) {
- this.pages = Arrays.asList(pages);
- }
-
- /**
- * Constructor.
- *
- */
- public Folder(String name, Page ... pages) {
- super(name);
- this.pages = Arrays.asList(pages);
- }
-
- /**
- * @return the pages
- */
- public List<Page> getPages() {
- return pages;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.IModelObject.sashmodel.query.IQueryTerm#accept(IPagesModelVisitor, EObject)
- *
- * @param visitor
- * @throws PagesModelException
- */
- public <M> void accept(IPagesModelVisitor<M> visitor, M modelObject) throws PagesModelException {
-
- visitor.walk(this, modelObject);
- }
-
- /**
- * @see java.lang.Object#toString()
- *
- * @return
- */
- @Override
- public String toString() {
-
- StringBuffer buff = new StringBuffer("Folder(");
-
- if( getName() != null ) {
- buff.append(getName()).append(", ");
- }
-
- for(Page page : pages ) {
- buff.append(page.toString()).append(", ");
- }
- // Remove extra ,
- int length = buff.length();
- if(buff.charAt(length-1) == ' ') {
- buff.delete(length-2, length );
- }
- buff.append(")");
-
- return buff.toString();
- }
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + +import java.util.Arrays; +import java.util.List; + +/** + * This represent a Folder in the Checker query. + * + * @author cedric dumoulin + */ +public class Folder extends PanelTerm implements IModelObject { + + protected List<Page> pages; + + /** + * Constructor. + * + */ + public Folder(Page ... pages) { + this.pages = Arrays.asList(pages); + } + + /** + * Constructor. + * + */ + public Folder(String name, Page ... pages) { + super(name); + this.pages = Arrays.asList(pages); + } + + /** + * @return the pages + */ + public List<Page> getPages() { + return pages; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.IModelObject.sashmodel.query.IQueryTerm#accept(IPagesModelVisitor, EObject) + * + * @param visitor + * @throws PagesModelException + */ + public <M> void accept(IPagesModelVisitor<M> visitor, M modelObject) throws PagesModelException { + + visitor.walk(this, modelObject); + } + + /** + * @see java.lang.Object#toString() + * + * @return + */ + @Override + public String toString() { + + StringBuffer buff = new StringBuffer("Folder("); + + if( getName() != null ) { + buff.append(getName()).append(", "); + } + + for(Page page : pages ) { + buff.append(page.toString()).append(", "); + } + // Remove extra , + int length = buff.length(); + if(buff.charAt(length-1) == ' ') { + buff.delete(length-2, length ); + } + buff.append(")"); + + return buff.toString(); + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/HSash.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/HSash.java index cbaedf11103..ef8abc77019 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/HSash.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/HSash.java @@ -1,66 +1,66 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-
-/**
- * @author dumoulin
- *
- */
-public class HSash extends AbstractSash {
-
- /**
- * Constructor.
- *
- * @param leftup
- * @param rightdown
- */
- public HSash(PanelTerm up, PanelTerm down) {
- super(up, down);
- }
-
- /**
- * Constructor.
- *
- * @param leftup
- * @param rightdown
- */
- public HSash(String name, PanelTerm up, PanelTerm down) {
- super(name, up, down);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.IModelObject.sashmodel.query.IQueryTerm#accept(IPagesModelVisitor, EObject)
- *
- * @param visitor
- * @throws PagesModelException
- */
- public <M> void accept(IPagesModelVisitor<M> visitor, M modelObject) throws PagesModelException {
-
- visitor.walk(this, modelObject);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.AbstractSash#getStringName()
- *
- * @return
- */
- @Override
- protected String getStringName() {
- return "HSash";
- }
-
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + + +/** + * @author dumoulin + * + */ +public class HSash extends AbstractSash { + + /** + * Constructor. + * + * @param leftup + * @param rightdown + */ + public HSash(PanelTerm up, PanelTerm down) { + super(up, down); + } + + /** + * Constructor. + * + * @param leftup + * @param rightdown + */ + public HSash(String name, PanelTerm up, PanelTerm down) { + super(name, up, down); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.IModelObject.sashmodel.query.IQueryTerm#accept(IPagesModelVisitor, EObject) + * + * @param visitor + * @throws PagesModelException + */ + public <M> void accept(IPagesModelVisitor<M> visitor, M modelObject) throws PagesModelException { + + visitor.walk(this, modelObject); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.AbstractSash#getStringName() + * + * @return + */ + @Override + protected String getStringName() { + return "HSash"; + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/IModelExp.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/IModelExp.java index 83654ea81f8..f516561baa7 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/IModelExp.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/IModelExp.java @@ -1,28 +1,28 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-/**
- * A Model Expression represent an expression used to describe a PagesModel.
- * Term implementing this interface can be used as starting point of expression.
- * <br>
- * Following classses are expressions: {@link PanelTerm}, {@link WindowTerm}, {@link PagesModel}.
- *
- * @author cedric dumoulin
- * TODO Rename to IModelExp
- */
-public interface IModelExp extends IModelObject {
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + +/** + * A Model Expression represent an expression used to describe a PagesModel. + * Term implementing this interface can be used as starting point of expression. + * <br> + * Following classses are expressions: {@link PanelTerm}, {@link WindowTerm}, {@link PagesModel}. + * + * @author cedric dumoulin + * TODO Rename to IModelExp + */ +public interface IModelExp extends IModelObject { + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/IModelObject.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/IModelObject.java index e16bfd38324..7692bdd3741 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/IModelObject.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/IModelObject.java @@ -1,38 +1,38 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-
-/**
- * Common ancestor of all object in the Model.
- * All object that can be used in a query should implement this interface.
- *
- * @author cedric dumoulin
- */
-public interface IModelObject {
-
- /**
- * Visit the query.
- * @param visitor
- * @throws PagesModelException
- */
- public <M> void accept(IPagesModelVisitor<M> visitor, M panel) throws PagesModelException;
-
- /**
- * Get the name associated to the query part.
- * Can return null;
- */
- public String getName();
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + + +/** + * Common ancestor of all object in the Model. + * All object that can be used in a query should implement this interface. + * + * @author cedric dumoulin + */ +public interface IModelObject { + + /** + * Visit the query. + * @param visitor + * @throws PagesModelException + */ + public <M> void accept(IPagesModelVisitor<M> visitor, M panel) throws PagesModelException; + + /** + * Get the name associated to the query part. + * Can return null; + */ + public String getName(); +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/IPagesModelVisitor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/IPagesModelVisitor.java index 3d9ac3b46d1..f0ef7e170df 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/IPagesModelVisitor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/IPagesModelVisitor.java @@ -1,68 +1,68 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-/**
- * Visitor used to visit pagemodel structure.
- *
- * @author cedric dumoulin
- *
- * @param M Type of the models provided to visit() and walk(). This is the common
- * ancestor of all types of the walked model.
- *
- */
-public interface IPagesModelVisitor <M>{
-
- /**
- * If true, parent are visited before children.
- * If false, parent are visited after children.
- * @return
- */
- public boolean isVisitingParentFirst();
-
- /**
- * Walk the node and its children. Call visit visit method appropiatly.
- * This method encapsulate the navigation between nodes.
- *
- * @param windowTerm The term to navigate
- * @param windowModel the model that maybe correspond to the term.
- * @throws PagesModelException
- *
- */
- public void walk( SashPagesModel windowTerm, M windowModel ) throws PagesModelException;
- public void walk( WindowTerm windowTerm, M windowModel ) throws PagesModelException;
- public void walk( Folder folder, M folderModel ) throws PagesModelException;
-
- public void walk(HSash sash, M sashModel) throws PagesModelException;
- public void walk(VSash sash, M sashModel) throws PagesModelException;
-
- public void walk(Page page, M pageModel) throws PagesModelException;
-
-
- /**
- * Visit the corresponding term.
- * @param windowTerm The term to visit
- * @param windowModel The corresponding model found while walking the expr.
- */
-// public void visit( SashPagesModel windowTerm, M windowModel ) throws PagesModelException;
-// public void visit( WindowTerm windowTerm, M windowModel ) throws PagesModelException;
-// public void visit( Folder folder, M folderModel ) throws PagesModelException;
-//
-// public void visit(HSash sash, M sashModel) throws PagesModelException;
-// public void visit(VSash sash, M sashModel) throws PagesModelException;
-//
-// public void visit(Page page, M pageModel) throws PagesModelException;
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + +/** + * Visitor used to visit pagemodel structure. + * + * @author cedric dumoulin + * + * @param M Type of the models provided to visit() and walk(). This is the common + * ancestor of all types of the walked model. + * + */ +public interface IPagesModelVisitor <M>{ + + /** + * If true, parent are visited before children. + * If false, parent are visited after children. + * @return + */ + public boolean isVisitingParentFirst(); + + /** + * Walk the node and its children. Call visit visit method appropiatly. + * This method encapsulate the navigation between nodes. + * + * @param windowTerm The term to navigate + * @param windowModel the model that maybe correspond to the term. + * @throws PagesModelException + * + */ + public void walk( SashPagesModel windowTerm, M windowModel ) throws PagesModelException; + public void walk( WindowTerm windowTerm, M windowModel ) throws PagesModelException; + public void walk( Folder folder, M folderModel ) throws PagesModelException; + + public void walk(HSash sash, M sashModel) throws PagesModelException; + public void walk(VSash sash, M sashModel) throws PagesModelException; + + public void walk(Page page, M pageModel) throws PagesModelException; + + + /** + * Visit the corresponding term. + * @param windowTerm The term to visit + * @param windowModel The corresponding model found while walking the expr. + */ +// public void visit( SashPagesModel windowTerm, M windowModel ) throws PagesModelException; +// public void visit( WindowTerm windowTerm, M windowModel ) throws PagesModelException; +// public void visit( Folder folder, M folderModel ) throws PagesModelException; +// +// public void visit(HSash sash, M sashModel) throws PagesModelException; +// public void visit(VSash sash, M sashModel) throws PagesModelException; +// +// public void visit(Page page, M pageModel) throws PagesModelException; + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/NoMatchException.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/NoMatchException.java index 3a3fcc211f7..b5df2266c75 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/NoMatchException.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/NoMatchException.java @@ -1,77 +1,77 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-/**
- * Exception thrown when a query part does not match a modelpart.
- *
- * @author cedric dumoulin
- *
- */
-public class NoMatchException extends PagesModelException {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructor.
- *
- */
- public NoMatchException() {
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- */
- public NoMatchException(String arg0) {
- super(arg0);
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- */
- public NoMatchException(Throwable arg0) {
- super(arg0);
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- * @param arg1
- */
- public NoMatchException(String arg0, Throwable arg1) {
- super(arg0, arg1);
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- * @param arg1
- * @param arg2
- * @param arg3
- */
- public NoMatchException(String arg0, Throwable arg1, boolean arg2, boolean arg3) {
- super(arg0, arg1, arg2, arg3);
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + +/** + * Exception thrown when a query part does not match a modelpart. + * + * @author cedric dumoulin + * + */ +public class NoMatchException extends PagesModelException { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * Constructor. + * + */ + public NoMatchException() { + } + + /** + * Constructor. + * + * @param arg0 + */ + public NoMatchException(String arg0) { + super(arg0); + } + + /** + * Constructor. + * + * @param arg0 + */ + public NoMatchException(Throwable arg0) { + super(arg0); + } + + /** + * Constructor. + * + * @param arg0 + * @param arg1 + */ + public NoMatchException(String arg0, Throwable arg1) { + super(arg0, arg1); + } + + /** + * Constructor. + * + * @param arg0 + * @param arg1 + * @param arg2 + * @param arg3 + */ + public NoMatchException(String arg0, Throwable arg1, boolean arg2, boolean arg3) { + super(arg0, arg1, arg2, arg3); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/NotFoundException.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/NotFoundException.java index eeca81273f3..5efb1e54db5 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/NotFoundException.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/NotFoundException.java @@ -1,82 +1,82 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-
-/**
- * @author cedric dumoulin
- *
- */
-public class NotFoundException extends PagesModelException {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructor.
- *
- */
- public NotFoundException() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- * @param arg1
- * @param arg2
- * @param arg3
- */
- public NotFoundException(String arg0, Throwable arg1, boolean arg2, boolean arg3) {
- super(arg0, arg1, arg2, arg3);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- * @param arg1
- */
- public NotFoundException(String arg0, Throwable arg1) {
- super(arg0, arg1);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- */
- public NotFoundException(String arg0) {
- super(arg0);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- */
- public NotFoundException(Throwable arg0) {
- super(arg0);
- // TODO Auto-generated constructor stub
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + + +/** + * @author cedric dumoulin + * + */ +public class NotFoundException extends PagesModelException { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * Constructor. + * + */ + public NotFoundException() { + super(); + // TODO Auto-generated constructor stub + } + + /** + * Constructor. + * + * @param arg0 + * @param arg1 + * @param arg2 + * @param arg3 + */ + public NotFoundException(String arg0, Throwable arg1, boolean arg2, boolean arg3) { + super(arg0, arg1, arg2, arg3); + // TODO Auto-generated constructor stub + } + + /** + * Constructor. + * + * @param arg0 + * @param arg1 + */ + public NotFoundException(String arg0, Throwable arg1) { + super(arg0, arg1); + // TODO Auto-generated constructor stub + } + + /** + * Constructor. + * + * @param arg0 + */ + public NotFoundException(String arg0) { + super(arg0); + // TODO Auto-generated constructor stub + } + + /** + * Constructor. + * + * @param arg0 + */ + public NotFoundException(Throwable arg0) { + super(arg0); + // TODO Auto-generated constructor stub + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/Page.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/Page.java index 5bd2fa904bb..4eb56723c9f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/Page.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/Page.java @@ -1,116 +1,116 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-
-/**
- * This represent a page in the Checker query.
- *
- * @author cedric dumoulin
- *
- */
-public class Page implements IModelObject {
-
- protected Object identifier;
-
- protected String name;
-
- /** To generate automatic name */
- static int count=1;
-
- /**
- * Constructor.
- *
- */
- public Page() {
- // Automatic name generation
- this( "page"+count++);
- }
-
- /**
- * Constructor.
- *
- * @param identifier
- */
- public Page(Object identifier) {
- this.identifier = identifier;
- this.name = identifier.toString();
- }
-
- /**
- * Constructor.
- *
- * @param name
- * @param identifier
- */
- public Page(String name) {
- this.name = name;
- this.identifier = name;
- }
-
- /**
- * Constructor.
- *
- * @param name
- * @param identifier
- */
- public Page(String name, Object identifier) {
- this.name = name;
- this.identifier = identifier;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.IModelObject.sashmodel.query.IQueryTerm#accept(IPagesModelVisitor, EObject)
- *
- * @param visitor
- * @throws PagesModelException
- */
- public <M> void accept(IPagesModelVisitor<M> visitor, M modelObject) throws PagesModelException {
-
- visitor.walk(this, modelObject);
- }
-
- /**
- * @return the identifier
- */
- public Object getIdentifier() {
- return identifier;
- }
-
- /**
- * @param identifier the identifier to set
- */
- public void setIdentifier(Object identifier) {
- this.identifier = identifier;
- }
-
- /**
- * @see java.lang.Object#toString()
- *
- * @return
- */
- @Override
- public String toString() {
-
- return "Page()";
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + + +/** + * This represent a page in the Checker query. + * + * @author cedric dumoulin + * + */ +public class Page implements IModelObject { + + protected Object identifier; + + protected String name; + + /** To generate automatic name */ + static int count=1; + + /** + * Constructor. + * + */ + public Page() { + // Automatic name generation + this( "page"+count++); + } + + /** + * Constructor. + * + * @param identifier + */ + public Page(Object identifier) { + this.identifier = identifier; + this.name = identifier.toString(); + } + + /** + * Constructor. + * + * @param name + * @param identifier + */ + public Page(String name) { + this.name = name; + this.identifier = name; + } + + /** + * Constructor. + * + * @param name + * @param identifier + */ + public Page(String name, Object identifier) { + this.name = name; + this.identifier = identifier; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.IModelObject.sashmodel.query.IQueryTerm#accept(IPagesModelVisitor, EObject) + * + * @param visitor + * @throws PagesModelException + */ + public <M> void accept(IPagesModelVisitor<M> visitor, M modelObject) throws PagesModelException { + + visitor.walk(this, modelObject); + } + + /** + * @return the identifier + */ + public Object getIdentifier() { + return identifier; + } + + /** + * @param identifier the identifier to set + */ + public void setIdentifier(Object identifier) { + this.identifier = identifier; + } + + /** + * @see java.lang.Object#toString() + * + * @return + */ + @Override + public String toString() { + + return "Page()"; + } + + /** + * @return the name + */ + public String getName() { + return name; + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/PagesModelException.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/PagesModelException.java index 912da20781e..3d880b331fc 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/PagesModelException.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/PagesModelException.java @@ -1,78 +1,78 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-/**
- * Root Exception of the pagesmodel package
- *
- * @author cedric dumoulin
- *
- * TODO Rename to PagesModelException
- */
-public class PagesModelException extends Exception {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructor.
- *
- */
- public PagesModelException() {
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- */
- public PagesModelException(String arg0) {
- super(arg0);
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- */
- public PagesModelException(Throwable arg0) {
- super(arg0);
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- * @param arg1
- */
- public PagesModelException(String arg0, Throwable arg1) {
- super(arg0, arg1);
- }
-
- /**
- * Constructor.
- *
- * @param arg0
- * @param arg1
- * @param arg2
- * @param arg3
- */
- public PagesModelException(String arg0, Throwable arg1, boolean arg2, boolean arg3) {
- super(arg0, arg1);//, arg2, arg3);
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + +/** + * Root Exception of the pagesmodel package + * + * @author cedric dumoulin + * + * TODO Rename to PagesModelException + */ +public class PagesModelException extends Exception { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * Constructor. + * + */ + public PagesModelException() { + } + + /** + * Constructor. + * + * @param arg0 + */ + public PagesModelException(String arg0) { + super(arg0); + } + + /** + * Constructor. + * + * @param arg0 + */ + public PagesModelException(Throwable arg0) { + super(arg0); + } + + /** + * Constructor. + * + * @param arg0 + * @param arg1 + */ + public PagesModelException(String arg0, Throwable arg1) { + super(arg0, arg1); + } + + /** + * Constructor. + * + * @param arg0 + * @param arg1 + * @param arg2 + * @param arg3 + */ + public PagesModelException(String arg0, Throwable arg1, boolean arg2, boolean arg3) { + super(arg0, arg1);//, arg2, arg3); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/PanelTerm.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/PanelTerm.java index bd1d79b05bf..ebd4e7d7ade 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/PanelTerm.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/PanelTerm.java @@ -1,74 +1,74 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-
-/**
- * Common ancestor of Panel (Folder and Sash) in queries structure.
- * <br>
- * This class can also be used a starting point of query expression (and so Folder, VSash and HSash).
- *
- * @author cedric dumoulin
- *
- */
-public abstract class PanelTerm implements IModelExp {
-
- protected String name;
-
-
- /**
- * Constructor.
- *
- */
- public PanelTerm() {
- }
-
- /**
- * Constructor.
- *
- * @param name
- */
- public PanelTerm(String name) {
- this.name = name;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.IModelObject.sashmodel.query.IQueryTerm#accept(org.eclipse.papyrus.infra.core.sasheditor.IPagesModelVisitor.sashmodel.query.IQueryVisitor, org.eclipse.emf.ecore.EObject)
- *
- * @param visitor
- * @param panel
- * @throws PagesModelException
- */
- public <M> void accept(IPagesModelVisitor<M> visitor, M panel)
- throws PagesModelException {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + + +/** + * Common ancestor of Panel (Folder and Sash) in queries structure. + * <br> + * This class can also be used a starting point of query expression (and so Folder, VSash and HSash). + * + * @author cedric dumoulin + * + */ +public abstract class PanelTerm implements IModelExp { + + protected String name; + + + /** + * Constructor. + * + */ + public PanelTerm() { + } + + /** + * Constructor. + * + * @param name + */ + public PanelTerm(String name) { + this.name = name; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.IModelObject.sashmodel.query.IQueryTerm#accept(org.eclipse.papyrus.infra.core.sasheditor.IPagesModelVisitor.sashmodel.query.IQueryVisitor, org.eclipse.emf.ecore.EObject) + * + * @param visitor + * @param panel + * @throws PagesModelException + */ + public <M> void accept(IPagesModelVisitor<M> visitor, M panel) + throws PagesModelException { + // TODO Auto-generated method stub + + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/SashPagesModel.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/SashPagesModel.java index a08aa1521f6..14e771b9e57 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/SashPagesModel.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/SashPagesModel.java @@ -1,103 +1,103 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Sash Pages model allow to create a models of the pages represented by the {@link SashWindowsContainer}.
- * Such model can then be used to create corresponding pages and intermediate artifact in a {@link ISashWindowsContentProvider},
- * or to check the structure, ....
- *
- * <br>
- * The model contains windows. Actually, the {@link SashWindowsContainer} only support one window.
- *
- * @author cedric dumoulin
- *
- */
-public class SashPagesModel implements IModelExp {
-
- /**
- * A window have only one panel.
- */
- protected List<WindowTerm> windows = new ArrayList<WindowTerm>();
-
- protected String name;
-
- /**
- * Constructor.
- *
- * @param panel
- */
- public SashPagesModel(WindowTerm window) {
- this.windows.add(window);
- }
-
- /**
- * Constructor.
- *
- * @param name
- * @param panel
- */
- public SashPagesModel(String name, WindowTerm window) {
- this.name = name;
- this.windows.add(window);
- }
-
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.IModelObject.sashmodel.query.IQueryTerm#accept(org.eclipse.papyrus.infra.core.sasheditor.IPagesModelVisitor.sashmodel.query.IQueryVisitor, org.eclipse.emf.ecore.EObject)
- *
- * @param visitor
- * @param panel
- * @throws PagesModelException
- */
- public <M> void accept(IPagesModelVisitor<M> visitor, M model) throws PagesModelException {
-
- visitor.walk(this, model);
-
- }
-
-
- /**
- * @return the panel
- * @throws PagesModelException
- */
- public WindowTerm getFirstWindow() throws PagesModelException {
- if( windows.size() >0) {
- return windows.get(0);
- }
-
- // no elements
- throw new PagesModelException("No window found in model.");
- }
-
- /**
- * @return the panel
- */
- public List<WindowTerm> getWindows() {
- return windows;
- }
-
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + +import java.util.ArrayList; +import java.util.List; + +/** + * Sash Pages model allow to create a models of the pages represented by the {@link SashWindowsContainer}. + * Such model can then be used to create corresponding pages and intermediate artifact in a {@link ISashWindowsContentProvider}, + * or to check the structure, .... + * + * <br> + * The model contains windows. Actually, the {@link SashWindowsContainer} only support one window. + * + * @author cedric dumoulin + * + */ +public class SashPagesModel implements IModelExp { + + /** + * A window have only one panel. + */ + protected List<WindowTerm> windows = new ArrayList<WindowTerm>(); + + protected String name; + + /** + * Constructor. + * + * @param panel + */ + public SashPagesModel(WindowTerm window) { + this.windows.add(window); + } + + /** + * Constructor. + * + * @param name + * @param panel + */ + public SashPagesModel(String name, WindowTerm window) { + this.name = name; + this.windows.add(window); + } + + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.IModelObject.sashmodel.query.IQueryTerm#accept(org.eclipse.papyrus.infra.core.sasheditor.IPagesModelVisitor.sashmodel.query.IQueryVisitor, org.eclipse.emf.ecore.EObject) + * + * @param visitor + * @param panel + * @throws PagesModelException + */ + public <M> void accept(IPagesModelVisitor<M> visitor, M model) throws PagesModelException { + + visitor.walk(this, model); + + } + + + /** + * @return the panel + * @throws PagesModelException + */ + public WindowTerm getFirstWindow() throws PagesModelException { + if( windows.size() >0) { + return windows.get(0); + } + + // no elements + throw new PagesModelException("No window found in model."); + } + + /** + * @return the panel + */ + public List<WindowTerm> getWindows() { + return windows; + } + + + /** + * @return the name + */ + public String getName() { + return name; + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/SashPagesModelFactory.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/SashPagesModelFactory.java index c29154cafd3..24611c6428c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/SashPagesModelFactory.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/SashPagesModelFactory.java @@ -1,98 +1,98 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-
-/**
- * This class provides a set of static constructor helping in writing model.
- * <br>
- * Examples:
- * <ul>
- * <li>PanelTerm query = folder("a", page(), page() );</li>
- * <li>query = hSash( folder( page("p1"), page() ), vSash("s2", folder( page() ), folder( page() )) );</li>
- * <li>PanelTerm query = hSash( folder("f1", page("p1"), page("p2"), page("p3") ), folder("f2", page("p4") ) );</li>
- * <li></li>
- * </ul>
- *
- * @author cedric dumoulin
- *
- */
-public class SashPagesModelFactory {
-
- /**
- * Static constructor for {@link Page}.
- * @return
- */
- static public Page page() {
- return new Page();
- }
-
- /**
- * Static constructor for {@link Page}.
- * @return
- */
- static public Page page(String name) {
- return new Page(name);
- }
-
- /**
- * Static constructor for {@link Folder}.
- * @return
- */
- static public Folder folder( Page ...pages ) {
- return new Folder(pages);
- }
-
- /**
- * Static constructor for {@link Folder}.
- * @return
- */
- static public Folder folder( String name, Page ...pages ) {
- return new Folder(name, pages);
- }
-
- /**
- * Static constructor for {@link VSash}.
- * @return
- */
- static public VSash vSash( String name, PanelTerm up, PanelTerm down) {
- return new VSash(name, up, down);
- }
-
- /**
- * Static constructor for {@link VSash}.
- * @return
- */
- static public VSash vSash( PanelTerm up, PanelTerm down) {
- return new VSash(up, down);
- }
-
- /**
- * Static constructor for {@link HSash}.
- * @return
- */
- static public HSash hSash( String name, PanelTerm left, PanelTerm right) {
- return new HSash(name, left, right);
- }
-
- /**
- * Static constructor for {@link HSash}.
- * @return
- */
- static public HSash hSash( PanelTerm left, PanelTerm right) {
- return new HSash(left, right);
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + + +/** + * This class provides a set of static constructor helping in writing model. + * <br> + * Examples: + * <ul> + * <li>PanelTerm query = folder("a", page(), page() );</li> + * <li>query = hSash( folder( page("p1"), page() ), vSash("s2", folder( page() ), folder( page() )) );</li> + * <li>PanelTerm query = hSash( folder("f1", page("p1"), page("p2"), page("p3") ), folder("f2", page("p4") ) );</li> + * <li></li> + * </ul> + * + * @author cedric dumoulin + * + */ +public class SashPagesModelFactory { + + /** + * Static constructor for {@link Page}. + * @return + */ + static public Page page() { + return new Page(); + } + + /** + * Static constructor for {@link Page}. + * @return + */ + static public Page page(String name) { + return new Page(name); + } + + /** + * Static constructor for {@link Folder}. + * @return + */ + static public Folder folder( Page ...pages ) { + return new Folder(pages); + } + + /** + * Static constructor for {@link Folder}. + * @return + */ + static public Folder folder( String name, Page ...pages ) { + return new Folder(name, pages); + } + + /** + * Static constructor for {@link VSash}. + * @return + */ + static public VSash vSash( String name, PanelTerm up, PanelTerm down) { + return new VSash(name, up, down); + } + + /** + * Static constructor for {@link VSash}. + * @return + */ + static public VSash vSash( PanelTerm up, PanelTerm down) { + return new VSash(up, down); + } + + /** + * Static constructor for {@link HSash}. + * @return + */ + static public HSash hSash( String name, PanelTerm left, PanelTerm right) { + return new HSash(name, left, right); + } + + /** + * Static constructor for {@link HSash}. + * @return + */ + static public HSash hSash( PanelTerm left, PanelTerm right) { + return new HSash(left, right); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/VSash.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/VSash.java index f3e020c216b..8cb6c405cc0 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/VSash.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/VSash.java @@ -1,66 +1,66 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-
-/**
- * Class for structure representing vertical sash in Checker
- *
- * @author dumoulin
- *
- */
-public class VSash extends AbstractSash {
-
- /**
- * Constructor.
- *
- * @param leftup
- * @param rightdown
- */
- public VSash(PanelTerm left, PanelTerm right) {
- super(left, right);
- }
-
- /**
- * Constructor.
- *
- * @param leftup
- * @param rightdown
- */
- public VSash(String name, PanelTerm left, PanelTerm right) {
- super(name, left, right);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.IModelObject.sashmodel.query.IQueryTerm#accept(IPagesModelVisitor, EObject)
- *
- * @param visitor
- * @throws PagesModelException
- */
- public <M> void accept(IPagesModelVisitor<M> visitor, M modelObject) throws PagesModelException {
- visitor.walk(this, modelObject);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.AbstractSash#getStringName()
- *
- * @return
- */
- @Override
- protected String getStringName() {
- return "VSash";
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + + +/** + * Class for structure representing vertical sash in Checker + * + * @author dumoulin + * + */ +public class VSash extends AbstractSash { + + /** + * Constructor. + * + * @param leftup + * @param rightdown + */ + public VSash(PanelTerm left, PanelTerm right) { + super(left, right); + } + + /** + * Constructor. + * + * @param leftup + * @param rightdown + */ + public VSash(String name, PanelTerm left, PanelTerm right) { + super(name, left, right); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.IModelObject.sashmodel.query.IQueryTerm#accept(IPagesModelVisitor, EObject) + * + * @param visitor + * @throws PagesModelException + */ + public <M> void accept(IPagesModelVisitor<M> visitor, M modelObject) throws PagesModelException { + visitor.walk(this, modelObject); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.AbstractSash#getStringName() + * + * @return + */ + @Override + protected String getStringName() { + return "VSash"; + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/WindowTerm.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/WindowTerm.java index 27399c58c99..2d4d09a4b70 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/WindowTerm.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/WindowTerm.java @@ -1,83 +1,83 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
-
-
-/**
- * A term representing a Window in the query
- *
- * @author cedric dumoulin
- *
- */
-public class WindowTerm implements IModelExp {
-
- /**
- * A window have only one panel.
- */
- protected PanelTerm panel;
-
- protected String name;
-
- /**
- * Constructor.
- *
- * @param panel
- */
- public WindowTerm(PanelTerm panel) {
- this.panel = panel;
- }
-
- /**
- * Constructor.
- *
- * @param name
- * @param panel
- */
- public WindowTerm(String name, PanelTerm panel) {
- this.name = name;
- this.panel = panel;
- }
-
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.IModelObject.sashmodel.query.IQueryTerm#accept(org.eclipse.papyrus.infra.core.sasheditor.IPagesModelVisitor.sashmodel.query.IQueryVisitor, org.eclipse.emf.ecore.EObject)
- *
- * @param visitor
- * @param panel
- * @throws PagesModelException
- */
- public <M> void accept(IPagesModelVisitor<M> visitor, M windowModel) throws PagesModelException {
-
- visitor.walk(this, windowModel);
-
- }
-
-
- /**
- * @return the panel
- */
- public PanelTerm getPanel() {
- return panel;
- }
-
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel; + + +/** + * A term representing a Window in the query + * + * @author cedric dumoulin + * + */ +public class WindowTerm implements IModelExp { + + /** + * A window have only one panel. + */ + protected PanelTerm panel; + + protected String name; + + /** + * Constructor. + * + * @param panel + */ + public WindowTerm(PanelTerm panel) { + this.panel = panel; + } + + /** + * Constructor. + * + * @param name + * @param panel + */ + public WindowTerm(String name, PanelTerm panel) { + this.name = name; + this.panel = panel; + } + + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.IModelObject.sashmodel.query.IQueryTerm#accept(org.eclipse.papyrus.infra.core.sasheditor.IPagesModelVisitor.sashmodel.query.IQueryVisitor, org.eclipse.emf.ecore.EObject) + * + * @param visitor + * @param panel + * @throws PagesModelException + */ + public <M> void accept(IPagesModelVisitor<M> visitor, M windowModel) throws PagesModelException { + + visitor.walk(this, windowModel); + + } + + + /** + * @return the panel + */ + public PanelTerm getPanel() { + return panel; + } + + + /** + * @return the name + */ + public String getName() { + return name; + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/package-info.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/package-info.java index cdc2289dac8..331140c54c3 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/package-info.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/pagesmodel/package-info.java @@ -1,19 +1,19 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-/**
- * @author cedric dumoulin
- *
- */
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +/** + * @author cedric dumoulin + * + */ package org.eclipse.papyrus.infra.core.sasheditor.pagesmodel;
\ No newline at end of file diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java index 462ff9469b8..390f62aa3c6 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java @@ -1,32 +1,32 @@ -/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.tests;
-
-import org.junit.runner.RunWith;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
-import org.junit.runners.Suite.SuiteClasses;
-
-
-/**
- * All tests for this plugin
- */
-@RunWith(ClassificationSuite.class)
-@SuiteClasses({
-// testModel1
-org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.AllTests.class,
-org.eclipse.papyrus.infra.core.sasheditor.editor.AllTests.class,
-org.eclipse.papyrus.infra.core.sasheditor.internal.AllTests.class,
-org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.AllTests.class
-})
-public class AllTests {
- //Testsuite
-}
+/***************************************************************************** + * Copyright (c) 2010 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.tests; + +import org.junit.runner.RunWith; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; +import org.junit.runners.Suite.SuiteClasses; + + +/** + * All tests for this plugin + */ +@RunWith(ClassificationSuite.class) +@SuiteClasses({ +// testModel1 +org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.AllTests.class, +org.eclipse.papyrus.infra.core.sasheditor.editor.AllTests.class, +org.eclipse.papyrus.infra.core.sasheditor.internal.AllTests.class, +org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.AllTests.class +}) +public class AllTests { + //Testsuite +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/AllTests.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/AllTests.java index 91fbcd0d3c1..7e180942bd2 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/AllTests.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/AllTests.java @@ -1,33 +1,33 @@ -/*****************************************************************************
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor;
-
-import org.junit.runner.RunWith;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
-import org.junit.runners.Suite.SuiteClasses;
-
-
-/**
- * @author cedric dumoulin
- *
- */
-@RunWith(ClassificationSuite.class)
-@SuiteClasses({ FakeEditorInputTest.class,
- FakeMultiSashPageEditorTest.class
- })
-
-public class AllTests {
-
-}
+/***************************************************************************** + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor; + +import org.junit.runner.RunWith; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; +import org.junit.runners.Suite.SuiteClasses; + + +/** + * @author cedric dumoulin + * + */ +@RunWith(ClassificationSuite.class) +@SuiteClasses({ FakeEditorInputTest.class, + FakeMultiSashPageEditorTest.class + }) + +public class AllTests { + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeEditorInput.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeEditorInput.java index 6f3d734817c..6f3d734817c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeEditorInput.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeEditorInput.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeEditorInputTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeEditorInputTest.java index 3f86e9bf682..8455cda5db6 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeEditorInputTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeEditorInputTest.java @@ -1,46 +1,46 @@ -/*****************************************************************************
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.ui.IEditorInput;
-import org.junit.Assert;
-import org.junit.Test;
-
-
-/**
- * @author dumoulin
- *
- */
-public class FakeEditorInputTest {
-
- /**
- * Test method for {@link org.eclipse.ui.part.FileEditorInput#equals(java.lang.Object)}.
- */
- @Test
- //@Ignore
- public void testEquals() {
-
-
- ISashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
- IEditorInput input1 = new FakeEditorInput(contentProvider);
-
- IEditorInput input2 = new FakeEditorInput(contentProvider);
-
- Assert.assertNotEquals("input are different", input1, input2);
- }
-
-}
+/***************************************************************************** + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider; +import org.eclipse.ui.IEditorInput; +import org.junit.Assert; +import org.junit.Test; + + +/** + * @author dumoulin + * + */ +public class FakeEditorInputTest { + + /** + * Test method for {@link org.eclipse.ui.part.FileEditorInput#equals(java.lang.Object)}. + */ + @Test + //@Ignore + public void testEquals() { + + + ISashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + IEditorInput input1 = new FakeEditorInput(contentProvider); + + IEditorInput input2 = new FakeEditorInput(contentProvider); + + Assert.assertNotEquals("input are different", input1, input2); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeMultiSashPageEditor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeMultiSashPageEditor.java index 2136d09e0d2..e5c082c219c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeMultiSashPageEditor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeMultiSashPageEditor.java @@ -1,386 +1,386 @@ -/*****************************************************************************
- * Copyright (c) 2009 CEA LIST & LIFL
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
-import org.eclipse.papyrus.infra.core.sasheditor.internal.IMultiEditorManager;
-import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
-import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.MultiPageSelectionProvider;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.EditorPart;
-
-/**
- * A fake editor used for JUnit tests.
- *
- * This main editor provide the minimum required to let a {@link SashWindowsContainer} run inside.
- * It allows addition of pages (editor and components).
- * To create an instance of this editor, use one of the {@link #openEditor()} method. It is possible to provide
- * a {@link ISashWindowsContentProvider} fully initialized.
- * See {@link FakeMultiSashPageEditorTest} for code examples.
- *
- * For tests to run properly, the editor should be registered as eclipse extension:
- *
- * <pre>
- * {@code
- * <extension
- * point="org.eclipse.ui.editors">
- * <editor
- * class="org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.FakeMultiSashPageEditor"
- * default="false"
- * id="org.eclipse.papyrus.infra.core.sasheditor.tests.editor.FakeMultiSashPageEditor"
- * name="FakeMultiSashPageEditor">
- * </editor>
- * </extension>
- * }
- * </pre>
- *
- * @author Cedric Dumoulin
- */
-public class FakeMultiSashPageEditor extends EditorPart implements IMultiEditorManager, IMultiPageEditorPart {
-
- /**
- * Id used to register this editor in Eclipse.
- * Can be used to open the editor.
- */
- public static String EditorID = "org.eclipse.papyrus.infra.core.sasheditor.tests.editor.FakeMultiSashPageEditor";
-
- /** The pageProvider */
- private ISashWindowsContentProvider pageProvider;
-
- /** The sash windows system :-) */
- private SashWindowsContainer sashContainer;
-
- /**
- * IEditorPart of the opened editor.
- */
- protected IEditorPart mainEditorPart;
-
-
- /**
- * Return an instance of the editor inside the Eclipse framework.
- * The Editor should be registered to Eclipse extension.
- * The editor will be created with the specified number of nested editors of type {@link TestTextEditor}
- *
- * @param nestedEditorCount
- * Number of expected nested editors.
- *
- * @throws PartInitException
- */
- public static FakeMultiSashPageEditor openEditor(int nestedEditorCount) throws PartInitException {
- // Create a content provider with one editor
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
- // Create pages and add them to the default folder
- for(int i = 0; i < nestedEditorCount; i++) {
- IPageModel newModel = new TextEditorPartModel("editor" + i);
- contentProvider.addPage(newModel);
- }
-
- return openEditor(contentProvider);
- }
-
- /**
- * Return an instance of the editor inside the Eclipse framework.
- * The Editor should be registered to Eclipse extension.
- * The editor will contain one nested editor.
- *
- * @throws PartInitException
- */
- public static FakeMultiSashPageEditor openEditor() throws PartInitException {
-
- return openEditor(1);
- }
-
- private static class OpenEditorRunnable implements Runnable {
-
- private ISashWindowsContentProvider contentProvider;
-
- private FakeMultiSashPageEditor editor;
-
- public OpenEditorRunnable(ISashWindowsContentProvider contentProvider) {
- this.contentProvider = contentProvider;
- }
-
- public void run() {
- IEditorInput input = new FakeEditorInput(contentProvider);
-
- IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = window.getActivePage();
- try {
- IEditorPart part = page.openEditor(input, FakeMultiSashPageEditor.EditorID);
-
- this.editor = (FakeMultiSashPageEditor)part;
- } catch (PartInitException ex) {
- ex.printStackTrace(System.out);
- }
- }
-
- public FakeMultiSashPageEditor getEditor() {
- return editor;
- }
- }
-
- /**
- * Return an instance of the editor inside the Eclipse framework.
- * The Editor should be registered to Eclipse extension.
- *
- * @throws PartInitException
- */
- public static FakeMultiSashPageEditor openEditor(ISashWindowsContentProvider contentProvider) throws PartInitException {
- OpenEditorRunnable runnable = new OpenEditorRunnable(contentProvider);
- Display.getDefault().syncExec(runnable);
- return runnable.getEditor();
- }
-
- /**
- * Close the specified editor.
- *
- * @param editor
- */
- public static void closeEditor(final FakeMultiSashPageEditor editor) {
- Display.getDefault().syncExec(new Runnable() {
-
- public void run() {
- IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = window.getActivePage();
- page.closeEditor(editor, false);
- }
- });
- }
-
- /**
- * get the contentProvider. Create it if necessary.
- *
- * @return
- */
- public ISashWindowsContentProvider getContentProvider() {
-
- return getContentProviderImpl();
- }
-
- /**
- * get the contentProvider. Create it if necessary.
- * This return the internal implementation.
- * Misc method. If the internal impl is not of the specified type, throw an exception ...
- *
- * @return
- */
- public SimpleSashWindowsContentProvider getContentProviderImpl() {
- if(pageProvider == null) {
- pageProvider = createPageProvider();
- }
-
- return (SimpleSashWindowsContentProvider)pageProvider;
- }
-
- /**
- * Set the contentProvider if not set. If it is already set, this method do not change it.
- *
- * @param contentProvider
- */
- public void setContentProvider(ISashWindowsContentProvider contentProvider) {
- if(pageProvider == null) {
- pageProvider = contentProvider;
- }
- }
-
- /**
- * Create and initialize the pageProvider.
- */
- protected ISashWindowsContentProvider createPageProvider() {
- ISashWindowsContentProvider pageProvider = new SimpleSashWindowsContentProvider();
- // Adding requested pages
- pageProvider.addPage(new TextEditorPartModel());
-
- return pageProvider;
- }
-
- /**
- * Handles a property change notification from a nested editor. The default implementation simply forwards the change to
- * listeners on this multi-page editor by calling <code>firePropertyChange</code> with the same property id. For example, if
- * the dirty state of a nested editor changes (property id <code>IEditorPart.PROP_DIRTY</code>), this method handles it
- * by firing a property change event for <code>IEditorPart.PROP_DIRTY</code> to property listeners on this multi-page
- * editor.
- * <p>
- * Subclasses may extend or reimplement this method.
- * </p>
- *
- * @copiedfrom org.eclipse.ui.part.MultiPageEditorPart.handlePropertyChange(int)
- *
- * @param propertyId
- * the id of the property that changed
- */
- // protected void handlePropertyChange(int propertyId) {
- // firePropertyChange(propertyId);
- // }
-
- /**
- * The <code>MultiPageEditorPart</code> implementation of this <code>IEditorPart</code> method sets its site to the given
- * site, its input to the given input, and the site's selection provider to a <code>MultiPageSelectionProvider</code>.
- * Subclasses may extend this method.
- *
- * @copiedfrom org.eclipse.ui.part.MultiPageEditorPart
- * @param site
- * The site for which this part is being created; must not be <code>null</code>.
- * @param input
- * The input on which this editor should be created; must not be <code>null</code>.
- * @throws PartInitException
- * If the initialization of the part fails -- currently never.
- */
- @Override
- public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-
- // Check if the input carry a ContentProvider.
- if(input instanceof FakeEditorInput) {
- // Get the content provider from the input
- FakeEditorInput providerInput = (FakeEditorInput)input;
- ISashWindowsContentProvider provider = providerInput.getContentProvider();
- if(provider != null) {
- setContentProvider(provider);
- }
- }
-
- setSite(site);
- setInput(input);
- site.setSelectionProvider(new MultiPageSelectionProvider(this));
- }
-
- /**
- * Create the part controls. {@inheritDoc}
- */
- @Override
- public void createPartControl(Composite parent) {
-
- // Create and intialize sash windows
- sashContainer = new SashWindowsContainer(this);
- sashContainer.setContentProvider(getContentProvider());
- sashContainer.createPartControl(parent);
- activate();
- }
-
- /**
- * Method to activate the editor.
- * Called immediately after createPartControl() is complete.
- * To be implemented by subclasses. Default implementation do nothing.
- */
- protected void activate() {
- }
-
- /**
- * Method to deactivate the editor.
- * Called when dispose() is called.
- * To be implemented by subclasses. Default implementation do nothing.
- */
- protected void deactivate() {
- }
-
- /**
- * Dispose the Editor. Also dispose the sashsystem.
- *
- * @see org.eclipse.ui.part.WorkbenchPart#dispose()
- *
- */
- @Override
- public void dispose() {
- deactivate();
- super.dispose();
- // System.err.println("editor disposed");
- // Clean references
- mainEditorPart = null;
- pageProvider = null;
- sashContainer = null;
- }
-
- /**
- * Refresh the sash windows system
- */
- public void refreshTabs() {
- if(sashContainer != null) {
- sashContainer.refreshTabs();
- }
-
- }
-
-
- /**
- * Needed by MultiPageActionBarContributor and MultiPageSelectionProvider.
- */
- public IEditorPart getActiveEditor() {
- return sashContainer.getActiveEditor();
- }
-
- /**
- * Get the {@link ISashWindowsContainer}.
- * Note the the ISashWindowsContainer can also be acuired with getAdapter(ISashWindowsContainer.class).
- */
- public ISashWindowsContainer getISashWindowsContainer() {
- return sashContainer;
- }
-
- /**
- * Get the {@link ISashWindowsContainer}.
- * Note the the ISashWindowsContainer can also be acuired with getAdapter(ISashWindowsContainer.class).
- */
- public SashWindowsContainer getSashWindowsContainer() {
- return sashContainer;
- }
-
- /**
- *
- * {@inheritDoc}
- */
- @Override
- public void setFocus() {
- sashContainer.setFocus();
-
- }
-
- /**
- * (non-Javadoc)
- * Method declared on IEditorPart.
- */
- @Override
- public boolean isSaveAsAllowed() {
- return false;
- }
-
- @Override
- public void doSave(IProgressMonitor monitor) {
-
- }
-
- @Override
- public void doSaveAs() {
-
- }
-
- @Override
- public boolean isDirty() {
- return false;
- }
-
-
-}
+/***************************************************************************** + * Copyright (c) 2009 CEA LIST & LIFL + * + * + * 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 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart; +import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer; +import org.eclipse.papyrus.infra.core.sasheditor.internal.IMultiEditorManager; +import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer; +import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.MultiPageSelectionProvider; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IEditorSite; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.EditorPart; + +/** + * A fake editor used for JUnit tests. + * + * This main editor provide the minimum required to let a {@link SashWindowsContainer} run inside. + * It allows addition of pages (editor and components). + * To create an instance of this editor, use one of the {@link #openEditor()} method. It is possible to provide + * a {@link ISashWindowsContentProvider} fully initialized. + * See {@link FakeMultiSashPageEditorTest} for code examples. + * + * For tests to run properly, the editor should be registered as eclipse extension: + * + * <pre> + * {@code + * <extension + * point="org.eclipse.ui.editors"> + * <editor + * class="org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.FakeMultiSashPageEditor" + * default="false" + * id="org.eclipse.papyrus.infra.core.sasheditor.tests.editor.FakeMultiSashPageEditor" + * name="FakeMultiSashPageEditor"> + * </editor> + * </extension> + * } + * </pre> + * + * @author Cedric Dumoulin + */ +public class FakeMultiSashPageEditor extends EditorPart implements IMultiEditorManager, IMultiPageEditorPart { + + /** + * Id used to register this editor in Eclipse. + * Can be used to open the editor. + */ + public static String EditorID = "org.eclipse.papyrus.infra.core.sasheditor.tests.editor.FakeMultiSashPageEditor"; + + /** The pageProvider */ + private ISashWindowsContentProvider pageProvider; + + /** The sash windows system :-) */ + private SashWindowsContainer sashContainer; + + /** + * IEditorPart of the opened editor. + */ + protected IEditorPart mainEditorPart; + + + /** + * Return an instance of the editor inside the Eclipse framework. + * The Editor should be registered to Eclipse extension. + * The editor will be created with the specified number of nested editors of type {@link TestTextEditor} + * + * @param nestedEditorCount + * Number of expected nested editors. + * + * @throws PartInitException + */ + public static FakeMultiSashPageEditor openEditor(int nestedEditorCount) throws PartInitException { + // Create a content provider with one editor + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + // Create pages and add them to the default folder + for(int i = 0; i < nestedEditorCount; i++) { + IPageModel newModel = new TextEditorPartModel("editor" + i); + contentProvider.addPage(newModel); + } + + return openEditor(contentProvider); + } + + /** + * Return an instance of the editor inside the Eclipse framework. + * The Editor should be registered to Eclipse extension. + * The editor will contain one nested editor. + * + * @throws PartInitException + */ + public static FakeMultiSashPageEditor openEditor() throws PartInitException { + + return openEditor(1); + } + + private static class OpenEditorRunnable implements Runnable { + + private ISashWindowsContentProvider contentProvider; + + private FakeMultiSashPageEditor editor; + + public OpenEditorRunnable(ISashWindowsContentProvider contentProvider) { + this.contentProvider = contentProvider; + } + + public void run() { + IEditorInput input = new FakeEditorInput(contentProvider); + + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchPage page = window.getActivePage(); + try { + IEditorPart part = page.openEditor(input, FakeMultiSashPageEditor.EditorID); + + this.editor = (FakeMultiSashPageEditor)part; + } catch (PartInitException ex) { + ex.printStackTrace(System.out); + } + } + + public FakeMultiSashPageEditor getEditor() { + return editor; + } + } + + /** + * Return an instance of the editor inside the Eclipse framework. + * The Editor should be registered to Eclipse extension. + * + * @throws PartInitException + */ + public static FakeMultiSashPageEditor openEditor(ISashWindowsContentProvider contentProvider) throws PartInitException { + OpenEditorRunnable runnable = new OpenEditorRunnable(contentProvider); + Display.getDefault().syncExec(runnable); + return runnable.getEditor(); + } + + /** + * Close the specified editor. + * + * @param editor + */ + public static void closeEditor(final FakeMultiSashPageEditor editor) { + Display.getDefault().syncExec(new Runnable() { + + public void run() { + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchPage page = window.getActivePage(); + page.closeEditor(editor, false); + } + }); + } + + /** + * get the contentProvider. Create it if necessary. + * + * @return + */ + public ISashWindowsContentProvider getContentProvider() { + + return getContentProviderImpl(); + } + + /** + * get the contentProvider. Create it if necessary. + * This return the internal implementation. + * Misc method. If the internal impl is not of the specified type, throw an exception ... + * + * @return + */ + public SimpleSashWindowsContentProvider getContentProviderImpl() { + if(pageProvider == null) { + pageProvider = createPageProvider(); + } + + return (SimpleSashWindowsContentProvider)pageProvider; + } + + /** + * Set the contentProvider if not set. If it is already set, this method do not change it. + * + * @param contentProvider + */ + public void setContentProvider(ISashWindowsContentProvider contentProvider) { + if(pageProvider == null) { + pageProvider = contentProvider; + } + } + + /** + * Create and initialize the pageProvider. + */ + protected ISashWindowsContentProvider createPageProvider() { + ISashWindowsContentProvider pageProvider = new SimpleSashWindowsContentProvider(); + // Adding requested pages + pageProvider.addPage(new TextEditorPartModel()); + + return pageProvider; + } + + /** + * Handles a property change notification from a nested editor. The default implementation simply forwards the change to + * listeners on this multi-page editor by calling <code>firePropertyChange</code> with the same property id. For example, if + * the dirty state of a nested editor changes (property id <code>IEditorPart.PROP_DIRTY</code>), this method handles it + * by firing a property change event for <code>IEditorPart.PROP_DIRTY</code> to property listeners on this multi-page + * editor. + * <p> + * Subclasses may extend or reimplement this method. + * </p> + * + * @copiedfrom org.eclipse.ui.part.MultiPageEditorPart.handlePropertyChange(int) + * + * @param propertyId + * the id of the property that changed + */ + // protected void handlePropertyChange(int propertyId) { + // firePropertyChange(propertyId); + // } + + /** + * The <code>MultiPageEditorPart</code> implementation of this <code>IEditorPart</code> method sets its site to the given + * site, its input to the given input, and the site's selection provider to a <code>MultiPageSelectionProvider</code>. + * Subclasses may extend this method. + * + * @copiedfrom org.eclipse.ui.part.MultiPageEditorPart + * @param site + * The site for which this part is being created; must not be <code>null</code>. + * @param input + * The input on which this editor should be created; must not be <code>null</code>. + * @throws PartInitException + * If the initialization of the part fails -- currently never. + */ + @Override + public void init(IEditorSite site, IEditorInput input) throws PartInitException { + + // Check if the input carry a ContentProvider. + if(input instanceof FakeEditorInput) { + // Get the content provider from the input + FakeEditorInput providerInput = (FakeEditorInput)input; + ISashWindowsContentProvider provider = providerInput.getContentProvider(); + if(provider != null) { + setContentProvider(provider); + } + } + + setSite(site); + setInput(input); + site.setSelectionProvider(new MultiPageSelectionProvider(this)); + } + + /** + * Create the part controls. {@inheritDoc} + */ + @Override + public void createPartControl(Composite parent) { + + // Create and intialize sash windows + sashContainer = new SashWindowsContainer(this); + sashContainer.setContentProvider(getContentProvider()); + sashContainer.createPartControl(parent); + activate(); + } + + /** + * Method to activate the editor. + * Called immediately after createPartControl() is complete. + * To be implemented by subclasses. Default implementation do nothing. + */ + protected void activate() { + } + + /** + * Method to deactivate the editor. + * Called when dispose() is called. + * To be implemented by subclasses. Default implementation do nothing. + */ + protected void deactivate() { + } + + /** + * Dispose the Editor. Also dispose the sashsystem. + * + * @see org.eclipse.ui.part.WorkbenchPart#dispose() + * + */ + @Override + public void dispose() { + deactivate(); + super.dispose(); + // System.err.println("editor disposed"); + // Clean references + mainEditorPart = null; + pageProvider = null; + sashContainer = null; + } + + /** + * Refresh the sash windows system + */ + public void refreshTabs() { + if(sashContainer != null) { + sashContainer.refreshTabs(); + } + + } + + + /** + * Needed by MultiPageActionBarContributor and MultiPageSelectionProvider. + */ + public IEditorPart getActiveEditor() { + return sashContainer.getActiveEditor(); + } + + /** + * Get the {@link ISashWindowsContainer}. + * Note the the ISashWindowsContainer can also be acuired with getAdapter(ISashWindowsContainer.class). + */ + public ISashWindowsContainer getISashWindowsContainer() { + return sashContainer; + } + + /** + * Get the {@link ISashWindowsContainer}. + * Note the the ISashWindowsContainer can also be acuired with getAdapter(ISashWindowsContainer.class). + */ + public SashWindowsContainer getSashWindowsContainer() { + return sashContainer; + } + + /** + * + * {@inheritDoc} + */ + @Override + public void setFocus() { + sashContainer.setFocus(); + + } + + /** + * (non-Javadoc) + * Method declared on IEditorPart. + */ + @Override + public boolean isSaveAsAllowed() { + return false; + } + + @Override + public void doSave(IProgressMonitor monitor) { + + } + + @Override + public void doSaveAs() { + + } + + @Override + public boolean isDirty() { + return false; + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeMultiSashPageEditorTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeMultiSashPageEditorTest.java index 2f16a08158b..1faff1a1208 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeMultiSashPageEditorTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/FakeMultiSashPageEditorTest.java @@ -1,252 +1,252 @@ -/*****************************************************************************
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.junit.After;
-import org.junit.Test;
-
-
-/**
- * Tests for testing the {@link FakeMultiSashPageEditor} test editor.
- *
- * @author Cedric dumoulin
- *
- */
-public class FakeMultiSashPageEditorTest /* extends AbstractPapyrusTest */{
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- Display.getDefault().syncExec(new Runnable() {
-
- public void run() {
- // Close all remaining opened editors
- IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = window.getActivePage();
- page.closeAllEditors(false);
- }
- });
- }
-
- /**
- * Test openEditor with a provided provider.
- *
- * @throws Exception
- */
- @Test
- public void testOpenEditor_contentProvider() throws Exception {
-
- // Create a content provider
- SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();
-
- // Create pages and add them to the default folder
- List<IPageModel> models = new ArrayList<IPageModel>();
- for(int i = 0; i < 3; i++) {
- IPageModel newModel = new TextEditorPartModel("model" + i);
- contentProvider.addPage(newModel);
- models.add(newModel);
- }
-
- FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(contentProvider);
-
- assertNotNull("Editor is created", editor);
- assertSame("ContentProvider is set", contentProvider, editor.getContentProvider());
-
- // Check nested editor types
- IEditorPart nestedEditor = editor.getActiveEditor();
- assertTrue("nested editor is of right type", (nestedEditor instanceof TestTextEditor));
-
- FakeMultiSashPageEditor.closeEditor(editor);
- }
-
- /**
- * Test openEditor with a provided provider.
- *
- * @throws Exception
- */
- @Test
- public void testOpenEditor() throws Exception {
-
- FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor();
-
- assertNotNull("Editor is created", editor);
- assertNotNull("ContentProvider is set", editor.getContentProvider());
- IEditorPart activeEditor = editor.getActiveEditor();
- assertNotNull("Active editor set", activeEditor);
-
- // Check nested editor types
- IEditorPart nestedEditor = editor.getActiveEditor();
- assertEquals("nested editor is of right type", TestTextEditor.class, nestedEditor.getClass());
-
- FakeMultiSashPageEditor.closeEditor(editor);
- }
-
- /**
- * Test openEditor with a provided provider.
- *
- * @throws Exception
- */
- @Test
- public void testOpenEditor_nestedEditorCount() throws Exception {
-
- int nestedEditorCount = 4;
-
- FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(nestedEditorCount);
-
- assertNotNull("Editor is created", editor);
- assertNotNull("ContentProvider is set", editor.getContentProvider());
- IEditorPart activeEditor = editor.getActiveEditor();
- assertNotNull("Active editor set", activeEditor);
-
- // Check nested editor types
- IEditorPart nestedEditor = editor.getActiveEditor();
- assertEquals("nested editor is of right type", TestTextEditor.class, nestedEditor.getClass());
-
- FakeMultiSashPageEditor.closeEditor(editor);
- }
-
- /**
- * Test openEditor with a provided provider.
- *
- * @throws Exception
- */
- @Test
- public void testCloseEditor() throws Exception {
-
- FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor();
-
- assertNotNull("Editor is created", editor);
- assertNotNull("ContentProvider is set", editor.getContentProvider());
- IEditorPart activeEditor = editor.getActiveEditor();
- assertNotNull("Active editor set", activeEditor);
-
- // Check nested editor types
- IEditorPart nestedEditor = editor.getActiveEditor();
- assertEquals("nested editor is of right type", TestTextEditor.class, nestedEditor.getClass());
-
- FakeMultiSashPageEditor.closeEditor(editor);
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.FakeMultiSashPageEditor#getActiveEditor()}.
- *
- * @throws PartInitException
- */
- @Test
- public void testGetSashContainer() throws PartInitException {
- FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor();
-
- assertNotNull("Container is set", editor.getSashWindowsContainer());
-
- FakeMultiSashPageEditor.closeEditor(editor);
- }
-
- /**
- * Check if we can start several {@link FakeMultiSashPageEditor} in the same time
- *
- * @throws PartInitException
- */
- @Test
- public void testStartMultipleFakeEditors() throws PartInitException {
-
-
- FakeMultiSashPageEditor editor1 = FakeMultiSashPageEditor.openEditor(2);
- FakeMultiSashPageEditor editor2 = FakeMultiSashPageEditor.openEditor(2);
- FakeMultiSashPageEditor editor3 = FakeMultiSashPageEditor.openEditor(2);
-
- assertNotSame("got different editors", editor1, editor2);
- assertNotSame("got different editors", editor1, editor3);
- assertNotSame("got different editors", editor2, editor3);
-
- FakeMultiSashPageEditor.closeEditor(editor1);
- FakeMultiSashPageEditor.closeEditor(editor2);
- FakeMultiSashPageEditor.closeEditor(editor3);
-
- }
-
- /**
- * Check if we can start several {@link FakeMultiSashPageEditor} in the same time
- *
- * @throws PartInitException
- */
- @Test
- public void testStartMultipleFakeEditorsOneByOne() throws PartInitException {
-
-
- FakeMultiSashPageEditor editor1 = FakeMultiSashPageEditor.openEditor();
- FakeMultiSashPageEditor.closeEditor(editor1);
-
- FakeMultiSashPageEditor editor2 = FakeMultiSashPageEditor.openEditor();
- assertNotSame("got different editors", editor1, editor2);
- FakeMultiSashPageEditor.closeEditor(editor2);
-
-
- FakeMultiSashPageEditor editor3 = FakeMultiSashPageEditor.openEditor();
-
- assertNotSame("got different editors", editor1, editor3);
- assertNotSame("got different editors", editor2, editor3);
-
- FakeMultiSashPageEditor.closeEditor(editor3);
- }
-
- /**
- * Check if we can start several {@link FakeMultiSashPageEditor} in the same time. Here
- * editors are closed by calling editor.dispose().
- * This test succeed, but exception are outputted because the dispose() on editor doesn't
- * fried the editors from workbench.
- *
- * @throws PartInitException
- */
- @Test
- //@Ignore
- public void testStartMultipleFakeEditorsOneByOneAndDispose() throws PartInitException {
-
-
- FakeMultiSashPageEditor editor1 = FakeMultiSashPageEditor.openEditor();
- editor1.dispose();
-
- FakeMultiSashPageEditor editor2 = FakeMultiSashPageEditor.openEditor();
- assertNotSame("got different editors", editor1, editor2);
- editor2.dispose();
-
-
- FakeMultiSashPageEditor editor3 = FakeMultiSashPageEditor.openEditor();
-
- assertNotSame("got different editors", editor1, editor3);
- assertNotSame("got different editors", editor2, editor3);
-
- editor3.dispose();
- }
-
-}
+/***************************************************************************** + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.junit.After; +import org.junit.Test; + + +/** + * Tests for testing the {@link FakeMultiSashPageEditor} test editor. + * + * @author Cedric dumoulin + * + */ +public class FakeMultiSashPageEditorTest /* extends AbstractPapyrusTest */{ + + /** + * @throws java.lang.Exception + */ + @After + public void tearDown() throws Exception { + Display.getDefault().syncExec(new Runnable() { + + public void run() { + // Close all remaining opened editors + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchPage page = window.getActivePage(); + page.closeAllEditors(false); + } + }); + } + + /** + * Test openEditor with a provided provider. + * + * @throws Exception + */ + @Test + public void testOpenEditor_contentProvider() throws Exception { + + // Create a content provider + SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider(); + + // Create pages and add them to the default folder + List<IPageModel> models = new ArrayList<IPageModel>(); + for(int i = 0; i < 3; i++) { + IPageModel newModel = new TextEditorPartModel("model" + i); + contentProvider.addPage(newModel); + models.add(newModel); + } + + FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(contentProvider); + + assertNotNull("Editor is created", editor); + assertSame("ContentProvider is set", contentProvider, editor.getContentProvider()); + + // Check nested editor types + IEditorPart nestedEditor = editor.getActiveEditor(); + assertTrue("nested editor is of right type", (nestedEditor instanceof TestTextEditor)); + + FakeMultiSashPageEditor.closeEditor(editor); + } + + /** + * Test openEditor with a provided provider. + * + * @throws Exception + */ + @Test + public void testOpenEditor() throws Exception { + + FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(); + + assertNotNull("Editor is created", editor); + assertNotNull("ContentProvider is set", editor.getContentProvider()); + IEditorPart activeEditor = editor.getActiveEditor(); + assertNotNull("Active editor set", activeEditor); + + // Check nested editor types + IEditorPart nestedEditor = editor.getActiveEditor(); + assertEquals("nested editor is of right type", TestTextEditor.class, nestedEditor.getClass()); + + FakeMultiSashPageEditor.closeEditor(editor); + } + + /** + * Test openEditor with a provided provider. + * + * @throws Exception + */ + @Test + public void testOpenEditor_nestedEditorCount() throws Exception { + + int nestedEditorCount = 4; + + FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(nestedEditorCount); + + assertNotNull("Editor is created", editor); + assertNotNull("ContentProvider is set", editor.getContentProvider()); + IEditorPart activeEditor = editor.getActiveEditor(); + assertNotNull("Active editor set", activeEditor); + + // Check nested editor types + IEditorPart nestedEditor = editor.getActiveEditor(); + assertEquals("nested editor is of right type", TestTextEditor.class, nestedEditor.getClass()); + + FakeMultiSashPageEditor.closeEditor(editor); + } + + /** + * Test openEditor with a provided provider. + * + * @throws Exception + */ + @Test + public void testCloseEditor() throws Exception { + + FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(); + + assertNotNull("Editor is created", editor); + assertNotNull("ContentProvider is set", editor.getContentProvider()); + IEditorPart activeEditor = editor.getActiveEditor(); + assertNotNull("Active editor set", activeEditor); + + // Check nested editor types + IEditorPart nestedEditor = editor.getActiveEditor(); + assertEquals("nested editor is of right type", TestTextEditor.class, nestedEditor.getClass()); + + FakeMultiSashPageEditor.closeEditor(editor); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.FakeMultiSashPageEditor#getActiveEditor()}. + * + * @throws PartInitException + */ + @Test + public void testGetSashContainer() throws PartInitException { + FakeMultiSashPageEditor editor = FakeMultiSashPageEditor.openEditor(); + + assertNotNull("Container is set", editor.getSashWindowsContainer()); + + FakeMultiSashPageEditor.closeEditor(editor); + } + + /** + * Check if we can start several {@link FakeMultiSashPageEditor} in the same time + * + * @throws PartInitException + */ + @Test + public void testStartMultipleFakeEditors() throws PartInitException { + + + FakeMultiSashPageEditor editor1 = FakeMultiSashPageEditor.openEditor(2); + FakeMultiSashPageEditor editor2 = FakeMultiSashPageEditor.openEditor(2); + FakeMultiSashPageEditor editor3 = FakeMultiSashPageEditor.openEditor(2); + + assertNotSame("got different editors", editor1, editor2); + assertNotSame("got different editors", editor1, editor3); + assertNotSame("got different editors", editor2, editor3); + + FakeMultiSashPageEditor.closeEditor(editor1); + FakeMultiSashPageEditor.closeEditor(editor2); + FakeMultiSashPageEditor.closeEditor(editor3); + + } + + /** + * Check if we can start several {@link FakeMultiSashPageEditor} in the same time + * + * @throws PartInitException + */ + @Test + public void testStartMultipleFakeEditorsOneByOne() throws PartInitException { + + + FakeMultiSashPageEditor editor1 = FakeMultiSashPageEditor.openEditor(); + FakeMultiSashPageEditor.closeEditor(editor1); + + FakeMultiSashPageEditor editor2 = FakeMultiSashPageEditor.openEditor(); + assertNotSame("got different editors", editor1, editor2); + FakeMultiSashPageEditor.closeEditor(editor2); + + + FakeMultiSashPageEditor editor3 = FakeMultiSashPageEditor.openEditor(); + + assertNotSame("got different editors", editor1, editor3); + assertNotSame("got different editors", editor2, editor3); + + FakeMultiSashPageEditor.closeEditor(editor3); + } + + /** + * Check if we can start several {@link FakeMultiSashPageEditor} in the same time. Here + * editors are closed by calling editor.dispose(). + * This test succeed, but exception are outputted because the dispose() on editor doesn't + * fried the editors from workbench. + * + * @throws PartInitException + */ + @Test + //@Ignore + public void testStartMultipleFakeEditorsOneByOneAndDispose() throws PartInitException { + + + FakeMultiSashPageEditor editor1 = FakeMultiSashPageEditor.openEditor(); + editor1.dispose(); + + FakeMultiSashPageEditor editor2 = FakeMultiSashPageEditor.openEditor(); + assertNotSame("got different editors", editor1, editor2); + editor2.dispose(); + + + FakeMultiSashPageEditor editor3 = FakeMultiSashPageEditor.openEditor(); + + assertNotSame("got different editors", editor1, editor3); + assertNotSame("got different editors", editor2, editor3); + + editor3.dispose(); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/TestTextEditor.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/TestTextEditor.java index ee1eee01e96..7511e61e64a 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/TestTextEditor.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/TestTextEditor.java @@ -1,128 +1,128 @@ -/*****************************************************************************
- * Copyright (c) 2009 CEA LIST & LIFL
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor;
-
-import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceLogger;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecordsFactory;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.editors.text.TextEditor;
-
-
-/**
- * A TextEditor that can be used as Tab of a sashes window.
- *
- * @author dumoulin
- */
-public class TestTextEditor extends TextEditor {
-
- private TraceLogger traceLog;
- /**
- * Id used to register this editor in Eclipse.
- * Can be used to open the editor.
- */
- public static String EditorID = "org.eclipse.papyrus.infra.core.sasheditor.tests.editor.TestTextEditor";
-
- /**
- *
- */
- public TestTextEditor() {
- this("", false);
- }
-
- /**
- *
- * Constructor.
- *
- * @param namespace Namespace used to associated traces
- * @param traceRecords Records where traces should be put.
- */
- public TestTextEditor(String name, ITraceRecords traceRecords) {
- this.traceLog = new TraceLogger(name, traceRecords);
- }
-
- /**
- *
- * Constructor.
- *
- * @param namespace Namespace used to associated traces
- * @param isRecording true is the traceRecord should record.
- */
- public TestTextEditor(String name, boolean isRecording) {
- this(name, TraceRecordsFactory.createTraceRecords(isRecording));
- }
-
-
- /**
- * @return the traceLog
- */
- public TraceLogger getTraceLog() {
- return traceLog;
- }
-
- /**
- * Set the namespace of this part. {@inheritDoc}
- */
- @Override
- public void setPartName(String partName) {
- super.setPartName(partName);
- }
-
- /**
- * Trace the call
- * @see org.eclipse.ui.editors.text.TextEditor#dispose()
- *
- */
- @Override
- public void dispose() {
- // Trace the call
- traceLog.trace("dispose");
-
- super.dispose();
- }
-
- /**
- * Close the specified editor.
- * @param editor
- */
- public static void closeEditor( TestTextEditor editor ) {
- IWorkbenchWindow window=PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = window.getActivePage();
- page.closeEditor(editor, false);
- }
-
- /**
- * Return an instance of the editor inside the Eclipse framework.
- * The Editor should be registered to Eclipse extension.
- * The editor will contain one nested editor.
- * @throws PartInitException
- */
- public static TestTextEditor openEditor() throws PartInitException {
-
- IEditorInput input = new FakeEditorInput();
-
- IWorkbenchWindow window=PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = window.getActivePage();
- IEditorPart part = page.openEditor(input, EditorID);
-
- return (TestTextEditor)part;
- }
-
-
-}
+/***************************************************************************** + * Copyright (c) 2009 CEA LIST & LIFL + * + * + * 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 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor; + +import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords; +import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceLogger; +import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecordsFactory; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.editors.text.TextEditor; + + +/** + * A TextEditor that can be used as Tab of a sashes window. + * + * @author dumoulin + */ +public class TestTextEditor extends TextEditor { + + private TraceLogger traceLog; + /** + * Id used to register this editor in Eclipse. + * Can be used to open the editor. + */ + public static String EditorID = "org.eclipse.papyrus.infra.core.sasheditor.tests.editor.TestTextEditor"; + + /** + * + */ + public TestTextEditor() { + this("", false); + } + + /** + * + * Constructor. + * + * @param namespace Namespace used to associated traces + * @param traceRecords Records where traces should be put. + */ + public TestTextEditor(String name, ITraceRecords traceRecords) { + this.traceLog = new TraceLogger(name, traceRecords); + } + + /** + * + * Constructor. + * + * @param namespace Namespace used to associated traces + * @param isRecording true is the traceRecord should record. + */ + public TestTextEditor(String name, boolean isRecording) { + this(name, TraceRecordsFactory.createTraceRecords(isRecording)); + } + + + /** + * @return the traceLog + */ + public TraceLogger getTraceLog() { + return traceLog; + } + + /** + * Set the namespace of this part. {@inheritDoc} + */ + @Override + public void setPartName(String partName) { + super.setPartName(partName); + } + + /** + * Trace the call + * @see org.eclipse.ui.editors.text.TextEditor#dispose() + * + */ + @Override + public void dispose() { + // Trace the call + traceLog.trace("dispose"); + + super.dispose(); + } + + /** + * Close the specified editor. + * @param editor + */ + public static void closeEditor( TestTextEditor editor ) { + IWorkbenchWindow window=PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchPage page = window.getActivePage(); + page.closeEditor(editor, false); + } + + /** + * Return an instance of the editor inside the Eclipse framework. + * The Editor should be registered to Eclipse extension. + * The editor will contain one nested editor. + * @throws PartInitException + */ + public static TestTextEditor openEditor() throws PartInitException { + + IEditorInput input = new FakeEditorInput(); + + IWorkbenchWindow window=PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchPage page = window.getActivePage(); + IEditorPart part = page.openEditor(input, EditorID); + + return (TestTextEditor)part; + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/TextEditorPartModel.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/TextEditorPartModel.java index 3b050c935f4..d239beb0dd8 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/TextEditorPartModel.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/TextEditorPartModel.java @@ -1,129 +1,129 @@ -/*****************************************************************************
- * Copyright (c) 2009, 2014 LIFL, CEA LIST, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 392301
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords;
-import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecordsFactory;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.EditorActionBarContributor;
-
-/**
- * Description of the first page
- *
- * @author dumoulin
- */
-
-public class TextEditorPartModel implements IEditorModel {
-
- /**
- * Records used to record traces.
- */
- private ITraceRecords traceRecords;
-
- private String title;
-
-
- static private int count = 0;
-
- /**
- * @param title
- */
- public TextEditorPartModel(String title) {
- this( title, false);
- }
-
- /**
- * @param title
- */
- public TextEditorPartModel(String title, boolean isRecording) {
- this(title, TraceRecordsFactory.createTraceRecords(isRecording));
-
- }
-
- /**
- *
- */
- public TextEditorPartModel() {
- this( null, false);
- }
-
- /**
- * @param title
- */
- public TextEditorPartModel(String title, ITraceRecords traceRecords) {
- this.title = title;
- if( title == null)
- this.title = "newText" + count++;
-
- this.traceRecords = traceRecords;
- }
-
-
- /**
- * @return the traceRecords
- */
- public ITraceRecords getTraceRecords() {
- return traceRecords;
- }
-
-
- /**
- * @param traceRecords the traceRecords to set
- */
- public void setTraceRecords(ITraceRecords traceRecords) {
- this.traceRecords = traceRecords;
- }
-
- public IEditorPart createIEditorPart() throws PartInitException {
-
- // Create an editor with the requested traceRecords
- TestTextEditor editor = new TestTextEditor(title, traceRecords);
-
- editor.setPartName(title);
-
- return editor;
- }
-
- public Image getTabIcon() {
- return null;
- }
-
- public String getTabTitle() {
- return title;
- }
-
- /**
- * Return this. In this implementation, the rawModel and the IEditorModel are the same.
- *
- */
- public Object getRawModel() {
- return this;
- }
-
- /**
- * Return the ActionBarContributor dedicated to the created editor.
- * Can return null if no particular ActionBarContributor is required.;
- */
- public EditorActionBarContributor getActionBarContributor() {
- return null;
- }
-
- public void dispose() {
- // Pass
- }
-}
+/***************************************************************************** + * Copyright (c) 2009, 2014 LIFL, CEA LIST, and others. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation + * Christian W. Damus (CEA) - bug 392301 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel; +import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords; +import org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecordsFactory; +import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.part.EditorActionBarContributor; + +/** + * Description of the first page + * + * @author dumoulin + */ + +public class TextEditorPartModel implements IEditorModel { + + /** + * Records used to record traces. + */ + private ITraceRecords traceRecords; + + private String title; + + + static private int count = 0; + + /** + * @param title + */ + public TextEditorPartModel(String title) { + this( title, false); + } + + /** + * @param title + */ + public TextEditorPartModel(String title, boolean isRecording) { + this(title, TraceRecordsFactory.createTraceRecords(isRecording)); + + } + + /** + * + */ + public TextEditorPartModel() { + this( null, false); + } + + /** + * @param title + */ + public TextEditorPartModel(String title, ITraceRecords traceRecords) { + this.title = title; + if( title == null) + this.title = "newText" + count++; + + this.traceRecords = traceRecords; + } + + + /** + * @return the traceRecords + */ + public ITraceRecords getTraceRecords() { + return traceRecords; + } + + + /** + * @param traceRecords the traceRecords to set + */ + public void setTraceRecords(ITraceRecords traceRecords) { + this.traceRecords = traceRecords; + } + + public IEditorPart createIEditorPart() throws PartInitException { + + // Create an editor with the requested traceRecords + TestTextEditor editor = new TestTextEditor(title, traceRecords); + + editor.setPartName(title); + + return editor; + } + + public Image getTabIcon() { + return null; + } + + public String getTabTitle() { + return title; + } + + /** + * Return this. In this implementation, the rawModel and the IEditorModel are the same. + * + */ + public Object getRawModel() { + return this; + } + + /** + * Return the ActionBarContributor dedicated to the created editor. + * Can return null if no particular ActionBarContributor is required.; + */ + public EditorActionBarContributor getActionBarContributor() { + return null; + } + + public void dispose() { + // Pass + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/ISashWindowsContentProviderTestUtils.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/ISashWindowsContentProviderTestUtils.java index d647f9bc261..bd8d398a533 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/ISashWindowsContentProviderTestUtils.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/ISashWindowsContentProviderTestUtils.java @@ -1,78 +1,78 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.tests.utils;
-
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp;
-import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException;
-
-
-/**
- * Common interface for utilities dedicated to IContentProvider tests. Implementations of this class
- * allow to create an internal model according to a provided {@link IModelExp}. It is also possible
- * to check if the internal model is conform to the {@link IModelExp}.
- *
- * <br>
- * There is several {@link ISashWindowsContentProvider} implementations, but a lot of tests are commons to
- * all the implementations. The interface allows to develop common tests regardless of the real implementation.
- * <br>
- * One develop common tests using {@link ISashWindowsContentProvider} and {@link IContentProviderTestUtils}. Then,
- * this test is subclassed and the appropriate implementations are specified in the subclasses.
- *
- *
- * @author cedric dumoulin
- *
- */
-public interface ISashWindowsContentProviderTestUtils {
-
- /**
- * Create an internal model conform to the specified query.
- * Any previous model is disguarded.
- *
- * Some implementations do not allow to call this method more than once. In this case,
- * the implementation should throw an Exception.
- *
- * @param query Should be a subtype PanelTerm (Folder, HSash, VSash)
- * @throws QueryException
- *
- */
- public abstract void createModel(IModelExp query) throws PagesModelException;
-
- /**
- * Check if the internal model is conformed to the specified query.
- * @param query
- * @throws QueryException
- */
- public abstract void assertConform(IModelExp query) throws PagesModelException;
-
- /**
- * Get element in the model.
- * Each model element whose corresponding model query part as a name is added to the result map.
- * The element is then accessible with the name set in the query part.
- *
- * @param query
- * @return
- * @throws QueryException
- */
- public abstract Map<String, Object> queryModel(IModelExp query) throws PagesModelException;
-
- /**
- * Get the {@link ISashWindowsContentProvider} associated to this utility class.
- * @return
- */
- public ISashWindowsContentProvider getIContentProvider();
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.tests.utils; + +import java.util.Map; + +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.IModelExp; +import org.eclipse.papyrus.infra.core.sasheditor.pagesmodel.PagesModelException; + + +/** + * Common interface for utilities dedicated to IContentProvider tests. Implementations of this class + * allow to create an internal model according to a provided {@link IModelExp}. It is also possible + * to check if the internal model is conform to the {@link IModelExp}. + * + * <br> + * There is several {@link ISashWindowsContentProvider} implementations, but a lot of tests are commons to + * all the implementations. The interface allows to develop common tests regardless of the real implementation. + * <br> + * One develop common tests using {@link ISashWindowsContentProvider} and {@link IContentProviderTestUtils}. Then, + * this test is subclassed and the appropriate implementations are specified in the subclasses. + * + * + * @author cedric dumoulin + * + */ +public interface ISashWindowsContentProviderTestUtils { + + /** + * Create an internal model conform to the specified query. + * Any previous model is disguarded. + * + * Some implementations do not allow to call this method more than once. In this case, + * the implementation should throw an Exception. + * + * @param query Should be a subtype PanelTerm (Folder, HSash, VSash) + * @throws QueryException + * + */ + public abstract void createModel(IModelExp query) throws PagesModelException; + + /** + * Check if the internal model is conformed to the specified query. + * @param query + * @throws QueryException + */ + public abstract void assertConform(IModelExp query) throws PagesModelException; + + /** + * Get element in the model. + * Each model element whose corresponding model query part as a name is added to the result map. + * The element is then accessible with the name set in the query part. + * + * @param query + * @return + * @throws QueryException + */ + public abstract Map<String, Object> queryModel(IModelExp query) throws PagesModelException; + + /** + * Get the {@link ISashWindowsContentProvider} associated to this utility class. + * @return + */ + public ISashWindowsContentProvider getIContentProvider(); +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/LeakingObject.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/LeakingObject.java index 4a49d9eb622..d8f8d0da184 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/LeakingObject.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/LeakingObject.java @@ -1,19 +1,19 @@ -package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * For testing purpose
- * @copyright http://www.forkcan.com/viewcode/215/Detecting-memory-leak-in-unit-test
- *
- */
-public class LeakingObject {
-
- static Map<LeakingObject, Object> leakingMap = new HashMap<LeakingObject, Object>();
-
- public LeakingObject() {
- leakingMap.put(this, System.currentTimeMillis());
- }
-
+package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak; + +import java.util.HashMap; +import java.util.Map; + +/** + * For testing purpose + * @copyright http://www.forkcan.com/viewcode/215/Detecting-memory-leak-in-unit-test + * + */ +public class LeakingObject { + + static Map<LeakingObject, Object> leakingMap = new HashMap<LeakingObject, Object>(); + + public LeakingObject() { + leakingMap.put(this, System.currentTimeMillis()); + } + }
\ No newline at end of file diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/MemoryLeakTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/MemoryLeakTest.java index ffec1460fcb..ba36e8a3dd0 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/MemoryLeakTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/MemoryLeakTest.java @@ -1,79 +1,79 @@ -package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak;
-import static org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak.MemoryLeakUtil.assertIsGarbageCollected;
-import static org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak.MemoryLeakUtil.assertIsGarbageCollected2;
-
-import java.lang.ref.WeakReference;
-
-import org.junit.Test;
-
-
-/**
- * Test the memory ling assertions.
- *
- * @copyright http://www.forkcan.com/viewcode/215/Detecting-memory-leak-in-unit-test
- *
- */
-public class MemoryLeakTest {
-
- /* This test of the LeakingObject will fail */
- @Test
- public void testLeakingObject() {
- LeakingObject lo = new LeakingObject();
-
- // 1. Create WeakReference for the object
- WeakReference<LeakingObject> loWeakRef = new WeakReference<LeakingObject>(lo);
-
- // 2. Remove strong reference for the object
- lo = null;
-
- // 3. Test object is garbage collected correctly
- assertIsGarbageCollected(loWeakRef, 10*1000);
- }
-
- /* This test of the NonLeakingObject will succeed */
- @Test
- public void testNonLeakingObject() {
- NonLeakingObject lo = new NonLeakingObject();
-
- // 1. Create WeakReference for the object
- WeakReference<NonLeakingObject> loWeakRef = new WeakReference<NonLeakingObject>(lo);
-
- // 2. Remove strong reference for the object
- lo = null;
-
- // 3. Test object is garbage collected correctly
- assertIsGarbageCollected(loWeakRef, 10*1000);
- }
-
-/* This test of the LeakingObject will fail */
- @Test
- public void testLeakingObject2() {
- LeakingObject lo = new LeakingObject();
-
- // 1. Create WeakReference for the object
- WeakReference<LeakingObject> loWeakRef = new WeakReference<LeakingObject>(lo);
-
- // 2. Remove strong reference for the object
- lo = null;
-
- // 3. Test object is garbage collected correctly
- assertIsGarbageCollected2(loWeakRef, 10*1000);
- }
-
-/* This test of the NonLeakingObject will succeed */
- @Test
- public void testNonLeakingObject2() {
- NonLeakingObject lo = new NonLeakingObject();
-
- // 1. Create WeakReference for the object
- WeakReference<NonLeakingObject> loWeakRef = new WeakReference<NonLeakingObject>(lo);
-
- // 2. Remove strong reference for the object
- lo = null;
-
- // 3. Test object is garbage collected correctly
- assertIsGarbageCollected2(loWeakRef, 10*1000);
- }
-
-
+package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak; +import static org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak.MemoryLeakUtil.assertIsGarbageCollected; +import static org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak.MemoryLeakUtil.assertIsGarbageCollected2; + +import java.lang.ref.WeakReference; + +import org.junit.Test; + + +/** + * Test the memory ling assertions. + * + * @copyright http://www.forkcan.com/viewcode/215/Detecting-memory-leak-in-unit-test + * + */ +public class MemoryLeakTest { + + /* This test of the LeakingObject will fail */ + @Test + public void testLeakingObject() { + LeakingObject lo = new LeakingObject(); + + // 1. Create WeakReference for the object + WeakReference<LeakingObject> loWeakRef = new WeakReference<LeakingObject>(lo); + + // 2. Remove strong reference for the object + lo = null; + + // 3. Test object is garbage collected correctly + assertIsGarbageCollected(loWeakRef, 10*1000); + } + + /* This test of the NonLeakingObject will succeed */ + @Test + public void testNonLeakingObject() { + NonLeakingObject lo = new NonLeakingObject(); + + // 1. Create WeakReference for the object + WeakReference<NonLeakingObject> loWeakRef = new WeakReference<NonLeakingObject>(lo); + + // 2. Remove strong reference for the object + lo = null; + + // 3. Test object is garbage collected correctly + assertIsGarbageCollected(loWeakRef, 10*1000); + } + +/* This test of the LeakingObject will fail */ + @Test + public void testLeakingObject2() { + LeakingObject lo = new LeakingObject(); + + // 1. Create WeakReference for the object + WeakReference<LeakingObject> loWeakRef = new WeakReference<LeakingObject>(lo); + + // 2. Remove strong reference for the object + lo = null; + + // 3. Test object is garbage collected correctly + assertIsGarbageCollected2(loWeakRef, 10*1000); + } + +/* This test of the NonLeakingObject will succeed */ + @Test + public void testNonLeakingObject2() { + NonLeakingObject lo = new NonLeakingObject(); + + // 1. Create WeakReference for the object + WeakReference<NonLeakingObject> loWeakRef = new WeakReference<NonLeakingObject>(lo); + + // 2. Remove strong reference for the object + lo = null; + + // 3. Test object is garbage collected correctly + assertIsGarbageCollected2(loWeakRef, 10*1000); + } + + }
\ No newline at end of file diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/MemoryLeakUtil.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/MemoryLeakUtil.java index e235cc7947c..45c93e3f4ce 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/MemoryLeakUtil.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/MemoryLeakUtil.java @@ -1,201 +1,201 @@ -/*****************************************************************************
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak;
-
-import static org.junit.Assert.fail;
-
-import java.lang.ref.PhantomReference;
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-
-/**
- * Provides an assertion method to verify that an object has been garbage collected.
- *
- * This method forward to one of the two implementations:
- * <br/>
- * {@link #assertIsGarbageCollected0(WeakReference, long)}
- * <br/>
- * {@link #assertIsGarbageCollected2(WeakReference, long)}
- *
- */
-public class MemoryLeakUtil {
-
- private static final int MAX_GC_ITERATIONS = 20;
- private static final int GC_SLEEP_TIME = 100;
-
- public static void assertIsGarbageCollected(WeakReference<? extends Object> ref, long timeout) {
- // Slower method
-// assertIsGarbageCollected0(ref, timeout);
- // Faster method
- assertIsGarbageCollected2(ref, timeout);
- }
-
- /**
- * Check that the specified Object (referenced through a WeakReference) is garbage collected
- * in the designated time. Otherwise throw an assertion failure.
- * <p>
- * IMPORTANT : in order for this method to work properly and success, you must get rid of all
- * strong references of your object in the method callee. For example :
- * <pre>
- * MyObject myObj = new MyObject();
- * // myObj.work();
- * // myObj.close();
- *
- * // 1. Create WeakReference for the object
- * WeakReference<MyObject> objWeakRef = new WeakReference<MyObject>(pub1);
- * // 2. Remove strong reference for the object
- * myObj = null;
- * // 3. Test object is garbage collected correctly, leaving 10 seconds for the test to succeed
- * assertObjectIsGarbageCollected(objWeakRef, 10*1000);
- * </pre>
- * <p>
- * <b>Implementation note</b> : this method will trigger a GC through
- * <code>System.gc()</code> every second until the timeout has been
- * reached or the object is detected has garbage collected.
- *
- * @param wRef the object WeakReference (required to prevent strong reference of object through callstack)
- * @param timeout the timeout after which this method will consider (should be a multiple of 1000 ms with current implementation)
- * @throws Exception
- */
- public static void assertIsGarbageCollected0(WeakReference<? extends Object> ref, long timeout) {
-
- // already cleared ?
- if( ref.get() == null)
- return;
-
- for (int i = 0; i < MAX_GC_ITERATIONS; i++) {
- s_runtime.runFinalization();
-// System.err.println("Try to garbage iter " + i);
- try {
- runGC();
- } catch (Exception e1) {
- e1.printStackTrace();
- }
-
- if (ref.get() == null)
- return ;
-
- // Pause for a while and then go back around the loop to try again...
- try {
- Thread.sleep(GC_SLEEP_TIME);
- } catch (InterruptedException e) {
- // Ignore any interrupts and just try again...
- }
- }
-
- fail("Object '" + ref.get() + "' was not be garbage collected ");
-
- }
-
- /**
- * Check that the specified Object (referenced through a WeakReference) is garbage collected
- * in the designated time. Otherwise throw an assertion failure.
- * <p>
- * IMPORTANT : in order for this method to work properly and success, you must get rid of all
- * strong references of your object in the method callee. For example :
- * <pre>
- * MyObject myObj = new MyObject();
- * // myObj.work();
- * // myObj.close();
- *
- * // 1. Create WeakReference for the object
- * WeakReference<MyObject> objWeakRef = new WeakReference<MyObject>(pub1);
- * // 2. Remove strong reference for the object
- * myObj = null;
- * // 3. Test object is garbage collected correctly, leaving 10 seconds for the test to succeed
- * assertObjectIsGarbageCollected(objWeakRef, 10*1000);
- * </pre>
- * <p>
- * <b>Implementation note</b> : this method will trigger a GC through
- * <code>System.gc()</code> every second until the timeout has been
- * reached or the object is detected has garbage collected.
- *
- * @param wRef the object WeakReference (required to prevent strong reference of object through callstack)
- * @param timeout the timeout after which this method will consider (should be a multiple of 1000 ms with current implementation)
- */
- public static void assertIsGarbageCollected2(WeakReference<? extends Object> wRef, long timeout) {
- final long PERIOD = 1000; // Perform GC and check every second;
-
- final long startTime = System.currentTimeMillis();
-
- // Create a reference queue
- ReferenceQueue<Object> rq = new ReferenceQueue<Object>();
-
- // Add some phantom reference object to the queue
- // the pr variable is never read, but there nothing to do with it
- @SuppressWarnings("unused")
- PhantomReference<Object> pr = new PhantomReference<Object>(wRef.get(), rq);
-
- // Poll the queue until the Reference is returned or the timeout is reached.
- // If a non null value is returned by poll, it will indicate that the original
- // object has been garbage collected
- Reference<? extends Object> ref = rq.poll();
- while (ref == null) {
- System.gc(); // Trigger GC to help a bit
- try { Thread.sleep(PERIOD); } catch (InterruptedException ex) {}
- ref = rq.poll();
-
- // Exit loop if timeout has been reached
- long now = System.currentTimeMillis();
- if ((now - startTime) > timeout) {
- break;
- }
- }
-
-
-
- // If no PhantomReference was found after the specified timeout, the garbage collection was unsuccessful
- if (ref == null) {
- // But before declaring it as a failure, check the WeakRefence
- // -> If the WeakReference has been removed, then the object is not strongly reachable
- // anymore so it also mean it has been garbage collected
- Object obj = wRef.get();
- if (obj == null) {
- return;
- }
-
- fail("Object '" + wRef.get() + "' was not be garbage collected during the timeout of " + timeout + " ms");
- }
- }
-
-
- private static void runGC () throws Exception
- {
- // It helps to call Runtime.gc()
- // using several method calls:
- for (int r = 0; r < 4; ++ r) _runGC ();
- }
-
- private static void _runGC () throws Exception
- {
- long usedMem1 = usedMemory (), usedMem2 = Long.MAX_VALUE;
- for (int i = 0; (usedMem1 < usedMem2) && (i < 500); ++ i)
- {
- s_runtime.runFinalization ();
- s_runtime.gc ();
- Thread.yield ();
-
- usedMem2 = usedMem1;
- usedMem1 = usedMemory ();
- }
- }
- private static long usedMemory ()
- {
- return s_runtime.totalMemory () - s_runtime.freeMemory ();
- }
-
- private static final Runtime s_runtime = Runtime.getRuntime ();
-}
+/***************************************************************************** + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak; + +import static org.junit.Assert.fail; + +import java.lang.ref.PhantomReference; +import java.lang.ref.Reference; +import java.lang.ref.ReferenceQueue; +import java.lang.ref.WeakReference; + +/** + * Provides an assertion method to verify that an object has been garbage collected. + * + * This method forward to one of the two implementations: + * <br/> + * {@link #assertIsGarbageCollected0(WeakReference, long)} + * <br/> + * {@link #assertIsGarbageCollected2(WeakReference, long)} + * + */ +public class MemoryLeakUtil { + + private static final int MAX_GC_ITERATIONS = 20; + private static final int GC_SLEEP_TIME = 100; + + public static void assertIsGarbageCollected(WeakReference<? extends Object> ref, long timeout) { + // Slower method +// assertIsGarbageCollected0(ref, timeout); + // Faster method + assertIsGarbageCollected2(ref, timeout); + } + + /** + * Check that the specified Object (referenced through a WeakReference) is garbage collected + * in the designated time. Otherwise throw an assertion failure. + * <p> + * IMPORTANT : in order for this method to work properly and success, you must get rid of all + * strong references of your object in the method callee. For example : + * <pre> + * MyObject myObj = new MyObject(); + * // myObj.work(); + * // myObj.close(); + * + * // 1. Create WeakReference for the object + * WeakReference<MyObject> objWeakRef = new WeakReference<MyObject>(pub1); + * // 2. Remove strong reference for the object + * myObj = null; + * // 3. Test object is garbage collected correctly, leaving 10 seconds for the test to succeed + * assertObjectIsGarbageCollected(objWeakRef, 10*1000); + * </pre> + * <p> + * <b>Implementation note</b> : this method will trigger a GC through + * <code>System.gc()</code> every second until the timeout has been + * reached or the object is detected has garbage collected. + * + * @param wRef the object WeakReference (required to prevent strong reference of object through callstack) + * @param timeout the timeout after which this method will consider (should be a multiple of 1000 ms with current implementation) + * @throws Exception + */ + public static void assertIsGarbageCollected0(WeakReference<? extends Object> ref, long timeout) { + + // already cleared ? + if( ref.get() == null) + return; + + for (int i = 0; i < MAX_GC_ITERATIONS; i++) { + s_runtime.runFinalization(); +// System.err.println("Try to garbage iter " + i); + try { + runGC(); + } catch (Exception e1) { + e1.printStackTrace(); + } + + if (ref.get() == null) + return ; + + // Pause for a while and then go back around the loop to try again... + try { + Thread.sleep(GC_SLEEP_TIME); + } catch (InterruptedException e) { + // Ignore any interrupts and just try again... + } + } + + fail("Object '" + ref.get() + "' was not be garbage collected "); + + } + + /** + * Check that the specified Object (referenced through a WeakReference) is garbage collected + * in the designated time. Otherwise throw an assertion failure. + * <p> + * IMPORTANT : in order for this method to work properly and success, you must get rid of all + * strong references of your object in the method callee. For example : + * <pre> + * MyObject myObj = new MyObject(); + * // myObj.work(); + * // myObj.close(); + * + * // 1. Create WeakReference for the object + * WeakReference<MyObject> objWeakRef = new WeakReference<MyObject>(pub1); + * // 2. Remove strong reference for the object + * myObj = null; + * // 3. Test object is garbage collected correctly, leaving 10 seconds for the test to succeed + * assertObjectIsGarbageCollected(objWeakRef, 10*1000); + * </pre> + * <p> + * <b>Implementation note</b> : this method will trigger a GC through + * <code>System.gc()</code> every second until the timeout has been + * reached or the object is detected has garbage collected. + * + * @param wRef the object WeakReference (required to prevent strong reference of object through callstack) + * @param timeout the timeout after which this method will consider (should be a multiple of 1000 ms with current implementation) + */ + public static void assertIsGarbageCollected2(WeakReference<? extends Object> wRef, long timeout) { + final long PERIOD = 1000; // Perform GC and check every second; + + final long startTime = System.currentTimeMillis(); + + // Create a reference queue + ReferenceQueue<Object> rq = new ReferenceQueue<Object>(); + + // Add some phantom reference object to the queue + // the pr variable is never read, but there nothing to do with it + @SuppressWarnings("unused") + PhantomReference<Object> pr = new PhantomReference<Object>(wRef.get(), rq); + + // Poll the queue until the Reference is returned or the timeout is reached. + // If a non null value is returned by poll, it will indicate that the original + // object has been garbage collected + Reference<? extends Object> ref = rq.poll(); + while (ref == null) { + System.gc(); // Trigger GC to help a bit + try { Thread.sleep(PERIOD); } catch (InterruptedException ex) {} + ref = rq.poll(); + + // Exit loop if timeout has been reached + long now = System.currentTimeMillis(); + if ((now - startTime) > timeout) { + break; + } + } + + + + // If no PhantomReference was found after the specified timeout, the garbage collection was unsuccessful + if (ref == null) { + // But before declaring it as a failure, check the WeakRefence + // -> If the WeakReference has been removed, then the object is not strongly reachable + // anymore so it also mean it has been garbage collected + Object obj = wRef.get(); + if (obj == null) { + return; + } + + fail("Object '" + wRef.get() + "' was not be garbage collected during the timeout of " + timeout + " ms"); + } + } + + + private static void runGC () throws Exception + { + // It helps to call Runtime.gc() + // using several method calls: + for (int r = 0; r < 4; ++ r) _runGC (); + } + + private static void _runGC () throws Exception + { + long usedMem1 = usedMemory (), usedMem2 = Long.MAX_VALUE; + for (int i = 0; (usedMem1 < usedMem2) && (i < 500); ++ i) + { + s_runtime.runFinalization (); + s_runtime.gc (); + Thread.yield (); + + usedMem2 = usedMem1; + usedMem1 = usedMemory (); + } + } + private static long usedMemory () + { + return s_runtime.totalMemory () - s_runtime.freeMemory (); + } + + private static final Runtime s_runtime = Runtime.getRuntime (); +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/NonLeakingObject.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/NonLeakingObject.java index cb5b097624c..acc86cc4781 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/NonLeakingObject.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/memoryleak/NonLeakingObject.java @@ -1,20 +1,20 @@ -package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak;
-
-import java.util.Map;
-import java.util.WeakHashMap;
-
-
-/**
- * For testing purpose
- * @copyright http://www.forkcan.com/viewcode/215/Detecting-memory-leak-in-unit-test
- *
- */
-public class NonLeakingObject {
-
- static Map<NonLeakingObject, Object> leakingMap = new WeakHashMap<NonLeakingObject, Object>();
-
- public NonLeakingObject() {
- leakingMap.put(this, System.currentTimeMillis());
- }
-
+package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak; + +import java.util.Map; +import java.util.WeakHashMap; + + +/** + * For testing purpose + * @copyright http://www.forkcan.com/viewcode/215/Detecting-memory-leak-in-unit-test + * + */ +public class NonLeakingObject { + + static Map<NonLeakingObject, Object> leakingMap = new WeakHashMap<NonLeakingObject, Object>(); + + public NonLeakingObject() { + leakingMap.put(this, System.currentTimeMillis()); + } + }
\ No newline at end of file diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/package-info.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/package-info.java index ee1b85d4846..97527149270 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/package-info.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/package-info.java @@ -1,19 +1,19 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-/**
- * @author dumoulin
- *
- */
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +/** + * @author dumoulin + * + */ package org.eclipse.papyrus.infra.core.sasheditor.tests.utils;
\ No newline at end of file diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/ITraceRecords.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/ITraceRecords.java index ff263804187..329a6740114 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/ITraceRecords.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/ITraceRecords.java @@ -1,87 +1,87 @@ -package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace;
-
-import java.util.List;
-
-
-
-public interface ITraceRecords {
-
- /**
- * Record a new trace.
- * @param trace
- */
- public abstract void addTrace(String trace);
-
- /**
- * Record a new trace.
- * @param trace
- */
- public abstract void addTrace(String name, String trace);
-
- /**
- * Record a new trace.
- * @param trace
- */
- public abstract void addTrace(String name, String trace, Object value);
-
- /**
- * Record a new trace.
- * @param trace
- */
- public abstract void addTrace(String name, String trace, Object... values);
-
- /**
- * Return the namespace and the trace in one concatenated string ("namespace,trace").
- * @param i Index of the requested trace
- * @return
- */
- public abstract String getFullName(int i);
-
- /**
- * Get the value
- * @param i
- * @return
- */
- public abstract Object getValue(int i);
-
- /**
- * Return true if the trace contains the specified events.
- * @return
- */
- public abstract boolean contains(String name, String trace);
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public abstract int indexOf(String name, String trace, Object value);
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public abstract int indexOfNamespaceTrace(String name, String trace);
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public abstract int indexOfTrace(String trace);
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public abstract int indexOfNamespace(String namespace);
-
- /**
- * Reset the trace.
- */
- public abstract void reset();
-
- /**
- * @return the traces
- */
- public abstract List<TraceRecord> getTraces();
-
-}
+package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace; + +import java.util.List; + + + +public interface ITraceRecords { + + /** + * Record a new trace. + * @param trace + */ + public abstract void addTrace(String trace); + + /** + * Record a new trace. + * @param trace + */ + public abstract void addTrace(String name, String trace); + + /** + * Record a new trace. + * @param trace + */ + public abstract void addTrace(String name, String trace, Object value); + + /** + * Record a new trace. + * @param trace + */ + public abstract void addTrace(String name, String trace, Object... values); + + /** + * Return the namespace and the trace in one concatenated string ("namespace,trace"). + * @param i Index of the requested trace + * @return + */ + public abstract String getFullName(int i); + + /** + * Get the value + * @param i + * @return + */ + public abstract Object getValue(int i); + + /** + * Return true if the trace contains the specified events. + * @return + */ + public abstract boolean contains(String name, String trace); + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public abstract int indexOf(String name, String trace, Object value); + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public abstract int indexOfNamespaceTrace(String name, String trace); + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public abstract int indexOfTrace(String trace); + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public abstract int indexOfNamespace(String namespace); + + /** + * Reset the trace. + */ + public abstract void reset(); + + /** + * @return the traces + */ + public abstract List<TraceRecord> getTraces(); + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/MultiValuesTraceRecord.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/MultiValuesTraceRecord.java index cc884399549..5db2a324893 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/MultiValuesTraceRecord.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/MultiValuesTraceRecord.java @@ -1,73 +1,73 @@ -/*****************************************************************************
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * @author dumoulin
- *
- */
-public class MultiValuesTraceRecord extends TraceRecord {
-
- public List<Object> values;
-
-
- public MultiValuesTraceRecord(String namespace, String trace, Object ... values) {
- super(namespace, trace);
-
- // Initialie collection
- this.values = new ArrayList<Object>(values.length);
- for( Object o : values )
- this.values.add(o);
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecord#getValue()
- *
- * @return
- */
- @Override
- public Object getValue() {
- if( values.size()>0)
- return values.get(0);
-
- // No value set.
- return null;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecord#getValues()
- *
- * @return
- */
- @Override
- public List<Object> getValues() {
- return values;
- }
-
- /**
- *
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecord#clear()
- *
- */
- @Override
- public void clear() {
- super.clear();
- values.clear();
- }
-}
+/***************************************************************************** + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace; + +import java.util.ArrayList; +import java.util.List; + + +/** + * @author dumoulin + * + */ +public class MultiValuesTraceRecord extends TraceRecord { + + public List<Object> values; + + + public MultiValuesTraceRecord(String namespace, String trace, Object ... values) { + super(namespace, trace); + + // Initialie collection + this.values = new ArrayList<Object>(values.length); + for( Object o : values ) + this.values.add(o); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecord#getValue() + * + * @return + */ + @Override + public Object getValue() { + if( values.size()>0) + return values.get(0); + + // No value set. + return null; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecord#getValues() + * + * @return + */ + @Override + public List<Object> getValues() { + return values; + } + + /** + * + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecord#clear() + * + */ + @Override + public void clear() { + super.clear(); + values.clear(); + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/NullTraceRecords.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/NullTraceRecords.java index 251a5907489..e272c80db2b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/NullTraceRecords.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/NullTraceRecords.java @@ -1,155 +1,155 @@ -/*****************************************************************************
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace;
-
-import java.util.List;
-
-
-/**
- * A {@link ITraceRecords} recording nothing.
- *
- * @author Cedric Dumoulin
- *
- */
-public class NullTraceRecords implements ITraceRecords {
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#addTrace(java.lang.String)
- *
- * @param trace
- */
- public void addTrace(String trace) {
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#addTrace(java.lang.String, java.lang.String)
- *
- * @param name
- * @param trace
- */
- public void addTrace(String name, String trace) {
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#addTrace(java.lang.String, java.lang.String, java.lang.Object)
- *
- * @param name
- * @param trace
- * @param value
- */
- public void addTrace(String name, String trace, Object value) {
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#addTrace(java.lang.String, java.lang.String, java.lang.Object[])
- *
- * @param name
- * @param trace
- * @param values
- */
- public void addTrace(String name, String trace, Object... values) {
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#getFullName(int)
- *
- * @param i
- * @return
- */
- public String getFullName(int i) {
- return null;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#getValue(int)
- *
- * @param i
- * @return
- */
- public Object getValue(int i) {
- throw new UnsupportedOperationException("Not available");
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#contains(java.lang.String, java.lang.String)
- *
- * @param name
- * @param trace
- * @return
- */
- public boolean contains(String name, String trace) {
- return false;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#indexOf(java.lang.String, java.lang.String, java.lang.Object)
- *
- * @param name
- * @param trace
- * @param value
- * @return
- */
- public int indexOf(String name, String trace, Object value) {
- return -1;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#indexOfNamespaceTrace(java.lang.String, java.lang.String)
- *
- * @param name
- * @param trace
- * @return
- */
- public int indexOfNamespaceTrace(String name, String trace) {
- return -1;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#indexOfTrace(java.lang.String)
- *
- * @param trace
- * @return
- */
- public int indexOfTrace(String trace) {
- return -1;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#indexOfNamespace(java.lang.String)
- *
- * @param namespace
- * @return
- */
- public int indexOfNamespace(String namespace) {
- return -1;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#reset()
- *
- */
- public void reset() {
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#getTraces()
- *
- * @return
- */
- public List<TraceRecord> getTraces() {
- throw new UnsupportedOperationException("Not available");
- }
-
-}
+/***************************************************************************** + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace; + +import java.util.List; + + +/** + * A {@link ITraceRecords} recording nothing. + * + * @author Cedric Dumoulin + * + */ +public class NullTraceRecords implements ITraceRecords { + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#addTrace(java.lang.String) + * + * @param trace + */ + public void addTrace(String trace) { + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#addTrace(java.lang.String, java.lang.String) + * + * @param name + * @param trace + */ + public void addTrace(String name, String trace) { + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#addTrace(java.lang.String, java.lang.String, java.lang.Object) + * + * @param name + * @param trace + * @param value + */ + public void addTrace(String name, String trace, Object value) { + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#addTrace(java.lang.String, java.lang.String, java.lang.Object[]) + * + * @param name + * @param trace + * @param values + */ + public void addTrace(String name, String trace, Object... values) { + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#getFullName(int) + * + * @param i + * @return + */ + public String getFullName(int i) { + return null; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#getValue(int) + * + * @param i + * @return + */ + public Object getValue(int i) { + throw new UnsupportedOperationException("Not available"); + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#contains(java.lang.String, java.lang.String) + * + * @param name + * @param trace + * @return + */ + public boolean contains(String name, String trace) { + return false; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#indexOf(java.lang.String, java.lang.String, java.lang.Object) + * + * @param name + * @param trace + * @param value + * @return + */ + public int indexOf(String name, String trace, Object value) { + return -1; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#indexOfNamespaceTrace(java.lang.String, java.lang.String) + * + * @param name + * @param trace + * @return + */ + public int indexOfNamespaceTrace(String name, String trace) { + return -1; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#indexOfTrace(java.lang.String) + * + * @param trace + * @return + */ + public int indexOfTrace(String trace) { + return -1; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#indexOfNamespace(java.lang.String) + * + * @param namespace + * @return + */ + public int indexOfNamespace(String namespace) { + return -1; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#reset() + * + */ + public void reset() { + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.ITraceRecords#getTraces() + * + * @return + */ + public List<TraceRecord> getTraces() { + throw new UnsupportedOperationException("Not available"); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/SimpleTraceRecord.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/SimpleTraceRecord.java index 1abaeb4698c..c1273c6e855 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/SimpleTraceRecord.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/SimpleTraceRecord.java @@ -1,73 +1,73 @@ -/*****************************************************************************
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace;
-
-import java.util.List;
-
-
-/**
- * This class represent one simple record, with only one associated value.
- * @author Cedric Dumoulin
- *
- */
-public class SimpleTraceRecord extends TraceRecord {
-
- public Object value;
-
- /**
- * Constructor.
- *
- * @param namespace
- * @param trace
- * @param value
- */
- public SimpleTraceRecord(String namespace, String trace, Object value) {
- super(namespace, trace);
- this.value = value;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecord#getValue()
- *
- * @return
- */
- @Override
- public Object getValue() {
- return value;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecord#getValues()
- *
- * @return
- */
- @Override
- public List<Object> getValues() {
- // TODO Return an List backuped by the single value.
- throw new UnsupportedOperationException("Not yet implemented");
- }
-
- /**
- *
- * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecord#clear()
- *
- */
- @Override
- public void clear() {
- // TODO Auto-generated method stub
- super.clear();
- value = null;
- }
-}
+/***************************************************************************** + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace; + +import java.util.List; + + +/** + * This class represent one simple record, with only one associated value. + * @author Cedric Dumoulin + * + */ +public class SimpleTraceRecord extends TraceRecord { + + public Object value; + + /** + * Constructor. + * + * @param namespace + * @param trace + * @param value + */ + public SimpleTraceRecord(String namespace, String trace, Object value) { + super(namespace, trace); + this.value = value; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecord#getValue() + * + * @return + */ + @Override + public Object getValue() { + return value; + } + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecord#getValues() + * + * @return + */ + @Override + public List<Object> getValues() { + // TODO Return an List backuped by the single value. + throw new UnsupportedOperationException("Not yet implemented"); + } + + /** + * + * @see org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace.TraceRecord#clear() + * + */ + @Override + public void clear() { + // TODO Auto-generated method stub + super.clear(); + value = null; + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceLogger.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceLogger.java index 30283cdd036..d9b19aad6e8 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceLogger.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceLogger.java @@ -1,115 +1,115 @@ -/*****************************************************************************
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace;
-
-
-/**
- * Instances of this class are used to log traces of a namespace.
- *
- * @author Cedric Dumoulin
- *
- */
-public class TraceLogger {
-
- /**
- * The namespace used to tag records.
- */
- protected String namespace;
-
- /**
- * The records
- */
- protected ITraceRecords records;
-
- /**
- * Constructor.
- * A logger logging nothing.
- *
- * @param namespace
- */
- public TraceLogger(String namespace, boolean isRecording) {
- this.namespace = namespace;
- this.records = TraceRecordsFactory.createTraceRecords(isRecording);
- }
-
- /**
- * Constructor.
- *
- * @param namespace
- * @param records
- */
- public TraceLogger(String namespace, ITraceRecords records) {
- this.namespace = namespace;
- this.records = records;
- }
-
-
- /**
- * @return the records
- */
- public ITraceRecords getTraceRecords() {
- return records;
- }
-
-
- /**
- * @param records the records to set
- */
- public void setTraceRecords(ITraceRecords records) {
- this.records = records;
- }
-
-
- /**
- * @return the namespace
- */
- public String getNamespace() {
- return namespace;
- }
-
-
- /**
- * @param namespace the namespace to set
- */
- public void setNamespace(String namespace) {
- this.namespace = namespace;
- }
-
- /**
- * Record a new trace.
- * @param trace
- */
- public void trace(String trace) {
- records.addTrace(namespace, trace, (Object)null);
- }
-
- /**
- * Record a new trace.
- * @param trace
- */
- public void trace(String trace, Object value) {
- records.addTrace( namespace, trace, value);
- }
-
- /**
- * Record a new trace.
- * @param trace
- */
- public void trace(String trace, Object ... values) {
- records.addTrace( namespace, trace, values);
- }
-
-
-}
+/***************************************************************************** + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace; + + +/** + * Instances of this class are used to log traces of a namespace. + * + * @author Cedric Dumoulin + * + */ +public class TraceLogger { + + /** + * The namespace used to tag records. + */ + protected String namespace; + + /** + * The records + */ + protected ITraceRecords records; + + /** + * Constructor. + * A logger logging nothing. + * + * @param namespace + */ + public TraceLogger(String namespace, boolean isRecording) { + this.namespace = namespace; + this.records = TraceRecordsFactory.createTraceRecords(isRecording); + } + + /** + * Constructor. + * + * @param namespace + * @param records + */ + public TraceLogger(String namespace, ITraceRecords records) { + this.namespace = namespace; + this.records = records; + } + + + /** + * @return the records + */ + public ITraceRecords getTraceRecords() { + return records; + } + + + /** + * @param records the records to set + */ + public void setTraceRecords(ITraceRecords records) { + this.records = records; + } + + + /** + * @return the namespace + */ + public String getNamespace() { + return namespace; + } + + + /** + * @param namespace the namespace to set + */ + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + /** + * Record a new trace. + * @param trace + */ + public void trace(String trace) { + records.addTrace(namespace, trace, (Object)null); + } + + /** + * Record a new trace. + * @param trace + */ + public void trace(String trace, Object value) { + records.addTrace( namespace, trace, value); + } + + /** + * Record a new trace. + * @param trace + */ + public void trace(String trace, Object ... values) { + records.addTrace( namespace, trace, values); + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceRecord.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceRecord.java index 84b3ca10a03..a82fd336ab2 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceRecord.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceRecord.java @@ -1,121 +1,121 @@ -/*****************************************************************************
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace;
-
-import java.util.List;
-
-
-/**
- * This interface represent one record
- * @author Cedric Dumoulin
- *
- */
-public abstract class TraceRecord {
-
- public String namespace;
- public String trace;
-
-
- /**
- * Constructor.
- *
- * @param namespace
- * @param trace
- */
- public TraceRecord(String namespace, String trace) {
- this.namespace = namespace;
- this.trace = trace;
- }
-
- /**
- * Get the full name, i.e. : the namespace, name
- * @return
- */
- public String getFullName() {
- return namespace + "," + trace;
- }
-
- /**
- * Get the first value associated to this record.
- * @return
- */
- public abstract Object getValue();
-
- /**
- * Get all values associated to this record
- * @return
- */
- public abstract List<Object> getValues();
-
- /**
- * Return true if this object's trace equal the provided values.
- *
- * @param trace
- * @return
- */
- public boolean isEqualsToTrace( String trace) {
-
- return (this.trace.equals(trace)) ;
- }
-
- /**
- * Return true if this object's namespace equal the provided values.
- *
- * @param namespace
- * @return
- */
- public boolean isEqualsToNameSpace( String namespace) {
-
- return this.namespace.equals(namespace) ;
- }
-
- /**
- * Return true if this object's namespace and trace equal the provided values.
- * If a provided value is null, it is consider as a wildcard.
- *
- * @param namespace
- * @param trace
- * @return
- */
- public boolean isEqualsTo( String namespace, String trace) {
-
- return (namespace != null ? namespace.equals(this.namespace) : true)
- && (trace != null ? trace.equals(this.trace) : true) ;
- }
-
- /**
- * Return true if this object's namespace and trace equal the provided values.
- * If a provided value is null, it is consider as a wildcard.
- *
- * @param namespace
- * @param trace
- * @return
- */
- public boolean isEqualsTo( String namespace, String trace, Object value) {
-
- return (namespace != null ? namespace.equals(this.namespace) : true)
- && (trace != null ? trace.equals(this.trace) : true)
- && (value != null ? value.equals(getValue()) : true);
- }
-
- /**
- * Clear the record. It will not be used anymore. This is mainly to avoid memory leak.
- */
- public void clear() {
- namespace = null;
- trace = null;
- }
-
-}
+/***************************************************************************** + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace; + +import java.util.List; + + +/** + * This interface represent one record + * @author Cedric Dumoulin + * + */ +public abstract class TraceRecord { + + public String namespace; + public String trace; + + + /** + * Constructor. + * + * @param namespace + * @param trace + */ + public TraceRecord(String namespace, String trace) { + this.namespace = namespace; + this.trace = trace; + } + + /** + * Get the full name, i.e. : the namespace, name + * @return + */ + public String getFullName() { + return namespace + "," + trace; + } + + /** + * Get the first value associated to this record. + * @return + */ + public abstract Object getValue(); + + /** + * Get all values associated to this record + * @return + */ + public abstract List<Object> getValues(); + + /** + * Return true if this object's trace equal the provided values. + * + * @param trace + * @return + */ + public boolean isEqualsToTrace( String trace) { + + return (this.trace.equals(trace)) ; + } + + /** + * Return true if this object's namespace equal the provided values. + * + * @param namespace + * @return + */ + public boolean isEqualsToNameSpace( String namespace) { + + return this.namespace.equals(namespace) ; + } + + /** + * Return true if this object's namespace and trace equal the provided values. + * If a provided value is null, it is consider as a wildcard. + * + * @param namespace + * @param trace + * @return + */ + public boolean isEqualsTo( String namespace, String trace) { + + return (namespace != null ? namespace.equals(this.namespace) : true) + && (trace != null ? trace.equals(this.trace) : true) ; + } + + /** + * Return true if this object's namespace and trace equal the provided values. + * If a provided value is null, it is consider as a wildcard. + * + * @param namespace + * @param trace + * @return + */ + public boolean isEqualsTo( String namespace, String trace, Object value) { + + return (namespace != null ? namespace.equals(this.namespace) : true) + && (trace != null ? trace.equals(this.trace) : true) + && (value != null ? value.equals(getValue()) : true); + } + + /** + * Clear the record. It will not be used anymore. This is mainly to avoid memory leak. + */ + public void clear() { + namespace = null; + trace = null; + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceRecords.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceRecords.java index 0a03007d24e..2376e66a32d 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceRecords.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceRecords.java @@ -1,162 +1,162 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * A list of trace records.
- *
- * @author cedric dumoulin
- *
- */
-public class TraceRecords implements ITraceRecords {
-
- public List<TraceRecord>traces = new ArrayList<TraceRecord>();
-
- /**
- * Record a new trace.
- * @param trace
- */
- public void addTrace(String trace) {
- addTrace(null, trace, (Object)null);
- }
-
- /**
- * Record a new trace.
- * @param trace
- */
- public void addTrace(String name, String trace) {
- addTrace(name, trace, (Object)null);
- }
-
- /**
- * Record a new trace.
- * @param trace
- */
- public void addTrace(String name, String trace, Object value) {
- traces.add(new SimpleTraceRecord( name, trace, value));
- }
-
- /**
- * Record a new trace.
- * @param trace
- */
- public void addTrace(String name, String trace, Object ... values) {
- traces.add(new MultiValuesTraceRecord( name, trace, values));
- }
-
- /**
- * Return the namespace and the trace in one concatenated string ("namespace,trace").
- * @param i Index of the requested trace
- * @return
- */
- public String getFullName(int i) {
- return traces.get(i).getFullName();
- }
-
- /**
- * Get the value
- * @param i
- * @return
- */
- public Object getValue(int i) {
- return traces.get(i).getValue();
- }
-
- /**
- * Return true if the trace contains the specified events.
- * @return
- */
- public boolean contains( String name, String trace) {
-
- return indexOfNamespaceTrace(name, trace) >= 0;
- }
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public int indexOf(String name, String trace, Object value) {
-
- for (int i = 0; i < traces.size(); i++) {
- TraceRecord record = traces.get(i);
-
- if( record.isEqualsTo(name, trace, value) )
- return i;
- }
-
- return -1;
- }
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public int indexOfNamespaceTrace(String name, String trace) {
-
- for (int i = 0; i < traces.size(); i++) {
- TraceRecord record = traces.get(i);
-
- if( record.isEqualsTo(name, trace) )
- return i;
- }
-
- return -1;
- }
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public int indexOfTrace(String trace) {
-
- for (int i = 0; i < traces.size(); i++) {
- TraceRecord record = traces.get(i);
-
- if( record.isEqualsToTrace(trace) )
- return i;
- }
-
- return -1;
- }
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public int indexOfNamespace(String namespace) {
-
- for (int i = 0; i < traces.size(); i++) {
- TraceRecord record = traces.get(i);
-
- if( record.isEqualsToNameSpace(namespace) )
- return i;
- }
-
- return -1;
- }
-
- /**
- * Reset the trace.
- */
- public void reset() {
- for( TraceRecord record : traces) {
- record.clear();
- }
- traces.clear();
- }
-
-
- /**
- * @return the traces
- */
- public List<TraceRecord> getTraces() {
- return traces;
- }
-
-
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace; + +import java.util.ArrayList; +import java.util.List; + + +/** + * A list of trace records. + * + * @author cedric dumoulin + * + */ +public class TraceRecords implements ITraceRecords { + + public List<TraceRecord>traces = new ArrayList<TraceRecord>(); + + /** + * Record a new trace. + * @param trace + */ + public void addTrace(String trace) { + addTrace(null, trace, (Object)null); + } + + /** + * Record a new trace. + * @param trace + */ + public void addTrace(String name, String trace) { + addTrace(name, trace, (Object)null); + } + + /** + * Record a new trace. + * @param trace + */ + public void addTrace(String name, String trace, Object value) { + traces.add(new SimpleTraceRecord( name, trace, value)); + } + + /** + * Record a new trace. + * @param trace + */ + public void addTrace(String name, String trace, Object ... values) { + traces.add(new MultiValuesTraceRecord( name, trace, values)); + } + + /** + * Return the namespace and the trace in one concatenated string ("namespace,trace"). + * @param i Index of the requested trace + * @return + */ + public String getFullName(int i) { + return traces.get(i).getFullName(); + } + + /** + * Get the value + * @param i + * @return + */ + public Object getValue(int i) { + return traces.get(i).getValue(); + } + + /** + * Return true if the trace contains the specified events. + * @return + */ + public boolean contains( String name, String trace) { + + return indexOfNamespaceTrace(name, trace) >= 0; + } + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public int indexOf(String name, String trace, Object value) { + + for (int i = 0; i < traces.size(); i++) { + TraceRecord record = traces.get(i); + + if( record.isEqualsTo(name, trace, value) ) + return i; + } + + return -1; + } + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public int indexOfNamespaceTrace(String name, String trace) { + + for (int i = 0; i < traces.size(); i++) { + TraceRecord record = traces.get(i); + + if( record.isEqualsTo(name, trace) ) + return i; + } + + return -1; + } + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public int indexOfTrace(String trace) { + + for (int i = 0; i < traces.size(); i++) { + TraceRecord record = traces.get(i); + + if( record.isEqualsToTrace(trace) ) + return i; + } + + return -1; + } + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public int indexOfNamespace(String namespace) { + + for (int i = 0; i < traces.size(); i++) { + TraceRecord record = traces.get(i); + + if( record.isEqualsToNameSpace(namespace) ) + return i; + } + + return -1; + } + + /** + * Reset the trace. + */ + public void reset() { + for( TraceRecord record : traces) { + record.clear(); + } + traces.clear(); + } + + + /** + * @return the traces + */ + public List<TraceRecord> getTraces() { + return traces; + } + + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceRecordsFactory.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceRecordsFactory.java index 6f39ee9295f..2b8b15a48b5 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceRecordsFactory.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/utils/trace/TraceRecordsFactory.java @@ -1,42 +1,42 @@ -/*****************************************************************************
- * 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace;
-
-
-/**
- * Factory to create TraceRecords.
- * @author dumoulin
- *
- */
-public class TraceRecordsFactory {
-
-
- /**
- * Create a TraceRecords.
- *
- * @param isRecording true is the traceRecord should record.
- * @return
- */
- public static ITraceRecords createTraceRecords( boolean isRecording ) {
-
- if(isRecording) {
- return new TraceRecords();
- }
- else {
- return new NullTraceRecords();
- }
- }
-
-}
+/***************************************************************************** + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace; + + +/** + * Factory to create TraceRecords. + * @author dumoulin + * + */ +public class TraceRecordsFactory { + + + /** + * Create a TraceRecords. + * + * @param isRecording true is the traceRecord should record. + * @return + */ + public static ITraceRecords createTraceRecords( boolean isRecording ) { + + if(isRecording) { + return new TraceRecords(); + } + else { + return new NullTraceRecords(); + } + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/utils/FakeObservableListener.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/utils/FakeObservableListener.java index fb123b1d04c..e0950121658 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/utils/FakeObservableListener.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/utils/FakeObservableListener.java @@ -1,84 +1,84 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * A fake listener for testing purpose.
- *
- * @author cedric dumoulin
- *
- */
-public class FakeObservableListener<E> implements IObservableListListener<E> {
-
- /**
- * Trace of event received
- */
- protected List<E> addEvents = new ArrayList<E>();
-
- /**
- * Trace of event received
- */
- protected List<E> removeEvents = new ArrayList<E>();
-
-
- /**
- * @return the events
- */
- public List<E> getAddEvents() {
- return addEvents;
- }
-
- /**
- * @return the events
- */
- public E getLastAddEvents() {
- if(addEvents.size()>0) {
- return addEvents.get(addEvents.size() -1);
- }
-
- return null;
- }
-
- /**
- * @return the events
- */
- public List<E> getRemoveEvents() {
- return removeEvents;
- }
-
- /**
- * @return the events
- */
- public E getLastRemoveEvents() {
- if(removeEvents.size()>0) {
- return removeEvents.get(removeEvents.size() -1);
- }
-
- return null;
- }
-
- public void elementAdded(E element) {
- addEvents.add(element);
- }
-
- public void elementRemoved(E element) {
- removeEvents.add(element);
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.utils; + +import java.util.ArrayList; +import java.util.List; + + +/** + * A fake listener for testing purpose. + * + * @author cedric dumoulin + * + */ +public class FakeObservableListener<E> implements IObservableListListener<E> { + + /** + * Trace of event received + */ + protected List<E> addEvents = new ArrayList<E>(); + + /** + * Trace of event received + */ + protected List<E> removeEvents = new ArrayList<E>(); + + + /** + * @return the events + */ + public List<E> getAddEvents() { + return addEvents; + } + + /** + * @return the events + */ + public E getLastAddEvents() { + if(addEvents.size()>0) { + return addEvents.get(addEvents.size() -1); + } + + return null; + } + + /** + * @return the events + */ + public List<E> getRemoveEvents() { + return removeEvents; + } + + /** + * @return the events + */ + public E getLastRemoveEvents() { + if(removeEvents.size()>0) { + return removeEvents.get(removeEvents.size() -1); + } + + return null; + } + + public void elementAdded(E element) { + addEvents.add(element); + } + + public void elementRemoved(E element) { + removeEvents.add(element); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/utils/ObservableListTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/utils/ObservableListTest.java index b46062e7339..e69925c2c72 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/utils/ObservableListTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/utils/ObservableListTest.java @@ -1,173 +1,173 @@ -/*****************************************************************************
- * Copyright (c) 2013 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
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.utils;
-
-import static org.junit.Assert.*;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * @author cedric dumoulin
- *
- */
-public class ObservableListTest {
-
- /**
- * @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.core.sasheditor.utils.ObservableList#ObservableList()}.
- */
- @Test
- public void testObservableList() {
- ObservableList<String> list = new ObservableList<String>();
- assertNotNull("list created", list);
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.utils.ObservableList#addListener(org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableListListener)}.
- */
- @Test
- public void testAddListener() {
- ObservableList<String> list = new ObservableList<String>();
- assertNotNull("list created", list);
-
- FakeObservableListener<String> listener = new FakeObservableListener<String>();
-
- // add a listener
- list.addListener(listener);
- // Check if added
- assertTrue("listener added", list.getListeners().contains(listener));
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.utils.ObservableList#removeListener(org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableListListener)}.
- */
- @Test
- public void testRemoveListener() {
- ObservableList<String> list = new ObservableList<String>();
- assertNotNull("list created", list);
-
- FakeObservableListener<String> listener = new FakeObservableListener<String>();
-
- // add a listener
- list.addListener(listener);
- // Check if added
- assertTrue("listener added", list.getListeners().contains(listener));
-
- list.removeListener(listener);
- // Check if added
- assertFalse("list contains listener", list.getListeners().contains(listener));
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.utils.ObservableList#fireElementAddedEvent(java.lang.Object)}.
- */
- @Test
- public void testFireElementAddedEvent() {
- ObservableList<String> list = new ObservableList<String>();
- assertNotNull("list created", list);
-
- FakeObservableListener<String> listener = new FakeObservableListener<String>();
-
- // add a listener
- list.addListener(listener);
- // Check event
-
- list.fireElementAddedEvent("string1");
- assertEquals( "event fired", "string1", listener.getLastAddEvents() );
-
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.utils.ObservableList#fireElementRemovedEvent(java.lang.Object)}.
- */
- @Test
- public void testFireElementRemovedEvent() {
- ObservableList<String> list = new ObservableList<String>();
- assertNotNull("list created", list);
-
- FakeObservableListener<String> listener = new FakeObservableListener<String>();
-
- // add a listener
- list.addListener(listener);
- // Check event
- String element = "string1";
- list.fireElementRemovedEvent(element);
- assertEquals( "event fired", element, listener.getLastRemoveEvents() );
- }
-
- /**
- * Test method for add}.
- */
- @Test
- public void testAdd() {
- ObservableList<String> list = new ObservableList<String>();
- assertNotNull("list created", list);
-
- FakeObservableListener<String> listener = new FakeObservableListener<String>();
-
- // add a listener
- list.addListener(listener);
- // Check event
-
- String element = "string1";
-
- list.add(element);
- assertEquals( "event fired", element, listener.getLastAddEvents() );
- assertEquals( "element added to list", element, list.get(list.size()-1) );
-
- }
-
- /**
- * Test method for add}.
- */
- @Test
- public void testRemove() {
- ObservableList<String> list = new ObservableList<String>();
- assertNotNull("list created", list);
-
- FakeObservableListener<String> listener = new FakeObservableListener<String>();
-
- // add a listener
- list.addListener(listener);
- // Check event
-
- String element = "string1";
- list.add(element);
- assertEquals( "element added to list", element, list.get(list.size()-1) );
-
- list.remove(element);
- assertFalse( "element removed from list", list.contains(element) );
- assertEquals( "event fired", element, listener.getLastRemoveEvents() );
-
- }
-
-
-}
+/***************************************************************************** + * Copyright (c) 2013 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 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.utils; + +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + + +/** + * @author cedric dumoulin + * + */ +public class ObservableListTest { + + /** + * @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.core.sasheditor.utils.ObservableList#ObservableList()}. + */ + @Test + public void testObservableList() { + ObservableList<String> list = new ObservableList<String>(); + assertNotNull("list created", list); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.utils.ObservableList#addListener(org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableListListener)}. + */ + @Test + public void testAddListener() { + ObservableList<String> list = new ObservableList<String>(); + assertNotNull("list created", list); + + FakeObservableListener<String> listener = new FakeObservableListener<String>(); + + // add a listener + list.addListener(listener); + // Check if added + assertTrue("listener added", list.getListeners().contains(listener)); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.utils.ObservableList#removeListener(org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableListListener)}. + */ + @Test + public void testRemoveListener() { + ObservableList<String> list = new ObservableList<String>(); + assertNotNull("list created", list); + + FakeObservableListener<String> listener = new FakeObservableListener<String>(); + + // add a listener + list.addListener(listener); + // Check if added + assertTrue("listener added", list.getListeners().contains(listener)); + + list.removeListener(listener); + // Check if added + assertFalse("list contains listener", list.getListeners().contains(listener)); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.utils.ObservableList#fireElementAddedEvent(java.lang.Object)}. + */ + @Test + public void testFireElementAddedEvent() { + ObservableList<String> list = new ObservableList<String>(); + assertNotNull("list created", list); + + FakeObservableListener<String> listener = new FakeObservableListener<String>(); + + // add a listener + list.addListener(listener); + // Check event + + list.fireElementAddedEvent("string1"); + assertEquals( "event fired", "string1", listener.getLastAddEvents() ); + + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.sasheditor.utils.ObservableList#fireElementRemovedEvent(java.lang.Object)}. + */ + @Test + public void testFireElementRemovedEvent() { + ObservableList<String> list = new ObservableList<String>(); + assertNotNull("list created", list); + + FakeObservableListener<String> listener = new FakeObservableListener<String>(); + + // add a listener + list.addListener(listener); + // Check event + String element = "string1"; + list.fireElementRemovedEvent(element); + assertEquals( "event fired", element, listener.getLastRemoveEvents() ); + } + + /** + * Test method for add}. + */ + @Test + public void testAdd() { + ObservableList<String> list = new ObservableList<String>(); + assertNotNull("list created", list); + + FakeObservableListener<String> listener = new FakeObservableListener<String>(); + + // add a listener + list.addListener(listener); + // Check event + + String element = "string1"; + + list.add(element); + assertEquals( "event fired", element, listener.getLastAddEvents() ); + assertEquals( "element added to list", element, list.get(list.size()-1) ); + + } + + /** + * Test method for add}. + */ + @Test + public void testRemove() { + ObservableList<String> list = new ObservableList<String>(); + assertNotNull("list created", list); + + FakeObservableListener<String> listener = new FakeObservableListener<String>(); + + // add a listener + list.addListener(listener); + // Check event + + String element = "string1"; + list.add(element); + assertEquals( "element added to list", element, list.get(list.size()-1) ); + + list.remove(element); + assertFalse( "element removed from list", list.contains(element) ); + assertEquals( "event fired", element, listener.getLastRemoveEvents() ); + + } + + +} diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/.classpath b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.classpath index 098194ca4b7..83be1d9f78c 100644..100755 --- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/.classpath +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="test"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/.project b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.project index c8c4ca6aa1d..4f4672ffbd7 100644..100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/.project +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.project @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.search.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.core.suite.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/core/org.eclipse.papyrus.infra.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.settings/org.eclipse.jdt.core.prefs index 62a08f4494d..b3aa6d60f94 100644..100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,291 +1,291 @@ -eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.settings/org.eclipse.jdt.ui.prefs index 954281dbc31..954281dbc31 100644..100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.ui.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.settings/org.eclipse.jdt.ui.prefs 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 new file mode 100755 index 00000000000..5c885189255 --- /dev/null +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF @@ -0,0 +1,20 @@ +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 +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", + org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core.sasheditor.di.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core.clipboard.tests;bundle-version="1.2.0" +
\ No newline at end of file diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus Generated Diagram Tests.launch b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/Papyrus Core tests.launch index da71e977a5b..2cc281f797c 100644..100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus Generated Diagram Tests.launch +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/Papyrus Core tests.launch @@ -8,12 +8,12 @@ <booleanAttribute key="clearConfig" value="true"/> <booleanAttribute key="clearws" value="true"/> <booleanAttribute key="clearwslog" value="false"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus Generated Diagram Tests"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus Core tests"/> <booleanAttribute key="default" value="true"/> <booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../junit-failures-workspace"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-core-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllGenTests.java"/> +<listEntry value="/org.eclipse.papyrus.infra.core.suite.tests/test/org/eclipse/papyrus/infra/core/suite/tests/AllTests.java"/> </listAttribute> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> <listEntry value="1"/> @@ -26,12 +26,12 @@ <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllGenTests"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -testConfig=GENERATED_TESTS_CONFIG"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.core.suite.tests.AllTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.core.suite.tests"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms512m -Xmx2048m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=512M -XX:SoftRefLRUPolicyMSPerMB=100"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:SoftRefLRUPolicyMSPerMB=100 -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.platform.ide"/> <booleanAttribute key="run_in_ui_thread" value="true"/> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/about.html b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/about.html index 82d49bf5f81..d35d5aed64c 100644..100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/about.html +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.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/core/org.eclipse.papyrus.infra.core.suite.tests/build.properties b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/build.properties new file mode 100755 index 00000000000..397cafd8221 --- /dev/null +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/build.properties @@ -0,0 +1,7 @@ +source.. = test/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties,\ + about.html,\ + Papyrus Core tests.launch diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/plugin.properties b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/plugin.properties new file mode 100755 index 00000000000..66285944234 --- /dev/null +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/plugin.properties @@ -0,0 +1,12 @@ +################################################################################# +# Copyright (c) 2008 CEA LIST. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation +################################################################################## +pluginName=Infra core Tests suite for Papyrus +providerName=Eclipse Modeling Project diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/pom.xml b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/pom.xml new file mode 100755 index 00000000000..f0421acc246 --- /dev/null +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> + <version>1.2.0-SNAPSHOT</version> + <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.core.suite.tests</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> + <testFailureIgnore>true</testFailureIgnore> + <product>org.eclipse.sdk.ide</product> + <!-- If a specific <argLine> is required here, make sure to include JaCoCo parameters (See parent pom, Bug 478170) --> + <skipTests>${skipAllTests}</skipTests> + <testClass>org.eclipse.papyrus.infra.core.suite.tests.AllTests</testClass> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>p2-installable-unit</type> + <id>org.eclipse.sdk.feature.group</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.papyrus.sdk.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/test/org/eclipse/papyrus/infra/core/suite/tests/Activator.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/test/org/eclipse/papyrus/infra/core/suite/tests/Activator.java new file mode 100755 index 00000000000..10363d5d0e8 --- /dev/null +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/test/org/eclipse/papyrus/infra/core/suite/tests/Activator.java @@ -0,0 +1,54 @@ +package org.eclipse.papyrus.infra.core.suite.tests; + +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.core.suite.tests"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @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/core/org.eclipse.papyrus.infra.core.suite.tests/test/org/eclipse/papyrus/infra/core/suite/tests/AllTests.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/test/org/eclipse/papyrus/infra/core/suite/tests/AllTests.java new file mode 100755 index 00000000000..e1f3b254fc0 --- /dev/null +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/test/org/eclipse/papyrus/infra/core/suite/tests/AllTests.java @@ -0,0 +1,51 @@ +/***************************************************************************** + * Copyright (c) 2010, 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: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993 + * Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220, 488791, 496598, 508629 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.suite.tests; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner; +import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.SuiteSpot; +import org.junit.runner.RunWith; + + +/** + * Test class for all tests for Papyrus + */ +@RunWith(AllTestsRunner.class) +public class AllTests { + + @SuiteSpot + public static final List<ITestSuiteClass> suiteClasses; + + /** list of classes to launch */ + static { + suiteClasses = new ArrayList<>(); + + /* **************** plugins *********************** */ + + /* core */ + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.clipboard.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.sasheditor.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.sasheditor.di.tests.AllTests.class)); + + // end + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/.classpath b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.classpath index e5fa400a126..e5fa400a126 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/.classpath +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.classpath diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/.project b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.project index 93b24f41eef..6fa5321eac5 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/.project +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.project @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.core.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.core.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/core/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.settings/org.eclipse.jdt.core.prefs index 4759947300a..b3aa6d60f94 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,291 +1,291 @@ -eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.settings/org.eclipse.jdt.ui.prefs index 954281dbc31..954281dbc31 100644 --- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/.settings/org.eclipse.jdt.ui.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.settings/org.eclipse.jdt.ui.prefs diff --git a/tests/junit/plugins/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 69403e3c645..69403e3c645 100644 --- a/tests/junit/plugins/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 diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/about.html b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/about.html new file mode 100644 index 00000000000..d35d5aed64c --- /dev/null +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("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/core/org.eclipse.papyrus.infra.core.tests/build.properties b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/build.properties index abe693aba0b..abe693aba0b 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/build.properties +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/build.properties diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/org.eclipse.papyrus.infra.core.tests.launch b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/org.eclipse.papyrus.infra.core.tests.launch index 8823f1a8091..8823f1a8091 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/org.eclipse.papyrus.infra.core.tests.launch +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/org.eclipse.papyrus.infra.core.tests.launch diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/plugin.properties b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/plugin.properties index d2860c1b07d..d2860c1b07d 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/plugin.properties +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/plugin.properties diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/plugin.xml b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/plugin.xml index 4be7351f353..4be7351f353 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/plugin.xml +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/plugin.xml diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/pom.xml b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/pom.xml index 920d5b7af0e..f14f585d5ea 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/pom.xml +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/pom.xml @@ -6,9 +6,9 @@ <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../../../../../releng/main-tests</relativePath> + <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.core.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/resources/My.ecore b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/resources/My.ecore index c35981cf49d..c35981cf49d 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/resources/My.ecore +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/resources/My.ecore diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/resources/My.genmodel b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/resources/My.genmodel index 9495ce441eb..9495ce441eb 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/resources/My.genmodel +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/resources/My.genmodel diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/language/LanguageServiceTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/language/LanguageServiceTest.java index 3530a06d78e..3530a06d78e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/language/LanguageServiceTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/language/LanguageServiceTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResourceTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResourceTest.java index 2f05f8ac076..f316787db54 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResourceTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResourceTest.java @@ -1,328 +1,328 @@ -/*****************************************************************************
- * Copyright (c) 2010, 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 436047
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.resource;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource.ModelKind;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-
-/**
- * Run as "JUnit Plugin-Test"
- *
- * @author cedric dumoulin
- *
- */
-public class AbstractModelWithSharedResourceTest extends AbstractPapyrusTest {
-
- @Rule
- public final HouseKeeper houseKeeper = new HouseKeeper();
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- }
-
- /**
- * Test that the resource is created only once.
- * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#createModel(org.eclipse.core.runtime.IPath)}.
- */
- @Test
- public void testCreateModel() {
-
- String model1Key = "ecore";
- String model2Key = "genmodel";
-
- // Create models with different key, but use same extension (default from FakeModelWithSharedResource)
- FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class);
- FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class);
-
- ModelSet modelSet = houseKeeper.cleanUpLater(new ModelSet());
- modelSet.registerModel(model1);
- modelSet.registerModel(model2);
-
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
-
- IFile model1File = p.getFile("tmp/model1." + model1Key);
-
- // Call creates
- modelSet.createsModels(model1File);
-
- // Do check
- assertNotNull("resource created", model1.getResouce());
- assertNotNull("resource created", model2.getResouce());
- assertEquals("Resource is shared", model1.getResouce(), model2.getResouce());
-
-
- }
-
- /**
- * Create and save models.
- *
- * @throws IOException
- * @throws CoreException
- */
- private void createAndSave(String model1Key, String model2Key) throws IOException, CoreException {
-
- FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class);
- FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class);
-
- ModelSet modelSet = houseKeeper.cleanUpLater(new ModelSet());
- modelSet.registerModel(model1);
- modelSet.registerModel(model2);
-
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
- if(!p.exists()) {
- p.create(new NullProgressMonitor());
- }
- p.open(new NullProgressMonitor());
-
- IFile model1File = p.getFile("tmp/model1." + model1Key);
-
- // Call creates and save
-
- modelSet.createsModels(model1File);
- model1.getResouce().setModified(true);
- modelSet.save(new NullProgressMonitor());
- modelSet.unload();
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#loadModel(org.eclipse.core.runtime.IPath)}.
- *
- * @throws CoreException
- * @throws IOException
- * @throws ModelMultiException
- */
- @Test
- public void testLoadModelIPath() throws IOException, CoreException, ModelMultiException {
-
-
- String model1Key = "ecore";
- String model2Key = "genmodel";
-
- createAndSave(model1Key, model2Key);
-
- FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class);
- FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class);
-
- ModelSet modelSet = houseKeeper.cleanUpLater(new ModelSet());
- modelSet.registerModel(model1);
- modelSet.registerModel(model2);
-
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
-
- IFile model1File = p.getFile("tmp/model1." + model1Key);
-
- // Call creates
- modelSet.loadModels(model1File);
-
- // Do check
- assertNotNull("resource loaded", model1.getResouce());
- assertNotNull("resource loaded", model2.getResouce());
- assertEquals("Resource is shared", model1.getResouce(), model2.getResouce());
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#saveModel()}.
- *
- * @throws IOException
- * @throws CoreException
- */
- @Test
- public void testSaveModel() throws IOException, CoreException {
- String model1Key = "ecore";
- String model2Key = "genmodel";
-
- FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class);
- FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class);
-
- ModelSet modelSet = houseKeeper.cleanUpLater(new ModelSet());
- modelSet.registerModel(model1);
- modelSet.registerModel(model2);
-
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
- if(!p.exists()) {
- p.create(new NullProgressMonitor());
- }
- p.open(new NullProgressMonitor());
-
- IFile model1File = p.getFile("tmp/model1." + model1Key);
-
- // Call creates and save
-
- modelSet.createsModels(model1File);
- model1.getResouce().setModified(true);
- modelSet.save(new NullProgressMonitor());
-
- // Do check
- assertNotNull("resource created", model1.getResouce());
- assertNotNull("resource created", model2.getResouce());
- assertEquals("Resource is shared", model1.getResouce(), model2.getResouce());
- // Check weither it is save
- assertFalse("Resource is saved", model1.getResouce().isModified());
- assertFalse("Resource is saved", model2.getResouce().isModified());
- // TODO : check that it is saved only once !
-
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#getModelRoot()}.
- */
- @Test
- public void testGetModelRoot() {
- String model1Key = "ecore";
- String model2Key = "genmodel";
-
- FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class);
- FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class);
-
- ModelSet modelSet = houseKeeper.cleanUpLater(new ModelSet());
- modelSet.registerModel(model1);
- modelSet.registerModel(model2);
-
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
-
- IFile model1File = p.getFile("tmp/model1." + model1Key);
-
- // Call creates
- modelSet.createsModels(model1File);
- // Add elements in both model
- EPackage p1 = EcoreFactory.eINSTANCE.createEPackage();
- model1.addModelRoot(p1);
-
- EClass c1 = EcoreFactory.eINSTANCE.createEClass();
- model2.addModelRoot(c1);
-
- // Do check
- assertEquals("root found", p1, model1.getModelRoot());
- assertEquals("root found", c1, model2.getModelRoot());
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#getModelRoot()}.
- */
- @Test
- public void testGetModelRoots() {
- String model1Key = "ecore";
- String model2Key = "genmodel";
-
- FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class);
- FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class);
-
- ModelSet modelSet = houseKeeper.cleanUpLater(new ModelSet());
- modelSet.registerModel(model1);
- modelSet.registerModel(model2);
-
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
-
- IFile model1File = p.getFile("tmp/model1." + model1Key);
-
- // Call creates
- modelSet.createsModels(model1File);
- // Add elements in both model
- EPackage p1 = EcoreFactory.eINSTANCE.createEPackage();
- model1.addModelRoot(p1);
- EPackage p2 = EcoreFactory.eINSTANCE.createEPackage();
- model1.addModelRoot(p2);
- EPackage p3 = EcoreFactory.eINSTANCE.createEPackage();
- model1.addModelRoot(p3);
-
- EClass c1 = EcoreFactory.eINSTANCE.createEClass();
- model2.addModelRoot(c1);
- EClass c2 = EcoreFactory.eINSTANCE.createEClass();
- model2.addModelRoot(c2);
- EClass c3 = EcoreFactory.eINSTANCE.createEClass();
- model2.addModelRoot(c3);
-
- // Do check
- List<EPackage> lp = model1.getModelRoots();
- List<EClass> lc = model2.getModelRoots();
-
- assertNotNull("list exist", lp);
- assertEquals("list size", 3, lp.size());
- assertTrue("element found", lp.contains(p1));
- assertTrue("element found", lp.contains(p2));
- assertTrue("element found", lp.contains(p3));
-
- assertNotNull("list exist", lc);
- assertEquals("list size", 3, lc.size());
- assertTrue("element found", lc.contains(c1));
- assertTrue("element found", lc.contains(c2));
- assertTrue("element found", lc.contains(c3));
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#addModelRoot(org.eclipse.emf.ecore.EObject)}.
- */
- @Test
- public void testAddModelRoot() {
- String model1Key = "ecore";
- String model2Key = "genmodel";
-
- FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class);
- FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class);
-
- ModelSet modelSet = houseKeeper.cleanUpLater(new ModelSet());
- modelSet.registerModel(model1);
- modelSet.registerModel(model2);
-
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core");
-
- IFile model1File = p.getFile("tmp/model1." + model1Key);
-
- // Call creates
- modelSet.createsModels(model1File);
- // Add elements in both model
- EPackage p1 = EcoreFactory.eINSTANCE.createEPackage();
- model1.addModelRoot(p1);
-
- EClass c1 = EcoreFactory.eINSTANCE.createEClass();
- model2.addModelRoot(c1);
-
- // Do check
- assertTrue("model contain element", model1.getResouce().getContents().contains(p1));
- assertTrue("model contain element", model2.getResouce().getContents().contains(c1));
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2010, 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 436047 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.resource; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EcoreFactory; +import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource.ModelKind; +import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; +import org.eclipse.papyrus.junit.utils.rules.HouseKeeper; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + + +/** + * Run as "JUnit Plugin-Test" + * + * @author cedric dumoulin + * + */ +public class AbstractModelWithSharedResourceTest extends AbstractPapyrusTest { + + @Rule + public final HouseKeeper houseKeeper = new HouseKeeper(); + + /** + * @throws java.lang.Exception + */ + @Before + public void setUp() throws Exception { + } + + /** + * @throws java.lang.Exception + */ + @After + public void tearDown() throws Exception { + } + + /** + * Test that the resource is created only once. + * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#createModel(org.eclipse.core.runtime.IPath)}. + */ + @Test + public void testCreateModel() { + + String model1Key = "ecore"; + String model2Key = "genmodel"; + + // Create models with different key, but use same extension (default from FakeModelWithSharedResource) + FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class); + FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class); + + ModelSet modelSet = houseKeeper.cleanUpLater(new ModelSet()); + modelSet.registerModel(model1); + modelSet.registerModel(model2); + + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core"); + + IFile model1File = p.getFile("tmp/model1." + model1Key); + + // Call creates + modelSet.createsModels(model1File); + + // Do check + assertNotNull("resource created", model1.getResouce()); + assertNotNull("resource created", model2.getResouce()); + assertEquals("Resource is shared", model1.getResouce(), model2.getResouce()); + + + } + + /** + * Create and save models. + * + * @throws IOException + * @throws CoreException + */ + private void createAndSave(String model1Key, String model2Key) throws IOException, CoreException { + + FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class); + FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class); + + ModelSet modelSet = houseKeeper.cleanUpLater(new ModelSet()); + modelSet.registerModel(model1); + modelSet.registerModel(model2); + + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core"); + if(!p.exists()) { + p.create(new NullProgressMonitor()); + } + p.open(new NullProgressMonitor()); + + IFile model1File = p.getFile("tmp/model1." + model1Key); + + // Call creates and save + + modelSet.createsModels(model1File); + model1.getResouce().setModified(true); + modelSet.save(new NullProgressMonitor()); + modelSet.unload(); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#loadModel(org.eclipse.core.runtime.IPath)}. + * + * @throws CoreException + * @throws IOException + * @throws ModelMultiException + */ + @Test + public void testLoadModelIPath() throws IOException, CoreException, ModelMultiException { + + + String model1Key = "ecore"; + String model2Key = "genmodel"; + + createAndSave(model1Key, model2Key); + + FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class); + FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class); + + ModelSet modelSet = houseKeeper.cleanUpLater(new ModelSet()); + modelSet.registerModel(model1); + modelSet.registerModel(model2); + + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core"); + + IFile model1File = p.getFile("tmp/model1." + model1Key); + + // Call creates + modelSet.loadModels(model1File); + + // Do check + assertNotNull("resource loaded", model1.getResouce()); + assertNotNull("resource loaded", model2.getResouce()); + assertEquals("Resource is shared", model1.getResouce(), model2.getResouce()); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#saveModel()}. + * + * @throws IOException + * @throws CoreException + */ + @Test + public void testSaveModel() throws IOException, CoreException { + String model1Key = "ecore"; + String model2Key = "genmodel"; + + FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class); + FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class); + + ModelSet modelSet = houseKeeper.cleanUpLater(new ModelSet()); + modelSet.registerModel(model1); + modelSet.registerModel(model2); + + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core"); + if(!p.exists()) { + p.create(new NullProgressMonitor()); + } + p.open(new NullProgressMonitor()); + + IFile model1File = p.getFile("tmp/model1." + model1Key); + + // Call creates and save + + modelSet.createsModels(model1File); + model1.getResouce().setModified(true); + modelSet.save(new NullProgressMonitor()); + + // Do check + assertNotNull("resource created", model1.getResouce()); + assertNotNull("resource created", model2.getResouce()); + assertEquals("Resource is shared", model1.getResouce(), model2.getResouce()); + // Check weither it is save + assertFalse("Resource is saved", model1.getResouce().isModified()); + assertFalse("Resource is saved", model2.getResouce().isModified()); + // TODO : check that it is saved only once ! + + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#getModelRoot()}. + */ + @Test + public void testGetModelRoot() { + String model1Key = "ecore"; + String model2Key = "genmodel"; + + FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class); + FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class); + + ModelSet modelSet = houseKeeper.cleanUpLater(new ModelSet()); + modelSet.registerModel(model1); + modelSet.registerModel(model2); + + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core"); + + IFile model1File = p.getFile("tmp/model1." + model1Key); + + // Call creates + modelSet.createsModels(model1File); + // Add elements in both model + EPackage p1 = EcoreFactory.eINSTANCE.createEPackage(); + model1.addModelRoot(p1); + + EClass c1 = EcoreFactory.eINSTANCE.createEClass(); + model2.addModelRoot(c1); + + // Do check + assertEquals("root found", p1, model1.getModelRoot()); + assertEquals("root found", c1, model2.getModelRoot()); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#getModelRoot()}. + */ + @Test + public void testGetModelRoots() { + String model1Key = "ecore"; + String model2Key = "genmodel"; + + FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class); + FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class); + + ModelSet modelSet = houseKeeper.cleanUpLater(new ModelSet()); + modelSet.registerModel(model1); + modelSet.registerModel(model2); + + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core"); + + IFile model1File = p.getFile("tmp/model1." + model1Key); + + // Call creates + modelSet.createsModels(model1File); + // Add elements in both model + EPackage p1 = EcoreFactory.eINSTANCE.createEPackage(); + model1.addModelRoot(p1); + EPackage p2 = EcoreFactory.eINSTANCE.createEPackage(); + model1.addModelRoot(p2); + EPackage p3 = EcoreFactory.eINSTANCE.createEPackage(); + model1.addModelRoot(p3); + + EClass c1 = EcoreFactory.eINSTANCE.createEClass(); + model2.addModelRoot(c1); + EClass c2 = EcoreFactory.eINSTANCE.createEClass(); + model2.addModelRoot(c2); + EClass c3 = EcoreFactory.eINSTANCE.createEClass(); + model2.addModelRoot(c3); + + // Do check + List<EPackage> lp = model1.getModelRoots(); + List<EClass> lc = model2.getModelRoots(); + + assertNotNull("list exist", lp); + assertEquals("list size", 3, lp.size()); + assertTrue("element found", lp.contains(p1)); + assertTrue("element found", lp.contains(p2)); + assertTrue("element found", lp.contains(p3)); + + assertNotNull("list exist", lc); + assertEquals("list size", 3, lc.size()); + assertTrue("element found", lc.contains(c1)); + assertTrue("element found", lc.contains(c2)); + assertTrue("element found", lc.contains(c3)); + } + + /** + * Test method for {@link org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#addModelRoot(org.eclipse.emf.ecore.EObject)}. + */ + @Test + public void testAddModelRoot() { + String model1Key = "ecore"; + String model2Key = "genmodel"; + + FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class); + FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class); + + ModelSet modelSet = houseKeeper.cleanUpLater(new ModelSet()); + modelSet.registerModel(model1); + modelSet.registerModel(model2); + + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.infra.core"); + + IFile model1File = p.getFile("tmp/model1." + model1Key); + + // Call creates + modelSet.createsModels(model1File); + // Add elements in both model + EPackage p1 = EcoreFactory.eINSTANCE.createEPackage(); + model1.addModelRoot(p1); + + EClass c1 = EcoreFactory.eINSTANCE.createEClass(); + model2.addModelRoot(c1); + + // Do check + assertTrue("model contain element", model1.getResouce().getContents().contains(p1)); + assertTrue("model contain element", model2.getResouce().getContents().contains(c1)); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/AbstractResourceAdapterTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/AbstractResourceAdapterTest.java index 0803216621e..0803216621e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/AbstractResourceAdapterTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/AbstractResourceAdapterTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/Bug402525.ecore b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/Bug402525.ecore index 8dea18de3e8..8dea18de3e8 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/Bug402525.ecore +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/Bug402525.ecore diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModel.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModel.java index 0f6c114bdcd..0f6c114bdcd 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModel.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModel.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModelManagerSnippet.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModelManagerSnippet.java index fc3a550811d..d7f5883e84c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModelManagerSnippet.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModelManagerSnippet.java @@ -1,62 +1,62 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.resource;
-
-
-
-/**
- * a fake {@link IModelSetSnippet} for test purpose.
- *
- * @author cedric dumoulin
- *
- */
-public class FakeModelManagerSnippet implements IModelSetSnippet {
-
- private TestTrace trace;
-
- private String name;
-
- /**
- *
- * Constructor.
- *
- * @param string
- */
- public FakeModelManagerSnippet(String name) {
- this.trace = new TestTrace();
- this.name = name;
- }
-
- /**
- *
- * Constructor.
- *
- * @param trace2
- * @param string
- */
- public FakeModelManagerSnippet(TestTrace trace, String name) {
- this.trace = trace;
- this.name = name;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.resource.IModelSetSnippet#start(org.eclipse.papyrus.infra.core.resource.ModelSet)
- *
- * @param modelsManager
- */
- public void start(ModelSet modelsManager) {
- trace.addTrace(name, "start");
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.resource.IModelSetSnippet#dispose(org.eclipse.papyrus.infra.core.resource.ModelSet)
- *
- * @param modelsManager
- */
- public void dispose(ModelSet modelsManager) {
- trace.addTrace(name, "dispose");
-
- }
-
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.resource; + + + +/** + * a fake {@link IModelSetSnippet} for test purpose. + * + * @author cedric dumoulin + * + */ +public class FakeModelManagerSnippet implements IModelSetSnippet { + + private TestTrace trace; + + private String name; + + /** + * + * Constructor. + * + * @param string + */ + public FakeModelManagerSnippet(String name) { + this.trace = new TestTrace(); + this.name = name; + } + + /** + * + * Constructor. + * + * @param trace2 + * @param string + */ + public FakeModelManagerSnippet(TestTrace trace, String name) { + this.trace = trace; + this.name = name; + } + + /** + * @see org.eclipse.papyrus.infra.core.resource.IModelSetSnippet#start(org.eclipse.papyrus.infra.core.resource.ModelSet) + * + * @param modelsManager + */ + public void start(ModelSet modelsManager) { + trace.addTrace(name, "start"); + } + + /** + * @see org.eclipse.papyrus.infra.core.resource.IModelSetSnippet#dispose(org.eclipse.papyrus.infra.core.resource.ModelSet) + * + * @param modelsManager + */ + public void dispose(ModelSet modelsManager) { + trace.addTrace(name, "dispose"); + + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModelWithSharedResource.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModelWithSharedResource.java index c2ec36169ba..3f9e7a38d29 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModelWithSharedResource.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModelWithSharedResource.java @@ -1,100 +1,100 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.resource;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-
-
-/**
- * @author dumoulin
- *
- */
-public class FakeModelWithSharedResource<T extends EObject> extends AbstractModelWithSharedResource<T> {
-
- private String identifier;
- private String fileExtension;
- private Class<T> expectedType;
-
- /**
- *
- * Constructor.
- *
- * @param kind
- * @param identifier
- * @param fileExtension
- * @param expectedType
- */
- public FakeModelWithSharedResource(ModelKind kind, String identifier, String fileExtension, Class<T> expectedType) {
- super(kind);
- this.identifier = identifier;
- this.expectedType = expectedType;
- this.fileExtension = fileExtension;
- }
-
- /**
- *
- * Constructor.
- *
- * @param kind
- * @param identifier
- * @param expectedType
- */
- public FakeModelWithSharedResource(ModelKind kind, String identifier, Class<T> expectedType) {
- this(kind, identifier, "di", expectedType);
- }
-
- /**
- *
- * Constructor.
- *
- * @param identifier
- * @param expectedType
- */
- public FakeModelWithSharedResource(String identifier, Class<T> expectedType) {
- this(ModelKind.slave, identifier, expectedType);
- }
-
- /**
- *
- * @see org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#isModelRoot(org.eclipse.emf.ecore.EObject)
- *
- * @param object
- * @return
- */
- @Override
- protected boolean isModelRoot(EObject object) {
- return expectedType.isInstance(object);
- }
-
- /**
- *
- * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()
- *
- * @return
- */
- @Override
- public String getIdentifier() {
- return identifier;
- }
-
- /**
- *
- * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()
- *
- * @return
- */
- @Override
- protected String getModelFileExtension() {
- return fileExtension;
- }
-
- /**
- * Get the associated resource.
- * @return
- */
- public Resource getResouce() {
- return resource;
- }
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.resource; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; + + +/** + * @author dumoulin + * + */ +public class FakeModelWithSharedResource<T extends EObject> extends AbstractModelWithSharedResource<T> { + + private String identifier; + private String fileExtension; + private Class<T> expectedType; + + /** + * + * Constructor. + * + * @param kind + * @param identifier + * @param fileExtension + * @param expectedType + */ + public FakeModelWithSharedResource(ModelKind kind, String identifier, String fileExtension, Class<T> expectedType) { + super(kind); + this.identifier = identifier; + this.expectedType = expectedType; + this.fileExtension = fileExtension; + } + + /** + * + * Constructor. + * + * @param kind + * @param identifier + * @param expectedType + */ + public FakeModelWithSharedResource(ModelKind kind, String identifier, Class<T> expectedType) { + this(kind, identifier, "di", expectedType); + } + + /** + * + * Constructor. + * + * @param identifier + * @param expectedType + */ + public FakeModelWithSharedResource(String identifier, Class<T> expectedType) { + this(ModelKind.slave, identifier, expectedType); + } + + /** + * + * @see org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#isModelRoot(org.eclipse.emf.ecore.EObject) + * + * @param object + * @return + */ + @Override + protected boolean isModelRoot(EObject object) { + return expectedType.isInstance(object); + } + + /** + * + * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier() + * + * @return + */ + @Override + public String getIdentifier() { + return identifier; + } + + /** + * + * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension() + * + * @return + */ + @Override + protected String getModelFileExtension() { + return fileExtension; + } + + /** + * Get the associated resource. + * @return + */ + public Resource getResouce() { + return resource; + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/ModelSetTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/ModelSetTest.java index d06b7d25e1c..d06b7d25e1c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/ModelSetTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/ModelSetTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/NestingTransactionalCommandStackTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/NestingTransactionalCommandStackTest.java index bd747b966a0..bd747b966a0 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/NestingTransactionalCommandStackTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/NestingTransactionalCommandStackTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/ResourceAdapterTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/ResourceAdapterTest.java index 72db79ae738..72db79ae738 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/ResourceAdapterTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/ResourceAdapterTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/ResourceAdapterTransactionalTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/ResourceAdapterTransactionalTest.java index 97e6cd3a857..97e6cd3a857 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/ResourceAdapterTransactionalTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/ResourceAdapterTransactionalTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/TestTrace.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/TestTrace.java index 5703afaa9d1..c41194fccf5 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/TestTrace.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/TestTrace.java @@ -1,153 +1,153 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.resource;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * A class used to record traces for tests
- *
- * @author cedric dumoulin
- *
- */
-public class TestTrace {
-
- public List<TraceRecord>traces = new ArrayList<TraceRecord>();
-
- /**
- * Record a new trace.
- * @param trace
- */
- public void addTrace(String trace) {
- addTrace(null, trace, null);
- }
-
- /**
- * Record a new trace.
- * @param trace
- */
- public void addTrace(String name, String trace) {
- addTrace(name, trace, null);
- }
-
- /**
- * Record a new trace.
- * @param trace
- */
- public void addTrace(String name, String trace, Object value) {
- traces.add(new TraceRecord( name, trace, value));
- }
-
- /**
- * Return true if the trace contains the specified events.
- * @return
- */
- public boolean contains( String name, String trace) {
-
- return indexOfNameTrace(name, trace) >= 0;
- }
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public int indexOf(String name, String trace, Object value) {
-
- for (int i = 0; i < traces.size(); i++) {
- TraceRecord record = traces.get(i);
-
- if( name.equals(record.name) && trace.equals(record.trace) )
- return i;
- }
-
- return -1;
- }
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public int indexOfNameTrace(String name, String trace) {
-
- for (int i = 0; i < traces.size(); i++) {
- TraceRecord record = traces.get(i);
-
- if( name.equals(record.name) && trace.equals(record.trace) )
- return i;
- }
-
- return -1;
- }
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public int indexOfTrace(String trace) {
-
- for (int i = 0; i < traces.size(); i++) {
- TraceRecord record = traces.get(i);
-
- if( trace.equals(record.trace) )
- return i;
- }
-
- return -1;
- }
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public int indexOfName(String name) {
-
- for (int i = 0; i < traces.size(); i++) {
- TraceRecord record = traces.get(i);
-
- if( name.equals(record.name) )
- return i;
- }
-
- return -1;
- }
-
- /**
- * Reset the trace.
- */
- public void reset() {
- traces.clear();
- }
-
-
- /**
- * @return the traces
- */
- public List<TraceRecord> getTraces() {
- return traces;
- }
-
- /**
- * A Record of the trace.
- */
- public class TraceRecord {
- public String name;
- public String trace;
- public Object value;
- /**
- * Constructor.
- *
- * @param name
- * @param trace
- * @param value
- */
- public TraceRecord(String name, String trace, Object value) {
- this.name = name;
- this.trace = trace;
- this.value = value;
- }
-
- }
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.resource; + +import java.util.ArrayList; +import java.util.List; + + +/** + * A class used to record traces for tests + * + * @author cedric dumoulin + * + */ +public class TestTrace { + + public List<TraceRecord>traces = new ArrayList<TraceRecord>(); + + /** + * Record a new trace. + * @param trace + */ + public void addTrace(String trace) { + addTrace(null, trace, null); + } + + /** + * Record a new trace. + * @param trace + */ + public void addTrace(String name, String trace) { + addTrace(name, trace, null); + } + + /** + * Record a new trace. + * @param trace + */ + public void addTrace(String name, String trace, Object value) { + traces.add(new TraceRecord( name, trace, value)); + } + + /** + * Return true if the trace contains the specified events. + * @return + */ + public boolean contains( String name, String trace) { + + return indexOfNameTrace(name, trace) >= 0; + } + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public int indexOf(String name, String trace, Object value) { + + for (int i = 0; i < traces.size(); i++) { + TraceRecord record = traces.get(i); + + if( name.equals(record.name) && trace.equals(record.trace) ) + return i; + } + + return -1; + } + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public int indexOfNameTrace(String name, String trace) { + + for (int i = 0; i < traces.size(); i++) { + TraceRecord record = traces.get(i); + + if( name.equals(record.name) && trace.equals(record.trace) ) + return i; + } + + return -1; + } + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public int indexOfTrace(String trace) { + + for (int i = 0; i < traces.size(); i++) { + TraceRecord record = traces.get(i); + + if( trace.equals(record.trace) ) + return i; + } + + return -1; + } + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public int indexOfName(String name) { + + for (int i = 0; i < traces.size(); i++) { + TraceRecord record = traces.get(i); + + if( name.equals(record.name) ) + return i; + } + + return -1; + } + + /** + * Reset the trace. + */ + public void reset() { + traces.clear(); + } + + + /** + * @return the traces + */ + public List<TraceRecord> getTraces() { + return traces; + } + + /** + * A Record of the trace. + */ + public class TraceRecord { + public String name; + public String trace; + public Object value; + /** + * Constructor. + * + * @param name + * @param trace + * @param value + */ + public TraceRecord(String name, String trace, Object value) { + this.name = name; + this.trace = trace; + this.value = value; + } + + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ComposedServiceTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ComposedServiceTest.java index 7492d60c2e4..7492d60c2e4 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ComposedServiceTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ComposedServiceTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedService.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedService.java index fe2d4f0d293..95785fc6f26 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedService.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedService.java @@ -1,46 +1,46 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.services;
-
-
-
-
-/**
- * A fake composed service for testing purpose.
- *
- * @author cedric dumoulin
- *
- */
-public class FakeComposedService extends ComposedService<FakeComposedServicePart> {
-
- /**
- * Call the same method on all associated service parts.
- */
- public void walkService() {
-
- for( FakeComposedServicePart servicePart : serviceParts )
- {
- servicePart.walkService();
- }
- }
-
- @Override
- public void init(ServicesRegistry servicesRegistry) throws ServiceException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void startService() throws ServiceException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void disposeService() throws ServiceException {
- // TODO Auto-generated method stub
-
- }
-
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.services; + + + + +/** + * A fake composed service for testing purpose. + * + * @author cedric dumoulin + * + */ +public class FakeComposedService extends ComposedService<FakeComposedServicePart> { + + /** + * Call the same method on all associated service parts. + */ + public void walkService() { + + for( FakeComposedServicePart servicePart : serviceParts ) + { + servicePart.walkService(); + } + } + + @Override + public void init(ServicesRegistry servicesRegistry) throws ServiceException { + // TODO Auto-generated method stub + + } + + @Override + public void startService() throws ServiceException { + // TODO Auto-generated method stub + + } + + @Override + public void disposeService() throws ServiceException { + // TODO Auto-generated method stub + + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePart.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePart.java index 72abc31d17d..aaba874576a 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePart.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePart.java @@ -1,27 +1,27 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.services;
-
-
-
-/**
- * A fake composed service part for testing purpose.
- * @author cedric dumoulin
- *
- */
-public class FakeComposedServicePart extends ComposedServicePart<FakeComposedService> {
-
-
- public FakeComposedServicePart() {
- super(FakeComposedService.class);
- }
-
- /**
- * A common method.
- */
- public void walkService() {
- // TODO Auto-generated method stub
-
- }
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.services; + + + +/** + * A fake composed service part for testing purpose. + * @author cedric dumoulin + * + */ +public class FakeComposedServicePart extends ComposedServicePart<FakeComposedService> { + + + public FakeComposedServicePart() { + super(FakeComposedService.class); + } + + /** + * A common method. + */ + public void walkService() { + // TODO Auto-generated method stub + + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePartA.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePartA.java index 9a7f28f1589..63387d8330c 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePartA.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePartA.java @@ -1,13 +1,13 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.services;
-
-
-/**
- * @author dumoulin
- *
- */
-public class FakeComposedServicePartA extends FakeComposedServicePart {
-
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.services; + + +/** + * @author dumoulin + * + */ +public class FakeComposedServicePartA extends FakeComposedServicePart { + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePartB.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePartB.java index 18f7e61102e..ae78757b188 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePartB.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeComposedServicePartB.java @@ -1,13 +1,13 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.services;
-
-
-/**
- * @author dumoulin
- *
- */
-public class FakeComposedServicePartB extends FakeComposedServicePart {
-
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.services; + + +/** + * @author dumoulin + * + */ +public class FakeComposedServicePartB extends FakeComposedServicePart { + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeService.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeService.java index 3f9b9e08866..2a4f1111018 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeService.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeService.java @@ -1,75 +1,75 @@ -package org.eclipse.papyrus.infra.core.services;
-
-
-
-/**
- * Fake service for testing purpose.
- *
- * @author cedric dumoulin
- *
- */
-public class FakeService implements IService {
-
-
- static public TestTrace trace = new TestTrace();
-
- static int count = 0;
-
- public String name = "name" + count++;
-
-
- /**
- *
- * Constructor.
- *
- */
- public FakeService() {
- trace.addTrace(name, "create");
- }
-
- /**
- * Constructor.
- *
- * @param name
- */
- public FakeService(String name) {
- this.name = name;
- trace.addTrace(name, "create");
- }
-
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return the trace
- */
- static public TestTrace getTrace() {
- return trace;
- }
-
-
- /**
- * @param trace the trace to set
- */
- public void setTrace(TestTrace trace) {
- this.trace = trace;
- }
-
- public void init(ServicesRegistry servicesRegistry) {
- trace.addTrace(name, "init", servicesRegistry);
- }
-
- public void startService() {
- trace.addTrace(name, "start");
- }
-
- public void disposeService() {
- trace.addTrace(name, "dispose");
- }
-
-}
+package org.eclipse.papyrus.infra.core.services; + + + +/** + * Fake service for testing purpose. + * + * @author cedric dumoulin + * + */ +public class FakeService implements IService { + + + static public TestTrace trace = new TestTrace(); + + static int count = 0; + + public String name = "name" + count++; + + + /** + * + * Constructor. + * + */ + public FakeService() { + trace.addTrace(name, "create"); + } + + /** + * Constructor. + * + * @param name + */ + public FakeService(String name) { + this.name = name; + trace.addTrace(name, "create"); + } + + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @return the trace + */ + static public TestTrace getTrace() { + return trace; + } + + + /** + * @param trace the trace to set + */ + public void setTrace(TestTrace trace) { + this.trace = trace; + } + + public void init(ServicesRegistry servicesRegistry) { + trace.addTrace(name, "init", servicesRegistry); + } + + public void startService() { + trace.addTrace(name, "start"); + } + + public void disposeService() { + trace.addTrace(name, "dispose"); + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeServiceFactory.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeServiceFactory.java index 8332ebee584..8f6190c8ac5 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeServiceFactory.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeServiceFactory.java @@ -1,66 +1,66 @@ -package org.eclipse.papyrus.infra.core.services;
-
-
-
-/**
- * Fake service factory for testing purpose.
- *
- * @author cedric dumoulin
- *
- */
-public class FakeServiceFactory extends FakeService implements IServiceFactory {
-
-
- /**
- *
- * Constructor.
- *
- */
- public FakeServiceFactory() {
-
- super( "factoryName" + count++ );
- }
-
- /**
- * Constructor.
- *
- * @param name
- */
- public FakeServiceFactory(String name) {
- super(name);
- }
-
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * Create the service
- * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()
- *
- * @return
- */
- public Object createServiceInstance() {
- trace.addTrace(getName(), "createInstance");
- return new FakeCreatedService();
- }
-
- /**
- * Pseudo service created by the factory.
- * @author dumoulin
- *
- */
- public class FakeCreatedService {
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
- }
-}
+package org.eclipse.papyrus.infra.core.services; + + + +/** + * Fake service factory for testing purpose. + * + * @author cedric dumoulin + * + */ +public class FakeServiceFactory extends FakeService implements IServiceFactory { + + + /** + * + * Constructor. + * + */ + public FakeServiceFactory() { + + super( "factoryName" + count++ ); + } + + /** + * Constructor. + * + * @param name + */ + public FakeServiceFactory(String name) { + super(name); + } + + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * Create the service + * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance() + * + * @return + */ + public Object createServiceInstance() { + trace.addTrace(getName(), "createInstance"); + return new FakeCreatedService(); + } + + /** + * Pseudo service created by the factory. + * @author dumoulin + * + */ + public class FakeCreatedService { + + /** + * @return the name + */ + public String getName() { + return name; + } + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeWithRequiredServiceFactory.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeWithRequiredServiceFactory.java index 0573a85f91e..eb3fda0cfee 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeWithRequiredServiceFactory.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/FakeWithRequiredServiceFactory.java @@ -1,54 +1,54 @@ -package org.eclipse.papyrus.infra.core.services;
-
-
-
-/**
- * Fake service factory for testing purpose.
- * This service require the
- *
- * @author cedric dumoulin
- *
- */
-public class FakeWithRequiredServiceFactory extends FakeServiceFactory implements IServiceFactory {
-
-
- /**
- *
- * Constructor.
- *
- */
- public FakeWithRequiredServiceFactory() {
-
- super( "factoryName" + count++ );
- }
-
- /**
- * Constructor.
- *
- * @param name
- */
- public FakeWithRequiredServiceFactory(String name) {
- super(name);
- }
-
-
- /**
- *
- * @see org.eclipse.papyrus.infra.core.services.FakeService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
- *
- * @param servicesRegistry
- */
- @Override
- public void init(ServicesRegistry servicesRegistry) {
-
- trace.addTrace(name, "init");
- Object foundService = null;
- try {
- foundService = servicesRegistry.getService("C");
- } catch (ServiceException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- trace.addTrace(name, "initEnd", foundService);
- }
-}
+package org.eclipse.papyrus.infra.core.services; + + + +/** + * Fake service factory for testing purpose. + * This service require the + * + * @author cedric dumoulin + * + */ +public class FakeWithRequiredServiceFactory extends FakeServiceFactory implements IServiceFactory { + + + /** + * + * Constructor. + * + */ + public FakeWithRequiredServiceFactory() { + + super( "factoryName" + count++ ); + } + + /** + * Constructor. + * + * @param name + */ + public FakeWithRequiredServiceFactory(String name) { + super(name); + } + + + /** + * + * @see org.eclipse.papyrus.infra.core.services.FakeService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry) + * + * @param servicesRegistry + */ + @Override + public void init(ServicesRegistry servicesRegistry) { + + trace.addTrace(name, "init"); + Object foundService = null; + try { + foundService = servicesRegistry.getService("C"); + } catch (ServiceException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + trace.addTrace(name, "initEnd", foundService); + } +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceA.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceA.java index b117f270449..183587aa859 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceA.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceA.java @@ -1,49 +1,49 @@ -package org.eclipse.papyrus.infra.core.services;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ServiceA implements IService {
-
- public enum TraceKind {
- init, start, dispose
- };
-
- static List<TraceKind> trace = new ArrayList<TraceKind>();
-
- static List<String> nametrace = new ArrayList<String>();
-
-
-
- static public TraceKind getEvent(int index) {
- return trace.get(index);
- }
-
- static public String getTraceName(int index) {
- return nametrace.get(index);
- }
-
- static public void resetTrace() {
- trace.clear();
- nametrace.clear();
- }
-
- public void init(ServicesRegistry servicesRegistry) {
- trace.add(TraceKind.init);
- nametrace.add(this.getClass().getSimpleName());
-
- }
-
- public void startService() {
- trace.add(TraceKind.start);
- nametrace.add(this.getClass().getSimpleName());
-
- }
-
- public void disposeService() {
- trace.add(TraceKind.dispose);
- nametrace.add(this.getClass().getSimpleName());
-
- }
-
-}
+package org.eclipse.papyrus.infra.core.services; + +import java.util.ArrayList; +import java.util.List; + +public class ServiceA implements IService { + + public enum TraceKind { + init, start, dispose + }; + + static List<TraceKind> trace = new ArrayList<TraceKind>(); + + static List<String> nametrace = new ArrayList<String>(); + + + + static public TraceKind getEvent(int index) { + return trace.get(index); + } + + static public String getTraceName(int index) { + return nametrace.get(index); + } + + static public void resetTrace() { + trace.clear(); + nametrace.clear(); + } + + public void init(ServicesRegistry servicesRegistry) { + trace.add(TraceKind.init); + nametrace.add(this.getClass().getSimpleName()); + + } + + public void startService() { + trace.add(TraceKind.start); + nametrace.add(this.getClass().getSimpleName()); + + } + + public void disposeService() { + trace.add(TraceKind.dispose); + nametrace.add(this.getClass().getSimpleName()); + + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceA10.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceA10.java index b8520e27ea7..6865b03163f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceA10.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceA10.java @@ -1,6 +1,6 @@ -package org.eclipse.papyrus.infra.core.services;
-
-
-public class ServiceA10 extends ServiceA {
-
-}
+package org.eclipse.papyrus.infra.core.services; + + +public class ServiceA10 extends ServiceA { + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceB.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceB.java index 7a675ef39e2..df2f6faaaff 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceB.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceB.java @@ -1,6 +1,6 @@ -package org.eclipse.papyrus.infra.core.services;
-
-
-public class ServiceB extends ServiceA {
-
-}
+package org.eclipse.papyrus.infra.core.services; + + +public class ServiceB extends ServiceA { + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceC.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceC.java index 926ab731aff..ac1e4779652 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceC.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServiceC.java @@ -1,6 +1,6 @@ -package org.eclipse.papyrus.infra.core.services;
-
-
-public class ServiceC extends ServiceA {
-
-}
+package org.eclipse.papyrus.infra.core.services; + + +public class ServiceC extends ServiceA { + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServicePojoA.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServicePojoA.java index 111d15ca791..ae6c9690eae 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServicePojoA.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServicePojoA.java @@ -1,6 +1,6 @@ -package org.eclipse.papyrus.infra.core.services;
-
-
-public class ServicePojoA extends ServiceA {
-
-}
+package org.eclipse.papyrus.infra.core.services; + + +public class ServicePojoA extends ServiceA { + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServicesRegistryTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServicesRegistryTest.java index 0b8e1ce035e..0b8e1ce035e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServicesRegistryTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/ServicesRegistryTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/SharedServiceFactoryTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/SharedServiceFactoryTest.java index 78424bb56b4..78424bb56b4 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/SharedServiceFactoryTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/SharedServiceFactoryTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/TestTrace.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/TestTrace.java index ab960a90f89..e7e81abd7d3 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/TestTrace.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/services/TestTrace.java @@ -1,181 +1,181 @@ -/**
- *
- */
-package org.eclipse.papyrus.infra.core.services;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * A class used to record traces for tests
- *
- * @author cedric dumoulin
- *
- */
-public class TestTrace {
-
- public List<TraceRecord>traces = new ArrayList<TraceRecord>();
-
- /**
- * Record a new trace.
- * @param trace
- */
- public void addTrace(String trace) {
- addTrace(null, trace, null);
- }
-
- /**
- * Record a new trace.
- * @param trace
- */
- public void addTrace(String name, String trace) {
- addTrace(name, trace, null);
- }
-
- /**
- * Record a new trace.
- * @param trace
- */
- public void addTrace(String name, String trace, Object value) {
- traces.add(new TraceRecord( name, trace, value));
- }
-
- /**
- * Return the name and the trace in one concatenated string ("name,trace").
- * @param i Index of the requested trace
- * @return
- */
- public String getNameTrace(int i) {
- return traces.get(i).getNameTrace();
- }
-
- /**
- * Get the value
- * @param i
- * @return
- */
- public Object getValue(int i) {
- return traces.get(i).value;
- }
-
- /**
- * Return true if the trace contains the specified events.
- * @return
- */
- public boolean contains( String name, String trace) {
-
- return indexOfNameTrace(name, trace) >= 0;
- }
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public int indexOf(String name, String trace, Object value) {
-
- for (int i = 0; i < traces.size(); i++) {
- TraceRecord record = traces.get(i);
-
- if( name.equals(record.name) && trace.equals(record.trace) )
- return i;
- }
-
- return -1;
- }
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public int indexOfNameTrace(String name, String trace) {
-
- for (int i = 0; i < traces.size(); i++) {
- TraceRecord record = traces.get(i);
-
- if( name.equals(record.name) && trace.equals(record.trace) )
- return i;
- }
-
- return -1;
- }
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public int indexOfTrace(String trace) {
-
- for (int i = 0; i < traces.size(); i++) {
- TraceRecord record = traces.get(i);
-
- if( trace.equals(record.trace) )
- return i;
- }
-
- return -1;
- }
-
- /**
- * Returns the index of the first occurrence of the specified elements
- * in these lists, or -1 if this list does not contain the element.
- */
- public int indexOfName(String name) {
-
- for (int i = 0; i < traces.size(); i++) {
- TraceRecord record = traces.get(i);
-
- if( name.equals(record.name) )
- return i;
- }
-
- return -1;
- }
-
- /**
- * Reset the trace.
- */
- public void reset() {
- traces.clear();
- }
-
-
- /**
- * @return the traces
- */
- public List<TraceRecord> getTraces() {
- return traces;
- }
-
- /**
- * A Record of the trace.
- */
- public class TraceRecord {
- public String name;
- public String trace;
- public Object value;
- /**
- * Constructor.
- *
- * @param name
- * @param trace
- * @param value
- */
- public TraceRecord(String name, String trace, Object value) {
- this.name = name;
- this.trace = trace;
- this.value = value;
- }
-
- /**
- *
- * @return
- */
- public String getNameTrace() {
- // TODO Auto-generated method stub
- return name + "," + trace;
- }
-
- }
-
-}
+/** + * + */ +package org.eclipse.papyrus.infra.core.services; + +import java.util.ArrayList; +import java.util.List; + + +/** + * A class used to record traces for tests + * + * @author cedric dumoulin + * + */ +public class TestTrace { + + public List<TraceRecord>traces = new ArrayList<TraceRecord>(); + + /** + * Record a new trace. + * @param trace + */ + public void addTrace(String trace) { + addTrace(null, trace, null); + } + + /** + * Record a new trace. + * @param trace + */ + public void addTrace(String name, String trace) { + addTrace(name, trace, null); + } + + /** + * Record a new trace. + * @param trace + */ + public void addTrace(String name, String trace, Object value) { + traces.add(new TraceRecord( name, trace, value)); + } + + /** + * Return the name and the trace in one concatenated string ("name,trace"). + * @param i Index of the requested trace + * @return + */ + public String getNameTrace(int i) { + return traces.get(i).getNameTrace(); + } + + /** + * Get the value + * @param i + * @return + */ + public Object getValue(int i) { + return traces.get(i).value; + } + + /** + * Return true if the trace contains the specified events. + * @return + */ + public boolean contains( String name, String trace) { + + return indexOfNameTrace(name, trace) >= 0; + } + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public int indexOf(String name, String trace, Object value) { + + for (int i = 0; i < traces.size(); i++) { + TraceRecord record = traces.get(i); + + if( name.equals(record.name) && trace.equals(record.trace) ) + return i; + } + + return -1; + } + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public int indexOfNameTrace(String name, String trace) { + + for (int i = 0; i < traces.size(); i++) { + TraceRecord record = traces.get(i); + + if( name.equals(record.name) && trace.equals(record.trace) ) + return i; + } + + return -1; + } + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public int indexOfTrace(String trace) { + + for (int i = 0; i < traces.size(); i++) { + TraceRecord record = traces.get(i); + + if( trace.equals(record.trace) ) + return i; + } + + return -1; + } + + /** + * Returns the index of the first occurrence of the specified elements + * in these lists, or -1 if this list does not contain the element. + */ + public int indexOfName(String name) { + + for (int i = 0; i < traces.size(); i++) { + TraceRecord record = traces.get(i); + + if( name.equals(record.name) ) + return i; + } + + return -1; + } + + /** + * Reset the trace. + */ + public void reset() { + traces.clear(); + } + + + /** + * @return the traces + */ + public List<TraceRecord> getTraces() { + return traces; + } + + /** + * A Record of the trace. + */ + public class TraceRecord { + public String name; + public String trace; + public Object value; + /** + * Constructor. + * + * @param name + * @param trace + * @param value + */ + public TraceRecord(String name, String trace, Object value) { + this.name = name; + this.trace = trace; + this.value = value; + } + + /** + * + * @return + */ + public String getNameTrace() { + // TODO Auto-generated method stub + return name + "," + trace; + } + + } + +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java index 9c4476c3738..8a41e04c361 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java @@ -1,57 +1,57 @@ -/*****************************************************************************
- * Copyright (c) 2010, 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:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA LIST) - add test for AdapterUtils
- * Christian W. Damus (CEA) - bugs 402525, 422257, 399859
- * Christian W. Damus - bugs 456934, 468030, 482949, 485220, 488558, 498140
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.tests;
-
-import org.eclipse.papyrus.infra.core.language.LanguageServiceTest;
-import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResourceTest;
-import org.eclipse.papyrus.infra.core.resource.ModelSetTest;
-import org.eclipse.papyrus.infra.core.resource.NestingTransactionalCommandStackTest;
-import org.eclipse.papyrus.infra.core.resource.ResourceAdapterTest;
-import org.eclipse.papyrus.infra.core.resource.ResourceAdapterTransactionalTest;
-import org.eclipse.papyrus.infra.core.services.ComposedServiceTest;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistryTest;
-import org.eclipse.papyrus.infra.core.services.SharedServiceFactoryTest;
-import org.eclipse.papyrus.infra.core.utils.AdapterUtilsTest;
-import org.eclipse.papyrus.infra.core.utils.JobBasedFutureTest;
-import org.eclipse.papyrus.infra.core.utils.JobExecutorServiceTest;
-import org.eclipse.papyrus.infra.core.utils.TransactionHelperTest;
-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({
- // {oep.resource}
- ModelSetTest.class, AbstractModelWithSharedResourceTest.class, NestingTransactionalCommandStackTest.class,
- ResourceAdapterTest.class, ResourceAdapterTransactionalTest.class,
- // {oep}.core.language
- LanguageServiceTest.class,
- // {oep}.core.services
- ComposedServiceTest.class, ServicesRegistryTest.class, SharedServiceFactoryTest.class,
- // {oep}.core.utils
- AdapterUtilsTest.class, JobBasedFutureTest.class, JobExecutorServiceTest.class,
- TransactionHelperTest.class,
-})
-/**
- * Suite Class for all tests in the plugin
- */
-public class AllTests {
- // Junit 4 Test suite
-}
+/***************************************************************************** + * Copyright (c) 2010, 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: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + * Christian W. Damus (CEA LIST) - add test for AdapterUtils + * Christian W. Damus (CEA) - bugs 402525, 422257, 399859 + * Christian W. Damus - bugs 456934, 468030, 482949, 485220, 488558, 498140 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.tests; + +import org.eclipse.papyrus.infra.core.language.LanguageServiceTest; +import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResourceTest; +import org.eclipse.papyrus.infra.core.resource.ModelSetTest; +import org.eclipse.papyrus.infra.core.resource.NestingTransactionalCommandStackTest; +import org.eclipse.papyrus.infra.core.resource.ResourceAdapterTest; +import org.eclipse.papyrus.infra.core.resource.ResourceAdapterTransactionalTest; +import org.eclipse.papyrus.infra.core.services.ComposedServiceTest; +import org.eclipse.papyrus.infra.core.services.ServicesRegistryTest; +import org.eclipse.papyrus.infra.core.services.SharedServiceFactoryTest; +import org.eclipse.papyrus.infra.core.utils.AdapterUtilsTest; +import org.eclipse.papyrus.infra.core.utils.JobBasedFutureTest; +import org.eclipse.papyrus.infra.core.utils.JobExecutorServiceTest; +import org.eclipse.papyrus.infra.core.utils.TransactionHelperTest; +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({ + // {oep.resource} + ModelSetTest.class, AbstractModelWithSharedResourceTest.class, NestingTransactionalCommandStackTest.class, + ResourceAdapterTest.class, ResourceAdapterTransactionalTest.class, + // {oep}.core.language + LanguageServiceTest.class, + // {oep}.core.services + ComposedServiceTest.class, ServicesRegistryTest.class, SharedServiceFactoryTest.class, + // {oep}.core.utils + AdapterUtilsTest.class, JobBasedFutureTest.class, JobExecutorServiceTest.class, + TransactionHelperTest.class, +}) +/** + * Suite Class for all tests in the plugin + */ +public class AllTests { + // Junit 4 Test suite +} diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/AdapterUtilsTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/AdapterUtilsTest.java index e1951316491..e1951316491 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/AdapterUtilsTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/AdapterUtilsTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/JobBasedFutureTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/JobBasedFutureTest.java index 5047dd18394..5047dd18394 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/JobBasedFutureTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/JobBasedFutureTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/JobExecutorServiceTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/JobExecutorServiceTest.java index 2259848c31f..2259848c31f 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/JobExecutorServiceTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/JobExecutorServiceTest.java diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/TransactionHelperTest.java b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/TransactionHelperTest.java index 6499866a806..6499866a806 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/TransactionHelperTest.java +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/utils/TransactionHelperTest.java diff --git a/tests/junit/plugins/infra/core/pom.xml b/tests/junit/plugins/infra/core/pom.xml new file mode 100755 index 00000000000..311004b223a --- /dev/null +++ b/tests/junit/plugins/infra/core/pom.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.core.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for the core functions of Papyrus.</description> + + <modules> + <module>org.eclipse.papyrus.infra.core.suite.tests</module> + <module>org.eclipse.papyrus.infra.core.clipboard.tests</module> + <module>org.eclipse.papyrus.infra.core.sasheditor.di.tests</module> + <module>org.eclipse.papyrus.infra.core.sasheditor.tests</module> + <module>org.eclipse.papyrus.infra.core.tests</module> + </modules> + +</project> diff --git a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/pom.xml b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/pom.xml index 39b810bbe75..c1270a8a6a3 100644 --- a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/pom.xml +++ b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.editor.welcome.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/editor/pom.xml b/tests/junit/plugins/infra/editor/pom.xml new file mode 100755 index 00000000000..897e69243e6 --- /dev/null +++ b/tests/junit/plugins/infra/editor/pom.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.editor.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for the Papyrus infra editor welcome</description> + + <modules> + <module>org.eclipse.papyrus.infra.editor.welcome.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/pom.xml b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/pom.xml index 700df4b93e3..af700410e6a 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/pom.xml +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.emf.gmf.tests</artifactId> <version>1.2.100-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml index a253e1efa1c..831bf2842ea 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.emf.readonly.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml index 84adf7aa7c5..ea0b4ad61b2 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.emf.tests</artifactId> <version>1.4.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/tests/AllTests.java b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/tests/AllTests.java index 46aa80c3609..887de618d7d 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/tests/AllTests.java +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/tests/AllTests.java @@ -24,6 +24,8 @@ import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurati import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.eclipse.papyrus.junit.framework.runner.Headless; import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.rules.Timeout; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; @@ -46,6 +48,8 @@ import org.junit.runners.Suite.SuiteClasses; WorkspaceModelIndexTest.class, }) public class AllTests { + @ClassRule + public static Timeout timeout = Timeout.seconds(300); public AllTests() { super(); diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/pom.xml b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/pom.xml index 61532094d16..713aaabd369 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/pom.xml +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.ui.emf.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/emf/pom.xml b/tests/junit/plugins/infra/emf/pom.xml new file mode 100755 index 00000000000..b3991f09d33 --- /dev/null +++ b/tests/junit/plugins/infra/emf/pom.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.emf.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for infra emf</description> + + <modules> + <module>org.eclipse.papyrus.infra.emf.gmf.tests</module> + <module>org.eclipse.papyrus.infra.emf.readonly.tests</module> + <module>org.eclipse.papyrus.infra.emf.tests</module> + <module>org.eclipse.papyrus.infra.ui.emf.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/pom.xml index f70872f424d..5f8c2a61b49 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../../releng/main-tests/pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant.tests</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/pom.xml index 0be1e977aeb..9a940512225 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.canonical.tests</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml index b443c541512..698cf893d83 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.commands.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml index 889089da13b..3194a3d3814 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.common.tests</artifactId> <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/pom.xml index f1e0eb056d2..5cd726981f8 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.css.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/pom.xml index 3ee4ce1789d..40d2c5a063f 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.menu.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/pom.xml index 018e9119426..dec5771eeeb 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.welcome.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/gmfdiag/pom.xml b/tests/junit/plugins/infra/gmfdiag/pom.xml new file mode 100755 index 00000000000..a865dfac7cc --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/pom.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.gmfdiag.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for infra gmfdiag</description> + + <modules> + <module>org.eclipse.papyrus.infra.gmfdiag.commands.tests</module> + <module>org.eclipse.papyrus.infra.gmfdiag.common.tests</module> + <module>org.eclipse.papyrus.infra.gmfdiag.canonical.tests</module> + <module>org.eclipse.papyrus.infra.gmfdiag.welcome.tests</module> + <module>org.eclipse.papyrus.infra.gmfdiag.css.tests</module> + <module>org.eclipse.papyrus.infra.gmfdiag.menu.tests</module> + <module>assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/pom.xml b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/pom.xml index 449bc4da548..ef7fa0162ee 100644 --- a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/pom.xml +++ b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/pom.xml @@ -3,11 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.internationalization.main.test</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.internationalization.tests</artifactId> <version>1.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> + <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/infra/internationalization/pom.xml b/tests/junit/plugins/infra/internationalization/pom.xml index f4e2d1997d3..d36c1dabd1b 100644 --- a/tests/junit/plugins/infra/internationalization/pom.xml +++ b/tests/junit/plugins/infra/internationalization/pom.xml @@ -2,17 +2,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../../../../../releng/main-tests/pom.xml</relativePath> - </parent> - <groupId>org.eclipse.papyrus</groupId> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.internationalization.main.test</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Papyrus Internationalization Test for Infra</name> <description>Papyrus Internationalization are a set of plugins dedicated to manage internationalization labels and languages in relation with models.</description> <modules> diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/pom.xml index db1adb44cd2..0fb8b958958 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/pom.xml +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.nattable.main.test</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.nattable.common.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/pom.xml index 40eb3423fd1..10c726069db 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/pom.xml +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.infra.nattable.main.test</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.nattable.main.test</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.nattable.model.editor.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/pom.xml index a4fd81c0be2..5d2664b5c87 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/pom.xml +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.infra.nattable.main.test</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.nattable.main.test</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.nattable.model.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.classpath b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.classpath new file mode 100755 index 00000000000..83be1d9f78c --- /dev/null +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="test"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.project b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.project new file mode 100755 index 00000000000..27b3850f426 --- /dev/null +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.nattable.suite.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/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 00000000000..b3aa6d60f94 --- /dev/null +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,291 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.settings/org.eclipse.jdt.ui.prefs index 954281dbc31..954281dbc31 100644..100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/.settings/org.eclipse.jdt.ui.prefs +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.settings/org.eclipse.jdt.ui.prefs diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF new file mode 100755 index 00000000000..7d799feec97 --- /dev/null +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF @@ -0,0 +1,22 @@ +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.nattable.suite.tests.Activator +Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.suite.tests +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", + org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", + org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.nattable.common.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.nattable.model.editor.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.nattable.model.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.nattable.tests;bundle-version="1.2.0", + org.eclipse.papyrus.editor.integration.tests;bundle-version="1.2.0" +
\ No newline at end of file diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/Papyrus Nattable Infra tests.launch b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/Papyrus Nattable Infra tests.launch new file mode 100755 index 00000000000..b431c5321b2 --- /dev/null +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/Papyrus Nattable Infra tests.launch @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus Nattable Infra tests"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-nattableinfra-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.papyrus.infra.nattable.suite.tests/test/org/eclipse/papyrus/infra/nattable/suite/tests/AllTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="skip.long.junit.tests" value="false"/> +</mapAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.nattable.suite.tests.AllTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.nattable.suite.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:SoftRefLRUPolicyMSPerMB=100 -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="true"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="true"/> +<booleanAttribute key="useProduct" value="true"/> +<stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/> +</launchConfiguration> diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/about.html b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/about.html new file mode 100755 index 00000000000..d35d5aed64c --- /dev/null +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("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/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/build.properties b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/build.properties new file mode 100755 index 00000000000..5d52f5264f2 --- /dev/null +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/build.properties @@ -0,0 +1,7 @@ +source.. = test/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties,\ + about.html,\ + Papyrus Nattable Infra tests.launch diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/plugin.properties b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/plugin.properties new file mode 100755 index 00000000000..0c6f3ed69f6 --- /dev/null +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/plugin.properties @@ -0,0 +1,12 @@ +################################################################################# +# Copyright (c) 2008 CEA LIST. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation +################################################################################## +pluginName=Infra nattable Tests suite for Papyrus +providerName=Eclipse Modeling Project diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/pom.xml new file mode 100755 index 00000000000..3927949f52f --- /dev/null +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> + <version>1.2.0-SNAPSHOT</version> + <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.nattable.suite.tests</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> + <testFailureIgnore>true</testFailureIgnore> + <product>org.eclipse.sdk.ide</product> + <!-- If a specific <argLine> is required here, make sure to include JaCoCo parameters (See parent pom, Bug 478170) --> + <skipTests>${skipAllTests}</skipTests> + <testClass>org.eclipse.papyrus.infra.nattable.suite.tests.AllTests</testClass> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>p2-installable-unit</type> + <id>org.eclipse.sdk.feature.group</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.papyrus.sdk.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/test/org/eclipse/papyrus/infra/nattable/suite/tests/Activator.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/test/org/eclipse/papyrus/infra/nattable/suite/tests/Activator.java new file mode 100755 index 00000000000..38dd524f0ff --- /dev/null +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/test/org/eclipse/papyrus/infra/nattable/suite/tests/Activator.java @@ -0,0 +1,54 @@ +package org.eclipse.papyrus.infra.nattable.suite.tests; + +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.nattable.suite.tests"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @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/suites/org.eclipse.papyrus.tests.diagramassistants/src/org/eclipse/papyrus/tests/diagramassistants/AllTests.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/test/org/eclipse/papyrus/infra/nattable/suite/tests/AllTests.java index 9ca38bb8ff8..75b77a1367c 100644..100755 --- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/src/org/eclipse/papyrus/tests/diagramassistants/AllTests.java +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/test/org/eclipse/papyrus/infra/nattable/suite/tests/AllTests.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2015 Christian W. Damus and others. + * Copyright (c) 2010, 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 @@ -7,13 +7,14 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Christian W. Damus - Initial API and implementation + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993 + * Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220, 488791, 496598, 508629 * *****************************************************************************/ -package org.eclipse.papyrus.tests.diagramassistants; +package org.eclipse.papyrus.infra.nattable.suite.tests; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner; @@ -24,7 +25,7 @@ import org.junit.runner.RunWith; /** - * Test suite for all Diagram Assistants tests for Papyrus. + * Test class for all tests for Papyrus */ @RunWith(AllTestsRunner.class) public class AllTests { @@ -32,24 +33,20 @@ public class AllTests { @SuiteSpot public static final List<ITestSuiteClass> suiteClasses; + /** list of classes to launch */ static { - suiteClasses = new ArrayList<ITestSuiteClass>(); + suiteClasses = new ArrayList<>(); - // Basic bundle metadata tests (always want to cover the plug-ins we're testing in the suite) - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.bundles.tests.AllTests.class)); + /* **************** plugins *********************** */ - // Infrastructure layer - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.filters.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.assistant.tests.AllTests.class)); + /* nattable tests */ + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.views.tests.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.common.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.model.editor.tests.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.model.tests.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.tests.tests.AllTests.class)); - // UML layer - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.filters.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.assistants.generator.tests.AllTests.class)); - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.types.generator.tests.AllTests.class)); + // end } - public static void appendTo(Collection<? super ITestSuiteClass> suite) { - // Don't include the bundles tests, which the suite we're appending to should already have - suite.addAll(suiteClasses.subList(1, suiteClasses.size())); - } } diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/pom.xml index 430e5a5392c..e94d2b21e59 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/pom.xml +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.infra.nattable.main.test</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.nattable.main.test</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.nattable.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml index a99557ff02b..9fb72360fb0 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.infra.nattable.main.test</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.nattable.main.test</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.nattable.views.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/nattable/pom.xml b/tests/junit/plugins/infra/nattable/pom.xml index bf083e8fb2d..651938aa0b3 100755 --- a/tests/junit/plugins/infra/nattable/pom.xml +++ b/tests/junit/plugins/infra/nattable/pom.xml @@ -2,20 +2,19 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../../../../../releng/main-tests/pom.xml</relativePath> - </parent> - <groupId>org.eclipse.papyrus</groupId> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.nattable.main.test</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Papyrus Nattable Test for Infra</name> <description>Papyrus Nattable are a set of plugins dedicated to manage tables in relation with models.</description> <modules> + <module>org.eclipse.papyrus.infra.nattable.suite.tests</module> <module>org.eclipse.papyrus.infra.nattable.common.tests</module> <module>org.eclipse.papyrus.infra.nattable.model.editor.tests</module> <module>org.eclipse.papyrus.infra.nattable.model.tests</module> diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/pom.xml b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/pom.xml index bf51ed31262..40941e65d7e 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/pom.xml +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../releng/main-tests/pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.filters.tests</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/pom.xml b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/pom.xml index ea118d3d67b..a436ca79fa3 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/pom.xml +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../releng/main-tests/pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.newchild.tests</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.classpath b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.classpath new file mode 100755 index 00000000000..83be1d9f78c --- /dev/null +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="test"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.project b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.project new file mode 100755 index 00000000000..5036f805a9c --- /dev/null +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.suite.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/org.eclipse.papyrus.infra.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 00000000000..b3aa6d60f94 --- /dev/null +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,291 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.settings/org.eclipse.jdt.ui.prefs new file mode 100755 index 00000000000..954281dbc31 --- /dev/null +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,68 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_redundant_type_arguments=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_type_arguments=false +cleanup_profile=_Papyrus +cleanup_settings_version=2 +eclipse.preferences.version=1 +formatter_profile=_Papyrus +formatter_settings_version=12 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF new file mode 100755 index 00000000000..1d49e96a703 --- /dev/null +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF @@ -0,0 +1,42 @@ +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.suite.tests.Activator +Bundle-SymbolicName: org.eclipse.papyrus.infra.suite.tests +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", + org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", + org.eclipse.papyrus.infra.tools.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.ui.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.services.edit.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.services.edit.ui.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.services.labelprovider.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.services.semantic.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.emf.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.emf.gmf.tests;bundle-version="1.2.1", + org.eclipse.papyrus.infra.ui.emf.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.types.tests;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.types.ui.tests;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.common.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.canonical.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.emf.readonly.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.viewpoints.configuration.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.editor.welcome.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.welcome.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.properties.ui.tests;bundle-version="1.2.1", + org.eclipse.papyrus.infra.filters.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.assistant.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.services.resourceloading.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.menu.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.internationalization.tests;bundle-version="1.0.0" +
\ No newline at end of file diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus Core tests (no SysML).launch b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/Papyrus Infra tests.launch index 037287cb364..d466c958755 100644..100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus Core tests (no SysML).launch +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/Papyrus Infra tests.launch @@ -8,12 +8,12 @@ <booleanAttribute key="clearConfig" value="true"/> <booleanAttribute key="clearws" value="true"/> <booleanAttribute key="clearwslog" value="false"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus Core tests (no SysML)"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus Infra tests"/> <booleanAttribute key="default" value="true"/> <booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../junit-all-workspace"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-infra-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java"/> +<listEntry value="/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/AllTests.java"/> </listAttribute> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> <listEntry value="1"/> @@ -27,11 +27,11 @@ <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllTests"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.suite.tests.AllTests"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.suite.tests"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms512m -Xmx768m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=512M -Dno.SysML.tests -XX:SoftRefLRUPolicyMSPerMB=100 -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:SoftRefLRUPolicyMSPerMB=100 -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.platform.ide"/> <booleanAttribute key="run_in_ui_thread" value="true"/> diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/about.html b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/about.html new file mode 100755 index 00000000000..d35d5aed64c --- /dev/null +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("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/org.eclipse.papyrus.infra.suite.tests/build.properties b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/build.properties new file mode 100755 index 00000000000..ed4d71c5417 --- /dev/null +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/build.properties @@ -0,0 +1,7 @@ +source.. = test/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties,\ + about.html,\ + Papyrus Infra tests.launch diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/plugin.properties b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/plugin.properties new file mode 100755 index 00000000000..aeddeca0fe0 --- /dev/null +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/plugin.properties @@ -0,0 +1,12 @@ +################################################################################# +# Copyright (c) 2008 CEA LIST. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation +################################################################################## +pluginName=Infra Tests suite for Papyrus +providerName=Eclipse Modeling Project diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/pom.xml b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/pom.xml new file mode 100755 index 00000000000..f7bc1c8b0e6 --- /dev/null +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> + <version>1.2.0-SNAPSHOT</version> + <relativePath>../../../../../releng/main-tests/pom.xml</relativePath> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.suite.tests</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> + <testFailureIgnore>true</testFailureIgnore> + <product>org.eclipse.sdk.ide</product> + <!-- If a specific <argLine> is required here, make sure to include JaCoCo parameters (See parent pom, Bug 478170) --> + <skipTests>${skipAllTests}</skipTests> + <testClass>org.eclipse.papyrus.infra.suite.tests.AllTests</testClass> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>p2-installable-unit</type> + <id>org.eclipse.sdk.feature.group</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.papyrus.sdk.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/Activator.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/Activator.java new file mode 100755 index 00000000000..27ed2e31ccf --- /dev/null +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/Activator.java @@ -0,0 +1,54 @@ +package org.eclipse.papyrus.infra.suite.tests; + +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.suite.tests"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @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/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/AllTests.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/AllTests.java new file mode 100755 index 00000000000..e08f06891bf --- /dev/null +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/AllTests.java @@ -0,0 +1,78 @@ +/***************************************************************************** + * Copyright (c) 2010, 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: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993 + * Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220, 488791, 496598, 508629 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.suite.tests; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner; +import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.SuiteSpot; +import org.junit.runner.RunWith; + + +/** + * Test class for all tests for Papyrus + */ +@RunWith(AllTestsRunner.class) +public class AllTests { + + @SuiteSpot + public static final List<ITestSuiteClass> suiteClasses; + + /** list of classes to launch */ + static { + suiteClasses = new ArrayList<>(); + + /* **************** plugins *********************** */ + + /* infra */ + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.tools.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.ui.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.edit.tests.suites.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.edit.ui.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.labelprovider.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.semantic.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.emf.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.emf.gmf.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.ui.emf.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.types.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.types.ui.tests.AllTests.class)); + // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.openelement.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.commands.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.common.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.canonical.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.emf.readonly.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.viewpoints.configuration.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.editor.welcome.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.welcome.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.properties.ui.tests.AllTests.class)); + + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.filters.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.assistant.tests.AllTests.class)); + + // FIXME: Workaround for Bug 441246: Move the ResourceLoading tests after EditorReloadTest, since they are currently conflicting + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.resourceloading.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.controlmode.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.menu.tests.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.css.tests.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.internationalization.tests.tests.AllTests.class)); + + + // end + } + +} diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml index 9d4eab4e7f2..979fcfa7235 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.tools.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/pom.xml b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/pom.xml index f79e3c87f9a..52afb32b032 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/pom.xml +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.ui.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/pom.xml b/tests/junit/plugins/infra/pom.xml new file mode 100755 index 00000000000..fd160fe2587 --- /dev/null +++ b/tests/junit/plugins/infra/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.plugins.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for the infra functions of Papyrus.</description> + + <modules> + <!-- Suites --> + <module>core</module> + <module>nattable</module> + <module>org.eclipse.papyrus.infra.suite.tests</module> + + <!-- Children --> + <module>editor</module> + <module>emf</module> + <module>gmfdiag</module> + <module>internationalization</module> + <module>properties</module> + <module>services</module> + <module>types</module> + <module>viewpoints</module> + + <!-- Standalone Plugins --> + <module>org.eclipse.papyrus.infra.filters.tests</module> + <module>org.eclipse.papyrus.infra.newchild.tests</module> + <module>org.eclipse.papyrus.infra.tools.tests</module> + <module>org.eclipse.papyrus.infra.ui.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/pom.xml b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/pom.xml index dde5b0fccb2..e5ba074f348 100644 --- a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/pom.xml +++ b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.properties.ui.tests</artifactId> <version>1.2.1-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/properties/pom.xml b/tests/junit/plugins/infra/properties/pom.xml new file mode 100755 index 00000000000..cd45a90fdd7 --- /dev/null +++ b/tests/junit/plugins/infra/properties/pom.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.properties.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for the Papyrus infra editor welcome</description> + + <modules> + <module>org.eclipse.papyrus.infra.properties.ui.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml index ac0785e925e..7fddc625f53 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.services.controlmode.tests</artifactId> <version>1.4.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/pom.xml index bb99634613b..ef8447b64b1 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/pom.xml +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.services.edit.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/pom.xml index 74980bbe827..8edc1a8baaf 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/pom.xml +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.services.edit.ui.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/pom.xml index a4474cf8d7e..90b6c9dc02c 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/pom.xml +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.services.labelprovider.tests</artifactId> <version>1.2.1-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/pom.xml index 3a73da7f809..a7b3bea4eab 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/pom.xml +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.services.resourceloading.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/pom.xml index 0ba7e7ab031..890db16e163 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/pom.xml +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.services.semantic.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/services/pom.xml b/tests/junit/plugins/infra/services/pom.xml new file mode 100755 index 00000000000..d8890d44d12 --- /dev/null +++ b/tests/junit/plugins/infra/services/pom.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.services.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for infra services</description> + + <modules> + <module>org.eclipse.papyrus.infra.services.edit.tests</module> + <module>org.eclipse.papyrus.infra.services.edit.ui.tests</module> + <module>org.eclipse.papyrus.infra.services.labelprovider.tests</module> + <module>org.eclipse.papyrus.infra.services.semantic.tests</module> + <module>org.eclipse.papyrus.infra.services.resourceloading.tests</module> + <module>org.eclipse.papyrus.infra.services.controlmode.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/pom.xml b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/pom.xml index 316b3990cec..0e8154b6603 100644 --- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/pom.xml +++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.types.tests</artifactId> <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/pom.xml b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/pom.xml index 3be8d33e596..76e240e28a4 100644 --- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/pom.xml +++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.types.ui.tests</artifactId> <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/infra/types/pom.xml b/tests/junit/plugins/infra/types/pom.xml new file mode 100755 index 00000000000..22cf28ff9b0 --- /dev/null +++ b/tests/junit/plugins/infra/types/pom.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.types.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for infra types model-driven types to the GMF Run-time Element-Types registry.</description> + + <modules> + <module>org.eclipse.papyrus.infra.types.tests</module> + <module>org.eclipse.papyrus.infra.types.ui.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/pom.xml b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/pom.xml index b5a333556e9..58000c6c040 100644 --- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/pom.xml +++ b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/pom.xml @@ -8,6 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.viewpoints.configuration.tests</artifactId> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/pom.xml b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/pom.xml index 85d4b481b74..cb501bbbda0 100644 --- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/pom.xml +++ b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/pom.xml @@ -8,6 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.viewpoints.policy.tests</artifactId> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/infra/viewpoints/pom.xml b/tests/junit/plugins/infra/viewpoints/pom.xml new file mode 100755 index 00000000000..b93b4e0a0bc --- /dev/null +++ b/tests/junit/plugins/infra/viewpoints/pom.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.infra.viewpoints.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for infra viewpoints role-based viewpoints customizing the UI experience.</description> + + <modules> + <module>org.eclipse.papyrus.infra.viewpoints.configuration.tests</module> + <module>org.eclipse.papyrus.infra.viewpoints.policy.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/org.eclipse.papyrus.tests/.classpath b/tests/junit/plugins/org.eclipse.papyrus.tests/.classpath new file mode 100644 index 00000000000..83be1d9f78c --- /dev/null +++ b/tests/junit/plugins/org.eclipse.papyrus.tests/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="test"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.project b/tests/junit/plugins/org.eclipse.papyrus.tests/.project index 979bedcae53..7bd1c9ed448 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.project +++ b/tests/junit/plugins/org.eclipse.papyrus.tests/.project @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.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.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/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..b3aa6d60f94 --- /dev/null +++ b/tests/junit/plugins/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,291 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000000..954281dbc31 --- /dev/null +++ b/tests/junit/plugins/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,68 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_redundant_type_arguments=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_type_arguments=false +cleanup_profile=_Papyrus +cleanup_settings_version=2 +eclipse.preferences.version=1 +formatter_profile=_Papyrus +formatter_settings_version=12 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF index 06836d338ba..910f3472ecd 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF @@ -1,13 +1,37 @@ +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.100.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.tests.Activator +Bundle-SymbolicName: org.eclipse.papyrus.tests +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", + org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", + org.eclipse.papyrus.bundles.tests;bundle-version="1.2.0", + org.eclipse.papyrus.eclipse.project.editors.tests;bundle-version="2.0.0", + org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.2.0", + org.eclipse.papyrus.editor.integration.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.services.resourceloading.tests;bundle-version="1.2.0", + org.eclipse.papyrus.search.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.menu.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.profile.drafter.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.alf.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.internationalization.tests;bundle-version="1.0.0", + org.eclipse.papyrus.uml.internationalization.tests;bundle-version="1.0.0", + org.eclipse.papyrus.uml.internationalization.controlmode.tests;bundle-version="1.0.0", + org.eclipse.papyrus.infra.emf.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.resourceloading.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.service.types.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.diagram.clazz.tests;bundle-version="1.2.0", - org.eclipse.papyrus.bundles.tests;bundle-version="1.2.0", - org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.diagram.deployment.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.diagram.component.tests;bundle-version="1.2.0", @@ -17,16 +41,12 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.uml.diagram.dnd.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.tests;bundle-version="1.2.0", org.eclipse.papyrus.infra.core.tests;bundle-version="1.2.0", org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="1.2.0", org.eclipse.papyrus.infra.core.sasheditor.di.tests;bundle-version="1.2.0", org.eclipse.papyrus.infra.services.labelprovider.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.diagram.timing.tests;bundle-version="1.2.0", - org.eclipse.papyrus.editor.integration.tests;bundle-version="1.2.0", - org.eclipse.papyrus.search.tests;bundle-version="1.2.0", - org.junit;bundle-version="4.10.0", org.eclipse.papyrus.uml.tools.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.tools.utils.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.nattable.tests;bundle-version="1.2.0", @@ -35,7 +55,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.2.0", org.eclipse.papyrus.infra.types.tests;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.gmfdiag.commands.tests;bundle-version="1.2.0", org.eclipse.papyrus.infra.emf.readonly.tests;bundle-version="1.2.0", @@ -45,10 +64,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.uml.modelrepair.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.profile.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.diagram.profile.tests;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="1.2.0", - org.eclipse.papyrus.junit.framework;bundle-version="1.2.0", org.eclipse.papyrus.infra.nattable.tests;bundle-version="1.2.0", - org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.nattable.generic.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="1.2.0", @@ -57,12 +73,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.uml.textedit.parameter.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.decoratormodel.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.menu.tests;bundle-version="1.2.0", org.eclipse.papyrus.infra.nattable.model.tests;bundle-version="1.2.0", - org.eclipse.papyrus.tests.diagramassistants;bundle-version="1.2.0", - org.eclipse.papyrus.uml.profile.drafter.tests;bundle-version="1.2.0", org.eclipse.papyrus.infra.gmfdiag.canonical.tests;bundle-version="1.2.0", - org.eclipse.papyrus.uml.alf.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.textedit.valuespecification.tests;bundle-version="1.2.0", org.eclipse.papyrus.infra.viewpoints.configuration.tests;bundle-version="1.2.0", org.eclipse.papyrus.infra.core.clipboard.tests;bundle-version="1.2.0", @@ -80,18 +92,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.types.ui.tests;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.services.semantic.tests;bundle-version="1.2.0", org.eclipse.papyrus.uml.service.types.ui.tests;bundle-version="1.2.0", - org.eclipse.papyrus.eclipse.project.editors.tests;bundle-version="2.0.0", org.eclipse.papyrus.infra.emf.gmf.tests;bundle-version="1.2.1", - org.eclipse.papyrus.infra.internationalization.tests;bundle-version="1.0.0", - org.eclipse.papyrus.infra.properties.ui.tests;bundle-version="1.2.1", - org.eclipse.papyrus.uml.internationalization.tests;bundle-version="1.0.0", - org.eclipse.papyrus.uml.internationalization.controlmode.tests;bundle-version="1.0.0" -Bundle-Vendor: %providerName -Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.100.qualifier -Bundle-Name: %pluginName -Bundle-Localization: plugin -Bundle-ManifestVersion: 2 -Bundle-Activator: org.eclipse.papyrus.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.tests -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + org.eclipse.papyrus.infra.properties.ui.tests;bundle-version="1.2.1" + diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests.launch b/tests/junit/plugins/org.eclipse.papyrus.tests/Papyrus ALL tests.launch index 003a1121a7d..34e079c82d8 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests.launch +++ b/tests/junit/plugins/org.eclipse.papyrus.tests/Papyrus ALL tests.launch @@ -1,45 +1,45 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus ALL tests"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-all-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="skip.long.junit.tests" value="false"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:SoftRefLRUPolicyMSPerMB=100 -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="true"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus ALL tests"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-all-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="skip.long.junit.tests" value="false"/> +</mapAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:SoftRefLRUPolicyMSPerMB=100 -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="true"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="true"/> +<booleanAttribute key="useProduct" value="true"/> +<stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/> +</launchConfiguration> diff --git a/tests/junit/plugins/org.eclipse.papyrus.tests/about.html b/tests/junit/plugins/org.eclipse.papyrus.tests/about.html new file mode 100644 index 00000000000..d35d5aed64c --- /dev/null +++ b/tests/junit/plugins/org.eclipse.papyrus.tests/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("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/core/org.eclipse.papyrus.tests/build.properties b/tests/junit/plugins/org.eclipse.papyrus.tests/build.properties index 2b4b9065052..3dce0b4a4cf 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/build.properties +++ b/tests/junit/plugins/org.eclipse.papyrus.tests/build.properties @@ -1,7 +1,7 @@ -source.. = test/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- about.html,\
- Papyrus ALL tests.launch
+source.. = test/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties,\ + about.html,\ + Papyrus ALL tests.launch diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/plugin.properties b/tests/junit/plugins/org.eclipse.papyrus.tests/plugin.properties index 10f46ee5911..79c74513d13 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/plugin.properties +++ b/tests/junit/plugins/org.eclipse.papyrus.tests/plugin.properties @@ -1,12 +1,12 @@ -#################################################################################
-# Copyright (c) 2008 CEA LIST.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
-##################################################################################
-pluginName=Tests for Papyrus
-providerName=Eclipse Modeling Project
+################################################################################# +# Copyright (c) 2008 CEA LIST. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation +################################################################################## +pluginName=Tests for Papyrus +providerName=Eclipse Modeling Project diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml b/tests/junit/plugins/org.eclipse.papyrus.tests/pom.xml index 85e599fe707..03e6487f2a8 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml +++ b/tests/junit/plugins/org.eclipse.papyrus.tests/pom.xml @@ -7,9 +7,9 @@ <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../../../../../releng/main-tests/pom.xml</relativePath> + <relativePath>../../../../releng/main-tests/pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.tests</artifactId> <version>1.2.100-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -24,8 +24,8 @@ <useUIThread>true</useUIThread> <testFailureIgnore>true</testFailureIgnore> <product>org.eclipse.sdk.ide</product> - <!-- If a specific <argLine> is required here, make sure to include JaCoCo parameters (See parent pom, Bug 478170) --> - <skipTests>${skipAllTests}</skipTests> + If a specific <argLine> is required here, make sure to include JaCoCo parameters (See parent pom, Bug 478170) + <skipTests>true</skipTests> <testClass>org.eclipse.papyrus.tests.AllTests</testClass> </configuration> </plugin> diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/Activator.java b/tests/junit/plugins/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/Activator.java index 7e5f01a0692..87f9b5cd6dc 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/Activator.java +++ b/tests/junit/plugins/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/Activator.java @@ -1,50 +1,50 @@ -package org.eclipse.papyrus.tests;
-
-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.tests"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- 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.tests; + +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.tests"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + 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/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java new file mode 100644 index 00000000000..8bb81014c4e --- /dev/null +++ b/tests/junit/plugins/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java @@ -0,0 +1,55 @@ +/***************************************************************************** + * Copyright (c) 2010, 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: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993 + * Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220, 488791, 496598, 508629 + * + *****************************************************************************/ +package org.eclipse.papyrus.tests; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner; +import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.SuiteSpot; +import org.junit.runner.RunWith; + + +/** + * Test class for all tests for Papyrus + */ +@RunWith(AllTestsRunner.class) +public class AllTests { + + @SuiteSpot + public static final List<ITestSuiteClass> suiteClasses; + + /** list of classes to launch */ + static { + suiteClasses = new ArrayList<>(); + + /* **************** suites *********************** */ + // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.developer.suite.tests.AllTests.class)); + // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.suite.tests.AllTests.class)); + // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.suite.tests.AllTests.class)); + // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.suite.tests.AllTests.class)); + // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.suite.tests.AllTests.class)); + // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.suite.tests.AllTests.class)); + // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.suite.tests.AllTests.class)); + // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.suite.tests.AllTests.class)); + // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.views.suite.tests.AllTests.class)); + + + // end + } + +} diff --git a/tests/junit/plugins/pom.xml b/tests/junit/plugins/pom.xml new file mode 100755 index 00000000000..b57f5424484 --- /dev/null +++ b/tests/junit/plugins/pom.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> + <version>1.2.0-SNAPSHOT</version> + <relativePath>../../../releng/main-tests/pom.xml</relativePath> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.plugins.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>The top container of plug-in projects tests for the main Papyrus distribution.</description> + + <modules> + <!-- Suites --> + <!-- <module>org.eclipse.papyrus.tests</module> --> + + <!-- children --> + <module>developer</module> + <module>editor</module> + <module>infra</module> + <!-- <module>sysml</module> --> + <module>uml</module> + <module>views</module> + + </modules> +</project>
\ No newline at end of file diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/META-INF/MANIFEST.MF b/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/META-INF/MANIFEST.MF deleted file mode 100644 index 6b1e3a8d35a..00000000000 --- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/META-INF/MANIFEST.MF +++ /dev/null @@ -1,21 +0,0 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit;bundle-version="4.11.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.bundles.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.filters.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.filters.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.assistant.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.types.generator.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.assistants.generator.tests;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.tests.diagramassistants
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.tests.diagramassistants
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/Papyrus Diagram Assistants tests.launch b/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/Papyrus Diagram Assistants tests.launch deleted file mode 100644 index 8bf0f4d60a0..00000000000 --- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/Papyrus Diagram Assistants tests.launch +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> -<booleanAttribute key="askclear" value="false"/> -<booleanAttribute key="automaticAdd" value="true"/> -<booleanAttribute key="automaticValidate" value="false"/> -<stringAttribute key="bootstrap" value=""/> -<stringAttribute key="checked" value="[NONE]"/> -<booleanAttribute key="clearConfig" value="true"/> -<booleanAttribute key="clearws" value="true"/> -<booleanAttribute key="clearwslog" value="false"/> -<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS"> -<listEntry value="=org.eclipse.papyrus.uml.profile.assistants.generator/src"/> -<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen"/> -<listEntry value="=org.eclipse.papyrus.uml.filters.edit/src-gen"/> -<listEntry value="=org.eclipse.papyrus.uml.profile.types.generator/src"/> -<listEntry value="=org.eclipse.papyrus.uml.profile.assistants.generator/xtend-gen"/> -<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.assistant.ui/src"/> -<listEntry value="=org.eclipse.papyrus.uml.filters/src"/> -<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.assistant/src"/> -<listEntry value="=org.eclipse.papyrus.infra.filters/src"/> -<listEntry value="=org.eclipse.papyrus.uml.profile.assistants.generator.ui/src"/> -<listEntry value="=org.eclipse.papyrus.infra.filters/src-gen"/> -<listEntry value="=org.eclipse.papyrus.uml.filters/src-gen"/> -<listEntry value="=org.eclipse.papyrus.uml.profile.types.generator/xtend-gen"/> -<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen"/> -<listEntry value="=org.eclipse.papyrus.infra.filters.edit/src-gen"/> -</listAttribute> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus Diagram Assistants tests"/> -<booleanAttribute key="default" value="true"/> -<booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../junit-all-workspace"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.papyrus.tests.diagramassistants/src/org/eclipse/papyrus/tests/diagramassistants/AllTests.java"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<mapAttribute key="org.eclipse.debug.core.environmentVariables"> -<mapEntry key="skip.long.junit.tests" value="false"/> -</mapAttribute> -<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> -<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> -<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> -<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> -<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.diagramassistants.AllTests"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests.diagramassistants"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=512M -XX:SoftRefLRUPolicyMSPerMB=100 -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/> -<stringAttribute key="org.eclipsorg.eclipse.papyrus.tests.diagramassistants.AllDiagramAssistantsTestss.tests.diagramassistants.AllDiagramAssistantsTests" value=""/> -<stringAttribute key="pde.version" value="3.3"/> -<stringAttribute key="product" value="org.eclipse.platform.ide"/> -<booleanAttribute key="run_in_ui_thread" value="true"/> -<booleanAttribute key="show_selected_only" value="false"/> -<booleanAttribute key="tracing" value="true"/> -<booleanAttribute key="useCustomFeatures" value="false"/> -<booleanAttribute key="useDefaultConfig" value="true"/> -<booleanAttribute key="useDefaultConfigArea" value="true"/> -<booleanAttribute key="useProduct" value="true"/> -<stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/> -</launchConfiguration> diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/build.properties b/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/build.properties deleted file mode 100644 index 9d979ed705b..00000000000 --- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/build.properties +++ /dev/null @@ -1,17 +0,0 @@ -# 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 - -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - about.html,\ - plugin.properties -src.includes = about.html diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/documentation.pdoc b/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/documentation.pdoc deleted file mode 100644 index ac57184f163..00000000000 --- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/documentation.pdoc +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Automated test suite for everything related to Diagram Assistants in Papyrus."> - <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="independent"/> -</doc:Documentation> diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/plugin.properties b/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/plugin.properties deleted file mode 100644 index 95e53e51387..00000000000 --- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/plugin.properties +++ /dev/null @@ -1,12 +0,0 @@ -# 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 - -pluginName=Diagram Assistants Test Suite -providerName=Eclipse Modeling Project diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/pom.xml b/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/pom.xml deleted file mode 100644 index 2b60219f140..00000000000 --- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../../../../../releng/main-tests</relativePath> - </parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.tests.diagramassistants</artifactId> - <version>1.2.0-SNAPSHOT</version> - <packaging>eclipse-test-plugin</packaging> -</project> diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/pom.xml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/pom.xml index 41814dcbe4f..0bf8516d10d 100644 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/pom.xml +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>1.1.0-SNAPSHOT</version> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> + <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.alf.backend.tests</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.1.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> + <packaging>eclipse-test-plugin</packaging> <build> <plugins> <plugin> diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/pom.xml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/pom.xml index b413fe3acf4..531671a81da 100644 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/pom.xml +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.alf.tests</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.2.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> + <packaging>eclipse-test-plugin</packaging> <build> <plugins> <plugin> diff --git a/tests/junit/plugins/uml/alf/pom.xml b/tests/junit/plugins/uml/alf/pom.xml new file mode 100755 index 00000000000..0bff009d388 --- /dev/null +++ b/tests/junit/plugins/uml/alf/pom.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.alf.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for the Papyrus uml alf</description> + + <modules> + <module>org.eclipse.papyrus.uml.alf.backend.tests</module> + <module>org.eclipse.papyrus.uml.alf.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/pom.xml b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/pom.xml index 1ec8f409a49..1f96ae3102e 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/pom.xml +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.profile.assistants.generator.tests</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/pom.xml b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/pom.xml index 3b3ba179c7f..42d7322bb77 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/pom.xml +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.profile.types.generator.tests</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/assistants/pom.xml b/tests/junit/plugins/uml/assistants/pom.xml new file mode 100755 index 00000000000..2d999dd948c --- /dev/null +++ b/tests/junit/plugins/uml/assistants/pom.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.assistants.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for the Papyrus uml assistants</description> + + <modules> + <module>org.eclipse.papyrus.uml.profile.assistants.generator.tests</module> + <!-- <module>org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests</module> --> + <module>org.eclipse.papyrus.uml.profile.types.generator.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/pom.xml b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/pom.xml index fc45da3173e..043329316cc 100644 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/pom.xml +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.decoratormodel.controlmode.tests</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/pom.xml b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/pom.xml index be027d2e8a5..49c74abe6c8 100644 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/pom.xml +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.decoratormodel.tests</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/decoratormodel/pom.xml b/tests/junit/plugins/uml/decoratormodel/pom.xml new file mode 100755 index 00000000000..9d9ece1c5f8 --- /dev/null +++ b/tests/junit/plugins/uml/decoratormodel/pom.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.decoratormodel.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for uml decoratormodel</description> + + <modules> + <module>org.eclipse.papyrus.uml.decoratormodel.controlmode.tests</module> + <module>org.eclipse.papyrus.uml.decoratormodel.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml index 9f8a966aa29..e6c99eb5883 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml @@ -4,12 +4,11 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.activity.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/pom.xml index f9547c077da..bf476b755ec 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/pom.xml @@ -4,12 +4,11 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.clazz.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/pom.xml index e6bce3c52eb..92a4f8acb91 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.common.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml index 3023e4c07bf..e82b6157d66 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml @@ -4,12 +4,11 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.communication.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/pom.xml index f16c1980774..e3f118afe12 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/pom.xml @@ -4,12 +4,11 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.component.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/pom.xml index 52c535b0acc..b03a25f7a61 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/pom.xml @@ -4,12 +4,11 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.composite.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/pom.xml index 5306014ed85..53766957efc 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/pom.xml @@ -4,12 +4,11 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.deployment.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/pom.xml index 342c0485e74..9258d7bbe8d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.dnd.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml index 19634321675..ffc5e147617 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.interactionoverview.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/pom.xml index d7b8944f0b6..247f0a70dec 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/pom.xml index 1d2e8fdc8e2..ff3ed8bfa6b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/pom.xml @@ -4,12 +4,11 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.profile.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/pom.xml index d0fb4cf0017..237546181bd 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/pom.xml @@ -4,12 +4,11 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.sequence.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml index a54a60abda5..55b4d1ce36b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml @@ -4,12 +4,11 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.statemachine.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/pom.xml index 48778d527b5..7ca7582d612 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.classpath new file mode 100755 index 00000000000..83be1d9f78c --- /dev/null +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="test"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.project b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.project new file mode 100755 index 00000000000..81f9a5a19f8 --- /dev/null +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.suite.tests</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 00000000000..b3aa6d60f94 --- /dev/null +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,291 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.settings/org.eclipse.jdt.ui.prefs new file mode 100755 index 00000000000..954281dbc31 --- /dev/null +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,68 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_redundant_type_arguments=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_type_arguments=false +cleanup_profile=_Papyrus +cleanup_settings_version=2 +eclipse.preferences.version=1 +formatter_profile=_Papyrus +formatter_settings_version=12 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF new file mode 100755 index 00000000000..50dbda00504 --- /dev/null +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF @@ -0,0 +1,32 @@ +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.uml.diagram.suite.tests.Activator +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.suite.tests +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", + org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.clazz.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.deployment.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.component.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.timing.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.usecase.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.statemachine.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.communication.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.profile.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.canonical.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="1.2.0" diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/Papyrus Diagram UML tests.launch b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/Papyrus Diagram UML tests.launch new file mode 100755 index 00000000000..d8ee69ffc14 --- /dev/null +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/Papyrus Diagram UML tests.launch @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus Diagram UML tests"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-diagramuml-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.papyrus.uml.diagram.suite.tests/test/org/eclipse/papyrus/uml/diagram/suite/tests/AllTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="skip.long.junit.tests" value="false"/> +</mapAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.diagram.suite.tests.AllTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.diagram.suite.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:SoftRefLRUPolicyMSPerMB=100 -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="true"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="true"/> +<booleanAttribute key="useProduct" value="true"/> +<stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/> +</launchConfiguration> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/about.html new file mode 100755 index 00000000000..d35d5aed64c --- /dev/null +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("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/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/build.properties new file mode 100755 index 00000000000..b127aabc6c0 --- /dev/null +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/build.properties @@ -0,0 +1,7 @@ +source.. = test/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties,\ + about.html,\ + Papyrus Diagram UML tests.launch diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/plugin.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/plugin.properties new file mode 100755 index 00000000000..cf924bafe23 --- /dev/null +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/plugin.properties @@ -0,0 +1,12 @@ +################################################################################# +# Copyright (c) 2008 CEA LIST. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation +################################################################################## +pluginName=UML diagram Tests suite for Papyrus +providerName=Eclipse Modeling Project diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/pom.xml new file mode 100755 index 00000000000..747cb9f453d --- /dev/null +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> + <version>1.2.0-SNAPSHOT</version> + <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.diagram.suite.tests</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> + <testFailureIgnore>true</testFailureIgnore> + <product>org.eclipse.sdk.ide</product> + <!-- If a specific <argLine> is required here, make sure to include JaCoCo parameters (See parent pom, Bug 478170) --> + <skipTests>${skipAllTests}</skipTests> + <testClass>org.eclipse.papyrus.uml.diagram.suite.tests.AllTests</testClass> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>p2-installable-unit</type> + <id>org.eclipse.sdk.feature.group</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.papyrus.sdk.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/test/org/eclipse/papyrus/uml/diagram/suite/tests/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/test/org/eclipse/papyrus/uml/diagram/suite/tests/Activator.java new file mode 100755 index 00000000000..b51f57076a7 --- /dev/null +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/test/org/eclipse/papyrus/uml/diagram/suite/tests/Activator.java @@ -0,0 +1,54 @@ +package org.eclipse.papyrus.uml.diagram.suite.tests; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.suite.tests"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @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/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/test/org/eclipse/papyrus/uml/diagram/suite/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/test/org/eclipse/papyrus/uml/diagram/suite/tests/AllTests.java new file mode 100755 index 00000000000..6a92e0aa4d0 --- /dev/null +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/test/org/eclipse/papyrus/uml/diagram/suite/tests/AllTests.java @@ -0,0 +1,60 @@ +/***************************************************************************** + * Copyright (c) 2010, 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: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993 + * Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220, 488791, 496598, 508629 + * + *****************************************************************************/ +package org.eclipse.papyrus.uml.diagram.suite.tests; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner; +import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.SuiteSpot; +import org.junit.runner.RunWith; + + +/** + * Test class for all tests for Papyrus + */ +@RunWith(AllTestsRunner.class) +public class AllTests { + + @SuiteSpot + public static final List<ITestSuiteClass> suiteClasses; + + /** list of classes to launch */ + static { + suiteClasses = new ArrayList<>(); + + /* **************** plugins *********************** */ + + /* uml diagrams */ + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.common.tests.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.clazz.test.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.activity.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.deployment.test.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.component.test.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.timing.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.usecase.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.composite.test.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.statemachine.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.communication.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.profile.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.sequence.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.interactionoverview.tests.AllTests.class)); + + // end + } + +} diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/pom.xml index 552ac532e1b..2d793f21563 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml index f33de397105..6676b60e9b0 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml @@ -4,12 +4,11 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.timing.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/pom.xml index 02927ef5f0e..468aeb507fe 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/pom.xml @@ -4,12 +4,11 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.usecase.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml index 8725b5ada90..18379d32caf 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.wizards.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/diagram/pom.xml b/tests/junit/plugins/uml/diagram/pom.xml index eb0cbace647..61d1cfcd603 100644 --- a/tests/junit/plugins/uml/diagram/pom.xml +++ b/tests/junit/plugins/uml/diagram/pom.xml @@ -4,17 +4,17 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../../../../../releng/main-tests/pom.xml</relativePath> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> + <module>org.eclipse.papyrus.uml.diagram.suite.tests</module> <module>org.eclipse.papyrus.uml.diagram.activity.tests</module> <module>org.eclipse.papyrus.uml.diagram.clazz.tests</module> <module>org.eclipse.papyrus.uml.diagram.statemachine.tests</module> diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/pom.xml b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/pom.xml index 3b33570d28c..256e983e14b 100644 --- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/pom.xml +++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/pom.xml @@ -3,11 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.internationalization.main.test</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.internationalization.controlmode.tests</artifactId> <version>1.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> + <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/pom.xml b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/pom.xml index 2a070d527e6..67063858fd0 100644 --- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/pom.xml +++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/pom.xml @@ -3,11 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.internationalization.main.test</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.internationalization.tests</artifactId> <version>1.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> + <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/internationalization/pom.xml b/tests/junit/plugins/uml/internationalization/pom.xml index 12f27b42d8d..e4b7f30a752 100644 --- a/tests/junit/plugins/uml/internationalization/pom.xml +++ b/tests/junit/plugins/uml/internationalization/pom.xml @@ -2,17 +2,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../../../../../releng/main-tests/pom.xml</relativePath> - </parent> - <groupId>org.eclipse.papyrus</groupId> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.internationalization.main.test</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Papyrus Internationalization Test for UML</name> <description>Papyrus Internationalization are a set of plugins dedicated to manage internationalization labels and language in relation with models.</description> <modules> diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/pom.xml b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/pom.xml index c55d7852851..58cc21079c0 100644 --- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/pom.xml +++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.modelexplorer.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/modelexplorer/pom.xml b/tests/junit/plugins/uml/modelexplorer/pom.xml new file mode 100755 index 00000000000..df5d6d9e25d --- /dev/null +++ b/tests/junit/plugins/uml/modelexplorer/pom.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.modelexplorer.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for the Papyrus uml model explorer</description> + + <modules> + <module>org.eclipse.papyrus.uml.modelexplorer.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/pom.xml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/pom.xml index 519cae888d2..d1dc2b135a5 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/pom.xml +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/pom.xml @@ -3,13 +3,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.nattable.main.test</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.nattable.clazz.config.tests</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml index 6b9d5764bdc..5bc35a3946f 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.nattable.main.test</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.nattable.generic.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/pom.xml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/pom.xml index 2c1a3799652..315bd8c02dc 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/pom.xml +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/pom.xml @@ -3,13 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.nattable.main.test</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.nattable.stereotype.display.tests</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/pom.xml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/pom.xml index e6aae8749a1..b792b1c954d 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/pom.xml +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.nattable.main.test</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.classpath b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.classpath new file mode 100755 index 00000000000..83be1d9f78c --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="test"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.project b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.project new file mode 100755 index 00000000000..ee89c28da70 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.nattable.suite.tests</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 00000000000..b3aa6d60f94 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,291 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.settings/org.eclipse.jdt.ui.prefs new file mode 100755 index 00000000000..954281dbc31 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,68 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_redundant_type_arguments=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_type_arguments=false +cleanup_profile=_Papyrus +cleanup_settings_version=2 +eclipse.preferences.version=1 +formatter_profile=_Papyrus +formatter_settings_version=12 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF new file mode 100755 index 00000000000..c80bbf4a433 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF @@ -0,0 +1,21 @@ +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.uml.nattable.suite.tests.Activator +Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.suite.tests +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", + org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", + org.eclipse.papyrus.uml.nattable.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.nattable.generic.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.nattable.clazz.config.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.nattable.stereotype.display.tests;bundle-version="1.2.0", + org.eclipse.papyrus.editor.integration.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="1.2.0" diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/Papyrus Nattable UML tests.launch b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/Papyrus Nattable UML tests.launch new file mode 100755 index 00000000000..938bbf6f795 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/Papyrus Nattable UML tests.launch @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus Nattable UML tests"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-nattableuml-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.papyrus.uml.nattable.suite.tests/test/org/eclipse/papyrus/uml/nattable/suite/tests/AllTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="skip.long.junit.tests" value="false"/> +</mapAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.nattable.suite.tests.AllTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.nattable.suite.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:SoftRefLRUPolicyMSPerMB=100 -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="true"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="true"/> +<booleanAttribute key="useProduct" value="true"/> +<stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/> +</launchConfiguration> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/about.html b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/about.html new file mode 100755 index 00000000000..d35d5aed64c --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("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/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/build.properties b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/build.properties new file mode 100755 index 00000000000..d4effb4cd8d --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/build.properties @@ -0,0 +1,7 @@ +source.. = test/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties,\ + about.html,\ + Papyrus Nattable UML tests.launch diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/plugin.properties b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/plugin.properties new file mode 100755 index 00000000000..cfbeaa2c464 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/plugin.properties @@ -0,0 +1,12 @@ +################################################################################# +# Copyright (c) 2008 CEA LIST. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation +################################################################################## +pluginName=UML nattable Tests suite for Papyrus +providerName=Eclipse Modeling Project diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/pom.xml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/pom.xml new file mode 100755 index 00000000000..3ba7ee3bc0e --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> + <version>1.2.0-SNAPSHOT</version> + <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.nattable.suite.tests</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> + <testFailureIgnore>true</testFailureIgnore> + <product>org.eclipse.sdk.ide</product> + <!-- If a specific <argLine> is required here, make sure to include JaCoCo parameters (See parent pom, Bug 478170) --> + <skipTests>${skipAllTests}</skipTests> + <testClass>org.eclipse.papyrus.uml.nattable.suite.tests.AllTests</testClass> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>p2-installable-unit</type> + <id>org.eclipse.sdk.feature.group</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.papyrus.sdk.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/test/org/eclipse/papyrus/uml/nattable/suite/tests/Activator.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/test/org/eclipse/papyrus/uml/nattable/suite/tests/Activator.java new file mode 100755 index 00000000000..0a65b04e58f --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/test/org/eclipse/papyrus/uml/nattable/suite/tests/Activator.java @@ -0,0 +1,54 @@ +package org.eclipse.papyrus.uml.nattable.suite.tests; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.nattable.suite.tests"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @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/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/test/org/eclipse/papyrus/uml/nattable/suite/tests/AllTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/test/org/eclipse/papyrus/uml/nattable/suite/tests/AllTests.java new file mode 100755 index 00000000000..b77dde8ab01 --- /dev/null +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/test/org/eclipse/papyrus/uml/nattable/suite/tests/AllTests.java @@ -0,0 +1,51 @@ +/***************************************************************************** + * Copyright (c) 2010, 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: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993 + * Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220, 488791, 496598, 508629 + * + *****************************************************************************/ +package org.eclipse.papyrus.uml.nattable.suite.tests; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner; +import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.SuiteSpot; +import org.junit.runner.RunWith; + + +/** + * Test class for all tests for Papyrus + */ +@RunWith(AllTestsRunner.class) +public class AllTests { + + @SuiteSpot + public static final List<ITestSuiteClass> suiteClasses; + + /** list of classes to launch */ + static { + suiteClasses = new ArrayList<>(); + + /* **************** plugins *********************** */ + + /* nattable tests */ + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.tests.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.generic.tests.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.clazz.config.tests.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.stereotype.display.tests.tests.AllTests.class)); + + // end + } + +} diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/pom.xml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/pom.xml index 86b9800bbb4..13c35002189 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/pom.xml +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/pom.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.nattable.main.test</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.nattable.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/nattable/pom.xml b/tests/junit/plugins/uml/nattable/pom.xml index ad4b678340d..fc84d099206 100755 --- a/tests/junit/plugins/uml/nattable/pom.xml +++ b/tests/junit/plugins/uml/nattable/pom.xml @@ -2,25 +2,27 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../../../../../releng/main-tests/pom.xml</relativePath> - </parent> - <groupId>org.eclipse.papyrus</groupId> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.nattable.main.test</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Papyrus Nattable Test for UML</name> <description>Papyrus Nattable are a set of plugins dedicated to manage tables in relation with models.</description> <modules> + <!-- Suites --> + <module>org.eclipse.papyrus.uml.nattable.suite.tests</module> + + <!-- Plugins --> <module>org.eclipse.papyrus.uml.nattable.clazz.config.tests</module> <module>org.eclipse.papyrus.uml.nattable.generic.tests</module> <module>org.eclipse.papyrus.uml.nattable.stereotype.display.tests</module> - <module>org.eclipse.papyrus.uml.nattable.tests</module> <module>org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests</module> + <module>org.eclipse.papyrus.uml.nattable.tests</module> </modules> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/.classpath deleted file mode 100644 index da1049abda9..00000000000 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 73da3815343..00000000000 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,295 +0,0 @@ -eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF deleted file mode 100644 index f227d5c6c25..00000000000 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui.ide;bundle-version="3.8.0",
- org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.search.tests.suites
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.search.tests
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/about.html b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/about.html deleted file mode 100644 index 5ddc72c177f..00000000000 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/about.html +++ /dev/null @@ -1,28 +0,0 @@ -<!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>November 20, 2008</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>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/pom.xml deleted file mode 100644 index 08c5aae03e1..00000000000 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../../../../../releng/main-tests</relativePath> - </parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.search.tests</artifactId> - <version>1.2.0-SNAPSHOT</version> - <packaging>eclipse-test-plugin</packaging> -</project> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/src/org/eclipse/papyrus/search/tests/suites/AllTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/src/org/eclipse/papyrus/search/tests/suites/AllTests.java deleted file mode 100644 index 6dd9e7a1dbe..00000000000 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/src/org/eclipse/papyrus/search/tests/suites/AllTests.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.eclipse.papyrus.search.tests.suites;
-
-import org.junit.runner.RunWith;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
-import org.junit.runners.Suite.SuiteClasses;
-
-/**
- * Main Test suite.
- */
-@RunWith(ClassificationSuite.class)
-@SuiteClasses({})
-public class AllTests {
- //TODO: Model-Search tests
-}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/pom.xml index 9de11d759ab..e6eb6047f52 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/pom.xml +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.dynamic.profile.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/pom.xml index dac13fcbd21..976e2e52d84 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/pom.xml +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../releng/main-tests/pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.filters.tests</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml index 7f15f824dde..c9deebeb803 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.modelrepair.tests</artifactId> <version>1.2.100-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.profile.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.profile.tests/pom.xml index 41463f418fa..374d0c0cb04 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.profile.tests/pom.xml +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.profile.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.profile.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml index 7bb37ddf8f8..4834641e115 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.service.types.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/pom.xml index 1603b5d5052..4be73cab0ba 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/pom.xml +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.service.types.ui.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.classpath new file mode 100755 index 00000000000..83be1d9f78c --- /dev/null +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="test"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.project b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.project new file mode 100755 index 00000000000..8ee9916ac98 --- /dev/null +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.suite.tests</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 00000000000..b3aa6d60f94 --- /dev/null +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,291 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.settings/org.eclipse.jdt.ui.prefs new file mode 100755 index 00000000000..954281dbc31 --- /dev/null +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,68 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_redundant_type_arguments=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_type_arguments=false +cleanup_profile=_Papyrus +cleanup_settings_version=2 +eclipse.preferences.version=1 +formatter_profile=_Papyrus +formatter_settings_version=12 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF new file mode 100755 index 00000000000..9f4381d2f20 --- /dev/null +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF @@ -0,0 +1,40 @@ +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.uml.suite.tests.Activator +Bundle-SymbolicName: org.eclipse.papyrus.uml.suite.tests +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", + org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", + org.eclipse.papyrus.uml.service.types.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.service.types.ui.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.dnd.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.tools.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.tools.utils.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.wizards.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.modelrepair.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.profile.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.decoratormodel.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.validation.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.filters.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.profile.assistants.generator.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.profile.types.generator.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.profile.drafter.tests;bundle-version="1.2.0", + org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.validation.tests.staticprofile;bundle-version="1.2.0", + org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.internationalization.tests;bundle-version="1.0.0", + org.eclipse.papyrus.uml.internationalization.controlmode.tests;bundle-version="1.0.0", + org.eclipse.papyrus.uml.alf.tests;bundle-version="1.2.0" +
\ No newline at end of file diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus All Headless tests.launch b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/Papyrus UML tests.launch index f8523c0fb7a..43aebdd7281 100644..100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus All Headless tests.launch +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/Papyrus UML tests.launch @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> -<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> <booleanAttribute key="askclear" value="false"/> <booleanAttribute key="automaticAdd" value="true"/> <booleanAttribute key="automaticValidate" value="false"/> @@ -9,12 +8,12 @@ <booleanAttribute key="clearConfig" value="true"/> <booleanAttribute key="clearws" value="true"/> <booleanAttribute key="clearwslog" value="false"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus All Headless tests"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus UML tests"/> <booleanAttribute key="default" value="true"/> <booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../junit-all-workspace"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-uml-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllHeadlessTests.java"/> +<listEntry value="/org.eclipse.papyrus.uml.suite.tests/test/org/eclipse/papyrus/uml/suite/tests/AllTests.java"/> </listAttribute> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> <listEntry value="1"/> @@ -28,11 +27,11 @@ <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllHeadlessTests"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.suite.tests.AllTests"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.suite.tests"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:SoftRefLRUPolicyMSPerMB=100 -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.platform.ide"/> <booleanAttribute key="run_in_ui_thread" value="true"/> @@ -41,6 +40,6 @@ <booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> -<booleanAttribute key="useProduct" value="false"/> +<booleanAttribute key="useProduct" value="true"/> <stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/> </launchConfiguration> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/about.html b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/about.html new file mode 100755 index 00000000000..d35d5aed64c --- /dev/null +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("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/uml/org.eclipse.papyrus.search.tests/build.properties b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/build.properties index a8e3182967e..2857f80ee88 100644..100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/build.properties +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/build.properties @@ -1,7 +1,7 @@ -source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- about.html
-src.includes = about.html
+source.. = test/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties,\ + about.html,\ + Papyrus UML tests.launch diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/plugin.properties b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/plugin.properties new file mode 100755 index 00000000000..d83acfdb369 --- /dev/null +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/plugin.properties @@ -0,0 +1,12 @@ +################################################################################# +# Copyright (c) 2008 CEA LIST. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation +################################################################################## +pluginName=UML Tests suite for Papyrus +providerName=Eclipse Modeling Project diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/pom.xml new file mode 100755 index 00000000000..3d87c8e65c8 --- /dev/null +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> + <version>1.2.0-SNAPSHOT</version> + <relativePath>../../../../../releng/main-tests/pom.xml</relativePath> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.suite.tests</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> + <testFailureIgnore>true</testFailureIgnore> + <product>org.eclipse.sdk.ide</product> + <!-- If a specific <argLine> is required here, make sure to include JaCoCo parameters (See parent pom, Bug 478170) --> + <skipTests>${skipAllTests}</skipTests> + <testClass>org.eclipse.papyrus.uml.suite.tests.AllTests</testClass> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>p2-installable-unit</type> + <id>org.eclipse.sdk.feature.group</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.papyrus.sdk.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/test/org/eclipse/papyrus/uml/suite/tests/Activator.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/test/org/eclipse/papyrus/uml/suite/tests/Activator.java new file mode 100755 index 00000000000..c9198957955 --- /dev/null +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/test/org/eclipse/papyrus/uml/suite/tests/Activator.java @@ -0,0 +1,54 @@ +package org.eclipse.papyrus.uml.suite.tests; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.suite.tests"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @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/uml/org.eclipse.papyrus.uml.suite.tests/test/org/eclipse/papyrus/uml/suite/tests/AllTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/test/org/eclipse/papyrus/uml/suite/tests/AllTests.java new file mode 100755 index 00000000000..a324b3fdec2 --- /dev/null +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/test/org/eclipse/papyrus/uml/suite/tests/AllTests.java @@ -0,0 +1,70 @@ +/***************************************************************************** + * Copyright (c) 2010, 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: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993 + * Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220, 488791, 496598, 508629 + * + *****************************************************************************/ +package org.eclipse.papyrus.uml.suite.tests; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner; +import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.SuiteSpot; +import org.junit.runner.RunWith; + + +/** + * Test class for all tests for Papyrus + */ +@RunWith(AllTestsRunner.class) +public class AllTests { + + @SuiteSpot + public static final List<ITestSuiteClass> suiteClasses; + + /** list of classes to launch */ + static { + suiteClasses = new ArrayList<>(); + + /* **************** plugins *********************** */ + + /* uml */ + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.service.types.tests.suites.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.service.types.ui.tests.suites.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.modelexplorer.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.dnd.tests.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.tools.tests.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.tools.utils.tests.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.stereotypeproperty.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.wizards.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.modelrepair.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.decoratormodel.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.decoratormodel.controlmode.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.validation.tests.AllTests.class)); + + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.filters.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.assistants.generator.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.types.generator.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.drafter.tests.AllTests.class)); + + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.internationalization.tests.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.internationalization.controlmode.tests.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.alf.tests.AllTests.class)); + + + // end + } + +} diff --git a/tests/junit/plugins/uml/pom.xml b/tests/junit/plugins/uml/pom.xml new file mode 100755 index 00000000000..ea679ad156d --- /dev/null +++ b/tests/junit/plugins/uml/pom.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.plugins.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for the core uml functions of Papyrus.</description> + + <modules> + <!-- Suites --> + <module>diagram</module> + <module>nattable</module> + <module>textedit</module> + <module>org.eclipse.papyrus.uml.suite.tests</module> + + <!-- Children --> + <module>alf</module> + <module>assistants</module> + <module>decoratormodel</module> + <module>internationalization</module> + <module>modelexplorer</module> + <module>profile</module> + <module>tools</module> + <module>validation</module> + + <!-- Standalone Plugins --> + <module>org.eclipse.papyrus.uml.dynamic.profile.tests</module> + <module>org.eclipse.papyrus.uml.filters.tests</module> + <module>org.eclipse.papyrus.uml.modelrepair.tests</module> + <module>org.eclipse.papyrus.uml.profile.tests</module> + <module>org.eclipse.papyrus.uml.service.types.tests</module> + <module>org.eclipse.papyrus.uml.service.types.ui.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/pom.xml b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/pom.xml index 23d5006997b..cb3c2d2be29 100644 --- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/pom.xml +++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.profile.drafter.tests</artifactId> - <groupId>org.eclipse.papyrus</groupId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/profile/pom.xml b/tests/junit/plugins/uml/profile/pom.xml new file mode 100755 index 00000000000..6150c6e5a20 --- /dev/null +++ b/tests/junit/plugins/uml/profile/pom.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.profile.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for the Papyrus uml profiles</description> + + <modules> + <module>org.eclipse.papyrus.uml.profile.drafter.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/pom.xml b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/pom.xml index 59efdab4998..fdc105fa3a1 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/pom.xml +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.textedit.parameter.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/pom.xml b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/pom.xml index 24dfde3ac1d..13c84a776be 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/pom.xml +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.textedit.port.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/pom.xml b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/pom.xml index dbd3822886b..22ac8400505 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/pom.xml +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.textedit.property.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.classpath b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.classpath new file mode 100755 index 00000000000..83be1d9f78c --- /dev/null +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="test"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.project b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.project new file mode 100755 index 00000000000..53d1e05fc55 --- /dev/null +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.suite.tests</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 00000000000..b3aa6d60f94 --- /dev/null +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,291 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.settings/org.eclipse.jdt.ui.prefs new file mode 100755 index 00000000000..954281dbc31 --- /dev/null +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,68 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_redundant_type_arguments=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_type_arguments=false +cleanup_profile=_Papyrus +cleanup_settings_version=2 +eclipse.preferences.version=1 +formatter_profile=_Papyrus +formatter_settings_version=12 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF new file mode 100755 index 00000000000..592dd0716d9 --- /dev/null +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF @@ -0,0 +1,21 @@ +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.uml.textedit.suite.tests.Activator +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.suite.tests +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", + org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", + org.eclipse.papyrus.uml.textedit.port.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.textedit.property.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.textedit.parameter.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.textedit.valuespecification.tests;bundle-version="1.2.0", + org.eclipse.papyrus.uml.textedit.tests;bundle-version="1.2.0" +
\ No newline at end of file diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/Papyrus Textedit tests.launch b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/Papyrus Textedit tests.launch new file mode 100755 index 00000000000..76c252858a1 --- /dev/null +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/Papyrus Textedit tests.launch @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus Textedit tests"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-textedit-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.papyrus.uml.textedit.suite.tests/test/org/eclipse/papyrus/uml/textedit/suite/tests/AllTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="skip.long.junit.tests" value="false"/> +</mapAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.textedit.suite.tests.AllTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.textedit.suite.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:SoftRefLRUPolicyMSPerMB=100 -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="true"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="true"/> +<booleanAttribute key="useProduct" value="true"/> +<stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/> +</launchConfiguration> diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/about.html b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/about.html new file mode 100755 index 00000000000..d35d5aed64c --- /dev/null +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("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/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/build.properties b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/build.properties new file mode 100755 index 00000000000..08215542f34 --- /dev/null +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/build.properties @@ -0,0 +1,7 @@ +source.. = test/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties,\ + about.html,\ + Papyrus Textedit tests.launch diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/plugin.properties b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/plugin.properties new file mode 100755 index 00000000000..67d2a5010f0 --- /dev/null +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/plugin.properties @@ -0,0 +1,12 @@ +################################################################################# +# Copyright (c) 2008 CEA LIST. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation +################################################################################## +pluginName=UML textedit Tests suite for Papyrus +providerName=Eclipse Modeling Project diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/pom.xml b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/pom.xml new file mode 100755 index 00000000000..5c926fb34f5 --- /dev/null +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> + <version>1.2.0-SNAPSHOT</version> + <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.textedit.suite.tests</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> + <testFailureIgnore>true</testFailureIgnore> + <product>org.eclipse.sdk.ide</product> + <!-- If a specific <argLine> is required here, make sure to include JaCoCo parameters (See parent pom, Bug 478170) --> + <skipTests>${skipAllTests}</skipTests> + <testClass>org.eclipse.papyrus.uml.textedit.suite.tests.AllTests</testClass> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>p2-installable-unit</type> + <id>org.eclipse.sdk.feature.group</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.papyrus.sdk.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/test/org/eclipse/papyrus/uml/textedit/suite/tests/Activator.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/test/org/eclipse/papyrus/uml/textedit/suite/tests/Activator.java new file mode 100755 index 00000000000..f4436ffa2fe --- /dev/null +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/test/org/eclipse/papyrus/uml/textedit/suite/tests/Activator.java @@ -0,0 +1,54 @@ +package org.eclipse.papyrus.uml.textedit.suite.tests; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.textedit.suite.tests"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @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/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/test/org/eclipse/papyrus/uml/textedit/suite/tests/AllTests.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/test/org/eclipse/papyrus/uml/textedit/suite/tests/AllTests.java new file mode 100755 index 00000000000..19d58dc3497 --- /dev/null +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/test/org/eclipse/papyrus/uml/textedit/suite/tests/AllTests.java @@ -0,0 +1,51 @@ +/***************************************************************************** + * Copyright (c) 2010, 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: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993 + * Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220, 488791, 496598, 508629 + * + *****************************************************************************/ +package org.eclipse.papyrus.uml.textedit.suite.tests; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner; +import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.SuiteSpot; +import org.junit.runner.RunWith; + + +/** + * Test class for all tests for Papyrus + */ +@RunWith(AllTestsRunner.class) +public class AllTests { + + @SuiteSpot + public static final List<ITestSuiteClass> suiteClasses; + + /** list of classes to launch */ + static { + suiteClasses = new ArrayList<>(); + + /* **************** plugins *********************** */ + + /* uml textedit tests */ + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.port.tests.suites.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.property.tests.suites.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.parameter.tests.suites.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.valuespecification.tests.suites.AllTests.class)); + + // end + } + +} diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/pom.xml b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/pom.xml index cefa4fd4a42..4aa55508fc1 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/pom.xml +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.textedit.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/pom.xml b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/pom.xml index 4dfac48bff6..237efa62bc5 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/pom.xml +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.textedit.valuespecification.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/textedit/pom.xml b/tests/junit/plugins/uml/textedit/pom.xml new file mode 100755 index 00000000000..561ee3a6aaf --- /dev/null +++ b/tests/junit/plugins/uml/textedit/pom.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.textedit.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for the embedded textual editors for UML constructs in the Papyrus diagrams.</description> + + <modules> + <module>org.eclipse.papyrus.uml.textedit.suite.tests</module> + <module>org.eclipse.papyrus.uml.textedit.tests</module> + <module>org.eclipse.papyrus.uml.textedit.port.tests</module> + <module>org.eclipse.papyrus.uml.textedit.property.tests</module> + <module>org.eclipse.papyrus.uml.textedit.parameter.tests</module> + <module>org.eclipse.papyrus.uml.textedit.valuespecification.tests</module> + </modules> + +</project> diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml index a1387fc2464..fdae0ab87c1 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.tools.tests</artifactId> <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml index dc291f7ffd2..37ba31cd000 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.tools.utils.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/tools/pom.xml b/tests/junit/plugins/uml/tools/pom.xml new file mode 100755 index 00000000000..7570c3235c1 --- /dev/null +++ b/tests/junit/plugins/uml/tools/pom.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.tools.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for uml tools</description> + + <modules> + <module>org.eclipse.papyrus.uml.tools.utils.tests</module> + <module>org.eclipse.papyrus.uml.tools.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/pom.xml b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/pom.xml index 85b61c9606c..132897ad8a1 100644 --- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/pom.xml +++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.validation.tests.genvalidation</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/pom.xml b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/pom.xml index 7abdb98345d..f13483b1e42 100644 --- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/pom.xml +++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.validation.tests.staticprofile</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/pom.xml b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/pom.xml index f1dfbdf15f6..8523a04596e 100644 --- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/pom.xml +++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.validation.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/uml/validation/pom.xml b/tests/junit/plugins/uml/validation/pom.xml new file mode 100755 index 00000000000..c9643d5be4e --- /dev/null +++ b/tests/junit/plugins/uml/validation/pom.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.uml.validation.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for uml validation</description> + + <modules> + <module>org.eclipse.papyrus.uml.validation.tests</module> + <module>org.eclipse.papyrus.uml.validation.tests.genvalidation</module> + <module>org.eclipse.papyrus.uml.validation.tests.staticprofile</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/pom.xml b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/pom.xml index 0334a2c8f02..cc74a4214a3 100644 --- a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/pom.xml +++ b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/pom.xml @@ -8,7 +8,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.views.modelexplorer.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.classpath b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.classpath new file mode 100755 index 00000000000..83be1d9f78c --- /dev/null +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="test"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.project b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.project new file mode 100755 index 00000000000..75176712f79 --- /dev/null +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.suite.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/views/org.eclipse.papyrus.views.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 00000000000..b3aa6d60f94 --- /dev/null +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,291 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.settings/org.eclipse.jdt.ui.prefs new file mode 100755 index 00000000000..954281dbc31 --- /dev/null +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,68 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_redundant_type_arguments=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_type_arguments=false +cleanup_profile=_Papyrus +cleanup_settings_version=2 +eclipse.preferences.version=1 +formatter_profile=_Papyrus +formatter_settings_version=12 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF new file mode 100755 index 00000000000..52d8638c63b --- /dev/null +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF @@ -0,0 +1,19 @@ +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.views.suite.tests.Activator +Bundle-SymbolicName: org.eclipse.papyrus.views.suite.tests +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", + org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", + org.eclipse.papyrus.bundles.tests;bundle-version="1.2.0", + org.eclipse.papyrus.eclipse.project.editors.tests;bundle-version="2.0.0", + org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.2.0", + org.eclipse.papyrus.editor.integration.tests;bundle-version="1.2.0" diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus All UI tests.launch b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/Papyrus Views ALL tests.launch index 961de8ec740..ffa3c4954d6 100644..100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus All UI tests.launch +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/Papyrus Views ALL tests.launch @@ -8,12 +8,12 @@ <booleanAttribute key="clearConfig" value="true"/> <booleanAttribute key="clearws" value="true"/> <booleanAttribute key="clearwslog" value="false"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus All UI tests"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus Views ALL tests"/> <booleanAttribute key="default" value="true"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../junit-all-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllUITests.java"/> +<listEntry value="/org.eclipse.papyrus.views.suite.tests/test/org/eclipse/papyrus/views/suite/tests/AllTests.java"/> </listAttribute> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> <listEntry value="1"/> @@ -27,11 +27,11 @@ <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllUITests"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.views.suite.tests.AllTests"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.views.suite.tests"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:SoftRefLRUPolicyMSPerMB=100 -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.platform.ide"/> <booleanAttribute key="run_in_ui_thread" value="true"/> diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/about.html b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/about.html new file mode 100755 index 00000000000..d35d5aed64c --- /dev/null +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("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/views/org.eclipse.papyrus.views.suite.tests/build.properties b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/build.properties new file mode 100755 index 00000000000..0b54259f7d3 --- /dev/null +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/build.properties @@ -0,0 +1,7 @@ +source.. = test/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties,\ + about.html,\ + Papyrus Views ALL tests.launch diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/plugin.properties b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/plugin.properties index 991bf48dd09..d50275728e5 100644..100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/plugin.properties +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/plugin.properties @@ -1,14 +1,12 @@ -#################################################################################
-# Copyright (c) 2011 CEA LIST.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#
-# CEA LIST - Initial API and Implementation.
-#
-##################################################################################
-pluginName=Papyrus Search Tests
-providerName=Eclipse Modeling Project
+################################################################################# +# Copyright (c) 2008 CEA LIST. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation +################################################################################## +pluginName=Tests for Papyrus Views +providerName=Eclipse Modeling Project diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/pom.xml b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/pom.xml new file mode 100755 index 00000000000..3460978dca1 --- /dev/null +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> + <version>1.2.0-SNAPSHOT</version> + <relativePath>../../../../../releng/main-tests/pom.xml</relativePath> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.views.suite.tests</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> + <testFailureIgnore>true</testFailureIgnore> + <product>org.eclipse.sdk.ide</product> + <!-- If a specific <argLine> is required here, make sure to include JaCoCo parameters (See parent pom, Bug 478170) --> + <skipTests>${skipAllTests}</skipTests> + <testClass>org.eclipse.papyrus.views.suite.tests.AllTests</testClass> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>p2-installable-unit</type> + <id>org.eclipse.sdk.feature.group</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.papyrus.sdk.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/test/org/eclipse/papyrus/views/suite/tests/Activator.java b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/test/org/eclipse/papyrus/views/suite/tests/Activator.java new file mode 100755 index 00000000000..cb55f221861 --- /dev/null +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/test/org/eclipse/papyrus/views/suite/tests/Activator.java @@ -0,0 +1,54 @@ +package org.eclipse.papyrus.views.suite.tests; + +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.views.suite.tests"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @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/views/org.eclipse.papyrus.views.suite.tests/test/org/eclipse/papyrus/views/suite/tests/AllTests.java b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/test/org/eclipse/papyrus/views/suite/tests/AllTests.java new file mode 100755 index 00000000000..40bbaac8a69 --- /dev/null +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/test/org/eclipse/papyrus/views/suite/tests/AllTests.java @@ -0,0 +1,55 @@ +/***************************************************************************** + * Copyright (c) 2010, 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: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993 + * Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220, 488791, 496598, 508629 + * + *****************************************************************************/ +package org.eclipse.papyrus.views.suite.tests; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner; +import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass; +import org.eclipse.papyrus.junit.framework.runner.SuiteSpot; +import org.junit.runner.RunWith; + + +/** + * Test class for all tests for Papyrus + */ +@RunWith(AllTestsRunner.class) +public class AllTests { + + @SuiteSpot + public static final List<ITestSuiteClass> suiteClasses; + + /** list of classes to launch */ + static { + suiteClasses = new ArrayList<>(); + + /* **************** plugins *********************** */ + + /* customization */ + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.eclipse.project.editors.tests.AllTests.class)); + + /* views */ + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.views.modelexplorer.tests.AllTests.class)); + + /* integration */ + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.editor.integration.tests.AllTests.class)); + + + // end + } + +} diff --git a/tests/junit/plugins/views/pom.xml b/tests/junit/plugins/views/pom.xml new file mode 100755 index 00000000000..4ddb512b99b --- /dev/null +++ b/tests/junit/plugins/views/pom.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.plugins.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.papyrus.tests</groupId> + <artifactId>org.eclipse.papyrus.views.tests.releng</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <description>Tests for the Papyrus views</description> + + <modules> + <!-- Suites --> + <module>org.eclipse.papyrus.views.suite.tests</module> + + <!-- Plugins --> + <module>modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests</module> + <module>properties/org.eclipse.papyrus.views.properties.toolsmiths.tests</module> + + </modules> + +</project> diff --git a/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/pom.xml b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/pom.xml index 8794d3c537e..ec51d24a4f2 100644 --- a/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/pom.xml +++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/pom.xml @@ -9,7 +9,7 @@ <version>1.2.0-SNAPSHOT</version> <relativePath>../../../../../../releng/main-tests/pom.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus</groupId> + <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.views.properties.toolsmiths.tests</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> |