1 files changed, 60 insertions, 60 deletions

diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSModelStylesheetTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSModelStylesheetTest.java
index 14e2730d7d6..e8abeb70adc 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSModelStylesheetTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSModelStylesheetTest.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net

- *

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

-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.gmf.runtime.notation.Diagram;

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

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.WorkspaceCSSEngine;

-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.preferences.ThemePreferences;

-import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class CSSModelStylesheetTest extends AbstractCSSStylesheetTest {

-

-	@BeforeClass

-	public static void initCSSTheme() {

-		IPreferenceStore cssThemePreferences = org.eclipse.papyrus.infra.gmfdiag.css.Activator.getDefault().getPreferenceStore();

-		cssThemePreferences.setValue(ThemePreferences.CURRENT_THEME, "org.eclipse.papyrus.css.papyrus_theme");

-		WorkspaceCSSEngine.instance.reset();

-	}

-

-	@Before

-	public void init() throws Exception {

-		ResourceSet resourceSet = houseKeeper.createResourceSet();

-		CSSHelper.installCSSSupport(resourceSet);

-

-		URI modelURI = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/modelStylesheetTest/model.notation", true);

-

-		Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, modelURI);

-		Assert.assertNotNull("Cannot find the model", diagram);

-		Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram);

-		this.diagram = (CSSDiagram)diagram;

-	}

-

-	@Test

-	public void testStyleSheetsPriorities() {

-		//Diagram CSS have a highter priority than Model CSS

-		//Component for Model CSS is Red and for diagram must be Lime

-		Shape componentView = findShape("Component1");

-		Assert.assertEquals("Invalid color", rgb(0, 255, 0), componentView.getFillColor()); //RGB(0,255,0)

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net
+ *
+ *****************************************************************************/
+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.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.WorkspaceCSSEngine;
+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.preferences.ThemePreferences;
+import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class CSSModelStylesheetTest extends AbstractCSSStylesheetTest {
+
+	@BeforeClass
+	public static void initCSSTheme() {
+		IPreferenceStore cssThemePreferences = org.eclipse.papyrus.infra.gmfdiag.css.Activator.getDefault().getPreferenceStore();
+		cssThemePreferences.setValue(ThemePreferences.CURRENT_THEME, "org.eclipse.papyrus.css.papyrus_theme");
+		WorkspaceCSSEngine.instance.reset();
+	}
+
+	@Before
+	public void init() throws Exception {
+		ResourceSet resourceSet = houseKeeper.createResourceSet();
+		CSSHelper.installCSSSupport(resourceSet);
+
+		URI modelURI = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/modelStylesheetTest/model.notation", true);
+
+		Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, modelURI);
+		Assert.assertNotNull("Cannot find the model", diagram);
+		Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram);
+		this.diagram = (CSSDiagram)diagram;
+	}
+
+	@Test
+	public void testStyleSheetsPriorities() {
+		//Diagram CSS have a highter priority than Model CSS
+		//Component for Model CSS is Red and for diagram must be Lime
+		Shape componentView = findShape("Component1");
+		Assert.assertEquals("Invalid color", rgb(0, 255, 0), componentView.getFillColor()); //RGB(0,255,0)
+	}
+}