From be67bc8bcf1bf5fb870e17af7506dbf405b62885 Mon Sep 17 00:00:00 2001 From: Camille Letavernier Date: Thu, 30 Jan 2014 11:02:54 +0100 Subject: 424315: [Releng - CSS] The Papyrus CSS Feature should be included as a main component in Papyrus https://bugs.eclipse.org/bugs/show_bug.cgi?id=424315 Add the CSS Tests to Papyrus/Main tests--- .../.classpath | 7 - .../.project | 28 --- .../.settings/org.eclipse.jdt.core.prefs | 7 - .../META-INF/MANIFEST.MF | 30 --- .../about.html | 28 --- .../build.properties | 7 - ....eclipse.papyrus.infra.gmfdiag.css.tests.launch | 40 ---- .../resources/model/classProviderTest/model.di | 17 -- .../model/classProviderTest/model.notation | 57 ----- .../resources/model/classProviderTest/model.uml | 4 - .../resources/model/stylesheetTest/model.di | 17 -- .../resources/model/stylesheetTest/model.notation | 261 --------------------- .../resources/model/stylesheetTest/model.uml | 17 -- .../resources/stylesheets/classProviderTest.css | 98 -------- .../resources/stylesheets/stylesheetTest.css | 55 ----- .../papyrus/infra/gmfdiag/css/tests/Activator.java | 69 ------ .../infra/gmfdiag/css/tests/tests/AllTests.java | 25 -- .../css/tests/tests/CSSClassProviderTest.java | 98 -------- .../gmfdiag/css/tests/tests/CSSStylesheetTest.java | 177 -------------- .../gmfdiag/css/tests/tests/CSSSupportTest.java | 77 ------ .../META-INF/MANIFEST.MF | 1 - .../org/eclipse/papyrus/tests/extra/AllTests.java | 12 +- .../org.eclipse.papyrus.tests/META-INF/MANIFEST.MF | 3 +- .../test/org/eclipse/papyrus/tests/AllTests.java | 7 +- .../.classpath | 7 + .../.project | 28 +++ .../.settings/org.eclipse.jdt.core.prefs | 7 + .../META-INF/MANIFEST.MF | 30 +++ .../about.html | 28 +++ .../build.properties | 7 + ....eclipse.papyrus.infra.gmfdiag.css.tests.launch | 40 ++++ .../resources/model/classProviderTest/model.di | 17 ++ .../model/classProviderTest/model.notation | 57 +++++ .../resources/model/classProviderTest/model.uml | 4 + .../resources/model/stylesheetTest/model.di | 17 ++ .../resources/model/stylesheetTest/model.notation | 261 +++++++++++++++++++++ .../resources/model/stylesheetTest/model.uml | 17 ++ .../resources/stylesheets/classProviderTest.css | 98 ++++++++ .../resources/stylesheets/stylesheetTest.css | 55 +++++ .../papyrus/infra/gmfdiag/css/tests/Activator.java | 69 ++++++ .../infra/gmfdiag/css/tests/tests/AllTests.java | 25 ++ .../css/tests/tests/CSSClassProviderTest.java | 98 ++++++++ .../gmfdiag/css/tests/tests/CSSStylesheetTest.java | 177 ++++++++++++++ .../gmfdiag/css/tests/tests/CSSSupportTest.java | 77 ++++++ 44 files changed, 1131 insertions(+), 1130 deletions(-) delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/.classpath delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/.settings/org.eclipse.jdt.core.prefs delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/about.html delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/build.properties delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.di delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.uml delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.di delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.uml delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/stylesheetTest.css delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/Activator.java delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSClassProviderTest.java delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java delete mode 100644 tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSSupportTest.java create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.classpath create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.settings/org.eclipse.jdt.core.prefs create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/about.html create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/build.properties create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.di create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.uml create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.di create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.uml create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/stylesheetTest.css create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/Activator.java create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSClassProviderTest.java create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSSupportTest.java (limited to 'tests/junit') diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/.classpath b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/.classpath deleted file mode 100644 index 2d1a4302f04..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project deleted file mode 100644 index ddbc718c56e..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.eclipse.papyrus.infra.gmfdiag.css.tests - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 44217f8c068..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +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.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 diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF deleted file mode 100644 index eb2be6b5fd3..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,30 +0,0 @@ -Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.0", - org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.0.0", - org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.0.0", - org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.0.0", - org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.0.0", - org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui;bundle-version="1.0.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.0.0", - org.eclipse.papyrus.infra.core;bundle-version="1.0.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0", - org.eclipse.core.resources;bundle-version="3.8.0", - org.eclipse.uml2.uml;bundle-version="4.0.0", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0", - org.junit;bundle-version="4.10.0" -Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.tests, - org.eclipse.papyrus.infra.gmfdiag.css.tests.tests -Bundle-Vendor: Eclipse Modeling Project -Bundle-ActivationPolicy: lazy -Bundle-Version: 1.0.0.qualifier -Bundle-Name: CSS Tests (Incubation) -Bundle-ManifestVersion: 2 -Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.tests.Activato - r -Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.tests -Bundle-RequiredExecutionEnvironment: J2SE-1.5 - diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/about.html b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/about.html deleted file mode 100644 index 82d49bf5f81..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/about.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - -About - - -

About This Content

- -

June 5, 2007

-

License

- -

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 http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

- -

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 http://www.eclipse.org.

- - - diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/build.properties b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/build.properties deleted file mode 100644 index 130df98d220..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - resources/,\ - about.html -src.includes = about.html diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch deleted file mode 100644 index 934fbbe559c..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.di b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.di deleted file mode 100644 index c1e4f445dce..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.di +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation deleted file mode 100644 index ad421b8149b..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation +++ /dev/null @@ -1,57 +0,0 @@ - - - - - -
-
-
-
-
- - -
- - -
- - -
- - - - -
- - - - - - - - -
- - - - - - - - -
- - - - - - - - - - - - - - - diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.uml b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.uml deleted file mode 100644 index 10f71c39957..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.uml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.di b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.di deleted file mode 100644 index 15fd7df2e2b..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.di +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation deleted file mode 100644 index da68a47987d..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - myInterface - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - myClass - myOtherClass - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - myClass - - - - - - - - - - - - - - - - - - - - - - - - - - myClass - - - - - - - - - - diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.uml b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.uml deleted file mode 100644 index e063ffd6ed3..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.uml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css deleted file mode 100644 index f45a4299049..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css +++ /dev/null @@ -1,98 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2012 CEA LIST. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - *****************************************************************************/ - -/** -* Papyrus 0.9 CSS -* Test stylesheet for #getAvailableClasses() -*/ - -/******************************************************** - * All cX should be matched for Interfaces (c01 ~ c17) - * xX should not be matched for Interfaces - *******************************************************/ - - -/**************** Ignored Selector *********************/ - -.anyClass { - -} - -/**************** Simple selectors *********************/ - - -*.c01{ - -} - -Interface.c02{ - -} - -.c03 { - -} - -.c04, .c05, .c06 { - -} - -Class.x01{ - -} - -#x05 { - -} - -/************ Combinator selectors **************/ - -.c07 .c08 { - -} -.c09 Class.x02{ - -} - -.c10 > Class.x03{ - -} - -Interface.c11 + Class.x04 { - -} - -*.c12 + Interface.c13 { - -} - -/************* Combinator Conditions ****************/ - -#x06:x07 { - -} - -.c14#x8:x09{ - -} - -Interface.c15#x10{ - -} - -#x11.c16 { - -} - -#x12.c17:x13 { - -} diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/stylesheetTest.css b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/stylesheetTest.css deleted file mode 100644 index 0542d4d041f..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/stylesheetTest.css +++ /dev/null @@ -1,55 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2012 CEA LIST. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - *****************************************************************************/ - -/** -* Papyrus 0.9 CSS -* Main test stylesheet -*/ - -* { - gradient:red vertical; -} - -Class { - gradient:none; - fillColor:red; -} - -Interface { - fillColor:yellow; -} - -Interface.myInterface { - fontName:KaiTi; /* TODO: The font name should be case insensitive */ - fillColor:lightgreen; - gradient:dEEpSKyBluE lightgreen horizontal; - elementIcon:false; -} - -Package { - fillColor:white; -} - -/* White elements */ -Class.myClass.myOtherClass, Class.myClass { - fillColor:white; - gradient:none; - bold:false; - fontName: Tunga; -} - -/* Blue + Gradient + Bold */ -Class[isAbstract=true] { - bold:true; - fillColor: rgb(195, 205, 255); - gradient: white vertical; -} diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/Activator.java b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/Activator.java deleted file mode 100644 index 5994b38d491..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/Activator.java +++ /dev/null @@ -1,69 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2012 CEA LIST. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation - *****************************************************************************/ -package org.eclipse.papyrus.infra.gmfdiag.css.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.infra.gmfdiag.css.tests"; //$NON-NLS-1$ - - // The shared instance - private static Activator plugin; - - 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/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java deleted file mode 100644 index 54ee115ce9a..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java +++ /dev/null @@ -1,25 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2012 CEA LIST. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation - *****************************************************************************/ -package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - - -@RunWith(Suite.class) -@SuiteClasses({ CSSClassProviderTest.class, CSSStylesheetTest.class - -}) -public class AllTests { - -} diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSClassProviderTest.java b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSClassProviderTest.java deleted file mode 100644 index a6946632989..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSClassProviderTest.java +++ /dev/null @@ -1,98 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2012 CEA LIST. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation - *****************************************************************************/ -package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests; - - -import java.io.IOException; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.gmf.runtime.notation.Diagram; -import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; -import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram; -import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSClassContentProvider; -import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator; -import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - - -public class CSSClassProviderTest { - - private CSSDiagram diagram; - - private static int expectedNumberOfClasses = 17; - - @Before - public void init() { - ResourceSet resourceSet = new ResourceSetImpl(); - CSSHelper.installCSSSupport(resourceSet); - - URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/classProviderTest/model.notation", true); - try { - Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, uri); - Assert.assertNotNull("Cannot find the model", diagram); - Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram); - this.diagram = (CSSDiagram)diagram; - } catch (IOException ex) { - Activator.log.error(ex); - } - } - - @Test - public void testCSSClassContentProvider() { - ExtendedCSSEngine engine = diagram.getEngine(); - IStaticContentProvider provider = new CSSClassContentProvider("Interface", engine); - Object[] result = provider.getElements(); - List resultList = Arrays.asList(result); - - //Result is expected to contain c01 to c17 - //Result should not contain x01 to x13 - //Result may contain anything else (Depending on the current Workspace Theme). - - //Check that all expected classes are returned - for(int i = 1; i <= expectedNumberOfClasses; i++) { - String expectedClassName = "c"; - if(i < 10) { - expectedClassName += "0"; - } - expectedClassName += i; - Assert.assertTrue("An expected CSS Class has not been found: " + expectedClassName, resultList.contains(expectedClassName)); - } - - //Check that no invalid class is returned - for(Object object : resultList) { - Assert.assertTrue("The CSSClassContentProvider must return Strings", object instanceof String); - String cssClass = (String)object; - - Assert.assertFalse("Invalid CSS Class has been returned: " + cssClass, cssClass.matches("x[0-9]+")); - } - } - - @After - public void dispose() { - Iterator iterator = diagram.eResource().getResourceSet().getResources().iterator(); - while(iterator.hasNext()) { - iterator.next().unload(); - iterator.remove(); - } - } -} diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java deleted file mode 100644 index 0c1efe15355..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java +++ /dev/null @@ -1,177 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2012 CEA LIST. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation - *****************************************************************************/ -package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests; - -import java.io.IOException; -import java.util.Iterator; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.gmf.runtime.notation.Diagram; -import org.eclipse.gmf.runtime.notation.GradientStyle; -import org.eclipse.gmf.runtime.notation.Shape; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram; -import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator; -import org.eclipse.uml2.uml.NamedElement; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - - -public class CSSStylesheetTest { - - private CSSDiagram diagram; - - @Before - public void init() { - ResourceSet resourceSet = new ResourceSetImpl(); - CSSHelper.installCSSSupport(resourceSet); - - URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/stylesheetTest/model.notation", true); - try { - Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, uri); - Assert.assertNotNull("Cannot find the model", diagram); - Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram); - this.diagram = (CSSDiagram)diagram; - } catch (IOException ex) { - Activator.log.error(ex); - } - } - - @Test - public void testClassStyle() { - Shape classView = findShape("Class1"); - if(classView == null) { - return; - } - - Assert.assertEquals("Invalid color", rgb(255, 0, 0), classView.getFillColor()); //Red = #FF0000 - Assert.assertNull("Invalid gradient", classView.getGradient()); - Assert.assertTrue(AppearanceHelper.showElementIcon(classView)); - } - - @Test - public void testInterfaceStyle() { - Shape interfaceView = findShape("Interface1"); - - Assert.assertNotNull(interfaceView.getGradient()); - Assert.assertEquals(rgb(255, 255, 0), interfaceView.getFillColor()); //Yellow = #FFFF00 - Assert.assertEquals(rgb(255, 0, 0), interfaceView.getGradient().getGradientColor1()); //Red = #FF0000 - Assert.assertEquals(GradientStyle.VERTICAL, interfaceView.getGradient().getGradientStyle()); - Assert.assertTrue(AppearanceHelper.showElementIcon(interfaceView)); - } - - @Test - public void testCSSClassStyle() { - Shape interfaceView = findShape("Interface2"); - Assert.assertNotNull(interfaceView.getGradient()); - Assert.assertEquals(rgb(144, 238, 144), interfaceView.getFillColor()); //Lightgreen = #90EE90 - - //Case insensitive color name - Assert.assertEquals(rgb(0, 191, 255), interfaceView.getGradient().getGradientColor1()); //DeepSkyBlue = #00BFFF - - Assert.assertEquals(GradientStyle.HORIZONTAL, interfaceView.getGradient().getGradientStyle()); - Assert.assertFalse(AppearanceHelper.showElementIcon(interfaceView)); - - //TODO: Font names should be case-insensitive - Assert.assertEquals("KaiTi", interfaceView.getFontName()); - } - - @Test - public void testPackage() { - Shape packageView = findShape("Package1"); - Assert.assertNotNull(packageView.getGradient()); - - //Inherited style (From *) - Assert.assertEquals(rgb(255, 0, 0), packageView.getGradient().getGradientColor1()); //Red = #FF0000 - } - - @Test - public void testPriorities() { - //Tests the priorities between styles: - //.myClass : Low priority - //.myClass.myOtherClass : Highest priority - //[isAbstract=true] : Medium priority - //Styles should also be merged when they aren't conflicting (ie. [isAbstract] + .myClass -> fontName = Tunga) - Shape class3 = findShape("Class3"); - Shape class5 = findShape("Class5"); - - testBlueStyle(class3); //isAbstract - testBlueStyle(class5); //isAbstract - - Shape class4 = findShape("Class4"); - - testWhiteStyle(class4); //.myClass.myOtherClass (Overrides isAbstract) - testFontName(class4); //.myClass (Doesn't conflict with isAbstract) - - Shape class6 = findShape("Class6"); - - testWhiteStyle(class6); //.myClass - testFontName(class6); //.myClass - - Shape class7 = findShape("Class7"); - - testBlueStyle(class7); //isAbstract - testFontName(class7); //.myClass (Doesn't conflict with isAbstract) - } - - private void testBlueStyle(Shape shape) { - Assert.assertEquals(rgb(195, 205, 255), shape.getFillColor()); //rgb syntax - Assert.assertTrue(shape.isBold()); - Assert.assertNotNull(shape.getGradient()); - } - - private void testWhiteStyle(Shape shape) { - Assert.assertEquals(rgb(255, 255, 255), shape.getFillColor()); //White = #FFFFFF (Hexa syntax) - Assert.assertFalse(shape.isBold()); - Assert.assertNull(shape.getGradient()); - } - - private void testFontName(Shape shape) { - Assert.assertEquals("Tunga", shape.getFontName()); - } - - @After - public void dispose() { - Iterator iterator = diagram.eResource().getResourceSet().getResources().iterator(); - while(iterator.hasNext()) { - iterator.next().unload(); - iterator.remove(); - } - } - - private int rgb(int red, int green, int blue) { - return red | green << 8 | blue << 16; - } - - private Shape findShape(String elementName) { - for(Object viewObject : diagram.getChildren()) { - View view = (View)viewObject; - if(view instanceof Shape && view.getElement() instanceof NamedElement) { - NamedElement element = (NamedElement)view.getElement(); - if(elementName.equals(element.getName())) { - return (Shape)view; - } - } - } - - Assert.fail("Cannot find the view associated to " + elementName); - return null; - } -} diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSSupportTest.java b/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSSupportTest.java deleted file mode 100644 index c0fb3f6647a..00000000000 --- a/tests/junit/extraplugins/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSSupportTest.java +++ /dev/null @@ -1,77 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2012 CEA LIST. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation - *****************************************************************************/ -package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.gmf.runtime.notation.Diagram; -import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram; -import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator; -import org.junit.Assert; -import org.junit.Test; - -/** - * Test the installation of CSS Support on a standard ResourceSet - * - * @author Camille Letavernier - * - */ -public class CSSSupportTest { - - /** - * Installs the CSS support on a resource set and check the results - * - * @throws Exception - */ - @Test - public void testCSSSupport() throws Exception { - //Resource set with CSS Support installed - ResourceSet resourceSetWithCSSSupport = new ResourceSetImpl(); - CSSHelper.installCSSSupport(resourceSetWithCSSSupport); - - URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/stylesheetTest/model.notation", true); - - Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSetWithCSSSupport, uri); - - //The diagram should be a CSSDiagram - Assert.assertTrue(diagram instanceof CSSDiagram); - - CSSDiagram cssDiagram = (CSSDiagram)diagram; - - //The CSSDiagram should have a CSSEngine - Assert.assertNotNull(cssDiagram.getEngine()); - - //Dispose the CSS Engine - resourceSetWithCSSSupport.getResources().remove(diagram.eResource()); - } - - /** - * Tests a standard resource set (without CSS support) and check the results. - * - * @throws Exception - */ - @Test - public void testWithoutCSSSupport() throws Exception { - //Standard resource set (Without CSS Support installed) - ResourceSet resourceSetWithoutCSSSupport = new ResourceSetImpl(); - - URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/stylesheetTest/model.notation", true); - - Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSetWithoutCSSSupport, uri); - - //The diagram should be a standard GMF Diagram (i.e. not a CSSDiagram) - Assert.assertFalse(diagram instanceof CSSDiagram); - } -} diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF index e7c905da4a8..2844ae19c38 100644 --- a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF +++ b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF @@ -1,7 +1,6 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.0.0", org.eclipse.papyrus.bundles.tests;bundle-version="1.0.0", org.junit;bundle-version="4.10.0", org.eclipse.papyrus.cdo.core.tests;bundle-version="1.0.0", diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/src/org/eclipse/papyrus/tests/extra/AllTests.java b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/src/org/eclipse/papyrus/tests/extra/AllTests.java index 10d5fbe1813..14f733e1eae 100644 --- a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/src/org/eclipse/papyrus/tests/extra/AllTests.java +++ b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/src/org/eclipse/papyrus/tests/extra/AllTests.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2012 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -38,7 +38,7 @@ public class AllTests { /* UML Compare tests */ /** * UML Compare tests have been temporarily disabled. See: - * + * * 389811: [Papyrus Compare] The Papyrus Compare feature is not compatible with Kepler * https://bugs.eclipse.org/bugs/show_bug.cgi?id=389811 */ @@ -47,9 +47,7 @@ public class AllTests { // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.compare.diff.tests.AllTests.class)); /* **************** plugins *********************** */ - /* css */ - suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.css.tests.tests.AllTests.class)); - + } /** @@ -59,7 +57,7 @@ public class AllTests { /** * Constructor. - * + * * @param clazz * the suite class – AllTests2 * @throws InitializationError @@ -73,7 +71,7 @@ public class AllTests { /** * Returns the list of test classes - * + * * @return the list of test classes */ private static Class[] getSuites() { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF index d71f488e326..e26293a32f0 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF @@ -41,7 +41,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.nattable.views.editor.tests;bundle-version="1.0.0", org.eclipse.papyrus.infra.nattable.model.editor.tests;bundle-version="1.0.0", org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="1.0.0", - org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="1.0.0" + org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="1.0.0", + org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.0.0" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier 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 index e07d3dff747..5b786c77510 100644 --- 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 @@ -1,6 +1,6 @@ /***************************************************************************** * 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 @@ -61,6 +61,9 @@ public class AllTests { /* 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)); + // /* sysml moved to a separate launcher */ // @@ -83,7 +86,7 @@ public class AllTests { suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.usecase.tests.AllTests.class)); //suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.sequence.tests.AllTests.class)); //Disabled. They currently do not run on Hudson // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.interactionoverview.tests.AllTests.class)); //Disabled. They currently do not run on Hudson - // + // //nattable tests suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.tests.tests.AllTests.class)); diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.classpath b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.classpath new file mode 100644 index 00000000000..2d1a4302f04 --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project new file mode 100644 index 00000000000..ddbc718c56e --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project @@ -0,0 +1,28 @@ + + + org.eclipse.papyrus.infra.gmfdiag.css.tests + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..44217f8c068 --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.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 diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..eb2be6b5fd3 --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF @@ -0,0 +1,30 @@ +Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.0", + org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.0.0", + org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.0.0", + org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.0.0", + org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.0.0", + org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui;bundle-version="1.0.0", + org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0", + org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", + org.eclipse.papyrus.infra.emf;bundle-version="1.0.0", + org.eclipse.papyrus.infra.core;bundle-version="1.0.0", + org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0", + org.eclipse.core.resources;bundle-version="3.8.0", + org.eclipse.uml2.uml;bundle-version="4.0.0", + org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0", + org.junit;bundle-version="4.10.0" +Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.tests, + org.eclipse.papyrus.infra.gmfdiag.css.tests.tests +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.0.0.qualifier +Bundle-Name: CSS Tests (Incubation) +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.tests.Activato + r +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.tests +Bundle-RequiredExecutionEnvironment: J2SE-1.5 + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/about.html b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/about.html new file mode 100644 index 00000000000..82d49bf5f81 --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/about.html @@ -0,0 +1,28 @@ + + + + +About + + +

About This Content

+ +

June 5, 2007

+

License

+ +

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 http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

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 http://www.eclipse.org.

+ + + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/build.properties b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/build.properties new file mode 100644 index 00000000000..130df98d220 --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/build.properties @@ -0,0 +1,7 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + resources/,\ + about.html +src.includes = about.html diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch new file mode 100644 index 00000000000..934fbbe559c --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.di b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.di new file mode 100644 index 00000000000..c1e4f445dce --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.di @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation new file mode 100644 index 00000000000..ad421b8149b --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation @@ -0,0 +1,57 @@ + + + + + +
+
+
+
+
+ + +
+ + +
+ + +
+ + + + +
+ + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + + + + + + + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.uml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.uml new file mode 100644 index 00000000000..10f71c39957 --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.uml @@ -0,0 +1,4 @@ + + + + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.di b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.di new file mode 100644 index 00000000000..15fd7df2e2b --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.di @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation new file mode 100644 index 00000000000..da68a47987d --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + myInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + myClass + myOtherClass + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + myClass + + + + + + + + + + + + + + + + + + + + + + + + + + myClass + + + + + + + + + + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.uml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.uml new file mode 100644 index 00000000000..e063ffd6ed3 --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.uml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css new file mode 100644 index 00000000000..f45a4299049 --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css @@ -0,0 +1,98 @@ +/***************************************************************************** + * Copyright (c) 2012 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr + *****************************************************************************/ + +/** +* Papyrus 0.9 CSS +* Test stylesheet for #getAvailableClasses() +*/ + +/******************************************************** + * All cX should be matched for Interfaces (c01 ~ c17) + * xX should not be matched for Interfaces + *******************************************************/ + + +/**************** Ignored Selector *********************/ + +.anyClass { + +} + +/**************** Simple selectors *********************/ + + +*.c01{ + +} + +Interface.c02{ + +} + +.c03 { + +} + +.c04, .c05, .c06 { + +} + +Class.x01{ + +} + +#x05 { + +} + +/************ Combinator selectors **************/ + +.c07 .c08 { + +} +.c09 Class.x02{ + +} + +.c10 > Class.x03{ + +} + +Interface.c11 + Class.x04 { + +} + +*.c12 + Interface.c13 { + +} + +/************* Combinator Conditions ****************/ + +#x06:x07 { + +} + +.c14#x8:x09{ + +} + +Interface.c15#x10{ + +} + +#x11.c16 { + +} + +#x12.c17:x13 { + +} diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/stylesheetTest.css b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/stylesheetTest.css new file mode 100644 index 00000000000..0542d4d041f --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/stylesheetTest.css @@ -0,0 +1,55 @@ +/***************************************************************************** + * Copyright (c) 2012 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr + *****************************************************************************/ + +/** +* Papyrus 0.9 CSS +* Main test stylesheet +*/ + +* { + gradient:red vertical; +} + +Class { + gradient:none; + fillColor:red; +} + +Interface { + fillColor:yellow; +} + +Interface.myInterface { + fontName:KaiTi; /* TODO: The font name should be case insensitive */ + fillColor:lightgreen; + gradient:dEEpSKyBluE lightgreen horizontal; + elementIcon:false; +} + +Package { + fillColor:white; +} + +/* White elements */ +Class.myClass.myOtherClass, Class.myClass { + fillColor:white; + gradient:none; + bold:false; + fontName: Tunga; +} + +/* Blue + Gradient + Bold */ +Class[isAbstract=true] { + bold:true; + fillColor: rgb(195, 205, 255); + gradient: white vertical; +} diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/Activator.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/Activator.java new file mode 100644 index 00000000000..5994b38d491 --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/Activator.java @@ -0,0 +1,69 @@ +/***************************************************************************** + * Copyright (c) 2012 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.infra.gmfdiag.css.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.infra.gmfdiag.css.tests"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + 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/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java new file mode 100644 index 00000000000..54ee115ce9a --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java @@ -0,0 +1,25 @@ +/***************************************************************************** + * Copyright (c) 2012 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + + +@RunWith(Suite.class) +@SuiteClasses({ CSSClassProviderTest.class, CSSStylesheetTest.class + +}) +public class AllTests { + +} diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSClassProviderTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSClassProviderTest.java new file mode 100644 index 00000000000..a6946632989 --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSClassProviderTest.java @@ -0,0 +1,98 @@ +/***************************************************************************** + * Copyright (c) 2012 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests; + + +import java.io.IOException; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.gmf.runtime.notation.Diagram; +import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; +import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper; +import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram; +import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSClassContentProvider; +import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator; +import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + + +public class CSSClassProviderTest { + + private CSSDiagram diagram; + + private static int expectedNumberOfClasses = 17; + + @Before + public void init() { + ResourceSet resourceSet = new ResourceSetImpl(); + CSSHelper.installCSSSupport(resourceSet); + + URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/classProviderTest/model.notation", true); + try { + Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, uri); + Assert.assertNotNull("Cannot find the model", diagram); + Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram); + this.diagram = (CSSDiagram)diagram; + } catch (IOException ex) { + Activator.log.error(ex); + } + } + + @Test + public void testCSSClassContentProvider() { + ExtendedCSSEngine engine = diagram.getEngine(); + IStaticContentProvider provider = new CSSClassContentProvider("Interface", engine); + Object[] result = provider.getElements(); + List resultList = Arrays.asList(result); + + //Result is expected to contain c01 to c17 + //Result should not contain x01 to x13 + //Result may contain anything else (Depending on the current Workspace Theme). + + //Check that all expected classes are returned + for(int i = 1; i <= expectedNumberOfClasses; i++) { + String expectedClassName = "c"; + if(i < 10) { + expectedClassName += "0"; + } + expectedClassName += i; + Assert.assertTrue("An expected CSS Class has not been found: " + expectedClassName, resultList.contains(expectedClassName)); + } + + //Check that no invalid class is returned + for(Object object : resultList) { + Assert.assertTrue("The CSSClassContentProvider must return Strings", object instanceof String); + String cssClass = (String)object; + + Assert.assertFalse("Invalid CSS Class has been returned: " + cssClass, cssClass.matches("x[0-9]+")); + } + } + + @After + public void dispose() { + Iterator iterator = diagram.eResource().getResourceSet().getResources().iterator(); + while(iterator.hasNext()) { + iterator.next().unload(); + iterator.remove(); + } + } +} diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java new file mode 100644 index 00000000000..0c1efe15355 --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSStylesheetTest.java @@ -0,0 +1,177 @@ +/***************************************************************************** + * Copyright (c) 2012 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests; + +import java.io.IOException; +import java.util.Iterator; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.gmf.runtime.notation.Diagram; +import org.eclipse.gmf.runtime.notation.GradientStyle; +import org.eclipse.gmf.runtime.notation.Shape; +import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; +import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper; +import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram; +import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator; +import org.eclipse.uml2.uml.NamedElement; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + + +public class CSSStylesheetTest { + + private CSSDiagram diagram; + + @Before + public void init() { + ResourceSet resourceSet = new ResourceSetImpl(); + CSSHelper.installCSSSupport(resourceSet); + + URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/stylesheetTest/model.notation", true); + try { + Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, uri); + Assert.assertNotNull("Cannot find the model", diagram); + Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram); + this.diagram = (CSSDiagram)diagram; + } catch (IOException ex) { + Activator.log.error(ex); + } + } + + @Test + public void testClassStyle() { + Shape classView = findShape("Class1"); + if(classView == null) { + return; + } + + Assert.assertEquals("Invalid color", rgb(255, 0, 0), classView.getFillColor()); //Red = #FF0000 + Assert.assertNull("Invalid gradient", classView.getGradient()); + Assert.assertTrue(AppearanceHelper.showElementIcon(classView)); + } + + @Test + public void testInterfaceStyle() { + Shape interfaceView = findShape("Interface1"); + + Assert.assertNotNull(interfaceView.getGradient()); + Assert.assertEquals(rgb(255, 255, 0), interfaceView.getFillColor()); //Yellow = #FFFF00 + Assert.assertEquals(rgb(255, 0, 0), interfaceView.getGradient().getGradientColor1()); //Red = #FF0000 + Assert.assertEquals(GradientStyle.VERTICAL, interfaceView.getGradient().getGradientStyle()); + Assert.assertTrue(AppearanceHelper.showElementIcon(interfaceView)); + } + + @Test + public void testCSSClassStyle() { + Shape interfaceView = findShape("Interface2"); + Assert.assertNotNull(interfaceView.getGradient()); + Assert.assertEquals(rgb(144, 238, 144), interfaceView.getFillColor()); //Lightgreen = #90EE90 + + //Case insensitive color name + Assert.assertEquals(rgb(0, 191, 255), interfaceView.getGradient().getGradientColor1()); //DeepSkyBlue = #00BFFF + + Assert.assertEquals(GradientStyle.HORIZONTAL, interfaceView.getGradient().getGradientStyle()); + Assert.assertFalse(AppearanceHelper.showElementIcon(interfaceView)); + + //TODO: Font names should be case-insensitive + Assert.assertEquals("KaiTi", interfaceView.getFontName()); + } + + @Test + public void testPackage() { + Shape packageView = findShape("Package1"); + Assert.assertNotNull(packageView.getGradient()); + + //Inherited style (From *) + Assert.assertEquals(rgb(255, 0, 0), packageView.getGradient().getGradientColor1()); //Red = #FF0000 + } + + @Test + public void testPriorities() { + //Tests the priorities between styles: + //.myClass : Low priority + //.myClass.myOtherClass : Highest priority + //[isAbstract=true] : Medium priority + //Styles should also be merged when they aren't conflicting (ie. [isAbstract] + .myClass -> fontName = Tunga) + Shape class3 = findShape("Class3"); + Shape class5 = findShape("Class5"); + + testBlueStyle(class3); //isAbstract + testBlueStyle(class5); //isAbstract + + Shape class4 = findShape("Class4"); + + testWhiteStyle(class4); //.myClass.myOtherClass (Overrides isAbstract) + testFontName(class4); //.myClass (Doesn't conflict with isAbstract) + + Shape class6 = findShape("Class6"); + + testWhiteStyle(class6); //.myClass + testFontName(class6); //.myClass + + Shape class7 = findShape("Class7"); + + testBlueStyle(class7); //isAbstract + testFontName(class7); //.myClass (Doesn't conflict with isAbstract) + } + + private void testBlueStyle(Shape shape) { + Assert.assertEquals(rgb(195, 205, 255), shape.getFillColor()); //rgb syntax + Assert.assertTrue(shape.isBold()); + Assert.assertNotNull(shape.getGradient()); + } + + private void testWhiteStyle(Shape shape) { + Assert.assertEquals(rgb(255, 255, 255), shape.getFillColor()); //White = #FFFFFF (Hexa syntax) + Assert.assertFalse(shape.isBold()); + Assert.assertNull(shape.getGradient()); + } + + private void testFontName(Shape shape) { + Assert.assertEquals("Tunga", shape.getFontName()); + } + + @After + public void dispose() { + Iterator iterator = diagram.eResource().getResourceSet().getResources().iterator(); + while(iterator.hasNext()) { + iterator.next().unload(); + iterator.remove(); + } + } + + private int rgb(int red, int green, int blue) { + return red | green << 8 | blue << 16; + } + + private Shape findShape(String elementName) { + for(Object viewObject : diagram.getChildren()) { + View view = (View)viewObject; + if(view instanceof Shape && view.getElement() instanceof NamedElement) { + NamedElement element = (NamedElement)view.getElement(); + if(elementName.equals(element.getName())) { + return (Shape)view; + } + } + } + + Assert.fail("Cannot find the view associated to " + elementName); + return null; + } +} diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSSupportTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSSupportTest.java new file mode 100644 index 00000000000..c0fb3f6647a --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSSupportTest.java @@ -0,0 +1,77 @@ +/***************************************************************************** + * Copyright (c) 2012 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.gmf.runtime.notation.Diagram; +import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper; +import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram; +import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator; +import org.junit.Assert; +import org.junit.Test; + +/** + * Test the installation of CSS Support on a standard ResourceSet + * + * @author Camille Letavernier + * + */ +public class CSSSupportTest { + + /** + * Installs the CSS support on a resource set and check the results + * + * @throws Exception + */ + @Test + public void testCSSSupport() throws Exception { + //Resource set with CSS Support installed + ResourceSet resourceSetWithCSSSupport = new ResourceSetImpl(); + CSSHelper.installCSSSupport(resourceSetWithCSSSupport); + + URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/stylesheetTest/model.notation", true); + + Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSetWithCSSSupport, uri); + + //The diagram should be a CSSDiagram + Assert.assertTrue(diagram instanceof CSSDiagram); + + CSSDiagram cssDiagram = (CSSDiagram)diagram; + + //The CSSDiagram should have a CSSEngine + Assert.assertNotNull(cssDiagram.getEngine()); + + //Dispose the CSS Engine + resourceSetWithCSSSupport.getResources().remove(diagram.eResource()); + } + + /** + * Tests a standard resource set (without CSS support) and check the results. + * + * @throws Exception + */ + @Test + public void testWithoutCSSSupport() throws Exception { + //Standard resource set (Without CSS Support installed) + ResourceSet resourceSetWithoutCSSSupport = new ResourceSetImpl(); + + URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/stylesheetTest/model.notation", true); + + Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSetWithoutCSSSupport, uri); + + //The diagram should be a standard GMF Diagram (i.e. not a CSSDiagram) + Assert.assertFalse(diagram instanceof CSSDiagram); + } +} -- cgit v1.2.3 From 3d98d0203b66ab05bda7c24d2c032c83391023fd Mon Sep 17 00:00:00 2001 From: Camille Letavernier Date: Thu, 30 Jan 2014 14:30:51 +0100 Subject: 417178: [CSS] The CSS Engine shall support compartments (Show/Hide, collapse, show title...) https://bugs.eclipse.org/bugs/show_bug.cgi?id=417178 Add tests--- .../AddMaskManagedLabelDisplayCommand.java | 65 ------ .../emf/appearance/style/ILabelMaskProvider.java | 37 --- .../infra/gmfdiag/css/engine/DiagramCSSEngine.java | 5 +- .../ViewLabelMaskManagerAdapterFactory.java | 53 ----- .../.project | 6 + .../META-INF/MANIFEST.MF | 3 +- ....eclipse.papyrus.infra.gmfdiag.css.tests.launch | 3 +- .../resources/model/compartmentsTest/model.di | 23 ++ .../model/compartmentsTest/model.notation | 254 +++++++++++++++++++++ .../resources/model/compartmentsTest/model.uml | 44 ++++ .../resources/stylesheets/compartments.css | 39 ++++ .../resources/stylesheets/labels.css | 0 .../infra/gmfdiag/css/tests/tests/AllTests.java | 4 +- .../css/tests/tests/CSSCompartmentsTests.java | 233 +++++++++++++++++++ 14 files changed, 609 insertions(+), 160 deletions(-) delete mode 100644 plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/AddMaskManagedLabelDisplayCommand.java delete mode 100644 plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/style/ILabelMaskProvider.java delete mode 100644 plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ViewLabelMaskManagerAdapterFactory.java create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.di create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.uml create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/labels.css create mode 100644 tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java (limited to 'tests/junit') diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/AddMaskManagedLabelDisplayCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/AddMaskManagedLabelDisplayCommand.java deleted file mode 100644 index aed6716800b..00000000000 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/AddMaskManagedLabelDisplayCommand.java +++ /dev/null @@ -1,65 +0,0 @@ -/***************************************************************************** - * 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: - * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation - * - *****************************************************************************/ -package org.eclipse.papyrus.infra.emf.appearance.commands; - -import org.eclipse.emf.ecore.EAnnotation; -import org.eclipse.emf.ecore.EModelElement; -import org.eclipse.emf.transaction.TransactionalEditingDomain; -import org.eclipse.papyrus.infra.emf.appearance.Activator; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand; - -/** - * The Class AddAppliedStereotypeToDisplayCommand used to set the list of applied stereotype to - * display - */ -public class AddMaskManagedLabelDisplayCommand extends CreateEAnnotationCommand { - - /** new Mask Value */ - private int maskValue; - - /** - * Instantiates a new sets the applied stereotype to display command. - * - * @param domain - * the editing domain that manages the command - * @param object - * the object to be modified - * @param maskValue - * the mask value to be stored - */ - public AddMaskManagedLabelDisplayCommand(TransactionalEditingDomain domain, EModelElement object, int maskValue) { - super(domain, object, VisualInformationPapyrusConstants.CUSTOM_APPEARENCE_ANNOTATION); - this.maskValue = maskValue; - } - - /** - * {@inheritDoc} - */ - @Override - protected void doExecute() { - - EAnnotation oldAnnotation = getObject().getEAnnotation(VisualInformationPapyrusConstants.CUSTOM_APPEARENCE_ANNOTATION); - if(oldAnnotation == null) { - oldAnnotation = createEAnnotation(); - attachEannotation(oldAnnotation, getObject()); - } - Activator.log.debug(maskValue + " -> " + Integer.toString(maskValue)); - replaceEntry(oldAnnotation, VisualInformationPapyrusConstants.CUSTOM_APPEARANCE_MASK_VALUE, Integer.toString(maskValue)); - - replaceEannotation(getObject().getEAnnotation(VisualInformationPapyrusConstants.CUSTOM_APPEARENCE_ANNOTATION), getObject()); - - } - -} diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/style/ILabelMaskProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/style/ILabelMaskProvider.java deleted file mode 100644 index a8fa4373ef8..00000000000 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/style/ILabelMaskProvider.java +++ /dev/null @@ -1,37 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2012 CEA LIST. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation - *****************************************************************************/ -package org.eclipse.papyrus.infra.emf.appearance.style; - -import java.util.Map; - -/** - * An interface to retrieve the label masks associated to an element - * - * @author Camille Letavernier - * - */ -public interface ILabelMaskProvider { - - /** - * Returns the list of masks for this provider - * - * @return - */ - public Map getMasks(); - - /** - * Returns the default mask value for this provider - * - * @return - */ - public int getDefaultValue(); -} diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/DiagramCSSEngine.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/DiagramCSSEngine.java index d89c4aea7c6..4d3e95c30bf 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/DiagramCSSEngine.java +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/DiagramCSSEngine.java @@ -77,7 +77,10 @@ public class DiagramCSSEngine extends ExtendedCSSEngineImpl implements IChangeLi } } else { URI uri = URI.createURI(styleSheet.getPath()); - uri = uri.resolve(diagram.eResource().getURI()); + if(uri.isRelative()) { + uri = uri.resolve(diagram.eResource().getURI()); + } + path = uri.toString(); } URL url = new URL(path); diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ViewLabelMaskManagerAdapterFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ViewLabelMaskManagerAdapterFactory.java deleted file mode 100644 index a3b40d16888..00000000000 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ViewLabelMaskManagerAdapterFactory.java +++ /dev/null @@ -1,53 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2012 CEA LIST. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation - *****************************************************************************/ -package org.eclipse.papyrus.infra.gmfdiag.common.providers; - -import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.core.runtime.Platform; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.infra.emf.appearance.style.ILabelMaskProvider; - -/** - * An AdapterFactory to retrieve a {@link ILabelMaskProvider} from a GMF {@link View} - * - * It delegates the adapter resolution to the view's element (if not null) - * - * @author Camille Letavernier - * - */ -public class ViewLabelMaskManagerAdapterFactory implements IAdapterFactory { - - /** - * {@inheritDoc} - */ - @Override - public ILabelMaskProvider getAdapter(Object adaptableObject, Class adapterType) { - if(adapterType == ILabelMaskProvider.class && adaptableObject instanceof View) { - //Forwards the resolution of the adapter to the view's semantic element - View view = (View)adaptableObject; - if(view.getElement() != null && view.getElement() != view) { - return (ILabelMaskProvider)Platform.getAdapterManager().getAdapter(view.getElement(), adapterType); - } - } - - return null; - } - - /** - * {@inheritDoc} - */ - @Override - public Class[] getAdapterList() { - return new Class[]{ ILabelMaskProvider.class }; - } - -} diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project index ddbc718c56e..ff2463a3162 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.project @@ -5,6 +5,11 @@ + + org.eclipse.xtext.ui.shared.xtextBuilder + + + org.eclipse.jdt.core.javabuilder @@ -24,5 +29,6 @@ org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.xtext.ui.shared.xtextNature diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF index eb2be6b5fd3..481cbb8fc50 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF @@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.resources;bundle-version="3.8.0", org.eclipse.uml2.uml;bundle-version="4.0.0", org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0", - org.junit;bundle-version="4.10.0" + org.junit;bundle-version="4.10.0", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0" Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.tests, org.eclipse.papyrus.infra.gmfdiag.css.tests.tests Bundle-Vendor: Eclipse Modeling Project diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch index 934fbbe559c..eb1de64a68e 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch @@ -23,11 +23,12 @@ + - + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.di b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.di new file mode 100644 index 00000000000..b38a75b62ee --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.di @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation new file mode 100644 index 00000000000..6fa635f903c --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.uml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.uml new file mode 100644 index 00000000000..b356eaf5ce0 --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.uml @@ -0,0 +1,44 @@ + + + + Test model for CSS in Luna >= M5 (Compartments, Labels) + + + Expected: Attribute collapsed, Nested classifier hidden + + + Expected: Compartments hidden + + + Expected: Collapsed = false + + + Expected: Attribute and Operation visible + + + Expected: Compartment Attribute and Operation visible + + + Expected: Only operation compartment is visible + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css new file mode 100644 index 00000000000..a07ea565036 --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css @@ -0,0 +1,39 @@ +* { + showTitle: false; +} + +/* Check showTitle, to avoid priority conflicts with more specific rules */ +.showTitleForAllCompartments Compartment { + showTitle: true; +} + +Interface > Compartment[kind=attribute], +Interface > Compartment[kind=nestedClassifier] { + visible:false; +} + +Interface[ownedAttribute] > Compartment[kind=attribute]{ + visible:true; +} + +Compartment[kind=nestedClassifier] { + visible: false; +} + + +/* Collapse the Attribute compartment if the Class contains a P1 attribute (Displayed) */ +Class[ownedAttribute~="P1"] > Compartment[kind=attribute]{ + collapsed: true; +} + +Enumeration > Compartment { + collapsed: true; +} + +Enumeration > Compartment[kind=EnUmerAtionLiteRal]{ /* Case insensitive */ + collapsed: false; +} + +Compartment { + showTitle: true; +} diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/labels.css b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/labels.css new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java index 54ee115ce9a..185aab5136d 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2012 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,7 +17,7 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses({ CSSClassProviderTest.class, CSSStylesheetTest.class +@SuiteClasses({ CSSClassProviderTest.class, CSSStylesheetTest.class, CSSCompartmentsTests.class }) public class AllTests { diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java new file mode 100644 index 00000000000..c311a50ca4e --- /dev/null +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java @@ -0,0 +1,233 @@ +/***************************************************************************** + * Copyright (c) 2014 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests; + +import java.io.IOException; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl; +import org.eclipse.gmf.runtime.notation.BasicCompartment; +import org.eclipse.gmf.runtime.notation.Diagram; +import org.eclipse.gmf.runtime.notation.NotationPackage; +import org.eclipse.gmf.runtime.notation.Shape; +import org.eclipse.gmf.runtime.notation.TitleStyle; +import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStringStyleObservableList; +import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper; +import org.eclipse.papyrus.infra.gmfdiag.css.helper.ResetStyleHelper; +import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram; +import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator; +import org.eclipse.uml2.uml.NamedElement; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +/** + * Test case for Compartment-related styles and properties + * See resources/model/compartmentsTest/model.di for details + * + * @author Camille Letavernier + * + */ +public class CSSCompartmentsTests { + + public static final String CLASS_ATTRIBUTE_COMPARTMENT_TYPE = "7017"; //$NON-NLS-1$ + + public static final String CLASS_OPERATION_COMPARTMENT_TYPE = "7018"; //$NON-NLS-1$ + + public static final String CLASS_CLASSIFIER_COMPARTMENT_TYPE = "7019"; //$NON-NLS-1$ + + public static final String INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE = "7006"; //$NON-NLS-1$ + + public static final String INTERFACE_OPERATION_COMPARTMENT_TYPE = "7007"; //$NON-NLS-1$ + + public static final String INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE = "7008"; //$NON-NLS-1$ + + public static final String ENUMERATION_LITERAL_COMPARTMENT_TYPE = "7015"; //$NON-NLS-1$ + + private CSSDiagram diagram; + + @Before + public void init() { + ResourceSet resourceSet = new ResourceSetImpl(); + CSSHelper.installCSSSupport(resourceSet); + + URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/compartmentsTest/model.notation", true); //$NON-NLS-1$ + try { + Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, uri); + Assert.assertNotNull("Cannot find the model", diagram); + Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram); + this.diagram = (CSSDiagram)diagram; + } catch (IOException ex) { + Activator.log.error(ex); + } + } + + /* Test Class1 and Class2 */ + @Test + public void testAttributeCompartment() { + Shape class1 = findShape("Class1"); + Shape class2 = findShape("Class2"); + + BasicCompartment attributes1 = findCompartment(class1, CLASS_ATTRIBUTE_COMPARTMENT_TYPE); + Assert.assertTrue("Attribute compartment should be collapsed, as it contains a P1 property", attributes1.isCollapsed()); + Assert.assertTrue("Attribute compartment should be visible", attributes1.isVisible()); + BasicCompartment operations1 = findCompartment(class1, CLASS_OPERATION_COMPARTMENT_TYPE); + Assert.assertTrue("Operation compartment should be visible", operations1.isVisible()); + BasicCompartment classifiers1 = findCompartment(class1, CLASS_CLASSIFIER_COMPARTMENT_TYPE); + Assert.assertFalse("Classifiers compartment should be hidden", classifiers1.isVisible()); + + BasicCompartment attributes2 = findCompartment(class2, CLASS_ATTRIBUTE_COMPARTMENT_TYPE); + Assert.assertFalse("Attribute compartment should not be collapsed, as it doesn't contain a P1 property", attributes2.isCollapsed()); + Assert.assertTrue("Attribute compartment should be visible", attributes2.isVisible()); + BasicCompartment operations2 = findCompartment(class2, CLASS_OPERATION_COMPARTMENT_TYPE); + Assert.assertTrue("Operation compartment should be visible", operations2.isVisible()); + BasicCompartment classifiers2 = findCompartment(class2, CLASS_CLASSIFIER_COMPARTMENT_TYPE); + Assert.assertFalse("Classifiers compartment should be hidden", classifiers2.isVisible()); + + + } + + /* Test Enumeration1 */ + @Test + //Currently fails. The EnumerationLiteral compartment is not defined in the NotationTypesMap + public void testCaseInsensitiveForEnumeration() { + Shape enumeration = findShape("Enumeration1"); + BasicCompartment compartment = findCompartment(enumeration, ENUMERATION_LITERAL_COMPARTMENT_TYPE); + + Assert.assertFalse("EnumerationLiteral Compartment should not be collapsed", compartment.isCollapsed()); + } + + /* Test Interface 1 and Interface 2 */ + //Currently fails. The interface compartments are not defined in the NotationTypesMap + @Test + public void testAttributeCompartmentForInterface() { + Shape interface1 = findShape("Interface1"); + Shape interface2 = findShape("Interface2"); + + BasicCompartment attributes1 = findCompartment(interface1, INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE); + Assert.assertTrue("Attribute compartment should be visible, as it contains a Property", attributes1.isVisible()); + BasicCompartment operations1 = findCompartment(interface1, INTERFACE_OPERATION_COMPARTMENT_TYPE); + Assert.assertTrue("Operation compartment should be visible", operations1.isVisible()); + BasicCompartment classifiers1 = findCompartment(interface1, INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE); + Assert.assertFalse("Classifiers compartment should be hidden", classifiers1.isVisible()); + + BasicCompartment attributes2 = findCompartment(interface2, INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE); + Assert.assertFalse("Attribute compartment should not be visible, as it doesn't contain any property", attributes2.isVisible()); + BasicCompartment operations2 = findCompartment(interface2, INTERFACE_OPERATION_COMPARTMENT_TYPE); + Assert.assertTrue("Operation compartment should be visible", operations2.isVisible()); + BasicCompartment classifiers2 = findCompartment(interface2, INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE); + Assert.assertFalse("Classifiers compartment should be hidden", classifiers2.isVisible()); + } + + /* Test Class 3 */ + @Test + public void testCompartmentForceValue() { + //Test initial situation + Shape class3 = findShape("Class3"); + + //Check all compartments + for(View childNode : (List)class3.getChildren()) { + if(childNode instanceof BasicCompartment) { + Assert.assertFalse("All compartments from Class3 should be hidden", childNode.isVisible()); + } + } + + //We need an editingDomain for the ResetStyle operation + new TransactionalEditingDomainImpl(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), diagram.eResource().getResourceSet()); + + //Test resetStyle + ResetStyleHelper.resetStyle(Collections.singleton(class3)); + //Check only some specific compartments. Some style rules still hide the nestedClassifier compartment. The visibility of e.g. the ShapeCompartment is undetermined. + BasicCompartment attributesCompartment = findCompartment(class3, CLASS_ATTRIBUTE_COMPARTMENT_TYPE); + BasicCompartment operationsCompartment = findCompartment(class3, CLASS_OPERATION_COMPARTMENT_TYPE); + + Assert.assertTrue("Attributes compartment should be visible after the reset style", attributesCompartment.isVisible()); + Assert.assertTrue("Operations compartment should be visible after the reset style", operationsCompartment.isVisible()); + } + + /* Test apply style */ + @Test + //Currently fails. showTitle is not properly supported for BasicCompartments + //Unlike Compartment, BasicCompartment doesn't implement TitleStyle. Instead, + //it owns a specific instance of TitleStyle, which is not supported by the CSS Engine (?) + public void testShowAllCompartmentsTitles() { + //Initial state: title should be hidden + for(View childNode : (List)diagram.getChildren()) { + for(View compartment : (List)childNode.getChildren()) { + if(compartment instanceof BasicCompartment) { + TitleStyle titleStyle = (TitleStyle)compartment.getStyle(NotationPackage.eINSTANCE.getTitleStyle()); + Assert.assertFalse("Title should be hidden", titleStyle.isShowTitle()); + } + } + } + + //Apply style + CustomStringStyleObservableList stylesList = new CustomStringStyleObservableList(diagram, null, "cssClass"); + stylesList.add("showTitleForAllCompartments"); + + //Check that all titles are visible + for(View childNode : (List)diagram.getChildren()) { + for(View compartment : (List)childNode.getChildren()) { + if(compartment instanceof BasicCompartment) { + TitleStyle titleStyle = (TitleStyle)compartment.getStyle(NotationPackage.eINSTANCE.getTitleStyle()); + Assert.assertTrue("Title should be visible", titleStyle.isShowTitle()); + } + } + } + } + + + @After + public void dispose() { + Iterator iterator = diagram.eResource().getResourceSet().getResources().iterator(); + while(iterator.hasNext()) { + iterator.next().unload(); + iterator.remove(); + } + } + + private BasicCompartment findCompartment(Shape element, String type) { + for(View childNode : (List)element.getChildren()) { + if(type.equals(childNode.getType())) { + return (BasicCompartment)childNode; + } + } + + return null; + } + + private Shape findShape(String elementName) { + for(Object viewObject : diagram.getChildren()) { + View view = (View)viewObject; + if(view instanceof Shape && view.getElement() instanceof NamedElement) { + NamedElement element = (NamedElement)view.getElement(); + if(elementName.equals(element.getName())) { + return (Shape)view; + } + } + } + + Assert.fail("Cannot find the view associated to " + elementName); + return null; + } + +} -- cgit v1.2.3 From ade9d574e165b8b0dcd4dc717b68eb7a39bb3ceb Mon Sep 17 00:00:00 2001 From: Camille Letavernier Date: Thu, 6 Feb 2014 16:00:07 +0100 Subject: 417396: [CSS] The CSS Engine shall support label visibility & mask https://bugs.eclipse.org/bugs/show_bug.cgi?id=417396 - Remove the manually defined contributions to NotationsTypesMap extension point - Update the compartments tests--- .../plugin.xml | 31 ---------------------- .../resources/stylesheets/compartments.css | 10 +++---- 2 files changed, 5 insertions(+), 36 deletions(-) (limited to 'tests/junit') diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml index 343f2d1d9a5..45243f3c623 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml @@ -175,37 +175,6 @@ - - - - - - - - - - - - - - - - diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css index a07ea565036..13660016b20 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css @@ -7,22 +7,22 @@ showTitle: true; } -Interface > Compartment[kind=attribute], -Interface > Compartment[kind=nestedClassifier] { +Interface > Compartment[kind=Attribute], +Interface > Compartment[kind=NestedClassifier] { visible:false; } -Interface[ownedAttribute] > Compartment[kind=attribute]{ +Interface[ownedAttribute] > Compartment[kind=Attribute]{ visible:true; } -Compartment[kind=nestedClassifier] { +Compartment[kind=NestedClassifier] { visible: false; } /* Collapse the Attribute compartment if the Class contains a P1 attribute (Displayed) */ -Class[ownedAttribute~="P1"] > Compartment[kind=attribute]{ +Class[ownedAttribute~="P1"] > Compartment[kind=Attribute]{ collapsed: true; } -- cgit v1.2.3 From 25d1978314cda6257c58358916dc6b1f42d20172 Mon Sep 17 00:00:00 2001 From: Camille Letavernier Date: Fri, 7 Feb 2014 11:07:58 +0100 Subject: 417396: [CSS] The CSS Engine shall support label visibility & mask https://bugs.eclipse.org/bugs/show_bug.cgi?id=417396 - Update tests--- .../plugin.xml | 2 +- .../editpart/ShapeDisplayCompartmentEditPart.java | 4 +- .../common/providers/NotationLabelProvider.java | 13 ++- .../org.eclipse.papyrus.uml.diagram.css/plugin.xml | 114 +-------------------- ....eclipse.papyrus.infra.gmfdiag.css.tests.launch | 2 +- .../css/tests/tests/CSSCompartmentsTests.java | 12 ++- 6 files changed, 23 insertions(+), 124 deletions(-) (limited to 'tests/junit') diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml index 45243f3c623..5faa3d62bbc 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml @@ -176,7 +176,7 @@ diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java index 8a31d568a5a..48c0b35f3d4 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java @@ -7,7 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * + * * CEA LIST - Initial API and implementation * *****************************************************************************/ @@ -53,7 +53,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.ShapeService; public class ShapeDisplayCompartmentEditPart extends ResizableCompartmentEditPart { /** Title of this compartment */ - public final static String COMPARTMENT_NAME = "shape"; // $NON-NLS-1$ + public final static String COMPARTMENT_NAME = "SymbolCompartment"; // $NON-NLS-1$ /** * Creates a new ShapeDisplayCompartmentEditPart diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/NotationLabelProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/NotationLabelProvider.java index 9beb2520610..cd8d0de611f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/NotationLabelProvider.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/NotationLabelProvider.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2012 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -24,7 +24,9 @@ import org.eclipse.papyrus.infra.core.editorsfactory.PageIconsRegistry; import org.eclipse.papyrus.infra.core.extension.diagrameditor.PluggableEditorFactoryReader; import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider; import org.eclipse.papyrus.infra.gmfdiag.common.Activator; +import org.eclipse.papyrus.infra.gmfdiag.common.types.NotationTypesMap; import org.eclipse.swt.graphics.Image; +import org.eclipse.uml2.uml.NamedElement; import org.w3c.dom.Element; /** @@ -68,9 +70,9 @@ public class NotationLabelProvider extends EMFLabelProvider { } /** - * + * * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) - * + * * @param element * @return
    *
  • if element is a {@link NamedElement}, we return its name
    • @@ -85,6 +87,11 @@ public class NotationLabelProvider extends EMFLabelProvider { } if(element instanceof View) { // maybe it is a view of a compartment + String humanType = NotationTypesMap.instance.getHumanReadableType((View)element); + if(humanType != null) { + return humanType; + } + EditPart dummyEP = EditPartService.getInstance().createGraphicEditPart((View)element); if(dummyEP instanceof ResizableCompartmentEditPart) { return ((ResizableCompartmentEditPart)dummyEP).getCompartmentName(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/plugin.xml index 6f317d68655..61d2dc7da72 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/plugin.xml @@ -7,117 +7,5 @@ factory="org.eclipse.papyrus.uml.diagram.css.dom.GMFUMLElementProviderFactory" order="50"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch index eb1de64a68e..7e6458447b4 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch @@ -23,7 +23,7 @@ - + diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java index c311a50ca4e..96f7c5198cb 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java @@ -20,7 +20,9 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl; import org.eclipse.gmf.runtime.notation.BasicCompartment; import org.eclipse.gmf.runtime.notation.Diagram; @@ -43,9 +45,9 @@ import org.junit.Test; /** * Test case for Compartment-related styles and properties * See resources/model/compartmentsTest/model.di for details - * - * @author Camille Letavernier * + * @author Camille Letavernier + * */ public class CSSCompartmentsTests { @@ -147,15 +149,17 @@ public class CSSCompartmentsTests { //Check all compartments for(View childNode : (List)class3.getChildren()) { if(childNode instanceof BasicCompartment) { - Assert.assertFalse("All compartments from Class3 should be hidden", childNode.isVisible()); + Assert.assertFalse("All compartments from Class3 should be hidden. " + childNode.getType() + " is visible", childNode.isVisible()); } } //We need an editingDomain for the ResetStyle operation - new TransactionalEditingDomainImpl(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), diagram.eResource().getResourceSet()); + TransactionalEditingDomain domain = new TransactionalEditingDomainImpl(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), diagram.eResource().getResourceSet()); + diagram.eResource().getResourceSet().eAdapters().add(new AdapterFactoryEditingDomain.EditingDomainProvider(domain)); //Test resetStyle ResetStyleHelper.resetStyle(Collections.singleton(class3)); + //Check only some specific compartments. Some style rules still hide the nestedClassifier compartment. The visibility of e.g. the ShapeCompartment is undetermined. BasicCompartment attributesCompartment = findCompartment(class3, CLASS_ATTRIBUTE_COMPARTMENT_TYPE); BasicCompartment operationsCompartment = findCompartment(class3, CLASS_OPERATION_COMPARTMENT_TYPE); -- cgit v1.2.3 From af0428c6072f0a3eea7fd5de262a1a1556257660 Mon Sep 17 00:00:00 2001 From: Camille Letavernier Date: Fri, 7 Feb 2014 17:19:14 +0100 Subject: 417396: [CSS] The CSS Engine shall support label visibility & mask https://bugs.eclipse.org/bugs/show_bug.cgi?id=417396 - Rename compartments to conform with UML2.5-beta2 specification, and unify naming--- .../plugin.xml | 2 +- .../editpart/ShapeDisplayCompartmentEditPart.java | 18 ++--- .../messages.properties | 78 +++++++++++----------- .../model/classdiagram.gmfgen | 74 ++++++++++---------- .../plugin.xml | 78 +++++++++++----------- .../messages.properties | 22 +++--- .../model/ComponentDiagram.gmfgen | 22 +++--- .../plugin.xml | 22 +++--- .../messages.properties | 54 +++++++-------- .../model/compositediagram.gmfgen | 54 +++++++-------- .../plugin.xml | 54 +++++++-------- .../messages.properties | 32 ++++----- .../model/profilediagram.gmfgen | 32 ++++----- .../plugin.xml | 32 ++++----- .../resources/stylesheets/compartments.css | 12 ++-- 15 files changed, 293 insertions(+), 293 deletions(-) (limited to 'tests/junit') diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml index 5faa3d62bbc..45243f3c623 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml @@ -176,7 +176,7 @@ diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java index 48c0b35f3d4..f4ccf8421f2 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java @@ -53,11 +53,11 @@ import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.ShapeService; public class ShapeDisplayCompartmentEditPart extends ResizableCompartmentEditPart { /** Title of this compartment */ - public final static String COMPARTMENT_NAME = "SymbolCompartment"; // $NON-NLS-1$ + public final static String COMPARTMENT_NAME = "symbol"; // $NON-NLS-1$ /** * Creates a new ShapeDisplayCompartmentEditPart - * + * * @param model * The resizable compartment view */ @@ -106,7 +106,7 @@ public class ShapeDisplayCompartmentEditPart extends ResizableCompartmentEditPar /** * this method is used to set the ratio of the figure. * pay attention if the ratio is true, the only figure is displayed - * + * * @param maintainRatio */ protected void maintainRatio(boolean maintainRatio) { @@ -154,7 +154,7 @@ public class ShapeDisplayCompartmentEditPart extends ResizableCompartmentEditPar * To be sure everything is clean, it removes all the current displayed shapes and then redraw all of the demanded shapes. This could be probably * improved in case of performance issues. *

    - * + * * @param contentPane * the figure where to add the new shapes */ @@ -242,7 +242,7 @@ public class ShapeDisplayCompartmentEditPart extends ResizableCompartmentEditPar public class OneShapeLayoutManager extends AbstractLayout { /** - * + * * {@inheritDoc} */ @Override @@ -255,7 +255,7 @@ public class ShapeDisplayCompartmentEditPart extends ResizableCompartmentEditPar } /** - * + * * {@inheritDoc} */ @Override @@ -343,7 +343,7 @@ public class ShapeDisplayCompartmentEditPart extends ResizableCompartmentEditPar /** * Gets the diagram event broker from the editing domain. - * + * * @return the diagram event broker */ protected DiagramEventBroker getDiagramEventBroker() { @@ -356,7 +356,7 @@ public class ShapeDisplayCompartmentEditPart extends ResizableCompartmentEditPar /** * Returns the view controlled by the host edit part - * + * * @return the view controlled by the host edit part */ protected View getView() { @@ -377,7 +377,7 @@ public class ShapeDisplayCompartmentEditPart extends ResizableCompartmentEditPar } /** - * + * * @param currentView * @return the current Style that reperesent the boder */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/messages.properties index b905e4e3897..0bc226ea9e0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/messages.properties +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/messages.properties @@ -164,45 +164,45 @@ createTemplateBinding21CreationTool_title=TemplateBinding createTemplateBinding21CreationTool_desc=Create a TemplateBinding createContextLink22CreationTool_title=ContextLink createContextLink22CreationTool_desc=Creation of a context link for a Constraint -ClassAttributeCompartmentEditPartCN_title=AttributeCompartment -ClassOperationCompartmentEditPartCN_title=OperationCompartment -ClassNestedClassifierCompartmentEditPartCN_title=NestedClassifierCompartment -ComponentAttributeCompartmentEditPartCN_title=AttributeCompartment -ComponentOperationCompartmentEditPartCN_title=OperationCompartment -ComponentNestedClassifierCompartmentEditPartCN_title=NestedClassifierCompartment -SignalAttributeCompartmentEditPartCN_title=AttributeCompartment -InterfaceAttributeCompartmentEditPartCN_title=AttributeCompartment -InterfaceOperationCompartmentEditPartCN_title=OperationCompartment -InterfaceNestedClassifierCompartmentEditPartCN_title=NestedClassifierCompartment -PrimitiveTypeAttributeCompartmentEditPartCN_title=AttributeCompartment -PrimitiveTypeOperationCompartmentEditPartCN_title=OperationCompartment -DataTypeAttributeCompartmentEditPartCN_title=AttributeCompartment -DataTypeOperationCompartmentEditPartCN_title=OperationCompartment -ModelPackageableElementCompartmentEditPartCN_title=PackageableElementCompartment -PackagePackageableElementCompartmentEditPartCN_title=PackageableElementCompartment -EnumerationEnumerationLiteralCompartmentEditPartCN_title=EnumerationLiteralCompartment -InstanceSpecificationSlotCompartmentEditPartCN_title=SlotCompartment -ClassAttributeCompartmentEditPart_title=AttributeCompartment -ClassOperationCompartmentEditPart_title=OperationCompartment -ClassNestedClassifierCompartmentEditPart_title=NestedClassifierCompartment -ComponentAttributeCompartmentEditPart_title=AttributeCompartment -ComponentOperationCompartmentEditPart_title=OperationCompartment -ComponentNestedClassifierCompartmentEditPart_title=NestedClassifierCompartment -InterfaceAttributeCompartmentEditPart_title=AttributeCompartment -InterfaceOperationCompartmentEditPart_title=OperationCompartment -InterfaceNestedClassifierCompartmentEditPart_title=NestedClassifierCompartment -PrimitiveTypeAttributeCompartmentEditPart_title=AttributeCompartment -PrimitiveTypeOperationCompartmentEditPart_title=OperationCompartment -DataTypeAttributeCompartmentEditPart_title=AttributeCompartment -DataTypeOperationCompartmentEditPart_title=OperationCompartment -AssociationClassAttributeCompartmentEditPart_title=AttributeCompartment -InstanceSpecificationSlotCompartmentEditPart_title=SlotCompartment -SignalAttributeCompartmentEditPart_title=AttributeCompartment -ModelPackageableElementCompartmentEditPartTN_title=PackageableElementCompartment -PackagePackageableElementCompartmentEditPart_title=PackageableElementCompartment -EnumerationEnumerationLiteralCompartmentEditPart_title=EnumerationLiteralCompartment -AssociationClassOperationCompartmentEditPart_title=OperationCompartment -AssociationClassNestedClassifierCompartmentEditPart_title=NestedClassifierCompartment +ClassAttributeCompartmentEditPartCN_title=attributes +ClassOperationCompartmentEditPartCN_title=operations +ClassNestedClassifierCompartmentEditPartCN_title=nested classifiers +ComponentAttributeCompartmentEditPartCN_title=attributes +ComponentOperationCompartmentEditPartCN_title=operations +ComponentNestedClassifierCompartmentEditPartCN_title=nested classifiers +SignalAttributeCompartmentEditPartCN_title=attributes +InterfaceAttributeCompartmentEditPartCN_title=attributes +InterfaceOperationCompartmentEditPartCN_title=operations +InterfaceNestedClassifierCompartmentEditPartCN_title=nested classifiers +PrimitiveTypeAttributeCompartmentEditPartCN_title=attributes +PrimitiveTypeOperationCompartmentEditPartCN_title=operations +DataTypeAttributeCompartmentEditPartCN_title=attributes +DataTypeOperationCompartmentEditPartCN_title=operations +ModelPackageableElementCompartmentEditPartCN_title=packaged elements +PackagePackageableElementCompartmentEditPartCN_title=packaged elements +EnumerationEnumerationLiteralCompartmentEditPartCN_title=literals +InstanceSpecificationSlotCompartmentEditPartCN_title=slots +ClassAttributeCompartmentEditPart_title=attributes +ClassOperationCompartmentEditPart_title=operations +ClassNestedClassifierCompartmentEditPart_title=nested classifiers +ComponentAttributeCompartmentEditPart_title=attributes +ComponentOperationCompartmentEditPart_title=operations +ComponentNestedClassifierCompartmentEditPart_title=nested classifiers +InterfaceAttributeCompartmentEditPart_title=attributes +InterfaceOperationCompartmentEditPart_title=operations +InterfaceNestedClassifierCompartmentEditPart_title=nested classifiers +PrimitiveTypeAttributeCompartmentEditPart_title=attributes +PrimitiveTypeOperationCompartmentEditPart_title=operations +DataTypeAttributeCompartmentEditPart_title=attributes +DataTypeOperationCompartmentEditPart_title=operations +AssociationClassAttributeCompartmentEditPart_title=attributes +InstanceSpecificationSlotCompartmentEditPart_title=slots +SignalAttributeCompartmentEditPart_title=attributes +ModelPackageableElementCompartmentEditPartTN_title=packaged elements +PackagePackageableElementCompartmentEditPart_title=packaged elements +EnumerationEnumerationLiteralCompartmentEditPart_title=literals +AssociationClassOperationCompartmentEditPart_title=operations +AssociationClassNestedClassifierCompartmentEditPart_title=nested classifiers RedefinableTemplateSignatureTemplateParameterCompartmentEditPart_title=TemplateParameterCompartment TemplateSignatureTemplateParameterCompartmentEditPart_title=TemplateParameterCompartment CommandName_OpenDiagram=Open Diagram diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen index 99e7e7ab901..60b51dfe447 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen @@ -6889,7 +6889,7 @@ itemSemanticEditPolicyClassName="ClassAttributeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ClassAttributeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.0" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@childNodes.33"> @@ -6912,7 +6912,7 @@ itemSemanticEditPolicyClassName="ClassOperationCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ClassOperationCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.19 /0/@diagram/@childNodes.9" - title="OperationCompartment" + title="operations" node="/0/@diagram/@childNodes.33"> @@ -6935,7 +6935,7 @@ itemSemanticEditPolicyClassName="ClassNestedClassifierCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ClassNestedClassifierCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.6 /0/@diagram/@childNodes.38 /0/@diagram/@childNodes.41 /0/@diagram/@childNodes.44 /0/@diagram/@childNodes.47 /0/@diagram/@childNodes.50" - title="NestedClassifierCompartment" + title="nested classifiers" node="/0/@diagram/@childNodes.33"> @@ -6962,7 +6962,7 @@ itemSemanticEditPolicyClassName="ComponentAttributeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ComponentAttributeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.1" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@childNodes.26"> @@ -6985,7 +6985,7 @@ itemSemanticEditPolicyClassName="ComponentOperationCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ComponentOperationCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.10 /0/@diagram/@childNodes.19" - title="OperationCompartment" + title="operations" node="/0/@diagram/@childNodes.26"> @@ -7008,7 +7008,7 @@ itemSemanticEditPolicyClassName="ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ComponentNestedClassifierCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.7 /0/@diagram/@childNodes.39 /0/@diagram/@childNodes.42 /0/@diagram/@childNodes.45 /0/@diagram/@childNodes.48 /0/@diagram/@childNodes.51" - title="NestedClassifierCompartment" + title="nested classifiers" node="/0/@diagram/@childNodes.26"> @@ -7035,7 +7035,7 @@ itemSemanticEditPolicyClassName="SignalAttributeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="SignalAttributeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.2" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@childNodes.27"> @@ -7058,7 +7058,7 @@ itemSemanticEditPolicyClassName="InterfaceAttributeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="InterfaceAttributeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.3" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@childNodes.28"> @@ -7081,7 +7081,7 @@ itemSemanticEditPolicyClassName="InterfaceOperationCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="InterfaceOperationCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.11 /0/@diagram/@childNodes.20" - title="OperationCompartment" + title="operations" node="/0/@diagram/@childNodes.28"> @@ -7104,7 +7104,7 @@ itemSemanticEditPolicyClassName="InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.8 /0/@diagram/@childNodes.40 /0/@diagram/@childNodes.43 /0/@diagram/@childNodes.46 /0/@diagram/@childNodes.49 /0/@diagram/@childNodes.52" - title="NestedClassifierCompartment" + title="nested classifiers" node="/0/@diagram/@childNodes.28"> @@ -7131,7 +7131,7 @@ itemSemanticEditPolicyClassName="PrimitiveTypeAttributeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="PrimitiveTypeAttributeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.4" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@childNodes.34"> @@ -7154,7 +7154,7 @@ itemSemanticEditPolicyClassName="PrimitiveTypeOperationCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="PrimitiveTypeOperationCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.12" - title="OperationCompartment" + title="operations" node="/0/@diagram/@childNodes.34"> @@ -7177,7 +7177,7 @@ itemSemanticEditPolicyClassName="DataTypeAttributeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="DataTypeAttributeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.5" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@childNodes.35"> @@ -7200,7 +7200,7 @@ itemSemanticEditPolicyClassName="DataTypeOperationCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="DataTypeOperationCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.13" - title="OperationCompartment" + title="operations" node="/0/@diagram/@childNodes.35"> @@ -7223,7 +7223,7 @@ itemSemanticEditPolicyClassName="ModelPackageableElementCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ModelPackageableElementCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.34 /0/@diagram/@childNodes.35 /0/@diagram/@childNodes.36 /0/@diagram/@childNodes.37 /0/@diagram/@childNodes.32" - title="PackageableElementCompartment" + title="packaged elements" canCollapse="false" node="/0/@diagram/@childNodes.29" listLayout="false"> @@ -7256,7 +7256,7 @@ itemSemanticEditPolicyClassName="PackagePackageableElementCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="PackagePackageableElementCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.34 /0/@diagram/@childNodes.35 /0/@diagram/@childNodes.36 /0/@diagram/@childNodes.37 /0/@diagram/@childNodes.32" - title="PackageableElementCompartment" + title="packaged elements" canCollapse="false" node="/0/@diagram/@childNodes.31" listLayout="false"> @@ -7312,7 +7312,7 @@ itemSemanticEditPolicyClassName="InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.21" - title="SlotCompartment" + title="slots" node="/0/@diagram/@childNodes.25"> @@ -7335,7 +7335,7 @@ itemSemanticEditPolicyClassName="ClassAttributeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="ClassAttributeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.0" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@topLevelNodes.11"> @@ -7358,7 +7358,7 @@ itemSemanticEditPolicyClassName="ClassOperationCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="ClassOperationCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.19 /0/@diagram/@childNodes.9" - title="OperationCompartment" + title="operations" node="/0/@diagram/@topLevelNodes.11"> @@ -7381,7 +7381,7 @@ itemSemanticEditPolicyClassName="ClassNestedClassifierCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="ClassNestedClassifierCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.6 /0/@diagram/@childNodes.38 /0/@diagram/@childNodes.41 /0/@diagram/@childNodes.44 /0/@diagram/@childNodes.47 /0/@diagram/@childNodes.50" - title="NestedClassifierCompartment" + title="nested classifiers" node="/0/@diagram/@topLevelNodes.11"> @@ -7412,7 +7412,7 @@ itemSemanticEditPolicyClassName="ComponentAttributeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="ComponentAttributeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.1" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@topLevelNodes.4"> @@ -7435,7 +7435,7 @@ itemSemanticEditPolicyClassName="ComponentOperationCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="ComponentOperationCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.10 /0/@diagram/@childNodes.19" - title="OperationCompartment" + title="operations" node="/0/@diagram/@topLevelNodes.4"> @@ -7458,7 +7458,7 @@ itemSemanticEditPolicyClassName="ComponentNestedClassifierCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="ComponentNestedClassifierCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.7 /0/@diagram/@childNodes.39 /0/@diagram/@childNodes.42 /0/@diagram/@childNodes.45 /0/@diagram/@childNodes.48 /0/@diagram/@childNodes.51" - title="NestedClassifierCompartment" + title="nested classifiers" node="/0/@diagram/@topLevelNodes.4"> @@ -7489,7 +7489,7 @@ itemSemanticEditPolicyClassName="InterfaceAttributeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="InterfaceAttributeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.3" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@topLevelNodes.6"> @@ -7512,7 +7512,7 @@ itemSemanticEditPolicyClassName="InterfaceOperationCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="InterfaceOperationCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.11 /0/@diagram/@childNodes.20" - title="OperationCompartment" + title="operations" node="/0/@diagram/@topLevelNodes.6"> @@ -7535,7 +7535,7 @@ itemSemanticEditPolicyClassName="InterfaceNestedClassifierCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="InterfaceNestedClassifierCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.8 /0/@diagram/@childNodes.40 /0/@diagram/@childNodes.43 /0/@diagram/@childNodes.46 /0/@diagram/@childNodes.49 /0/@diagram/@childNodes.52" - title="NestedClassifierCompartment" + title="nested classifiers" node="/0/@diagram/@topLevelNodes.6"> @@ -7566,7 +7566,7 @@ itemSemanticEditPolicyClassName="PrimitiveTypeAttributeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="PrimitiveTypeAttributeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.4" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@topLevelNodes.12"> @@ -7589,7 +7589,7 @@ itemSemanticEditPolicyClassName="PrimitiveTypeOperationCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="PrimitiveTypeOperationCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.12" - title="OperationCompartment" + title="operations" node="/0/@diagram/@topLevelNodes.12"> @@ -7612,7 +7612,7 @@ itemSemanticEditPolicyClassName="DataTypeAttributeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="DataTypeAttributeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.5" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@topLevelNodes.13"> @@ -7635,7 +7635,7 @@ itemSemanticEditPolicyClassName="DataTypeOperationCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="DataTypeOperationCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.13" - title="OperationCompartment" + title="operations" node="/0/@diagram/@topLevelNodes.13"> @@ -7658,7 +7658,7 @@ itemSemanticEditPolicyClassName="AssociationClassAttributeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="AssociationClassAttributeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.1" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@topLevelNodes.1"> @@ -7681,7 +7681,7 @@ itemSemanticEditPolicyClassName="InstanceSpecificationSlotCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="InstanceSpecificationSlotCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.21" - title="SlotCompartment" + title="slots" node="/0/@diagram/@topLevelNodes.3"> @@ -7704,7 +7704,7 @@ itemSemanticEditPolicyClassName="SignalAttributeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="SignalAttributeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.2" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@topLevelNodes.5"> @@ -7727,7 +7727,7 @@ itemSemanticEditPolicyClassName="ModelPackageableElementCompartmentItemSemanticEditPolicyTN" canonicalEditPolicyClassName="ModelPackageableElementCompartmentCanonicalEditPolicyTN" childNodes="/0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.34 /0/@diagram/@childNodes.35 /0/@diagram/@childNodes.36 /0/@diagram/@childNodes.37 /0/@diagram/@childNodes.32" - title="PackageableElementCompartment" + title="packaged elements" canCollapse="false" node="/0/@diagram/@topLevelNodes.7" listLayout="false"> @@ -7760,7 +7760,7 @@ itemSemanticEditPolicyClassName="PackagePackageableElementCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="PackagePackageableElementCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.34 /0/@diagram/@childNodes.35 /0/@diagram/@childNodes.36 /0/@diagram/@childNodes.37 /0/@diagram/@childNodes.32" - title="PackageableElementCompartment" + title="packaged elements" canCollapse="false" node="/0/@diagram/@topLevelNodes.9" listLayout="false"> @@ -7816,7 +7816,7 @@ itemSemanticEditPolicyClassName="AssociationClassOperationCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="AssociationClassOperationCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.10" - title="OperationCompartment" + title="operations" node="/0/@diagram/@topLevelNodes.1"> @@ -7839,7 +7839,7 @@ itemSemanticEditPolicyClassName="AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="AssociationClassNestedClassifierCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.7" - title="NestedClassifierCompartment" + title="nested classifiers" node="/0/@diagram/@topLevelNodes.1"> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml index 1ce486bd10a..fdc18ad9e1d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml @@ -3025,197 +3025,197 @@ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/messages.properties index ebe249e6611..1b3c0535d99 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/messages.properties +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/messages.properties @@ -82,29 +82,29 @@ createInterfaceRealizationCreationTool_title=Interface Realization createInterfaceRealizationCreationTool_desc=Create an Interface Realization createComponentRealizationCreationTool_title=Component Realization createComponentRealizationCreationTool_desc=Create a Component Realization -ComponentCompositeCompartmentEditPart_title=CompositeCompartment -ModelPackageableElementCompartmentEditPart_title=ModelElementCompartment -PackagePackageableElementCompartmentEditPart_title=PackageableElementCompartment -ModelPackageableElementCompartmentEditPartCN_title=ModelElementCompartment -PackagePackageableElementCompartmentEditPartCN_title=PackageableElementCompartment -ComponentCompositeCompartmentEditPartCN_title=CompositeCompartmentCN -ComponentCompositeCompartmentEditPartPCN_title=CompositeCompartmentPCN +ComponentCompositeCompartmentEditPart_title=packaged elements +ModelPackageableElementCompartmentEditPart_title=packaged elements +PackagePackageableElementCompartmentEditPart_title=packaged elements +ModelPackageableElementCompartmentEditPartCN_title=packaged elements +PackagePackageableElementCompartmentEditPartCN_title=packaged elements +ComponentCompositeCompartmentEditPartCN_title=packaged elements +ComponentCompositeCompartmentEditPartPCN_title=packaged elements CommandName_OpenDiagram=Open Diagram MessageFormatParser_InvalidInputError=Invalid input at {0} UMLModelingAssistantProviderTitle=Select domain model element UMLModelingAssistantProviderMessage=Available domain model elements: createRectancleInterfaceCreationTool_title=Interface createRectancleInterfaceCreationTool_desc=Create an Interface -InterfaceAttributeCompartmentEditPart_title=AttributeCompartment +InterfaceAttributeCompartmentEditPart_title=attributes createPropertyCreationTool_title=Property createPropertyCreationTool_desc=Create a Property createOperationCreationTool_title=Operation createOperationCreationTool_desc=Create an Operation -InterfaceOperationCompartmentEditPart_title=OperationCompartment +InterfaceOperationCompartmentEditPart_title=operations createReceptionCreationTool_title=Reception createReceptionCreationTool_desc=Create a Reception -InterfaceAttributeCompartmentEditPartCN_title=AttributeCompartment -InterfaceOperationCompartmentEditPartCN_title=OperationCompartment +InterfaceAttributeCompartmentEditPartCN_title=attributes +InterfaceOperationCompartmentEditPartCN_title=operations NodesGroup_title=Nodes NodesGroup_desc=Diagram Nodes LinksGroup_title=Links diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen index 2dce7a75f3e..a4b1f326dd8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen @@ -2634,7 +2634,7 @@ itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12" - title="CompositeCompartment" + title="packaged elements" hideIfEmpty="false" node="/0/@diagram/@topLevelNodes.1" listLayout="false"> @@ -2659,7 +2659,7 @@ itemSemanticEditPolicyClassName="ModelPackageableElementCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="ModelPackageableElementCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.11" - title="ModelElementCompartment" + title="packaged elements" canCollapse="false" node="/0/@diagram/@topLevelNodes.2" listLayout="false"> @@ -2684,7 +2684,7 @@ itemSemanticEditPolicyClassName="PackagePackageableElementCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="PackagePackageableElementCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.11" - title="PackageableElementCompartment" + title="packaged elements" canCollapse="false" node="/0/@diagram/@topLevelNodes.3" listLayout="false"> @@ -2709,7 +2709,7 @@ itemSemanticEditPolicyClassName="ModelPackageableElementCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ModelPackageableElementCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.11" - title="ModelElementCompartment" + title="packaged elements" canCollapse="false" node="/0/@diagram/@childNodes.1" listLayout="false"> @@ -2734,7 +2734,7 @@ itemSemanticEditPolicyClassName="PackagePackageableElementCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="PackagePackageableElementCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.11" - title="PackageableElementCompartment" + title="packaged elements" canCollapse="false" node="/0/@diagram/@childNodes.2" listLayout="false"> @@ -2759,7 +2759,7 @@ itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12" - title="CompositeCompartmentCN" + title="packaged elements" hideIfEmpty="false" node="/0/@diagram/@childNodes.4" listLayout="false"> @@ -2784,7 +2784,7 @@ itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicyPCN" canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicyPCN" childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12" - title="CompositeCompartmentPCN" + title="packaged elements" hideIfEmpty="false" node="/0/@diagram/@childNodes.5" listLayout="false"> @@ -2809,7 +2809,7 @@ itemSemanticEditPolicyClassName="InterfaceAttributeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="InterfaceAttributeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.8" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@topLevelNodes.4"> @@ -2824,7 +2824,7 @@ itemSemanticEditPolicyClassName="InterfaceOperationCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="InterfaceOperationCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10" - title="OperationCompartment" + title="operations" node="/0/@diagram/@topLevelNodes.4"> @@ -2839,7 +2839,7 @@ itemSemanticEditPolicyClassName="InterfaceAttributeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="InterfaceAttributeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.8" - title="AttributeCompartment" + title="attributes" node="/0/@diagram/@childNodes.3"> @@ -2854,7 +2854,7 @@ itemSemanticEditPolicyClassName="InterfaceOperationCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="InterfaceOperationCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10" - title="OperationCompartment" + title="operations" node="/0/@diagram/@childNodes.3"> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml index da9465709d7..35b9385e01c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml @@ -1563,57 +1563,57 @@ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/messages.properties index 10ee82ea2f4..b9b24f41ec6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/messages.properties +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/messages.properties @@ -105,37 +105,37 @@ createRepresentationCreationTool_title=Representation createRepresentationCreationTool_desc=Create new representation for an InformationItem createInformationFlowCreationTool_title=InformationFlow createInformationFlowCreationTool_desc=Create new InformationFlow -DataTypeAttributeCompartmentEditPart_title=properties +DataTypeAttributeCompartmentEditPart_title=attributes DataTypeOperationCompartmentEditPart_title=operations -DataTypeAttributeCompartmentEditPartCN_title=properties +DataTypeAttributeCompartmentEditPartCN_title=attributes DataTypeOperationCompartmentEditPartCN_title=operations EnumerationEnumerationLiteralCompartmentEditPart_title=literals EnumerationEnumerationLiteralCompartmentEditPartCN_title=literals -ActivityCompositeCompartmentEditPartCN_title=structure -InteractionCompositeCompartmentEditPartCN_title=structure -ProtocolStateMachineCompositeCompartmentEditPartCN_title=structure -StateMachineCompositeCompartmentEditPartCN_title=structure -FunctionBehaviorCompositeCompartmentEditPartCN_title=structure -OpaqueBehaviorCompositeCompartmentEditPartCN_title=structure -ComponentCompositeCompartmentEditPartCN_title=structure -DeviceCompositeCompartmentEditPartCN_title=structure -ExecutionEnvironmentCompositeCompartmentEditPartCN_title=structure -NodeCompositeCompartmentEditPartCN_title=structure -ClassCompositeCompartmentEditPartCN_title=structure -CollaborationCompositeCompartmentEditPartCN_title=structure -ActivityCompositeCompartmentEditPart_title=structure -InteractionCompositeCompartmentEditPart_title=structure -ProtocolStateMachineCompositeCompartmentEditPart_title=structure -StateMachineCompositeCompartmentEditPart_title=structure -FunctionBehaviorCompositeCompartmentEditPart_title=structure -OpaqueBehaviorCompositeCompartmentEditPart_title=structure -ComponentCompositeCompartmentEditPart_title=structure -DeviceCompositeCompartmentEditPart_title=structure -ExecutionEnvironmentCompositeCompartmentEditPart_title=structure -NodeCompositeCompartmentEditPart_title=structure -ClassCompositeCompartmentEditPart_title=structure -CollaborationCompositeCompartmentEditPart_title=structure -PropertyPartCompartmentEditPartCN_title=structure +ActivityCompositeCompartmentEditPartCN_title=internal structure +InteractionCompositeCompartmentEditPartCN_title=internal structure +ProtocolStateMachineCompositeCompartmentEditPartCN_title=internal structure +StateMachineCompositeCompartmentEditPartCN_title=internal structure +FunctionBehaviorCompositeCompartmentEditPartCN_title=internal structure +OpaqueBehaviorCompositeCompartmentEditPartCN_title=internal structure +ComponentCompositeCompartmentEditPartCN_title=internal structure +DeviceCompositeCompartmentEditPartCN_title=internal structure +ExecutionEnvironmentCompositeCompartmentEditPartCN_title=internal structure +NodeCompositeCompartmentEditPartCN_title=internal structure +ClassCompositeCompartmentEditPartCN_title=internal structure +CollaborationCompositeCompartmentEditPartCN_title=internal structure +ActivityCompositeCompartmentEditPart_title=internal structure +InteractionCompositeCompartmentEditPart_title=internal structure +ProtocolStateMachineCompositeCompartmentEditPart_title=internal structure +StateMachineCompositeCompartmentEditPart_title=internal structure +FunctionBehaviorCompositeCompartmentEditPart_title=internal structure +OpaqueBehaviorCompositeCompartmentEditPart_title=internal structure +ComponentCompositeCompartmentEditPart_title=internal structure +DeviceCompositeCompartmentEditPart_title=internal structure +ExecutionEnvironmentCompositeCompartmentEditPart_title=internal structure +NodeCompositeCompartmentEditPart_title=internal structure +ClassCompositeCompartmentEditPart_title=internal structure +CollaborationCompositeCompartmentEditPart_title=internal structure +PropertyPartCompartmentEditPartCN_title=internal structure CommandName_OpenDiagram=Open Diagram MessageFormatParser_InvalidInputError=Invalid input at {0} UMLModelingAssistantProviderTitle=Select domain model element diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen index 90ff2fde591..83ddf09b6ec 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen @@ -3374,7 +3374,7 @@ - + @@ -3386,7 +3386,7 @@ - + @@ -3410,7 +3410,7 @@ - + @@ -3418,7 +3418,7 @@ - + @@ -3426,7 +3426,7 @@ - + @@ -3434,7 +3434,7 @@ - + @@ -3442,7 +3442,7 @@ - + @@ -3450,7 +3450,7 @@ - + @@ -3458,7 +3458,7 @@ - + @@ -3466,7 +3466,7 @@ - + @@ -3474,7 +3474,7 @@ - + @@ -3482,7 +3482,7 @@ - + @@ -3490,7 +3490,7 @@ - + @@ -3498,7 +3498,7 @@ - + @@ -3506,7 +3506,7 @@ - + @@ -3514,7 +3514,7 @@ - + @@ -3522,7 +3522,7 @@ - + @@ -3530,7 +3530,7 @@ - + @@ -3538,7 +3538,7 @@ - + @@ -3546,7 +3546,7 @@ - + @@ -3554,7 +3554,7 @@ - + @@ -3562,7 +3562,7 @@ - + @@ -3570,7 +3570,7 @@ - + @@ -3578,7 +3578,7 @@ - + @@ -3586,7 +3586,7 @@ - + @@ -3594,7 +3594,7 @@ - + @@ -3602,7 +3602,7 @@ - + diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml index ef6341e34c4..69b8c144132 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml @@ -2359,7 +2359,7 @@ @@ -2369,7 +2369,7 @@ @@ -2389,127 +2389,127 @@ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/messages.properties index 5589ac3550f..b14ec3bbd19 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/messages.properties +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/messages.properties @@ -87,22 +87,22 @@ createEnumerationLiteral3CreationTool_title=EnumerationLiteral createEnumerationLiteral3CreationTool_desc=Add new EnumerationLiteral createContextLink6CreationTool_title=ContextLink createContextLink6CreationTool_desc=Creation of a context link for a Constraint -PackagePackageableElementCompartmentEditPart_title=PackageableElementCompartment -PackagePackageableElementCompartmentEditPartCN_title=PackageableElementCompartment -ProfilePackageableElementCompartmentEditPartTN_title=ProfilePackageableElementCompartment -ProfilePackageableElementCompartmentEditPartCN_title=ProfilePackageableElementCompartment -StereotypeAttributeCompartmentEditPart_title=AttributeCompartment -StereotypeAttributeCompartmentEditPartCN_title=AttributeCompartment -StereotypeOperationCompartmentEditPart_title=OperationCompartment -StereotypeOperationCompartmentEditPartCN_title=OperationCompartment -ModelPackageableElementCompartmentEditPartTN_title=ModelElementCompartment -ModelPackageableElementCompartmentEditPartCN_title=ModelElementCompartment -EnumerationEnumerationLiteralCompartmentEditPartCN_title=EnumerationEnumerationLiteral -EnumerationEnumerationLiteralCompartmentEditPart_title=EnumerationEnumerationLiteral -DataTypeAttributeCompartmentEditPart_title=DataTypeAttributeCompartment -DataTypeAttributeCompartmentEditPartCN_title=DataTypeAttributeCompartment -DataTypeOperationCompartmentEditPart_title=DataTypeOperationCompartment -DataTypeOperationCompartmentEditPartCN_title=DataTypeOperationCompartment +PackagePackageableElementCompartmentEditPart_title=packaged elements +PackagePackageableElementCompartmentEditPartCN_title=packaged elements +ProfilePackageableElementCompartmentEditPartTN_title=packaged elements +ProfilePackageableElementCompartmentEditPartCN_title=packaged elements +StereotypeAttributeCompartmentEditPart_title=attributes +StereotypeAttributeCompartmentEditPartCN_title=attributes +StereotypeOperationCompartmentEditPart_title=operations +StereotypeOperationCompartmentEditPartCN_title=operations +ModelPackageableElementCompartmentEditPartTN_title=packaged elements +ModelPackageableElementCompartmentEditPartCN_title=packaged elements +EnumerationEnumerationLiteralCompartmentEditPartCN_title=literals +EnumerationEnumerationLiteralCompartmentEditPart_title=literals +DataTypeAttributeCompartmentEditPart_title=attributes +DataTypeAttributeCompartmentEditPartCN_title=attributes +DataTypeOperationCompartmentEditPart_title=operations +DataTypeOperationCompartmentEditPartCN_title=operations CommandName_OpenDiagram=Open Diagram NavigatorActionProvider_OpenDiagramActionName=Open Diagram MessageFormatParser_InvalidInputError=Invalid input at {0} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen index 97ba2a29b47..c5b9d930930 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen @@ -1101,59 +1101,59 @@ - + - + - + - + - + - + - + - + - + @@ -1161,7 +1161,7 @@ - + @@ -1169,37 +1169,37 @@ - + - + - + - + - + - + diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml index 19d7b6f9d52..6c32fc5b2e7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml @@ -1541,82 +1541,82 @@ diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css index 13660016b20..fe0cb1f18a7 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/compartments.css @@ -7,22 +7,22 @@ showTitle: true; } -Interface > Compartment[kind=Attribute], -Interface > Compartment[kind=NestedClassifier] { +Interface > Compartment[kind=attributes], +Interface > Compartment[kind=nestedclassifiers] { visible:false; } -Interface[ownedAttribute] > Compartment[kind=Attribute]{ +Interface[ownedAttribute] > Compartment[kind=attributes]{ visible:true; } -Compartment[kind=NestedClassifier] { +Compartment[kind=nestedclassifiers] { visible: false; } /* Collapse the Attribute compartment if the Class contains a P1 attribute (Displayed) */ -Class[ownedAttribute~="P1"] > Compartment[kind=Attribute]{ +Class[ownedAttribute~="P1"] > Compartment[kind=attributes]{ collapsed: true; } @@ -30,7 +30,7 @@ Enumeration > Compartment { collapsed: true; } -Enumeration > Compartment[kind=EnUmerAtionLiteRal]{ /* Case insensitive */ +Enumeration > Compartment[kind=LiteRalS]{ /* Case insensitive */ collapsed: false; } -- cgit v1.2.3 From 460dfc77532b3471d72d9a1cd263de8866b9b8e6 Mon Sep 17 00:00:00 2001 From: Camille Letavernier Date: Fri, 14 Feb 2014 18:57:21 +0100 Subject: [Releng - CSS] Fix missing dependency to core.databinding --- .../org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/junit') diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF index 481cbb8fc50..915af9d0366 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF @@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.uml2.uml;bundle-version="4.0.0", org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0", org.junit;bundle-version="4.10.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0" + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0", + org.eclipse.core.databinding;bundle-version="1.4.1" Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.tests, org.eclipse.papyrus.infra.gmfdiag.css.tests.tests Bundle-Vendor: Eclipse Modeling Project -- cgit v1.2.3