Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2019-02-18 16:07:45 -0500
committervincent lorenzo2019-02-19 06:15:19 -0500
commit8ca8773cd17e6803dea8430f20d991c51415ed17 (patch)
tree45957de10cb760e9aee686c78256d6c1c69cb26b
parent0008788c3b16845b0758f8808edd2c87f4310501 (diff)
downloadorg.eclipse.papyrus-8ca8773cd17e6803dea8430f20d991c51415ed17.tar.gz
org.eclipse.papyrus-8ca8773cd17e6803dea8430f20d991c51415ed17.tar.xz
org.eclipse.papyrus-8ca8773cd17e6803dea8430f20d991c51415ed17.zip
Bug 544547: [CDO] Replace CSSDiagramImpl by CSSDiagram in oep.infra.gmfdiag.css, to avoid a ClassCastException
Change-Id: I06dc69439a4d4d88b2b66047b5f40c1cf1ceb9fe Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml12
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicCompartmentImpl.java9
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicSemanticCompartmentImpl.java7
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSCompartmentImpl.java7
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSConnectorImpl.java9
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSDecorationNodeImpl.java9
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSEdgeImpl.java9
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSListCompartmentImpl.java7
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSNodeImpl.java9
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSSemanticListCompartmentImpl.java7
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeImpl.java9
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSStandardDiagramImpl.java7
-rwxr-xr-xplugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java36
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/pom.xml3
15 files changed, 78 insertions, 64 deletions
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
index 472718fa1a9..48a910526be 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
@@ -33,7 +33,7 @@ Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.100.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.Activator
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
index 787f390379d..63a5c38f9ad 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.infra-gmfdiag-css</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.infra-gmfdiag-css</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.css</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicCompartmentImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicCompartmentImpl.java
index 2c285134c8d..8d45eda08ec 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicCompartmentImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicCompartmentImpl.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2012, 2016, 2019 CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -11,6 +11,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
* Christian W. Damus - bugs 433206, 436665
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 544547
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css;
@@ -21,7 +22,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.Style;
import org.eclipse.gmf.runtime.notation.impl.BasicCompartmentImpl;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDrawerStyle;
import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;
@@ -45,7 +46,7 @@ public class CSSBasicCompartmentImpl extends BasicCompartmentImpl implements CSS
protected ExtendedCSSEngine getEngine() {
if (engine == null) {
- engine = ((CSSDiagramImpl) getDiagram()).getEngine();
+ engine = ((CSSDiagram) getDiagram()).getEngine();
}
return engine;
}
@@ -56,7 +57,7 @@ public class CSSBasicCompartmentImpl extends BasicCompartmentImpl implements CSS
}
return cssView;
}
-
+
@Override
public void resetCSS() {
cssView = null;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicSemanticCompartmentImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicSemanticCompartmentImpl.java
index b7caaf005d4..b5767c27296 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicSemanticCompartmentImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicSemanticCompartmentImpl.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
+ * Copyright (c) 2012, 2019 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
*
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 544547
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css;
@@ -17,7 +18,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.impl.BasicSemanticCompartmentImpl;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDrawerStyle;
import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;
@@ -41,7 +42,7 @@ public class CSSBasicSemanticCompartmentImpl extends BasicSemanticCompartmentImp
protected ExtendedCSSEngine getEngine() {
if (engine == null) {
- engine = ((CSSDiagramImpl) getDiagram()).getEngine();
+ engine = ((CSSDiagram) getDiagram()).getEngine();
}
return engine;
}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSCompartmentImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSCompartmentImpl.java
index 7616f3a3070..79b4f211a7e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSCompartmentImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSCompartmentImpl.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
+ * Copyright (c) 2012, 2019 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
*
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 544547
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css;
@@ -17,7 +18,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.impl.CompartmentImpl;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDrawerStyle;
import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;
@@ -41,7 +42,7 @@ public class CSSCompartmentImpl extends CompartmentImpl implements CSSDrawerStyl
protected ExtendedCSSEngine getEngine() {
if (engine == null) {
- engine = ((CSSDiagramImpl) getDiagram()).getEngine();
+ engine = ((CSSDiagram) getDiagram()).getEngine();
}
return engine;
}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSConnectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSConnectorImpl.java
index aab403da6e3..914a380fb89 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSConnectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSConnectorImpl.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2012, 2016, 2019 CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -11,6 +11,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
* Christian W. Damus - bugs 433206, 436665
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 544547
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css;
@@ -25,7 +26,7 @@ import org.eclipse.gmf.runtime.notation.Smoothness;
import org.eclipse.gmf.runtime.notation.Style;
import org.eclipse.gmf.runtime.notation.impl.ConnectorImpl;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSConnectorStyle;
import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;
@@ -49,7 +50,7 @@ public class CSSConnectorImpl extends ConnectorImpl implements CSSConnectorStyle
protected ExtendedCSSEngine getEngine() {
if (engine == null) {
- engine = ((CSSDiagramImpl) getDiagram()).getEngine();
+ engine = ((CSSDiagram) getDiagram()).getEngine();
}
return engine;
}
@@ -60,7 +61,7 @@ public class CSSConnectorImpl extends ConnectorImpl implements CSSConnectorStyle
}
return cssView;
}
-
+
@Override
public void resetCSS() {
cssView = null;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSDecorationNodeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSDecorationNodeImpl.java
index 81fb73e657c..0c305d6ff23 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSDecorationNodeImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSDecorationNodeImpl.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2014, 2016, 2019 CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -11,6 +11,7 @@
* Contributors:
* CEA LIST - Initial API and implementation
* Christian W. Damus - bugs 433206, 436665
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 544547
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css;
@@ -21,7 +22,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.Style;
import org.eclipse.gmf.runtime.notation.impl.DecorationNodeImpl;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSCustomStyleDelegate;
import org.eclipse.papyrus.infra.gmfdiag.css.provider.CustomStyle;
@@ -39,7 +40,7 @@ public class CSSDecorationNodeImpl extends DecorationNodeImpl implements CustomS
protected ExtendedCSSEngine getEngine() {
if (engine == null) {
- engine = ((CSSDiagramImpl) getDiagram()).getEngine();
+ engine = ((CSSDiagram) getDiagram()).getEngine();
}
return engine;
}
@@ -57,7 +58,7 @@ public class CSSDecorationNodeImpl extends DecorationNodeImpl implements CustomS
}
return cssView;
}
-
+
@Override
public void resetCSS() {
cssView = null;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSEdgeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSEdgeImpl.java
index 38f3fca5500..8f15e704d39 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSEdgeImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSEdgeImpl.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2012, 2016, 2019 CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -11,6 +11,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
* Christian W. Damus - bugs 433206, 436665
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 544547
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css;
@@ -21,7 +22,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.Style;
import org.eclipse.gmf.runtime.notation.impl.EdgeImpl;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSCustomStyleDelegate;
import org.eclipse.papyrus.infra.gmfdiag.css.provider.CustomStyle;
@@ -38,7 +39,7 @@ public class CSSEdgeImpl extends EdgeImpl implements CSSView.Internal, CustomSty
protected ExtendedCSSEngine getEngine() {
if (engine == null) {
- engine = ((CSSDiagramImpl) getDiagram()).getEngine();
+ engine = ((CSSDiagram) getDiagram()).getEngine();
}
return engine;
}
@@ -49,7 +50,7 @@ public class CSSEdgeImpl extends EdgeImpl implements CSSView.Internal, CustomSty
}
return cssView;
}
-
+
@Override
public void resetCSS() {
cssView = null;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSListCompartmentImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSListCompartmentImpl.java
index 85ba8671bf5..3a72bd7abfd 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSListCompartmentImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSListCompartmentImpl.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
+ * Copyright (c) 2012, 2019 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
*
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 544547
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css;
@@ -19,7 +20,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.Sorting;
import org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDrawerStyle;
import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSTitleStyle;
@@ -54,7 +55,7 @@ public class CSSListCompartmentImpl extends ListCompartmentImpl implements CSSDr
protected ExtendedCSSEngine getEngine() {
if (engine == null) {
- engine = ((CSSDiagramImpl) getDiagram()).getEngine();
+ engine = ((CSSDiagram) getDiagram()).getEngine();
}
return engine;
}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSNodeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSNodeImpl.java
index 58ca8d87751..b4b900d26a4 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSNodeImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSNodeImpl.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2012, 2016, 2019 CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -11,6 +11,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
* Christian W. Damus - bugs 433206, 436665
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 544547
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css;
@@ -21,7 +22,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.Style;
import org.eclipse.gmf.runtime.notation.impl.NodeImpl;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSCustomStyleDelegate;
import org.eclipse.papyrus.infra.gmfdiag.css.provider.CustomStyle;
@@ -38,7 +39,7 @@ public class CSSNodeImpl extends NodeImpl implements CSSView.Internal, CustomSty
protected ExtendedCSSEngine getEngine() {
if (engine == null) {
- engine = ((CSSDiagramImpl) getDiagram()).getEngine();
+ engine = ((CSSDiagram) getDiagram()).getEngine();
}
return engine;
}
@@ -49,7 +50,7 @@ public class CSSNodeImpl extends NodeImpl implements CSSView.Internal, CustomSty
}
return cssView;
}
-
+
@Override
public void resetCSS() {
cssView = null;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSSemanticListCompartmentImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSSemanticListCompartmentImpl.java
index c5acf379731..f2c8f4ccc53 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSSemanticListCompartmentImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSSemanticListCompartmentImpl.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
+ * Copyright (c) 2012, 2019 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
*
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 544547
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css;
@@ -19,7 +20,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.Sorting;
import org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDrawerStyle;
import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;
@@ -43,7 +44,7 @@ public class CSSSemanticListCompartmentImpl extends SemanticListCompartmentImpl
protected ExtendedCSSEngine getEngine() {
if (engine == null) {
- engine = ((CSSDiagramImpl) getDiagram()).getEngine();
+ engine = ((CSSDiagram) getDiagram()).getEngine();
}
return engine;
}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeImpl.java
index cb5398168b1..47c1f89eb2b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeImpl.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2012, 2016, 2019 CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -11,6 +11,7 @@
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
* Christian W. Damus - bugs 433206, 436665
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 544547
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css;
@@ -21,7 +22,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.Style;
import org.eclipse.gmf.runtime.notation.impl.ShapeImpl;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSCustomStyleDelegate;
import org.eclipse.papyrus.infra.gmfdiag.css.provider.CustomStyle;
@@ -60,7 +61,7 @@ public class CSSShapeImpl extends ShapeImpl implements CSSShapeStyle, CustomStyl
}
return cssView;
}
-
+
@Override
public void resetCSS() {
cssView = null;
@@ -69,7 +70,7 @@ public class CSSShapeImpl extends ShapeImpl implements CSSShapeStyle, CustomStyl
protected ExtendedCSSEngine getEngine() {
if (engine == null) {
- engine = ((CSSDiagramImpl) getDiagram()).getEngine();
+ engine = ((CSSDiagram) getDiagram()).getEngine();
}
return engine;
}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSStandardDiagramImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSStandardDiagramImpl.java
index 2c8e79fe50e..5f933ed1250 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSStandardDiagramImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CSSStandardDiagramImpl.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
+ * Copyright (c) 2012, 2019 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
*
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 544547
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css;
@@ -18,7 +19,7 @@ import org.eclipse.gmf.runtime.notation.MeasurementUnit;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDiagramStyle;
import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDiagramStyleDelegate;
@@ -38,7 +39,7 @@ public class CSSStandardDiagramImpl extends StandardDiagramImpl implements CSSDi
protected ExtendedCSSEngine getEngine() {
if (engine == null) {
- engine = ((CSSDiagramImpl) getDiagram()).getEngine();
+ engine = ((CSSDiagram) getDiagram()).getEngine();
}
return engine;
}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java
index e045b70e078..05c91ee6bff 100755
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2013, 2019 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,7 +10,7 @@
*
* Contributors:
* Laurent Wouters <laurent.wouters@cea.fr> CEA LIST - Initial API and implementation
- *
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 544547
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css;
@@ -63,12 +63,12 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
/**
* The name of the CSS property that points to the CSS file for the SVG figure
*/
- private static final String CSS_PROPERTY_SVG_STYLESHEET = "svgCSSFile";
+ private static final String CSS_PROPERTY_SVG_STYLESHEET = "svgCSSFile"; //$NON-NLS-1$
/**
* The name of the CSS property that defines the name of the CSS class to look for in the SVG figure
*/
- private static final String CSS_PROPERTY_SVG_CLASS = "svgCSSClass";
+ private static final String CSS_PROPERTY_SVG_CLASS = "svgCSSClass"; //$NON-NLS-1$
/**
* The CSS engine for this post-processor
@@ -136,12 +136,12 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
}
// Retrieve the applied CSS class
StringValueStyle nsClassName = (StringValueStyle) shape.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), CSS_PROPERTY_SVG_CLASS);
- String className = "";
+ String className = ""; //$NON-NLS-1$
if (nsClassName != null) {
className = nsClassName.getStringValue();
}
// Apply the style
- document.getDocumentElement().setAttribute("class", className);
+ document.getDocumentElement().setAttribute("class", className); //$NON-NLS-1$
applyStyles(document);
}
}
@@ -166,7 +166,7 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
try {
stream = URIConverter.INSTANCE.createInputStream(uri);
} catch (IOException e) {
- Activator.log.error("Failed to locate stylesheet from " + uri, e);
+ Activator.log.error("Failed to locate stylesheet from " + uri, e); //$NON-NLS-1$
failedSheets.add(uri);
return;
}
@@ -174,7 +174,7 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
try {
sheet = engine.parseStyleSheet(stream);
} catch (IOException e) {
- Activator.log.error("Failed to load stylesheet at " + uri, e);
+ Activator.log.error("Failed to load stylesheet at " + uri, e); //$NON-NLS-1$
failedSheets.add(uri);
} finally {
try {
@@ -198,7 +198,7 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
* @return The canonical URI of the resource
*/
private URI getCanonicalURI(EObject model, String uri) {
- if (uri.startsWith("platform:/")) {
+ if (uri.startsWith("platform:/")) { //$NON-NLS-1$
return URI.createURI(uri);
}
@@ -216,11 +216,11 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
if (!resURI.isPlatform()) {
return null;
}
- StringBuilder builder = new StringBuilder("platform:/");
+ StringBuilder builder = new StringBuilder("platform:/"); //$NON-NLS-1$
String[] segments = resURI.segments();
for (int i = 0; i < segments.length - 1; i++) {
builder.append(segments[i]);
- builder.append("/");
+ builder.append("/"); //$NON-NLS-1$
}
builder.append(uri);
canonical = URI.createURI(builder.toString());
@@ -284,14 +284,14 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
int count = 0;
for (Entry<String, String> entry : style.entrySet()) {
if (count != 0) {
- builder.append(";");
+ builder.append(";"); //$NON-NLS-1$
}
builder.append(entry.getKey());
- builder.append(":");
+ builder.append(":"); //$NON-NLS-1$
builder.append(entry.getValue());
count++;
}
- element.setAttribute("style", builder.toString());
+ element.setAttribute("style", builder.toString()); //$NON-NLS-1$
}
/**
@@ -383,17 +383,17 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
*/
private Map<String, String> getBaseStyle(Element element) {
HashMap<String, String> result = new HashMap<>();
- String styleValue = element.getAttribute("style");
+ String styleValue = element.getAttribute("style"); //$NON-NLS-1$
if (styleValue != null && !styleValue.isEmpty()) {
- String[] props = styleValue.split(";");
+ String[] props = styleValue.split(";"); //$NON-NLS-1$
for (int i = 0; i != props.length; i++) {
- String[] temp = props[i].split(":");
+ String[] temp = props[i].split(":"); //$NON-NLS-1$
if (temp.length == 2) {
result.put(temp[0], temp[1]);
} else if (temp.length > 2) {
StringBuilder builder = new StringBuilder(temp[1]);
for (int j = 2; j != temp.length; j++) {
- builder.append(":");
+ builder.append(":"); //$NON-NLS-1$
builder.append(temp[j]);
}
result.put(temp[0], builder.toString());
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/pom.xml
index 7757e1fd371..612c39b4b6f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>

Back to the top