diff options
Diffstat (limited to 'incoming/org.eclipse.papyrus.infra.gmfdiag.css')
60 files changed, 366 insertions, 2632 deletions
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF index 5e4a2100168..cbf7fa8bfc0 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF @@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.9.0", org.eclipse.gmf.runtime.notation.edit;bundle-version="1.4.0", org.eclipse.papyrus.infra.core;bundle-version="0.9.0", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="0.9.0" + org.eclipse.papyrus.infra.emf.appearance;bundle-version="0.9.0", + org.eclipse.papyrus.infra.tools;bundle-version="0.9.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrus.infra.gmfdiag.css, diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/model/ModelStyleSheets.ecore b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/model/ModelStyleSheets.ecore index d3ce2874f7e..9a441a75567 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/model/ModelStyleSheets.ecore +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/model/ModelStyleSheets.ecore @@ -6,7 +6,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="stylesheets" upperBound="-1"
eType="#//StyleSheet" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="StyleSheet" abstract="true"/>
+ <eClassifiers xsi:type="ecore:EClass" name="StyleSheet" abstract="true" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="StyleSheetReference" eSuperTypes="#//StyleSheet">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="path" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
</eClassifiers>
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/resources/papyrus_theme.css b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/resources/papyrus_theme.css index 9812e06765d..5b3caeb77a6 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/resources/papyrus_theme.css +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/resources/papyrus_theme.css @@ -94,9 +94,4 @@ Constraint { Package {
fillColor: white;
}
-
-.external { /* Elements tagged as external (ie. imported) */
- fillColor: rgb(255, 192, 192);
- qualifiedNameDepth: full;
-}
\ No newline at end of file diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSBooleanListValueStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSBooleanListValueStyleImpl.java deleted file mode 100644 index d30271da794..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSBooleanListValueStyleImpl.java +++ /dev/null @@ -1,125 +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; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.runtime.notation.impl.BooleanListValueStyleImpl; -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.ForceValueHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSBooleanListValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSBooleanListValueStyleDelegate; - -public class CSSBooleanListValueStyleImpl extends BooleanListValueStyleImpl implements CSSBooleanListValueStyle { - - protected ExtendedCSSEngine engine; - - private CSSBooleanListValueStyle booleanListValueStyle; - - protected CSSBooleanListValueStyle getBooleanListValueStyle() { - if(booleanListValueStyle == null) { - booleanListValueStyle = new CSSBooleanListValueStyleDelegate(this, getEngine()); - } - return booleanListValueStyle; - } - - protected ExtendedCSSEngine getEngine() { - if(engine == null) { - engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine(); - } - return engine; - } - - protected View findView() { - EObject parent = eContainer(); - while(!(parent instanceof View) && parent != null) { - parent = parent.eContainer(); - } - - if(parent != null) { - return (View)parent; - } - - return null; - } - - - ////////////////////////////////////////// - // Forwards accesses to CSS properties // - ////////////////////////////////////////// - - - public java.lang.String getCSSName() { - java.lang.String value = super.getName(); - - if(ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)) { - return value; - } else { - return getBooleanListValueStyle().getCSSName(); - } - } - - public EList getCSSBooleanListValue() { - EList value = super.getBooleanListValue(); - - if(ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getBooleanListValueStyle_BooleanListValue(), value)) { - return value; - } else { - return getBooleanListValueStyle().getCSSBooleanListValue(); - } - } - - - @Override - public java.lang.String getName() { - //return super.getName(); - return getCSSName(); - } - - @Override - public EList getBooleanListValue() { - //return super.getBooleanListValue(); - return getCSSBooleanListValue(); - } - - - - //////////////////////////////////////////////// - // Implements a setter for each CSS property // - //////////////////////////////////////////////// - - @Override - public void setName(java.lang.String value) { - super.setName(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name(); - ForceValueHelper.setValue(findView(), feature, value); - } - - ////////////////////////////////// - // Implements the unset method // - ////////////////////////////////// - - @Override - public void eUnset(int featureId) { - super.eUnset(featureId); - - EStructuralFeature feature = eDynamicFeature(featureId); - ForceValueHelper.unsetValue(findView(), feature); - } - - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSBooleanValueStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSBooleanValueStyleImpl.java deleted file mode 100644 index 463c2c69f30..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSBooleanValueStyleImpl.java +++ /dev/null @@ -1,132 +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; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.runtime.notation.impl.BooleanValueStyleImpl; -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.ForceValueHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSBooleanValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSBooleanValueStyleDelegate; - -public class CSSBooleanValueStyleImpl extends BooleanValueStyleImpl implements CSSBooleanValueStyle { - - protected ExtendedCSSEngine engine; - - private CSSBooleanValueStyle booleanValueStyle; - - protected CSSBooleanValueStyle getBooleanValueStyle() { - if(booleanValueStyle == null) { - booleanValueStyle = new CSSBooleanValueStyleDelegate(this, getEngine()); - } - return booleanValueStyle; - } - - protected ExtendedCSSEngine getEngine(){ - if (engine == null){ - engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine(); - } - return engine; - } - - protected View findView(){ - EObject parent = eContainer(); - while (! (parent instanceof View) && parent != null){ - parent = parent.eContainer(); - } - - if (parent != null){ - return (View)parent; - } - - return null; - } - - - ////////////////////////////////////////// - // Forwards accesses to CSS properties // - ////////////////////////////////////////// - - - public java.lang.String getCSSName(){ - java.lang.String value = super.getName(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)){ - return value; - } else { - return getBooleanValueStyle().getCSSName(); - } - } - - public boolean isCSSBooleanValue(){ - boolean value = super.isBooleanValue(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), value)){ - return value; - } else { - return getBooleanValueStyle().isCSSBooleanValue(); - } - } - - - @Override - public java.lang.String getName(){ - //return super.getName(); - return getCSSName(); - } - - @Override - public boolean isBooleanValue(){ - //return super.isBooleanValue(); - return isCSSBooleanValue(); - } - - - - //////////////////////////////////////////////// - // Implements a setter for each CSS property // - //////////////////////////////////////////////// - - @Override - public void setName(java.lang.String value){ - super.setName(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name(); - ForceValueHelper.setValue(findView(), feature, value); - } - - @Override - public void setBooleanValue(boolean value){ - super.setBooleanValue(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getBooleanValueStyle_BooleanValue(); - ForceValueHelper.setValue(findView(), feature, value); - } - - ////////////////////////////////// - // Implements the unset method // - ////////////////////////////////// - - @Override - public void eUnset(int featureId) { - super.eUnset(featureId); - - EStructuralFeature feature = eDynamicFeature(featureId); - ForceValueHelper.unsetValue(findView(), feature); - } - - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDoubleListValueStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDoubleListValueStyleImpl.java deleted file mode 100644 index e12c0235a80..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDoubleListValueStyleImpl.java +++ /dev/null @@ -1,125 +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; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.runtime.notation.impl.DoubleListValueStyleImpl; -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.ForceValueHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDoubleListValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDoubleListValueStyleDelegate; - -public class CSSDoubleListValueStyleImpl extends DoubleListValueStyleImpl implements CSSDoubleListValueStyle { - - protected ExtendedCSSEngine engine; - - private CSSDoubleListValueStyle doubleListValueStyle; - - protected CSSDoubleListValueStyle getDoubleListValueStyle() { - if(doubleListValueStyle == null) { - doubleListValueStyle = new CSSDoubleListValueStyleDelegate(this, getEngine()); - } - return doubleListValueStyle; - } - - protected ExtendedCSSEngine getEngine(){ - if (engine == null){ - engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine(); - } - return engine; - } - - protected View findView(){ - EObject parent = eContainer(); - while (! (parent instanceof View) && parent != null){ - parent = parent.eContainer(); - } - - if (parent != null){ - return (View)parent; - } - - return null; - } - - - ////////////////////////////////////////// - // Forwards accesses to CSS properties // - ////////////////////////////////////////// - - - public java.lang.String getCSSName(){ - java.lang.String value = super.getName(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)){ - return value; - } else { - return getDoubleListValueStyle().getCSSName(); - } - } - - public EList getCSSDoubleListValue(){ - EList value = super.getDoubleListValue(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getDoubleListValueStyle_DoubleListValue(), value)){ - return value; - } else { - return getDoubleListValueStyle().getCSSDoubleListValue(); - } - } - - - @Override - public java.lang.String getName(){ - //return super.getName(); - return getCSSName(); - } - - @Override - public EList getDoubleListValue(){ - //return super.getDoubleListValue(); - return getCSSDoubleListValue(); - } - - - - //////////////////////////////////////////////// - // Implements a setter for each CSS property // - //////////////////////////////////////////////// - - @Override - public void setName(java.lang.String value){ - super.setName(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name(); - ForceValueHelper.setValue(findView(), feature, value); - } - - ////////////////////////////////// - // Implements the unset method // - ////////////////////////////////// - - @Override - public void eUnset(int featureId) { - super.eUnset(featureId); - - EStructuralFeature feature = eDynamicFeature(featureId); - ForceValueHelper.unsetValue(findView(), feature); - } - - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDoubleValueStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDoubleValueStyleImpl.java deleted file mode 100644 index 33291745e97..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDoubleValueStyleImpl.java +++ /dev/null @@ -1,132 +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; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.runtime.notation.impl.DoubleValueStyleImpl; -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.ForceValueHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDoubleValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDoubleValueStyleDelegate; - -public class CSSDoubleValueStyleImpl extends DoubleValueStyleImpl implements CSSDoubleValueStyle { - - protected ExtendedCSSEngine engine; - - private CSSDoubleValueStyle doubleValueStyle; - - protected CSSDoubleValueStyle getDoubleValueStyle() { - if(doubleValueStyle == null) { - doubleValueStyle = new CSSDoubleValueStyleDelegate(this, getEngine()); - } - return doubleValueStyle; - } - - protected ExtendedCSSEngine getEngine(){ - if (engine == null){ - engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine(); - } - return engine; - } - - protected View findView(){ - EObject parent = eContainer(); - while (! (parent instanceof View) && parent != null){ - parent = parent.eContainer(); - } - - if (parent != null){ - return (View)parent; - } - - return null; - } - - - ////////////////////////////////////////// - // Forwards accesses to CSS properties // - ////////////////////////////////////////// - - - public java.lang.String getCSSName(){ - java.lang.String value = super.getName(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)){ - return value; - } else { - return getDoubleValueStyle().getCSSName(); - } - } - - public double getCSSDoubleValue(){ - double value = super.getDoubleValue(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getDoubleValueStyle_DoubleValue(), value)){ - return value; - } else { - return getDoubleValueStyle().getCSSDoubleValue(); - } - } - - - @Override - public java.lang.String getName(){ - //return super.getName(); - return getCSSName(); - } - - @Override - public double getDoubleValue(){ - //return super.getDoubleValue(); - return getCSSDoubleValue(); - } - - - - //////////////////////////////////////////////// - // Implements a setter for each CSS property // - //////////////////////////////////////////////// - - @Override - public void setName(java.lang.String value){ - super.setName(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name(); - ForceValueHelper.setValue(findView(), feature, value); - } - - @Override - public void setDoubleValue(double value){ - super.setDoubleValue(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getDoubleValueStyle_DoubleValue(); - ForceValueHelper.setValue(findView(), feature, value); - } - - ////////////////////////////////// - // Implements the unset method // - ////////////////////////////////// - - @Override - public void eUnset(int featureId) { - super.eUnset(featureId); - - EStructuralFeature feature = eDynamicFeature(featureId); - ForceValueHelper.unsetValue(findView(), feature); - } - - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSEObjectListValueStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSEObjectListValueStyleImpl.java deleted file mode 100644 index 806a70cc13b..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSEObjectListValueStyleImpl.java +++ /dev/null @@ -1,108 +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; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.runtime.notation.impl.EObjectListValueStyleImpl; -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.ForceValueHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSEObjectListValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSEObjectListValueStyleDelegate; - -public class CSSEObjectListValueStyleImpl extends EObjectListValueStyleImpl implements CSSEObjectListValueStyle { - - protected ExtendedCSSEngine engine; - - private CSSEObjectListValueStyle eObjectListValueStyle; - - protected CSSEObjectListValueStyle getEObjectListValueStyle() { - if(eObjectListValueStyle == null) { - eObjectListValueStyle = new CSSEObjectListValueStyleDelegate(this, getEngine()); - } - return eObjectListValueStyle; - } - - protected ExtendedCSSEngine getEngine(){ - if (engine == null){ - engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine(); - } - return engine; - } - - protected View findView(){ - EObject parent = eContainer(); - while (! (parent instanceof View) && parent != null){ - parent = parent.eContainer(); - } - - if (parent != null){ - return (View)parent; - } - - return null; - } - - - ////////////////////////////////////////// - // Forwards accesses to CSS properties // - ////////////////////////////////////////// - - - public java.lang.String getCSSName(){ - java.lang.String value = super.getName(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)){ - return value; - } else { - return getEObjectListValueStyle().getCSSName(); - } - } - - - @Override - public java.lang.String getName(){ - //return super.getName(); - return getCSSName(); - } - - - - //////////////////////////////////////////////// - // Implements a setter for each CSS property // - //////////////////////////////////////////////// - - @Override - public void setName(java.lang.String value){ - super.setName(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name(); - ForceValueHelper.setValue(findView(), feature, value); - } - - ////////////////////////////////// - // Implements the unset method // - ////////////////////////////////// - - @Override - public void eUnset(int featureId) { - super.eUnset(featureId); - - EStructuralFeature feature = eDynamicFeature(featureId); - ForceValueHelper.unsetValue(findView(), feature); - } - - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSEObjectValueStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSEObjectValueStyleImpl.java deleted file mode 100644 index 889730a87ac..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSEObjectValueStyleImpl.java +++ /dev/null @@ -1,108 +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; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.runtime.notation.impl.EObjectValueStyleImpl; -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.ForceValueHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSEObjectValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSEObjectValueStyleDelegate; - -public class CSSEObjectValueStyleImpl extends EObjectValueStyleImpl implements CSSEObjectValueStyle { - - protected ExtendedCSSEngine engine; - - private CSSEObjectValueStyle eObjectValueStyle; - - protected CSSEObjectValueStyle getEObjectValueStyle() { - if(eObjectValueStyle == null) { - eObjectValueStyle = new CSSEObjectValueStyleDelegate(this, getEngine()); - } - return eObjectValueStyle; - } - - protected ExtendedCSSEngine getEngine(){ - if (engine == null){ - engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine(); - } - return engine; - } - - protected View findView(){ - EObject parent = eContainer(); - while (! (parent instanceof View) && parent != null){ - parent = parent.eContainer(); - } - - if (parent != null){ - return (View)parent; - } - - return null; - } - - - ////////////////////////////////////////// - // Forwards accesses to CSS properties // - ////////////////////////////////////////// - - - public java.lang.String getCSSName(){ - java.lang.String value = super.getName(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)){ - return value; - } else { - return getEObjectValueStyle().getCSSName(); - } - } - - - @Override - public java.lang.String getName(){ - //return super.getName(); - return getCSSName(); - } - - - - //////////////////////////////////////////////// - // Implements a setter for each CSS property // - //////////////////////////////////////////////// - - @Override - public void setName(java.lang.String value){ - super.setName(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name(); - ForceValueHelper.setValue(findView(), feature, value); - } - - ////////////////////////////////// - // Implements the unset method // - ////////////////////////////////// - - @Override - public void eUnset(int featureId) { - super.eUnset(featureId); - - EStructuralFeature feature = eDynamicFeature(featureId); - ForceValueHelper.unsetValue(findView(), feature); - } - - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSIntListValueStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSIntListValueStyleImpl.java deleted file mode 100644 index 9836c2b0648..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSIntListValueStyleImpl.java +++ /dev/null @@ -1,125 +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; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.runtime.notation.impl.IntListValueStyleImpl; -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.ForceValueHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSIntListValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSIntListValueStyleDelegate; - -public class CSSIntListValueStyleImpl extends IntListValueStyleImpl implements CSSIntListValueStyle { - - protected ExtendedCSSEngine engine; - - private CSSIntListValueStyle intListValueStyle; - - protected CSSIntListValueStyle getIntListValueStyle() { - if(intListValueStyle == null) { - intListValueStyle = new CSSIntListValueStyleDelegate(this, getEngine()); - } - return intListValueStyle; - } - - protected ExtendedCSSEngine getEngine(){ - if (engine == null){ - engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine(); - } - return engine; - } - - protected View findView(){ - EObject parent = eContainer(); - while (! (parent instanceof View) && parent != null){ - parent = parent.eContainer(); - } - - if (parent != null){ - return (View)parent; - } - - return null; - } - - - ////////////////////////////////////////// - // Forwards accesses to CSS properties // - ////////////////////////////////////////// - - - public java.lang.String getCSSName(){ - java.lang.String value = super.getName(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)){ - return value; - } else { - return getIntListValueStyle().getCSSName(); - } - } - - public EList getCSSIntListValue(){ - EList value = super.getIntListValue(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getIntListValueStyle_IntListValue(), value)){ - return value; - } else { - return getIntListValueStyle().getCSSIntListValue(); - } - } - - - @Override - public java.lang.String getName(){ - //return super.getName(); - return getCSSName(); - } - - @Override - public EList getIntListValue(){ - //return super.getIntListValue(); - return getCSSIntListValue(); - } - - - - //////////////////////////////////////////////// - // Implements a setter for each CSS property // - //////////////////////////////////////////////// - - @Override - public void setName(java.lang.String value){ - super.setName(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name(); - ForceValueHelper.setValue(findView(), feature, value); - } - - ////////////////////////////////// - // Implements the unset method // - ////////////////////////////////// - - @Override - public void eUnset(int featureId) { - super.eUnset(featureId); - - EStructuralFeature feature = eDynamicFeature(featureId); - ForceValueHelper.unsetValue(findView(), feature); - } - - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSIntValueStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSIntValueStyleImpl.java deleted file mode 100644 index 340ff6a7c20..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSIntValueStyleImpl.java +++ /dev/null @@ -1,132 +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; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.runtime.notation.impl.IntValueStyleImpl; -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.ForceValueHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSIntValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSIntValueStyleDelegate; - -public class CSSIntValueStyleImpl extends IntValueStyleImpl implements CSSIntValueStyle { - - protected ExtendedCSSEngine engine; - - private CSSIntValueStyle intValueStyle; - - protected CSSIntValueStyle getIntValueStyle() { - if(intValueStyle == null) { - intValueStyle = new CSSIntValueStyleDelegate(this, getEngine()); - } - return intValueStyle; - } - - protected ExtendedCSSEngine getEngine(){ - if (engine == null){ - engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine(); - } - return engine; - } - - protected View findView(){ - EObject parent = eContainer(); - while (! (parent instanceof View) && parent != null){ - parent = parent.eContainer(); - } - - if (parent != null){ - return (View)parent; - } - - return null; - } - - - ////////////////////////////////////////// - // Forwards accesses to CSS properties // - ////////////////////////////////////////// - - - public java.lang.String getCSSName(){ - java.lang.String value = super.getName(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)){ - return value; - } else { - return getIntValueStyle().getCSSName(); - } - } - - public int getCSSIntValue(){ - int value = super.getIntValue(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getIntValueStyle_IntValue(), value)){ - return value; - } else { - return getIntValueStyle().getCSSIntValue(); - } - } - - - @Override - public java.lang.String getName(){ - //return super.getName(); - return getCSSName(); - } - - @Override - public int getIntValue(){ - //return super.getIntValue(); - return getCSSIntValue(); - } - - - - //////////////////////////////////////////////// - // Implements a setter for each CSS property // - //////////////////////////////////////////////// - - @Override - public void setName(java.lang.String value){ - super.setName(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name(); - ForceValueHelper.setValue(findView(), feature, value); - } - - @Override - public void setIntValue(int value){ - super.setIntValue(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getIntValueStyle_IntValue(); - ForceValueHelper.setValue(findView(), feature, value); - } - - ////////////////////////////////// - // Implements the unset method // - ////////////////////////////////// - - @Override - public void eUnset(int featureId) { - super.eUnset(featureId); - - EStructuralFeature feature = eDynamicFeature(featureId); - ForceValueHelper.unsetValue(findView(), feature); - } - - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSListValueStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSListValueStyleImpl.java deleted file mode 100644 index fd2748e8e7b..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSListValueStyleImpl.java +++ /dev/null @@ -1,125 +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; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.runtime.notation.impl.ListValueStyleImpl; -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.ForceValueHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSListValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSListValueStyleDelegate; - -public class CSSListValueStyleImpl extends ListValueStyleImpl implements CSSListValueStyle { - - protected ExtendedCSSEngine engine; - - private CSSListValueStyle listValueStyle; - - protected CSSListValueStyle getListValueStyle() { - if(listValueStyle == null) { - listValueStyle = new CSSListValueStyleDelegate(this, getEngine()); - } - return listValueStyle; - } - - protected ExtendedCSSEngine getEngine(){ - if (engine == null){ - engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine(); - } - return engine; - } - - protected View findView(){ - EObject parent = eContainer(); - while (! (parent instanceof View) && parent != null){ - parent = parent.eContainer(); - } - - if (parent != null){ - return (View)parent; - } - - return null; - } - - - ////////////////////////////////////////// - // Forwards accesses to CSS properties // - ////////////////////////////////////////// - - - public java.lang.String getCSSName(){ - java.lang.String value = super.getName(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)){ - return value; - } else { - return getListValueStyle().getCSSName(); - } - } - - public EList getCSSRawValuesList(){ - EList value = super.getRawValuesList(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getListValueStyle_RawValuesList(), value)){ - return value; - } else { - return getListValueStyle().getCSSRawValuesList(); - } - } - - - @Override - public java.lang.String getName(){ - //return super.getName(); - return getCSSName(); - } - - @Override - public EList getRawValuesList(){ - //return super.getRawValuesList(); - return getCSSRawValuesList(); - } - - - - //////////////////////////////////////////////// - // Implements a setter for each CSS property // - //////////////////////////////////////////////// - - @Override - public void setName(java.lang.String value){ - super.setName(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name(); - ForceValueHelper.setValue(findView(), feature, value); - } - - ////////////////////////////////// - // Implements the unset method // - ////////////////////////////////// - - @Override - public void eUnset(int featureId) { - super.eUnset(featureId); - - EStructuralFeature feature = eDynamicFeature(featureId); - ForceValueHelper.unsetValue(findView(), feature); - } - - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeImpl.java index 40171e0c281..28fe6143d1d 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeImpl.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeImpl.java @@ -433,7 +433,9 @@ public class CSSShapeImpl extends ShapeImpl implements CSSShapeStyle, CustomStyl super.eUnset(featureId); EStructuralFeature feature = eDynamicFeature(featureId); - ForceValueHelper.unsetValue(this, feature); + if(feature != null) { + ForceValueHelper.unsetValue(this, feature); + } } public boolean showElementIcon() { diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSSingleValueStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSSingleValueStyleImpl.java deleted file mode 100644 index 81f009b03b5..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSSingleValueStyleImpl.java +++ /dev/null @@ -1,132 +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; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.runtime.notation.impl.SingleValueStyleImpl; -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.ForceValueHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSSingleValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSSingleValueStyleDelegate; - -public class CSSSingleValueStyleImpl extends SingleValueStyleImpl implements CSSSingleValueStyle { - - protected ExtendedCSSEngine engine; - - private CSSSingleValueStyle singleValueStyle; - - protected CSSSingleValueStyle getSingleValueStyle() { - if(singleValueStyle == null) { - singleValueStyle = new CSSSingleValueStyleDelegate(this, getEngine()); - } - return singleValueStyle; - } - - protected ExtendedCSSEngine getEngine(){ - if (engine == null){ - engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine(); - } - return engine; - } - - protected View findView(){ - EObject parent = eContainer(); - while (! (parent instanceof View) && parent != null){ - parent = parent.eContainer(); - } - - if (parent != null){ - return (View)parent; - } - - return null; - } - - - ////////////////////////////////////////// - // Forwards accesses to CSS properties // - ////////////////////////////////////////// - - - public java.lang.String getCSSName(){ - java.lang.String value = super.getName(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)){ - return value; - } else { - return getSingleValueStyle().getCSSName(); - } - } - - public java.lang.String getCSSRawValue(){ - java.lang.String value = super.getRawValue(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getSingleValueStyle_RawValue(), value)){ - return value; - } else { - return getSingleValueStyle().getCSSRawValue(); - } - } - - - @Override - public java.lang.String getName(){ - //return super.getName(); - return getCSSName(); - } - - @Override - public java.lang.String getRawValue(){ - //return super.getRawValue(); - return getCSSRawValue(); - } - - - - //////////////////////////////////////////////// - // Implements a setter for each CSS property // - //////////////////////////////////////////////// - - @Override - public void setName(java.lang.String value){ - super.setName(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name(); - ForceValueHelper.setValue(findView(), feature, value); - } - - @Override - public void setRawValue(java.lang.String value){ - super.setRawValue(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getSingleValueStyle_RawValue(); - ForceValueHelper.setValue(findView(), feature, value); - } - - ////////////////////////////////// - // Implements the unset method // - ////////////////////////////////// - - @Override - public void eUnset(int featureId) { - super.eUnset(featureId); - - EStructuralFeature feature = eDynamicFeature(featureId); - ForceValueHelper.unsetValue(findView(), feature); - } - - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSStringListValueStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSStringListValueStyleImpl.java deleted file mode 100644 index c9413124a1f..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSStringListValueStyleImpl.java +++ /dev/null @@ -1,125 +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; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.runtime.notation.impl.StringListValueStyleImpl; -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.ForceValueHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSStringListValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSStringListValueStyleDelegate; - -public class CSSStringListValueStyleImpl extends StringListValueStyleImpl implements CSSStringListValueStyle { - - protected ExtendedCSSEngine engine; - - private CSSStringListValueStyle stringListValueStyle; - - protected CSSStringListValueStyle getStringListValueStyle() { - if(stringListValueStyle == null) { - stringListValueStyle = new CSSStringListValueStyleDelegate(this, getEngine()); - } - return stringListValueStyle; - } - - protected ExtendedCSSEngine getEngine(){ - if (engine == null){ - engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine(); - } - return engine; - } - - protected View findView(){ - EObject parent = eContainer(); - while (! (parent instanceof View) && parent != null){ - parent = parent.eContainer(); - } - - if (parent != null){ - return (View)parent; - } - - return null; - } - - - ////////////////////////////////////////// - // Forwards accesses to CSS properties // - ////////////////////////////////////////// - - - public java.lang.String getCSSName(){ - java.lang.String value = super.getName(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)){ - return value; - } else { - return getStringListValueStyle().getCSSName(); - } - } - - public EList getCSSStringListValue(){ - EList value = super.getStringListValue(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getStringListValueStyle_StringListValue(), value)){ - return value; - } else { - return getStringListValueStyle().getCSSStringListValue(); - } - } - - - @Override - public java.lang.String getName(){ - //return super.getName(); - return getCSSName(); - } - - @Override - public EList getStringListValue(){ - //return super.getStringListValue(); - return getCSSStringListValue(); - } - - - - //////////////////////////////////////////////// - // Implements a setter for each CSS property // - //////////////////////////////////////////////// - - @Override - public void setName(java.lang.String value){ - super.setName(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name(); - ForceValueHelper.setValue(findView(), feature, value); - } - - ////////////////////////////////// - // Implements the unset method // - ////////////////////////////////// - - @Override - public void eUnset(int featureId) { - super.eUnset(featureId); - - EStructuralFeature feature = eDynamicFeature(featureId); - ForceValueHelper.unsetValue(findView(), feature); - } - - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSStringValueStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSStringValueStyleImpl.java deleted file mode 100644 index dbc3e4cfc0d..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSStringValueStyleImpl.java +++ /dev/null @@ -1,132 +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; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.gmf.runtime.notation.impl.StringValueStyleImpl; -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.ForceValueHelper; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSStringValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSStringValueStyleDelegate; - -public class CSSStringValueStyleImpl extends StringValueStyleImpl implements CSSStringValueStyle { - - protected ExtendedCSSEngine engine; - - private CSSStringValueStyle stringValueStyle; - - protected CSSStringValueStyle getStringValueStyle() { - if(stringValueStyle == null) { - stringValueStyle = new CSSStringValueStyleDelegate(this, getEngine()); - } - return stringValueStyle; - } - - protected ExtendedCSSEngine getEngine(){ - if (engine == null){ - engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine(); - } - return engine; - } - - protected View findView(){ - EObject parent = eContainer(); - while (! (parent instanceof View) && parent != null){ - parent = parent.eContainer(); - } - - if (parent != null){ - return (View)parent; - } - - return null; - } - - - ////////////////////////////////////////// - // Forwards accesses to CSS properties // - ////////////////////////////////////////// - - - public java.lang.String getCSSName(){ - java.lang.String value = super.getName(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)){ - return value; - } else { - return getStringValueStyle().getCSSName(); - } - } - - public java.lang.String getCSSStringValue(){ - java.lang.String value = super.getStringValue(); - - if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getStringValueStyle_StringValue(), value)){ - return value; - } else { - return getStringValueStyle().getCSSStringValue(); - } - } - - - @Override - public java.lang.String getName(){ - //return super.getName(); - return getCSSName(); - } - - @Override - public java.lang.String getStringValue(){ - //return super.getStringValue(); - return getCSSStringValue(); - } - - - - //////////////////////////////////////////////// - // Implements a setter for each CSS property // - //////////////////////////////////////////////// - - @Override - public void setName(java.lang.String value){ - super.setName(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name(); - ForceValueHelper.setValue(findView(), feature, value); - } - - @Override - public void setStringValue(java.lang.String value){ - super.setStringValue(value); - - EStructuralFeature feature = NotationPackage.eINSTANCE.getStringValueStyle_StringValue(); - ForceValueHelper.setValue(findView(), feature, value); - } - - ////////////////////////////////// - // Implements the unset method // - ////////////////////////////////// - - @Override - public void eUnset(int featureId) { - super.eUnset(featureId); - - EStructuralFeature feature = eDynamicFeature(featureId); - ForceValueHelper.unsetValue(findView(), feature); - } - - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/factory/CSSNotationFactory.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/factory/CSSNotationFactory.java index ae804dc14d2..8de955093ed 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/factory/CSSNotationFactory.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/factory/CSSNotationFactory.java @@ -14,8 +14,6 @@ package org.eclipse.papyrus.infra.gmfdiag.css.factory; import org.eclipse.gmf.runtime.notation.ArrowStyle; import org.eclipse.gmf.runtime.notation.BasicCompartment; import org.eclipse.gmf.runtime.notation.BasicSemanticCompartment; -import org.eclipse.gmf.runtime.notation.BooleanListValueStyle; -import org.eclipse.gmf.runtime.notation.BooleanValueStyle; import org.eclipse.gmf.runtime.notation.ByteArrayValueStyle; import org.eclipse.gmf.runtime.notation.CanonicalStyle; import org.eclipse.gmf.runtime.notation.Compartment; @@ -26,11 +24,7 @@ import org.eclipse.gmf.runtime.notation.DescriptionStyle; import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.gmf.runtime.notation.DiagramLinkStyle; import org.eclipse.gmf.runtime.notation.DiagramStyle; -import org.eclipse.gmf.runtime.notation.DoubleListValueStyle; -import org.eclipse.gmf.runtime.notation.DoubleValueStyle; import org.eclipse.gmf.runtime.notation.DrawerStyle; -import org.eclipse.gmf.runtime.notation.EObjectListValueStyle; -import org.eclipse.gmf.runtime.notation.EObjectValueStyle; import org.eclipse.gmf.runtime.notation.FillStyle; import org.eclipse.gmf.runtime.notation.FilteringStyle; import org.eclipse.gmf.runtime.notation.FontStyle; @@ -38,12 +32,9 @@ import org.eclipse.gmf.runtime.notation.GuideStyle; import org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle; import org.eclipse.gmf.runtime.notation.ImageBufferStyle; import org.eclipse.gmf.runtime.notation.ImageStyle; -import org.eclipse.gmf.runtime.notation.IntListValueStyle; -import org.eclipse.gmf.runtime.notation.IntValueStyle; import org.eclipse.gmf.runtime.notation.LineStyle; import org.eclipse.gmf.runtime.notation.LineTypeStyle; import org.eclipse.gmf.runtime.notation.ListCompartment; -import org.eclipse.gmf.runtime.notation.ListValueStyle; import org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle; import org.eclipse.gmf.runtime.notation.NamedStyle; import org.eclipse.gmf.runtime.notation.PageStyle; @@ -53,19 +44,14 @@ import org.eclipse.gmf.runtime.notation.RoutingStyle; import org.eclipse.gmf.runtime.notation.SemanticListCompartment; import org.eclipse.gmf.runtime.notation.Shape; import org.eclipse.gmf.runtime.notation.ShapeStyle; -import org.eclipse.gmf.runtime.notation.SingleValueStyle; import org.eclipse.gmf.runtime.notation.SortingStyle; import org.eclipse.gmf.runtime.notation.StandardDiagram; -import org.eclipse.gmf.runtime.notation.StringListValueStyle; -import org.eclipse.gmf.runtime.notation.StringValueStyle; import org.eclipse.gmf.runtime.notation.TextStyle; import org.eclipse.gmf.runtime.notation.TitleStyle; import org.eclipse.gmf.runtime.notation.impl.NotationFactoryImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSArrowStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSBasicCompartmentImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSBasicSemanticCompartmentImpl; -import org.eclipse.papyrus.infra.gmfdiag.css.CSSBooleanListValueStyleImpl; -import org.eclipse.papyrus.infra.gmfdiag.css.CSSBooleanValueStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSByteArrayValueStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSCanonicalStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSCompartmentImpl; @@ -75,11 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.css.CSSDataTypeStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSDescriptionStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSDiagramLinkStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSDiagramStyleImpl; -import org.eclipse.papyrus.infra.gmfdiag.css.CSSDoubleListValueStyleImpl; -import org.eclipse.papyrus.infra.gmfdiag.css.CSSDoubleValueStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSDrawerStyleImpl; -import org.eclipse.papyrus.infra.gmfdiag.css.CSSEObjectListValueStyleImpl; -import org.eclipse.papyrus.infra.gmfdiag.css.CSSEObjectValueStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSFillStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSFilteringStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSFontStyleImpl; @@ -87,12 +69,9 @@ import org.eclipse.papyrus.infra.gmfdiag.css.CSSGuideStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSHintedDiagramLinkStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSImageBufferStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSImageStyleImpl; -import org.eclipse.papyrus.infra.gmfdiag.css.CSSIntListValueStyleImpl; -import org.eclipse.papyrus.infra.gmfdiag.css.CSSIntValueStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSLineStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSLineTypeStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSListCompartmentImpl; -import org.eclipse.papyrus.infra.gmfdiag.css.CSSListValueStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSMultiDiagramLinkStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSNamedStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSPageStyleImpl; @@ -102,11 +81,8 @@ import org.eclipse.papyrus.infra.gmfdiag.css.CSSRoutingStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSSemanticListCompartmentImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSShapeImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSShapeStyleImpl; -import org.eclipse.papyrus.infra.gmfdiag.css.CSSSingleValueStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSSortingStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSStandardDiagramImpl; -import org.eclipse.papyrus.infra.gmfdiag.css.CSSStringListValueStyleImpl; -import org.eclipse.papyrus.infra.gmfdiag.css.CSSStringValueStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSTextStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.CSSTitleStyleImpl; import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl; @@ -116,249 +92,188 @@ public class CSSNotationFactory extends NotationFactoryImpl { public static CSSNotationFactory eINSTANCE = new CSSNotationFactory(); @Override - public Diagram createDiagram(){ + public Diagram createDiagram() { return new CSSDiagramImpl(); } - @Override - public FillStyle createFillStyle() { + public FillStyle createFillStyle() { return new CSSFillStyleImpl(); } - + @Override - public LineStyle createLineStyle() { + public LineStyle createLineStyle() { return new CSSLineStyleImpl(); } - + @Override - public FontStyle createFontStyle() { + public FontStyle createFontStyle() { return new CSSFontStyleImpl(); } - + @Override - public TitleStyle createTitleStyle() { + public TitleStyle createTitleStyle() { return new CSSTitleStyleImpl(); } - + @Override - public SortingStyle createSortingStyle() { + public SortingStyle createSortingStyle() { return new CSSSortingStyleImpl(); } - + @Override - public DescriptionStyle createDescriptionStyle() { + public DescriptionStyle createDescriptionStyle() { return new CSSDescriptionStyleImpl(); } - + @Override - public RoutingStyle createRoutingStyle() { + public RoutingStyle createRoutingStyle() { return new CSSRoutingStyleImpl(); } - + @Override - public CanonicalStyle createCanonicalStyle() { + public CanonicalStyle createCanonicalStyle() { return new CSSCanonicalStyleImpl(); } - + @Override - public ShapeStyle createShapeStyle() { + public ShapeStyle createShapeStyle() { return new CSSShapeStyleImpl(); } - + @Override - public ConnectorStyle createConnectorStyle() { + public ConnectorStyle createConnectorStyle() { return new CSSConnectorStyleImpl(); } - + @Override - public PageStyle createPageStyle() { + public PageStyle createPageStyle() { return new CSSPageStyleImpl(); } - + @Override - public DrawerStyle createDrawerStyle() { + public DrawerStyle createDrawerStyle() { return new CSSDrawerStyleImpl(); } - + @Override - public GuideStyle createGuideStyle() { + public GuideStyle createGuideStyle() { return new CSSGuideStyleImpl(); } - + @Override - public FilteringStyle createFilteringStyle() { + public FilteringStyle createFilteringStyle() { return new CSSFilteringStyleImpl(); } - + @Override - public DiagramStyle createDiagramStyle() { + public DiagramStyle createDiagramStyle() { return new CSSDiagramStyleImpl(); } - + @Override - public ImageStyle createImageStyle() { + public ImageStyle createImageStyle() { return new CSSImageStyleImpl(); } - + @Override - public ImageBufferStyle createImageBufferStyle() { + public ImageBufferStyle createImageBufferStyle() { return new CSSImageBufferStyleImpl(); } - + @Override - public PropertiesSetStyle createPropertiesSetStyle() { + public PropertiesSetStyle createPropertiesSetStyle() { return new CSSPropertiesSetStyleImpl(); } - - @Override - public SingleValueStyle createSingleValueStyle() { - return new CSSSingleValueStyleImpl(); - } - - @Override - public ListValueStyle createListValueStyle() { - return new CSSListValueStyleImpl(); - } - + @Override - public NamedStyle createNamedStyle() { + public NamedStyle createNamedStyle() { return new CSSNamedStyleImpl(); } - + @Override - public DataTypeStyle createDataTypeStyle() { + public DataTypeStyle createDataTypeStyle() { return new CSSDataTypeStyleImpl(); } - - @Override - public IntValueStyle createIntValueStyle() { - return new CSSIntValueStyleImpl(); - } - - @Override - public IntListValueStyle createIntListValueStyle() { - return new CSSIntListValueStyleImpl(); - } - - @Override - public BooleanValueStyle createBooleanValueStyle() { - return new CSSBooleanValueStyleImpl(); - } - - @Override - public DoubleValueStyle createDoubleValueStyle() { - return new CSSDoubleValueStyleImpl(); - } - - @Override - public DoubleListValueStyle createDoubleListValueStyle() { - return new CSSDoubleListValueStyleImpl(); - } - - @Override - public StringValueStyle createStringValueStyle() { - return new CSSStringValueStyleImpl(); - } - - @Override - public StringListValueStyle createStringListValueStyle() { - return new CSSStringListValueStyleImpl(); - } - - @Override - public EObjectValueStyle createEObjectValueStyle() { - return new CSSEObjectValueStyleImpl(); - } - - @Override - public EObjectListValueStyle createEObjectListValueStyle() { - return new CSSEObjectListValueStyleImpl(); - } - + @Override - public ByteArrayValueStyle createByteArrayValueStyle() { + public ByteArrayValueStyle createByteArrayValueStyle() { return new CSSByteArrayValueStyleImpl(); } - - @Override - public BooleanListValueStyle createBooleanListValueStyle() { - return new CSSBooleanListValueStyleImpl(); - } - + @Override - public HintedDiagramLinkStyle createHintedDiagramLinkStyle() { + public HintedDiagramLinkStyle createHintedDiagramLinkStyle() { return new CSSHintedDiagramLinkStyleImpl(); } - + @Override - public DiagramLinkStyle createDiagramLinkStyle() { + public DiagramLinkStyle createDiagramLinkStyle() { return new CSSDiagramLinkStyleImpl(); } - + @Override - public MultiDiagramLinkStyle createMultiDiagramLinkStyle() { + public MultiDiagramLinkStyle createMultiDiagramLinkStyle() { return new CSSMultiDiagramLinkStyleImpl(); } - + @Override - public TextStyle createTextStyle() { + public TextStyle createTextStyle() { return new CSSTextStyleImpl(); } - + @Override - public LineTypeStyle createLineTypeStyle() { + public LineTypeStyle createLineTypeStyle() { return new CSSLineTypeStyleImpl(); } - + @Override - public ArrowStyle createArrowStyle() { + public ArrowStyle createArrowStyle() { return new CSSArrowStyleImpl(); } - + @Override - public Shape createShape() { + public Shape createShape() { return new CSSShapeImpl(); } - + @Override - public Compartment createCompartment() { + public Compartment createCompartment() { return new CSSCompartmentImpl(); } - + @Override - public ListCompartment createListCompartment() { + public ListCompartment createListCompartment() { return new CSSListCompartmentImpl(); } - + @Override - public Connector createConnector() { + public Connector createConnector() { return new CSSConnectorImpl(); } - + @Override - public StandardDiagram createStandardDiagram() { + public StandardDiagram createStandardDiagram() { return new CSSStandardDiagramImpl(); } - + @Override - public BasicCompartment createBasicCompartment() { + public BasicCompartment createBasicCompartment() { return new CSSBasicCompartmentImpl(); } - + @Override - public BasicSemanticCompartment createBasicSemanticCompartment() { + public BasicSemanticCompartment createBasicSemanticCompartment() { return new CSSBasicSemanticCompartmentImpl(); } - + @Override - public SemanticListCompartment createSemanticListCompartment() { + public SemanticListCompartment createSemanticListCompartment() { return new CSSSemanticListCompartmentImpl(); } - + @Override - public RoundedCornersStyle createRoundedCornersStyle() { + public RoundedCornersStyle createRoundedCornersStyle() { return new CSSRoundedCornersStyleImpl(); } - + } diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/ModelStyleSheetsPackage.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/ModelStyleSheetsPackage.java index ab81c0fcbf1..17c16b5ce6f 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/ModelStyleSheetsPackage.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/ModelStyleSheetsPackage.java @@ -98,10 +98,10 @@ public interface ModelStyleSheetsPackage extends EPackage { int MODEL_STYLE_SHEETS_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.impl.StyleSheetImpl <em>Style Sheet</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheet <em>Style Sheet</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.impl.StyleSheetImpl
+ * @see org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheet
* @see org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.impl.ModelStyleSheetsPackageImpl#getStyleSheet()
* @generated
*/
@@ -287,10 +287,10 @@ public interface ModelStyleSheetsPackage extends EPackage { EReference MODEL_STYLE_SHEETS__STYLESHEETS = eINSTANCE.getModelStyleSheets_Stylesheets();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.impl.StyleSheetImpl <em>Style Sheet</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheet <em>Style Sheet</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.impl.StyleSheetImpl
+ * @see org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheet
* @see org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.impl.ModelStyleSheetsPackageImpl#getStyleSheet()
* @generated
*/
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/StyleSheet.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/StyleSheet.java index 5433b1893ea..67bca2f9ddb 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/StyleSheet.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/StyleSheet.java @@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.EObject; *
*
* @see org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.ModelStyleSheetsPackage#getStyleSheet()
- * @model abstract="true"
+ * @model interface="true" abstract="true"
* @generated
*/
public interface StyleSheet extends EObject {
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/impl/EmbeddedStyleSheetImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/impl/EmbeddedStyleSheetImpl.java index b945e244cd9..116ac79b92d 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/impl/EmbeddedStyleSheetImpl.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/impl/EmbeddedStyleSheetImpl.java @@ -12,6 +12,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.EmbeddedStyleSheet;
import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.ModelStyleSheetsPackage;
@@ -28,7 +29,8 @@ import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.ModelStyleSheetsPa *
* @generated
*/
-public class EmbeddedStyleSheetImpl extends StyleSheetImpl implements EmbeddedStyleSheet {
+public class EmbeddedStyleSheetImpl extends
+EObjectImpl implements EmbeddedStyleSheet {
/**
* The default value of the '{@link #getContent() <em>Content</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/impl/ModelStyleSheetsPackageImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/impl/ModelStyleSheetsPackageImpl.java index 5b11a9a5fe4..c254bbd5cab 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/impl/ModelStyleSheetsPackageImpl.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/impl/ModelStyleSheetsPackageImpl.java @@ -262,7 +262,7 @@ public class ModelStyleSheetsPackageImpl extends EPackageImpl implements ModelSt initEClass(modelStyleSheetsEClass, ModelStyleSheets.class, "ModelStyleSheets", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getModelStyleSheets_Stylesheets(), this.getStyleSheet(), null, "stylesheets", null, 0, -1, ModelStyleSheets.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(styleSheetEClass, StyleSheet.class, "StyleSheet", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEClass(styleSheetEClass, StyleSheet.class, "StyleSheet", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(styleSheetReferenceEClass, StyleSheetReference.class, "StyleSheetReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getStyleSheetReference_Path(), theEcorePackage.getEString(), "path", null, 1, 1, StyleSheetReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/impl/StyleSheetReferenceImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/impl/StyleSheetReferenceImpl.java index 9cca0da7b0a..4b181e3e169 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/impl/StyleSheetReferenceImpl.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/modelstylesheets/impl/StyleSheetReferenceImpl.java @@ -12,6 +12,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.ModelStyleSheetsPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheetReference;
@@ -28,7 +29,8 @@ import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheetReferenc *
* @generated
*/
-public class StyleSheetReferenceImpl extends StyleSheetImpl implements StyleSheetReference {
+public class StyleSheetReferenceImpl extends
+EObjectImpl implements StyleSheetReference {
/**
* The default value of the '{@link #getPath() <em>Path</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSBooleanValueStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSBooleanValueStyle.java deleted file mode 100644 index 965de48b1df..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSBooleanValueStyle.java +++ /dev/null @@ -1,19 +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.style; - - -public interface CSSBooleanValueStyle extends CSSNamedStyle{ - - public boolean isCSSBooleanValue(); - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDoubleListValueStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDoubleListValueStyle.java deleted file mode 100644 index 0e1e9798ce4..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDoubleListValueStyle.java +++ /dev/null @@ -1,20 +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.style; - -import org.eclipse.emf.common.util.EList; - -public interface CSSDoubleListValueStyle extends CSSNamedStyle{ - - public EList getCSSDoubleListValue(); - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDoubleValueStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDoubleValueStyle.java deleted file mode 100644 index 937d3e87eb6..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDoubleValueStyle.java +++ /dev/null @@ -1,19 +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.style; - - -public interface CSSDoubleValueStyle extends CSSNamedStyle{ - - public double getCSSDoubleValue(); - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSEObjectListValueStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSEObjectListValueStyle.java deleted file mode 100644 index 8c46df5d84b..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSEObjectListValueStyle.java +++ /dev/null @@ -1,18 +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.style; - - -public interface CSSEObjectListValueStyle extends CSSNamedStyle{ - - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSEObjectValueStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSEObjectValueStyle.java deleted file mode 100644 index f028e22ca86..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSEObjectValueStyle.java +++ /dev/null @@ -1,18 +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.style; - - -public interface CSSEObjectValueStyle extends CSSNamedStyle{ - - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSIntListValueStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSIntListValueStyle.java deleted file mode 100644 index aa7f438274f..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSIntListValueStyle.java +++ /dev/null @@ -1,20 +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.style; - -import org.eclipse.emf.common.util.EList; - -public interface CSSIntListValueStyle extends CSSNamedStyle{ - - public EList getCSSIntListValue(); - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSIntValueStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSIntValueStyle.java deleted file mode 100644 index 0e0d791f82a..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSIntValueStyle.java +++ /dev/null @@ -1,19 +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.style; - - -public interface CSSIntValueStyle extends CSSNamedStyle{ - - public int getCSSIntValue(); - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSListValueStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSListValueStyle.java deleted file mode 100644 index a71ecc65890..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSListValueStyle.java +++ /dev/null @@ -1,20 +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.style; - -import org.eclipse.emf.common.util.EList; - -public interface CSSListValueStyle extends CSSNamedStyle, CSSDataTypeStyle{ - - public EList getCSSRawValuesList(); - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSSingleValueStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSSingleValueStyle.java deleted file mode 100644 index b666af0888e..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSSingleValueStyle.java +++ /dev/null @@ -1,19 +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.style; - - -public interface CSSSingleValueStyle extends CSSNamedStyle, CSSDataTypeStyle{ - - public java.lang.String getCSSRawValue(); - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSStringListValueStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSStringListValueStyle.java deleted file mode 100644 index d649eb1b8fb..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSStringListValueStyle.java +++ /dev/null @@ -1,20 +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.style; - -import org.eclipse.emf.common.util.EList; - -public interface CSSStringListValueStyle extends CSSNamedStyle{ - - public EList getCSSStringListValue(); - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSStringValueStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSStringValueStyle.java deleted file mode 100644 index 1119a976c56..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSStringValueStyle.java +++ /dev/null @@ -1,19 +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.style; - - -public interface CSSStringValueStyle extends CSSNamedStyle{ - - public java.lang.String getCSSStringValue(); - -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSBooleanListValueStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSBooleanListValueStyleDelegate.java deleted file mode 100644 index 7f84db4066d..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSBooleanListValueStyleDelegate.java +++ /dev/null @@ -1,58 +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.style.impl; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.gmf.runtime.notation.BooleanListValueStyle; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSBooleanListValueStyle; -import org.w3c.dom.Element; -import org.w3c.dom.css.CSSValue; - -@SuppressWarnings("restriction") -public class CSSBooleanListValueStyleDelegate implements CSSBooleanListValueStyle { - - private BooleanListValueStyle booleanListValueStyle; - - private ExtendedCSSEngine engine; - - private Element element; - - public CSSBooleanListValueStyleDelegate(BooleanListValueStyle booleanListValueStyle, ExtendedCSSEngine engine) { - this.booleanListValueStyle = booleanListValueStyle; - this.engine = engine; - this.element = engine.getElement(this.booleanListValueStyle); - } - - //////////////////////////////////////////////// - // Implements a getter for each CSS property // - //////////////////////////////////////////////// - - public java.lang.String getCSSName() { - CSSValue cssValue = engine.retrievePropertyValue(element, "name"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); - return (String)defaultValue; - } - return (String)engine.convert(cssValue, String.class, null); - } - - public EList getCSSBooleanListValue() { - CSSValue cssValue = engine.retrievePropertyValue(element, "booleanListValue"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getBooleanListValueStyle_BooleanListValue().getDefaultValue(); - return (EList)defaultValue; - } - return null; - } -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSBooleanValueStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSBooleanValueStyleDelegate.java deleted file mode 100644 index f323975caba..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSBooleanValueStyleDelegate.java +++ /dev/null @@ -1,57 +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.style.impl; - -import org.eclipse.gmf.runtime.notation.BooleanValueStyle; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSBooleanValueStyle; -import org.w3c.dom.Element; -import org.w3c.dom.css.CSSValue; - -@SuppressWarnings("restriction") -public class CSSBooleanValueStyleDelegate implements CSSBooleanValueStyle{ - - private BooleanValueStyle booleanValueStyle; - - private ExtendedCSSEngine engine; - - private Element element; - - public CSSBooleanValueStyleDelegate(BooleanValueStyle booleanValueStyle, ExtendedCSSEngine engine){ - this.booleanValueStyle = booleanValueStyle; - this.engine = engine; - this.element = engine.getElement(this.booleanValueStyle); - } - - //////////////////////////////////////////////// - // Implements a getter for each CSS property // - //////////////////////////////////////////////// - - public java.lang.String getCSSName(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "name"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); - return (String)defaultValue; - } - return (String)engine.convert(cssValue, String.class, null); - } - - public boolean isCSSBooleanValue(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "booleanValue"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getBooleanValueStyle_BooleanValue().getDefaultValue(); - return (Boolean)defaultValue; - } - return (Boolean)engine.convert(cssValue, Boolean.class, null); - } -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDoubleListValueStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDoubleListValueStyleDelegate.java deleted file mode 100644 index d8f0473e435..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDoubleListValueStyleDelegate.java +++ /dev/null @@ -1,58 +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.style.impl; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.gmf.runtime.notation.DoubleListValueStyle; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDoubleListValueStyle; -import org.w3c.dom.Element; -import org.w3c.dom.css.CSSValue; - -@SuppressWarnings("restriction") -public class CSSDoubleListValueStyleDelegate implements CSSDoubleListValueStyle{ - - private DoubleListValueStyle doubleListValueStyle; - - private ExtendedCSSEngine engine; - - private Element element; - - public CSSDoubleListValueStyleDelegate(DoubleListValueStyle doubleListValueStyle, ExtendedCSSEngine engine){ - this.doubleListValueStyle = doubleListValueStyle; - this.engine = engine; - this.element = engine.getElement(this.doubleListValueStyle); - } - - //////////////////////////////////////////////// - // Implements a getter for each CSS property // - //////////////////////////////////////////////// - - public java.lang.String getCSSName(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "name"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); - return (String)defaultValue; - } - return (String)engine.convert(cssValue, String.class, null); - } - - public EList getCSSDoubleListValue(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "doubleListValue"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getDoubleListValueStyle_DoubleListValue().getDefaultValue(); - return (EList)defaultValue; - } - return null; - } -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDoubleValueStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDoubleValueStyleDelegate.java deleted file mode 100644 index 3f230a0ede5..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDoubleValueStyleDelegate.java +++ /dev/null @@ -1,57 +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.style.impl; - -import org.eclipse.gmf.runtime.notation.DoubleValueStyle; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDoubleValueStyle; -import org.w3c.dom.Element; -import org.w3c.dom.css.CSSValue; - -@SuppressWarnings("restriction") -public class CSSDoubleValueStyleDelegate implements CSSDoubleValueStyle{ - - private DoubleValueStyle doubleValueStyle; - - private ExtendedCSSEngine engine; - - private Element element; - - public CSSDoubleValueStyleDelegate(DoubleValueStyle doubleValueStyle, ExtendedCSSEngine engine){ - this.doubleValueStyle = doubleValueStyle; - this.engine = engine; - this.element = engine.getElement(this.doubleValueStyle); - } - - //////////////////////////////////////////////// - // Implements a getter for each CSS property // - //////////////////////////////////////////////// - - public java.lang.String getCSSName(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "name"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); - return (String)defaultValue; - } - return (String)engine.convert(cssValue, String.class, null); - } - - public double getCSSDoubleValue(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "doubleValue"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getDoubleValueStyle_DoubleValue().getDefaultValue(); - return (Double)defaultValue; - } - return (Double)engine.convert(cssValue, Double.class, null); - } -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSEObjectListValueStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSEObjectListValueStyleDelegate.java deleted file mode 100644 index 7d758207683..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSEObjectListValueStyleDelegate.java +++ /dev/null @@ -1,48 +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.style.impl; - -import org.eclipse.gmf.runtime.notation.EObjectListValueStyle; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSEObjectListValueStyle; -import org.w3c.dom.Element; -import org.w3c.dom.css.CSSValue; - -@SuppressWarnings("restriction") -public class CSSEObjectListValueStyleDelegate implements CSSEObjectListValueStyle{ - - private EObjectListValueStyle eObjectListValueStyle; - - private ExtendedCSSEngine engine; - - private Element element; - - public CSSEObjectListValueStyleDelegate(EObjectListValueStyle eObjectListValueStyle, ExtendedCSSEngine engine){ - this.eObjectListValueStyle = eObjectListValueStyle; - this.engine = engine; - this.element = engine.getElement(this.eObjectListValueStyle); - } - - //////////////////////////////////////////////// - // Implements a getter for each CSS property // - //////////////////////////////////////////////// - - public java.lang.String getCSSName(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "name"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); - return (String)defaultValue; - } - return (String)engine.convert(cssValue, String.class, null); - } -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSEObjectValueStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSEObjectValueStyleDelegate.java deleted file mode 100644 index 4666f4cdbcc..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSEObjectValueStyleDelegate.java +++ /dev/null @@ -1,48 +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.style.impl; - -import org.eclipse.gmf.runtime.notation.EObjectValueStyle; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSEObjectValueStyle; -import org.w3c.dom.Element; -import org.w3c.dom.css.CSSValue; - -@SuppressWarnings("restriction") -public class CSSEObjectValueStyleDelegate implements CSSEObjectValueStyle{ - - private EObjectValueStyle eObjectValueStyle; - - private ExtendedCSSEngine engine; - - private Element element; - - public CSSEObjectValueStyleDelegate(EObjectValueStyle eObjectValueStyle, ExtendedCSSEngine engine){ - this.eObjectValueStyle = eObjectValueStyle; - this.engine = engine; - this.element = engine.getElement(this.eObjectValueStyle); - } - - //////////////////////////////////////////////// - // Implements a getter for each CSS property // - //////////////////////////////////////////////// - - public java.lang.String getCSSName(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "name"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); - return (String)defaultValue; - } - return (String)engine.convert(cssValue, String.class, null); - } -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSIntListValueStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSIntListValueStyleDelegate.java deleted file mode 100644 index 9e29d557416..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSIntListValueStyleDelegate.java +++ /dev/null @@ -1,58 +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.style.impl; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.gmf.runtime.notation.IntListValueStyle; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSIntListValueStyle; -import org.w3c.dom.Element; -import org.w3c.dom.css.CSSValue; - -@SuppressWarnings("restriction") -public class CSSIntListValueStyleDelegate implements CSSIntListValueStyle{ - - private IntListValueStyle intListValueStyle; - - private ExtendedCSSEngine engine; - - private Element element; - - public CSSIntListValueStyleDelegate(IntListValueStyle intListValueStyle, ExtendedCSSEngine engine){ - this.intListValueStyle = intListValueStyle; - this.engine = engine; - this.element = engine.getElement(this.intListValueStyle); - } - - //////////////////////////////////////////////// - // Implements a getter for each CSS property // - //////////////////////////////////////////////// - - public java.lang.String getCSSName(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "name"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); - return (String)defaultValue; - } - return (String)engine.convert(cssValue, String.class, null); - } - - public EList getCSSIntListValue(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "intListValue"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getIntListValueStyle_IntListValue().getDefaultValue(); - return (EList)defaultValue; - } - return null; - } -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSIntValueStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSIntValueStyleDelegate.java deleted file mode 100644 index 3ff680bd9b8..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSIntValueStyleDelegate.java +++ /dev/null @@ -1,57 +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.style.impl; - -import org.eclipse.gmf.runtime.notation.IntValueStyle; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSIntValueStyle; -import org.w3c.dom.Element; -import org.w3c.dom.css.CSSValue; - -@SuppressWarnings("restriction") -public class CSSIntValueStyleDelegate implements CSSIntValueStyle{ - - private IntValueStyle intValueStyle; - - private ExtendedCSSEngine engine; - - private Element element; - - public CSSIntValueStyleDelegate(IntValueStyle intValueStyle, ExtendedCSSEngine engine){ - this.intValueStyle = intValueStyle; - this.engine = engine; - this.element = engine.getElement(this.intValueStyle); - } - - //////////////////////////////////////////////// - // Implements a getter for each CSS property // - //////////////////////////////////////////////// - - public java.lang.String getCSSName(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "name"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); - return (String)defaultValue; - } - return (String)engine.convert(cssValue, String.class, null); - } - - public int getCSSIntValue(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "intValue"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getIntValueStyle_IntValue().getDefaultValue(); - return (Integer)defaultValue; - } - return (Integer)engine.convert(cssValue, Integer.class, null); - } -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSListValueStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSListValueStyleDelegate.java deleted file mode 100644 index db42e0f0e5c..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSListValueStyleDelegate.java +++ /dev/null @@ -1,58 +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.style.impl; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.gmf.runtime.notation.ListValueStyle; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSListValueStyle; -import org.w3c.dom.Element; -import org.w3c.dom.css.CSSValue; - -@SuppressWarnings("restriction") -public class CSSListValueStyleDelegate implements CSSListValueStyle{ - - private ListValueStyle listValueStyle; - - private ExtendedCSSEngine engine; - - private Element element; - - public CSSListValueStyleDelegate(ListValueStyle listValueStyle, ExtendedCSSEngine engine){ - this.listValueStyle = listValueStyle; - this.engine = engine; - this.element = engine.getElement(this.listValueStyle); - } - - //////////////////////////////////////////////// - // Implements a getter for each CSS property // - //////////////////////////////////////////////// - - public java.lang.String getCSSName(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "name"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); - return (String)defaultValue; - } - return (String)engine.convert(cssValue, String.class, null); - } - - public EList getCSSRawValuesList(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "rawValuesList"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getListValueStyle_RawValuesList().getDefaultValue(); - return (EList)defaultValue; - } - return null; - } -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSSingleValueStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSSingleValueStyleDelegate.java deleted file mode 100644 index 6c0f78fae5f..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSSingleValueStyleDelegate.java +++ /dev/null @@ -1,57 +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.style.impl; - -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.SingleValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSSingleValueStyle; -import org.w3c.dom.Element; -import org.w3c.dom.css.CSSValue; - -@SuppressWarnings("restriction") -public class CSSSingleValueStyleDelegate implements CSSSingleValueStyle{ - - private SingleValueStyle singleValueStyle; - - private ExtendedCSSEngine engine; - - private Element element; - - public CSSSingleValueStyleDelegate(SingleValueStyle singleValueStyle, ExtendedCSSEngine engine){ - this.singleValueStyle = singleValueStyle; - this.engine = engine; - this.element = engine.getElement(this.singleValueStyle); - } - - //////////////////////////////////////////////// - // Implements a getter for each CSS property // - //////////////////////////////////////////////// - - public java.lang.String getCSSName(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "name"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); - return (String)defaultValue; - } - return (String)engine.convert(cssValue, String.class, null); - } - - public java.lang.String getCSSRawValue(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "rawValue"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getSingleValueStyle_RawValue().getDefaultValue(); - return (String)defaultValue; - } - return (String)engine.convert(cssValue, String.class, null); - } -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSStringListValueStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSStringListValueStyleDelegate.java deleted file mode 100644 index 26ef117eaca..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSStringListValueStyleDelegate.java +++ /dev/null @@ -1,58 +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.style.impl; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.StringListValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSStringListValueStyle; -import org.w3c.dom.Element; -import org.w3c.dom.css.CSSValue; - -@SuppressWarnings("restriction") -public class CSSStringListValueStyleDelegate implements CSSStringListValueStyle{ - - private StringListValueStyle stringListValueStyle; - - private ExtendedCSSEngine engine; - - private Element element; - - public CSSStringListValueStyleDelegate(StringListValueStyle stringListValueStyle, ExtendedCSSEngine engine){ - this.stringListValueStyle = stringListValueStyle; - this.engine = engine; - this.element = engine.getElement(this.stringListValueStyle); - } - - //////////////////////////////////////////////// - // Implements a getter for each CSS property // - //////////////////////////////////////////////// - - public java.lang.String getCSSName(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "name"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); - return (String)defaultValue; - } - return (String)engine.convert(cssValue, String.class, null); - } - - public EList getCSSStringListValue(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "stringListValue"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getStringListValueStyle_StringListValue().getDefaultValue(); - return (EList)defaultValue; - } - return null; - } -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSStringValueStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSStringValueStyleDelegate.java deleted file mode 100644 index 8967f509e2a..00000000000 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSStringValueStyleDelegate.java +++ /dev/null @@ -1,57 +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.style.impl; - -import org.eclipse.gmf.runtime.notation.NotationPackage; -import org.eclipse.gmf.runtime.notation.StringValueStyle; -import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; -import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSStringValueStyle; -import org.w3c.dom.Element; -import org.w3c.dom.css.CSSValue; - -@SuppressWarnings("restriction") -public class CSSStringValueStyleDelegate implements CSSStringValueStyle{ - - private StringValueStyle stringValueStyle; - - private ExtendedCSSEngine engine; - - private Element element; - - public CSSStringValueStyleDelegate(StringValueStyle stringValueStyle, ExtendedCSSEngine engine){ - this.stringValueStyle = stringValueStyle; - this.engine = engine; - this.element = engine.getElement(this.stringValueStyle); - } - - //////////////////////////////////////////////// - // Implements a getter for each CSS property // - //////////////////////////////////////////////// - - public java.lang.String getCSSName(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "name"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); - return (String)defaultValue; - } - return (String)engine.convert(cssValue, String.class, null); - } - - public java.lang.String getCSSStringValue(){ - CSSValue cssValue = engine.retrievePropertyValue(element, "stringValue"); - if(cssValue == null) { - Object defaultValue = NotationPackage.eINSTANCE.getStringValueStyle_StringValue().getDefaultValue(); - return (String)defaultValue; - } - return (String)engine.convert(cssValue, String.class, null); - } -} diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/GMFElementAdapter.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/GMFElementAdapter.java index 78955709441..a458cbdd849 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/GMFElementAdapter.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/GMFElementAdapter.java @@ -17,6 +17,7 @@ import static org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSAnnotations.CSS_ import static org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSAnnotations.CSS_GMF_STYLE_KEY;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -25,14 +26,20 @@ import java.util.Map; import org.eclipse.e4.ui.css.core.dom.ElementAdapter;
import org.eclipse.e4.ui.css.core.engine.CSSEngine;
import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.NamedStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.StringListValueStyle;
+import org.eclipse.gmf.runtime.notation.StringValueStyle;
import org.eclipse.gmf.runtime.notation.View;
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.SemanticElementHelper;
+import org.eclipse.papyrus.infra.tools.util.ListHelper;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -99,7 +106,8 @@ public class GMFElementAdapter extends ElementAdapter implements NodeList { }
public static String getCSSClass(EObject sourceElement) {
- return getCSSValue(sourceElement, CSS_GMF_CLASS_KEY);
+ List<String> allClasses = getCSSValues(sourceElement, CSS_GMF_CLASS_KEY);
+ return ListHelper.deepToString(allClasses, " "); //$NON-NLS-1$
}
public static String getCSSStyle(EObject sourceElement) {
@@ -115,25 +123,42 @@ public class GMFElementAdapter extends ElementAdapter implements NodeList { }
private static String getCSSValue(EObject sourceElement, String key) {
- EModelElement modelElement = findModelElement(sourceElement);
- EAnnotation annotation = getStyleAnnotation(modelElement);
- if(annotation == null) {
+ StringValueStyle style = (StringValueStyle)findStyle(sourceElement, key, NotationPackage.eINSTANCE.getStringValueStyle());
+ if(style == null) {
return null;
}
- return annotation.getDetails().get(key);
+ return style.getStringValue();
}
- private static EModelElement findModelElement(EObject sourceElement) {
+ private static List<String> getCSSValues(EObject sourceElement, String key) {
+ StringListValueStyle style = (StringListValueStyle)findStyle(sourceElement, key, NotationPackage.eINSTANCE.getStringListValueStyle());
+ if(style == null) {
+ return Collections.emptyList();
+ }
+
+ return style.getStringListValue();
+ }
+
+ private static NamedStyle findStyle(EObject sourceElement, String key, EClass type) {
+ View view = findView(sourceElement);
+ if(view == null) {
+ return null;
+ }
+
+ return view.getNamedStyle(type, key);
+ }
+
+ private static View findView(EObject sourceElement) {
if(sourceElement == null) {
return null;
}
- if(sourceElement instanceof EModelElement) {
- return (EModelElement)sourceElement;
+ if(sourceElement instanceof View) {
+ return (View)sourceElement;
}
- return findModelElement(sourceElement.eContainer());
+ return findView(sourceElement.eContainer());
}
public GMFElementAdapter(View view, ExtendedCSSEngine engine) {
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/BaseCSSEngine.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/BaseCSSEngine.java index 9afb4a38ed4..9a5560eac51 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/BaseCSSEngine.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/BaseCSSEngine.java @@ -38,7 +38,7 @@ public class BaseCSSEngine extends ExtendedCSSEngineImpl { public static ExtendedCSSEngine instance = new BaseCSSEngine();
- //Unsupported operations. The WorkspaceCSSEngine should never be used directly.
+ //Unsupported operations. The BaseCSSEngine should never be used directly.
@Override
public Element getElement(Object node) {
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/DiagramCSSEngine.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/DiagramCSSEngine.java index 40782936641..cbeb5dfe86b 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/DiagramCSSEngine.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/DiagramCSSEngine.java @@ -11,29 +11,51 @@ *****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css.engine;
+import java.io.IOException;
+import java.net.URL;
import java.util.List;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler;
import org.eclipse.papyrus.infra.gmfdiag.css.helper.SemanticElementHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheetReference;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
import org.w3c.dom.Element;
@SuppressWarnings("restriction")
public class DiagramCSSEngine extends ExtendedCSSEngineImpl {
- private Diagram diagram;
+ private CSSDiagram diagram;
- public DiagramCSSEngine(ExtendedCSSEngine parent, Diagram diagram) {
+ public DiagramCSSEngine(ExtendedCSSEngine parent, CSSDiagram diagram) {
super(parent);
this.diagram = diagram;
setElementProvider(new GMFElementProvider());
+ for(StyleSheet styleSheet : diagram.getStyleSheets()) {
+ addStyleSheet(styleSheet);
+ }
+ }
+
+ @Override
+ protected void parseStyleSheet(StyleSheetReference styleSheet) throws IOException {
+ String path = styleSheet.getPath();
+ if(path.startsWith("/")) {
+ path = "platform:/plugin" + path;
+ } else {
+ URI uri = URI.createURI(styleSheet.getPath());
+ uri = uri.resolve(diagram.eResource().getURI());
+ path = uri.toString();
+ }
+ URL url = new URL(path);
+ parseStyleSheet(url.openStream());
}
/**
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngine.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngine.java index b6e1b95309e..cb7830a4d0b 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngine.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngine.java @@ -16,29 +16,25 @@ import java.net.URL; import org.eclipse.e4.ui.css.core.engine.CSSEngine;
import org.eclipse.papyrus.infra.gmfdiag.css.listener.StyleSheetChangeListener;
import org.eclipse.papyrus.infra.gmfdiag.css.lists.ExtendedStyleSheetList;
+import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheet;
import org.w3c.dom.css.CSSValue;
@SuppressWarnings("restriction")
public interface ExtendedCSSEngine extends LazyCSSEngine, CSSEngine {
/**
- * Adds a stylesheet from a given URL.
- * The kind of stylesheet (CSS vs CSSX) is determined according to the
- * file's extension (Standard parser for CSS, extended parser for CSSX)
+ * Adds a stylesheet from a given StyleSheet model.
*
* @param inputURL
*/
- public void addStyleSheet(URL inputURL);
+ public void addStyleSheet(StyleSheet styleSheet);
/**
* Adds a stylesheet from a given URL.
- * If extended is true, the CSSX parser will be used. Otherwise,
- * the standard CSS parser is used.
*
* @param inputURL
- * @param extended
*/
- public void addStyleSheet(URL inputURL, boolean extended);
+ public void addStyleSheet(URL inputURL);
/**
* Resets the CSS cache
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngineImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngineImpl.java index 4c6995482bb..183342b3138 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngineImpl.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngineImpl.java @@ -12,6 +12,8 @@ package org.eclipse.papyrus.infra.gmfdiag.css.engine;
import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
import java.net.URL;
import java.util.HashMap;
import java.util.HashSet;
@@ -28,7 +30,6 @@ import org.eclipse.e4.ui.css.core.dom.properties.converters.ICSSValueConverter; import org.eclipse.e4.ui.css.core.impl.engine.AbstractCSSEngine;
import org.eclipse.e4.ui.css.core.impl.sac.CSSConditionFactoryImpl;
import org.eclipse.e4.ui.css.core.impl.sac.CSSSelectorFactoryImpl;
-import org.eclipse.papyrus.infra.emf.Activator;
import org.eclipse.papyrus.infra.gmfdiag.css.converters.BooleanConverter;
import org.eclipse.papyrus.infra.gmfdiag.css.converters.ColorToGMFConverter;
import org.eclipse.papyrus.infra.gmfdiag.css.converters.IntegerConverter;
@@ -36,11 +37,15 @@ import org.eclipse.papyrus.infra.gmfdiag.css.converters.StringConverter; import org.eclipse.papyrus.infra.gmfdiag.css.engine.enginecopy.ExtendedViewCSSImpl;
import org.eclipse.papyrus.infra.gmfdiag.css.listener.StyleSheetChangeListener;
import org.eclipse.papyrus.infra.gmfdiag.css.lists.ExtendedStyleSheetList;
+import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.EmbeddedStyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheetReference;
import org.w3c.css.sac.ConditionFactory;
import org.w3c.dom.Element;
import org.w3c.dom.css.CSSStyleDeclaration;
import org.w3c.dom.css.CSSValue;
import org.w3c.dom.css.ViewCSS;
+import org.w3c.dom.stylesheets.StyleSheetList;
/**
* Base implementation for a hierarchic, lazy CSS Engine.
@@ -66,7 +71,12 @@ public abstract class ExtendedCSSEngineImpl extends AbstractCSSEngine implements /**
* Owned stylesheets
*/
- private final List<URL> styleSheets = new LinkedList<URL>();
+ private final List<StyleSheet> styleSheets = new LinkedList<StyleSheet>();
+
+ /**
+ * Owned stylesheets, by URL
+ */
+ private final List<URL> styleSheetURLs = new LinkedList<URL>();
public ExtendedCSSEngineImpl() {
this(null);
@@ -93,6 +103,8 @@ public abstract class ExtendedCSSEngineImpl extends AbstractCSSEngine implements this.registerCSSValueConverter(new IntegerConverter());
this.registerCSSValueConverter(new StringConverter());
this.registerCSSValueConverter(new BooleanConverter());
+
+ setErrorHandler(new GMFErrorHandler());
}
/**
@@ -137,11 +149,13 @@ public abstract class ExtendedCSSEngineImpl extends AbstractCSSEngine implements return declarationsCache.get(element);
}
- /**
- * {@inheritDoc}
- */
- public void addStyleSheet(URL styleSheetURL) {
- styleSheets.add(styleSheetURL);
+ public void addStyleSheet(StyleSheet styleSheet) {
+ styleSheets.add(styleSheet);
+ reset();
+ }
+
+ public void addStyleSheet(URL styleSheet) {
+ styleSheetURLs.add(styleSheet);
reset();
}
@@ -174,15 +188,47 @@ public abstract class ExtendedCSSEngineImpl extends AbstractCSSEngine implements }
private void parseStyleSheets() {
- for(URL styleSheetURL : styleSheets) {
+ for(URL styleSheet : styleSheetURLs) {
+ try {
+ parseStyleSheet(styleSheet.openStream());
+ } catch (IOException ex) {
+ handleExceptions(ex);
+ }
+ }
+ for(StyleSheet styleSheet : styleSheets) {
try {
- parseStyleSheet(styleSheetURL.openStream());
+ if(styleSheet instanceof EmbeddedStyleSheet) {
+ parseStyleSheet((EmbeddedStyleSheet)styleSheet);
+ } else if(styleSheet instanceof StyleSheetReference) {
+ parseStyleSheet((StyleSheetReference)styleSheet);
+ }
} catch (IOException ex) {
- Activator.log.error("Cannot parse styleSheet at URL : " + styleSheetURL, ex);
+ handleExceptions(ex);
}
}
}
+ /**
+ * @see #addStyleSheet(StyleSheet)
+ */
+ private void parseStyleSheet(EmbeddedStyleSheet styleSheet) throws IOException {
+ Reader reader = new StringReader(styleSheet.getContent());
+ parseStyleSheet(reader);
+ }
+
+ /**
+ * @see #addStyleSheet(StyleSheet)
+ */
+ protected void parseStyleSheet(StyleSheetReference styleSheet) throws IOException {
+ String path = styleSheet.getPath();
+ if(path.startsWith("/")) {
+ path = "platform:/resource" + path;
+ }
+
+ URL url = new URL(path);
+ parseStyleSheet(url.openStream());
+ }
+
@Override
public CSSParser makeCSSParser() {
//TODO : Extended parser (CSSX)
@@ -231,10 +277,11 @@ public abstract class ExtendedCSSEngineImpl extends AbstractCSSEngine implements public ExtendedStyleSheetList getAllStylesheets() {
if(styleSheetsList == null) {
parseStyleSheets();
- styleSheetsList = new ExtendedStyleSheetList(getDocumentCSS().getStyleSheets());
+ styleSheetsList = new ExtendedStyleSheetList();
if(parent != null) {
- styleSheetsList.addAll(parent.getAllStylesheets());
+ styleSheetsList.addAll((StyleSheetList)parent.getAllStylesheets());
}
+ styleSheetsList.addAll(getDocumentCSS().getStyleSheets());
}
return styleSheetsList;
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java index 5a35c9c3d4f..a8e5c5dbb56 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java @@ -11,7 +11,18 @@ *****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.css.engine;
+import java.io.IOException;
+import java.net.URL;
+
+import org.eclipse.e4.ui.css.core.dom.IElementProvider;
+import org.eclipse.e4.ui.css.core.engine.CSSElementContext;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.ModelStyleSheets;
+import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheetReference;
+import org.w3c.dom.Element;
@SuppressWarnings("restriction")
public class ModelCSSEngine extends ExtendedCSSEngineImpl {
@@ -21,5 +32,49 @@ public class ModelCSSEngine extends ExtendedCSSEngineImpl { public ModelCSSEngine(Resource model) {
super(WorkspaceCSSEngine.instance);
this.model = model;
+ for(EObject eObject : model.getContents()) {
+ if(eObject instanceof ModelStyleSheets) {
+ ModelStyleSheets styleSheets = (ModelStyleSheets)eObject;
+ for(StyleSheet styleSheet : styleSheets.getStylesheets()) {
+ addStyleSheet(styleSheet);
+ }
+ }
+ }
+ }
+
+ @Override
+ protected void parseStyleSheet(StyleSheetReference styleSheet) throws IOException {
+ String path = styleSheet.getPath();
+ if(path.startsWith("/")) {
+ path = "platform:/plugin" + path;
+ } else {
+ URI uri = URI.createURI(styleSheet.getPath());
+ uri = uri.resolve(model.getURI());
+ path = uri.toString();
+ }
+ URL url = new URL(path);
+ parseStyleSheet(url.openStream());
+ }
+
+ //Unsupported operations. The ModelCSSEngine should not be used directly.
+
+ @Override
+ public Element getElement(Object node) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public IElementProvider getElementProvider() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setElementProvider(IElementProvider elementProvider) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public CSSElementContext getCSSElementContext(Object node) {
+ throw new UnsupportedOperationException();
}
}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/WorkspaceCSSEngine.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/WorkspaceCSSEngine.java index 4d565bbee8c..14c628ad355 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/WorkspaceCSSEngine.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/WorkspaceCSSEngine.java @@ -32,6 +32,8 @@ public class WorkspaceCSSEngine extends ExtendedCSSEngineImpl { private WorkspaceCSSEngine() {
super(BaseCSSEngine.instance);
try {
+ //TODO: Use an extension point to register themes
+ //TODO: Use a Preference page to select a theme
addStyleSheet(new URL("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/papyrus_theme.css"));
} catch (MalformedURLException ex) {
Activator.log.error(ex);
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/enginecopy/ExtendedViewCSSImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/enginecopy/ExtendedViewCSSImpl.java index 0aa6acf6f59..367100010cb 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/enginecopy/ExtendedViewCSSImpl.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/enginecopy/ExtendedViewCSSImpl.java @@ -46,7 +46,8 @@ public class ExtendedViewCSSImpl implements ViewCSS { /**
* {@inheritDoc}
*
- * Implementation based on {@link ViewCSSImpl#getComputedStyle(Element, String)} The base implementations returns the first CSSStyleDeclaration.
+ * Implementation based on {@link ViewCSSImpl#getComputedStyle(Element, String)}.
+ * The base implementations returns the first CSSStyleDeclaration.
*
* When a StyleDeclaration is found in a StyleSheet, it is added to a list of declarations.
* Then, these declarations are merged
@@ -59,7 +60,7 @@ public class ExtendedViewCSSImpl implements ViewCSS { //Stylesheets
for(StyleSheet styleSheet : styleSheetList) {
- List<StyleWrapper> styleWrappers = getStyleWrappers((CSSStyleSheet)styleSheet, elt, pseudo);
+ List<StyleWrapper> styleWrappers = getStyleWrappers((CSSStyleSheet)styleSheet, elt, pseudo, declarations.size());
declarations.addAll(styleWrappers);
}
@@ -92,11 +93,10 @@ public class ExtendedViewCSSImpl implements ViewCSS { *
* Returns the StyleWrappers instead of a StyleDeclaration
*/
- private List<StyleWrapper> getStyleWrappers(CSSStyleSheet styleSheet, Element elt, String pseudoElt) {
+ private List<StyleWrapper> getStyleWrappers(CSSStyleSheet styleSheet, Element elt, String pseudoElt, int position) {
List<StyleWrapper> styleDeclarations = new ArrayList<StyleWrapper>();
CSSRuleList ruleList = styleSheet.getCssRules();
int length = ruleList.getLength();
- int position = 0;
for(int i = 0; i < length; i++) {
CSSRule rule = ruleList.item(i);
switch(rule.getType()) {
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/SemanticElementHelper.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/SemanticElementHelper.java index 2e71ddfcc91..0f8abdc840d 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/SemanticElementHelper.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/SemanticElementHelper.java @@ -24,21 +24,28 @@ public class SemanticElementHelper { * The result element can also be a Diagram
*/
public static EObject findSemanticElement(EObject notationElement) {
+ if (notationElement == null){
+ return null;
+ }
if(notationElement instanceof Diagram) {
return notationElement;
}
+ if(notationElement instanceof View) {
+ View view = (View)notationElement;
+ EObject semanticElement = view.getElement();
+ if(semanticElement != null) {
+ return semanticElement;
+ }
+ //The graphical element isn't related to a Semantic Element. The view becomes the semantic element.
+ //e.g. : Links in UML
+ return view;
+ }
- EObject currentElement = notationElement;
+ EObject currentElement = notationElement.eContainer();
do {
if(currentElement instanceof View) {
- View view = (View)currentElement;
- if(view.getElement() != null) {
- return view.getElement();
- }
- //The graphical element isn't related to a Semantic Element. The view becomes the semantic element.
- //e.g. : Links in UML
- return view;
+ return findSemanticElement(currentElement);
}
currentElement = currentElement.eContainer();
} while(currentElement != null);
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedStyleSheetList.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedStyleSheetList.java index 390d9a3efd9..ae28bf25a59 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedStyleSheetList.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedStyleSheetList.java @@ -27,9 +27,7 @@ public class ExtendedStyleSheetList extends LinkedList<StyleSheet> implements St }
public ExtendedStyleSheetList(StyleSheetList listToCopy) {
- for(int i = 0; i < listToCopy.getLength(); i++) {
- add(listToCopy.item(i));
- }
+ addAll(listToCopy);
}
public ExtendedStyleSheetList(Collection<? extends StyleSheet> listToCopy) {
@@ -44,4 +42,10 @@ public class ExtendedStyleSheetList extends LinkedList<StyleSheet> implements St return get(index);
}
+ public void addAll(StyleSheetList styleSheets) {
+ for(int i = 0; i < styleSheets.getLength(); i++) {
+ add(styleSheets.item(i));
+ }
+ }
+
}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSAnnotations.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSAnnotations.java index 352e6d30ad9..05141e43bea 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSAnnotations.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSAnnotations.java @@ -31,7 +31,7 @@ public interface CSSAnnotations { /**
* The Diagram Stylesheets key
*/
- public static final Object CSS_DIAGRAM_STYLESHEETS_KEY = "styleSheets"; //$NON-NLS-1$
+ public static final String CSS_DIAGRAM_STYLESHEETS_KEY = "css_stylesheets"; //$NON-NLS-1$
/**
* The name of the EAnnotation containing css informations
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSBooleanListValueStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagram.java index 333f2109049..d04ca9d457c 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSBooleanListValueStyle.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagram.java @@ -1,20 +1,24 @@ -/***************************************************************************** - * 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.style; - -import org.eclipse.emf.common.util.EList; - -public interface CSSBooleanListValueStyle extends CSSNamedStyle{ - - public EList getCSSBooleanListValue(); - -} +/*****************************************************************************
+ * 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.notation;
+
+import java.util.List;
+
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheet;
+
+
+
+public interface CSSDiagram extends Diagram {
+
+ public List<StyleSheet> getStyleSheets();
+}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagramImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagramImpl.java index fd9cc1f3c5c..67c43b0391d 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagramImpl.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagramImpl.java @@ -11,12 +11,18 @@ *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.css.notation; +import java.util.LinkedList; +import java.util.List; + +import org.eclipse.gmf.runtime.notation.EObjectListValueStyle; +import org.eclipse.gmf.runtime.notation.NamedStyle; import org.eclipse.gmf.runtime.notation.impl.DiagramImpl; import org.eclipse.papyrus.infra.gmfdiag.css.engine.DiagramCSSEngine; import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine; +import org.eclipse.papyrus.infra.gmfdiag.css.modelstylesheets.StyleSheet; import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource; -public class CSSDiagramImpl extends DiagramImpl { +public class CSSDiagramImpl extends DiagramImpl implements CSSDiagram { protected ExtendedCSSEngine engine; @@ -34,4 +40,30 @@ public class CSSDiagramImpl extends DiagramImpl { return null; } + public List<StyleSheet> getStyleSheets() { + List<StyleSheet> result = new LinkedList<StyleSheet>(); + + for(Object styleObject : getStyles()) { + if(styleObject instanceof NamedStyle) { + + NamedStyle style = (NamedStyle)styleObject; + + if(CSSAnnotations.CSS_DIAGRAM_STYLESHEETS_KEY.equals(style.getName())) { + if(style instanceof EObjectListValueStyle) { + + EObjectListValueStyle stylesheetsStyle = (EObjectListValueStyle)style; + + for(Object eObjectValue : stylesheetsStyle.getEObjectListValue()) { + if(eObjectValue instanceof StyleSheet) { + result.add((StyleSheet)eObjectValue); + } + } + } + } + } + } + + return result; + } + } diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/ForceValueHelper.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/ForceValueHelper.java index 5366062ac87..588602a1498 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/ForceValueHelper.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/ForceValueHelper.java @@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;
/**
* This helper handles the EAnnotation used to distinguish between an EMF
@@ -69,8 +70,8 @@ public class ForceValueHelper { }
private static boolean isCSSView(View view) {
- return false;
- // return view != null && view.eResource() instanceof CSSNotationResource;
+ // return false;
+ return view != null && view.eResource() instanceof CSSNotationResource;
}
private static boolean equals(Object value1, Object value2) {
@@ -86,6 +87,10 @@ public class ForceValueHelper { return;
}
+ if(feature == null) {
+ return;
+ }
+
//Remove the annotation which forces the value, if needed
String annotationKey = feature.getName();
@@ -104,13 +109,12 @@ public class ForceValueHelper { }
public static boolean isSet(View annotationContext, EObject style, EStructuralFeature feature, Object value) {
- boolean defaultIsSet = style.eIsSet(feature);
if(!isCSSView(annotationContext)) {
//Do not contaminate non-Papyrus models
return true;
}
- if(!defaultIsSet) {
+ if(!style.eIsSet(feature)) {
return false;
}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResource.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResource.java index 3c4bd5aa3cb..5369cd89c64 100644 --- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResource.java +++ b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResource.java @@ -23,10 +23,12 @@ public class CSSNotationResource extends GMFResource { public CSSNotationResource(URI uri) {
super(uri);
- engine = new ModelCSSEngine(this);
}
public ExtendedCSSEngine getEngine() {
+ if(engine == null) {
+ engine = new ModelCSSEngine(this);
+ }
return engine;
}
|