Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2012-12-07 12:33:30 +0000
committercletavernie2012-12-07 12:33:30 +0000
commitd133513ea2ebe4e4b127811055c37971657aa1fb (patch)
treed187ab939ff52263f0af528e1efc9b9eb75896b9 /plugins
parent5a7ee8a1e8b15b6aecc8895b2a594a262b636154 (diff)
downloadorg.eclipse.papyrus-d133513ea2ebe4e4b127811055c37971657aa1fb.tar.gz
org.eclipse.papyrus-d133513ea2ebe4e4b127811055c37971657aa1fb.tar.xz
org.eclipse.papyrus-d133513ea2ebe4e4b127811055c37971657aa1fb.zip
391945: [Refactoring] Part 2: Refactoring on Kepler (0.10)
https://bugs.eclipse.org/bugs/show_bug.cgi?id=391945
Diffstat (limited to 'plugins')
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/build.properties5
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF7
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/plugin.xml_gen57
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/AbstractCSSUiModule.java7
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/CSSExecutableExtensionFactory.java6
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/AbstractCSSProposalProvider.java6
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/CSSParser.java5
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSLexer.java389
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSParser.java24
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/internal/CSSActivator.java64
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/AbstractCSSRuntimeModule.java18
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.genmodel2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.xmi2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSSStandaloneSetupGenerated.java30
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Expression.java1
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Import.java1
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Stylesheet.java1
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AngleImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeValueImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CSSIdImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ClassImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CombinatorImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CompositeSelectorImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ContentImpl.java2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssFactoryImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssPackageImpl.java3466
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/DeclarationImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/EmsImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExpressionImpl.java5
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExsImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FrequencyImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FunctionImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/HexColorImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ImportImpl.java5
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/LengthImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/MediaImpl.java4
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NameImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NumberImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PageImpl.java5
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PercentageImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoPageImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/RulesetImpl.java4
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorConditionImpl.java2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorImpl.java2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SimpleSelectorImpl.java5
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StringValueImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StylesheetImpl.java5
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SubtermImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TermImpl.java2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TimeImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UnaryOperatorImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UriImpl.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssAdapterFactory.java3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssSwitch.java2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSAntlrTokenFileProvider.java1
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSParser.java6
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSLexer.java379
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSParser.java26
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSemanticSequencer.java (renamed from plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/AbstractCSSSemanticSequencer.java)33
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSyntacticSequencer.java (renamed from plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/AbstractCSSSyntacticSequencer.java)40
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/services/CSSGrammarAccess.java234
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSS.xtext2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/OperationParser.java20
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/PropertyParser.java21
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/src/org/eclipse/papyrus/uml/diagram/common/palette/customaction/toolbox/AbstractToolWizard.java28
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShapeEditPart.java6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShortCutDiagramEditPart.java31
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/ShortCutDiagramEditPolicy.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml3
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java5
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java78
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/TransitionPropertiesParser.java48
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/CreateExtensionPointCommand.java21
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java10
-rw-r--r--plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/src/org/eclipse/papyrus/uml/modelexplorer/widgets/ProfileContentProvider.java84
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/src/org/eclipse/papyrus/uml/textedit/connectionpointreference/xtext/ui/contributions/ConnectionPointReferencePopupEditorConfiguration.java127
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contributions/MessagePopupEditor.java39
-rwxr-xr-xplugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF3
-rwxr-xr-xplugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/src/org/eclipse/papyrus/uml/textedit/state/xtext/ui/contributions/StatePopupEditorConfigurationContribution.java41
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/OwnerObservableValue.java2
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/actions/GenericTransformer.java3
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java58
-rw-r--r--plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElement.java4
92 files changed, 2956 insertions, 2633 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/build.properties b/plugins/developer/org.eclipse.papyrus.def/build.properties
index a6f4dd38c26..234da03e945 100644
--- a/plugins/developer/org.eclipse.papyrus.def/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.def/build.properties
@@ -2,7 +2,6 @@ bin.includes = META-INF/,\
.,\
about.html,\
dynamic-templates3.5/,\
- build.properties,\
plugin.properties
-src.includes = dynamic-templates3.5/,\
- bin/
+src.includes = dynamic-templates3.5,\
+ about.html
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF
index f0a22db21e4..98a58bef5f7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF
@@ -20,9 +20,6 @@ Bundle-ActivationPolicy: lazy
Bundle-Version: 0.10.0.qualifier
Bundle-Name: CSS Editor UI (Incubation)
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.ui.internal.CSSAct
- ivator
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui;si
- ngleton:=true
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.ui.internal.CSSActivator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/plugin.xml_gen b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/plugin.xml_gen
index ecd95a11843..22a3d8b8d60 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/plugin.xml_gen
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/plugin.xml_gen
@@ -151,6 +151,28 @@
</extension>
+ <!-- marker definitions for org.eclipse.papyrus.infra.gmfdiag.CSS -->
+ <extension
+ id="css.check.fast"
+ name="CSS Problem"
+ point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.xtext.ui.check.fast"/>
+ <persistent value="true"/>
+ </extension>
+ <extension
+ id="css.check.normal"
+ name="CSS Problem"
+ point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.xtext.ui.check.normal"/>
+ <persistent value="true"/>
+ </extension>
+ <extension
+ id="css.check.expensive"
+ name="CSS Problem"
+ point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.xtext.ui.check.expensive"/>
+ <persistent value="true"/>
+ </extension>
<extension
point="org.eclipse.xtext.builder.participant">
@@ -216,13 +238,34 @@
</command>
</menuContribution>
</extension>
- <!-- quickfix marker resolution generator -->
- <extension
- point="org.eclipse.ui.ide.markerResolution">
- <markerResolutionGenerator
- class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator">
- </markerResolutionGenerator>
- </extension>
+ <!-- quickfix marker resolution generator for org.eclipse.papyrus.infra.gmfdiag.CSS -->
+ <extension
+ point="org.eclipse.ui.ide.markerResolution">
+ <markerResolutionGenerator
+ class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+ markerType="org.eclipse.papyrus.infra.gmfdiag.ui.css.check.fast">
+ <attribute
+ name="FIXABLE_KEY"
+ value="true">
+ </attribute>
+ </markerResolutionGenerator>
+ <markerResolutionGenerator
+ class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+ markerType="org.eclipse.papyrus.infra.gmfdiag.ui.css.check.normal">
+ <attribute
+ name="FIXABLE_KEY"
+ value="true">
+ </attribute>
+ </markerResolutionGenerator>
+ <markerResolutionGenerator
+ class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+ markerType="org.eclipse.papyrus.infra.gmfdiag.ui.css.check.expensive">
+ <attribute
+ name="FIXABLE_KEY"
+ value="true">
+ </attribute>
+ </markerResolutionGenerator>
+ </extension>
<!-- Rename Refactoring -->
<extension point="org.eclipse.ui.handlers">
<handler
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/AbstractCSSUiModule.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/AbstractCSSUiModule.java
index 2c8c59b2d5b..87b06e95fc4 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/AbstractCSSUiModule.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/AbstractCSSUiModule.java
@@ -4,8 +4,8 @@
*/
package org.eclipse.papyrus.infra.gmfdiag.ui;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.xtext.ui.DefaultUiModule;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
* Manual modifications go to {org.eclipse.papyrus.infra.gmfdiag.ui.CSSUiModule}
@@ -208,6 +208,11 @@ public abstract class AbstractCSSUiModule extends DefaultUiModule {
return org.eclipse.xtext.common.types.ui.refactoring.JvmRefactoringResourceSetProvider.class;
}
+ // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
+ public Class<? extends org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation> bindIJavaSearchParticipation() {
+ return org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation.Yes.class;
+ }
+
// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/CSSExecutableExtensionFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/CSSExecutableExtensionFactory.java
index 1b944f0bae5..b6520fb0d33 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/CSSExecutableExtensionFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/CSSExecutableExtensionFactory.java
@@ -8,6 +8,8 @@ import org.osgi.framework.Bundle;
import com.google.inject.Injector;
+import org.eclipse.papyrus.infra.gmfdiag.ui.internal.CSSActivator;
+
/**
* This class was generated. Customizations should only happen in a newly
* introduced subclass.
@@ -16,12 +18,12 @@ public class CSSExecutableExtensionFactory extends AbstractGuiceAwareExecutableE
@Override
protected Bundle getBundle() {
- return org.eclipse.papyrus.infra.gmfdiag.ui.internal.CSSActivator.getInstance().getBundle();
+ return CSSActivator.getInstance().getBundle();
}
@Override
protected Injector getInjector() {
- return org.eclipse.papyrus.infra.gmfdiag.ui.internal.CSSActivator.getInstance().getInjector("org.eclipse.papyrus.infra.gmfdiag.CSS");
+ return CSSActivator.getInstance().getInjector(CSSActivator.ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS);
}
}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/AbstractCSSProposalProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/AbstractCSSProposalProvider.java
index 6ebee245552..aa798fedcfe 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/AbstractCSSProposalProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/AbstractCSSProposalProvider.java
@@ -4,12 +4,10 @@
package org.eclipse.papyrus.infra.gmfdiag.ui.contentassist;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.Alternatives;
-import org.eclipse.xtext.Assignment;
-import org.eclipse.xtext.RuleCall;
+import org.eclipse.xtext.*;
import org.eclipse.xtext.ui.editor.contentassist.AbstractJavaBasedContentProposalProvider;
-import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
+import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
/**
* Represents a generated, default implementation of interface {@link IProposalProvider}.
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/CSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/CSSParser.java
index bccee237d69..a5e2c61d056 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/CSSParser.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/CSSParser.java
@@ -4,11 +4,10 @@
package org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Map;
+import java.util.HashMap;
import org.antlr.runtime.RecognitionException;
-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
import org.eclipse.xtext.AbstractElement;
import org.eclipse.xtext.ui.editor.contentassist.antlr.AbstractContentAssistParser;
import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
@@ -16,6 +15,8 @@ import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternal
import com.google.inject.Inject;
+import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
+
public class CSSParser extends AbstractContentAssistParser {
@Inject
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g
index d984467b735..dde80e79835 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g
@@ -7651,7 +7651,7 @@ RULE_FREQ_UNIT : ('hz'|'mhz');
RULE_T_NUM : (('0'..'9')+|('0'..'9')* '.' ('0'..'9')+);
-RULE_ID : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+RULE_ID : '-'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'-')*;
RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSLexer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSLexer.java
index b1c903193ff..8ebdbf8b435 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSLexer.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSLexer.java
@@ -2,17 +2,14 @@ package org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.internal;
// Hack: Use our own Lexer superclass by means of import.
// Currently there is no other way to specify the superclass for the lexer.
-import org.antlr.runtime.BaseRecognizer;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.DFA;
-import org.antlr.runtime.EarlyExitException;
-import org.antlr.runtime.IntStream;
-import org.antlr.runtime.MismatchedSetException;
-import org.antlr.runtime.NoViableAltException;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.RecognizerSharedState;
import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;
+
+import org.antlr.runtime.*;
+import java.util.Stack;
+import java.util.List;
+import java.util.ArrayList;
+
@SuppressWarnings("all")
public class InternalCSSLexer extends Lexer {
public static final int RULE_ID=7;
@@ -1112,9 +1109,27 @@ public class InternalCSSLexer extends Lexer {
try {
int _type = RULE_ID;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7654:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7654:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7654:9: ( ( '-' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )* )
+ // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7654:11: ( '-' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )*
{
+ // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7654:11: ( '-' )?
+ int alt10=2;
+ int LA10_0 = input.LA(1);
+
+ if ( (LA10_0=='-') ) {
+ alt10=1;
+ }
+ switch (alt10) {
+ case 1 :
+ // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7654:11: '-'
+ {
+ match('-');
+
+ }
+ break;
+
+ }
+
if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
input.consume();
@@ -1124,22 +1139,22 @@ public class InternalCSSLexer extends Lexer {
recover(mse);
throw mse;}
- // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7654:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
- loop10:
+ // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7654:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )*
+ loop11:
do {
- int alt10=2;
- int LA10_0 = input.LA(1);
+ int alt11=2;
+ int LA11_0 = input.LA(1);
- if ( ((LA10_0>='0' && LA10_0<='9')||(LA10_0>='A' && LA10_0<='Z')||LA10_0=='_'||(LA10_0>='a' && LA10_0<='z')) ) {
- alt10=1;
+ if ( (LA11_0=='-'||(LA11_0>='0' && LA11_0<='9')||(LA11_0>='A' && LA11_0<='Z')||LA11_0=='_'||(LA11_0>='a' && LA11_0<='z')) ) {
+ alt11=1;
}
- switch (alt10) {
+ switch (alt11) {
case 1 :
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:
{
- if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
+ if ( input.LA(1)=='-'||(input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
input.consume();
}
@@ -1153,7 +1168,7 @@ public class InternalCSSLexer extends Lexer {
break;
default :
- break loop10;
+ break loop11;
}
} while (true);
@@ -1177,41 +1192,41 @@ public class InternalCSSLexer extends Lexer {
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
- int alt13=2;
- int LA13_0 = input.LA(1);
+ int alt14=2;
+ int LA14_0 = input.LA(1);
- if ( (LA13_0=='\"') ) {
- alt13=1;
+ if ( (LA14_0=='\"') ) {
+ alt14=1;
}
- else if ( (LA13_0=='\'') ) {
- alt13=2;
+ else if ( (LA14_0=='\'') ) {
+ alt14=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("", 13, 0, input);
+ new NoViableAltException("", 14, 0, input);
throw nvae;
}
- switch (alt13) {
+ switch (alt14) {
case 1 :
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
- loop11:
+ loop12:
do {
- int alt11=3;
- int LA11_0 = input.LA(1);
+ int alt12=3;
+ int LA12_0 = input.LA(1);
- if ( (LA11_0=='\\') ) {
- alt11=1;
+ if ( (LA12_0=='\\') ) {
+ alt12=1;
}
- else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA11_0>=']' && LA11_0<='\uFFFF')) ) {
- alt11=2;
+ else if ( ((LA12_0>='\u0000' && LA12_0<='!')||(LA12_0>='#' && LA12_0<='[')||(LA12_0>=']' && LA12_0<='\uFFFF')) ) {
+ alt12=2;
}
- switch (alt11) {
+ switch (alt12) {
case 1 :
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
{
@@ -1245,7 +1260,7 @@ public class InternalCSSLexer extends Lexer {
break;
default :
- break loop11;
+ break loop12;
}
} while (true);
@@ -1258,20 +1273,20 @@ public class InternalCSSLexer extends Lexer {
{
match('\'');
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
- loop12:
+ loop13:
do {
- int alt12=3;
- int LA12_0 = input.LA(1);
+ int alt13=3;
+ int LA13_0 = input.LA(1);
- if ( (LA12_0=='\\') ) {
- alt12=1;
+ if ( (LA13_0=='\\') ) {
+ alt13=1;
}
- else if ( ((LA12_0>='\u0000' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='[')||(LA12_0>=']' && LA12_0<='\uFFFF')) ) {
- alt12=2;
+ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA13_0>=']' && LA13_0<='\uFFFF')) ) {
+ alt13=2;
}
- switch (alt12) {
+ switch (alt13) {
case 1 :
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
{
@@ -1305,7 +1320,7 @@ public class InternalCSSLexer extends Lexer {
break;
default :
- break loop12;
+ break loop13;
}
} while (true);
@@ -1380,29 +1395,29 @@ public class InternalCSSLexer extends Lexer {
match("/*");
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7662:24: ( options {greedy=false; } : . )*
- loop14:
+ loop15:
do {
- int alt14=2;
- int LA14_0 = input.LA(1);
+ int alt15=2;
+ int LA15_0 = input.LA(1);
- if ( (LA14_0=='*') ) {
- int LA14_1 = input.LA(2);
+ if ( (LA15_0=='*') ) {
+ int LA15_1 = input.LA(2);
- if ( (LA14_1=='/') ) {
- alt14=2;
+ if ( (LA15_1=='/') ) {
+ alt15=2;
}
- else if ( ((LA14_1>='\u0000' && LA14_1<='.')||(LA14_1>='0' && LA14_1<='\uFFFF')) ) {
- alt14=1;
+ else if ( ((LA15_1>='\u0000' && LA15_1<='.')||(LA15_1>='0' && LA15_1<='\uFFFF')) ) {
+ alt15=1;
}
}
- else if ( ((LA14_0>='\u0000' && LA14_0<=')')||(LA14_0>='+' && LA14_0<='\uFFFF')) ) {
- alt14=1;
+ else if ( ((LA15_0>='\u0000' && LA15_0<=')')||(LA15_0>='+' && LA15_0<='\uFFFF')) ) {
+ alt15=1;
}
- switch (alt14) {
+ switch (alt15) {
case 1 :
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7662:52: .
{
@@ -1412,7 +1427,7 @@ public class InternalCSSLexer extends Lexer {
break;
default :
- break loop14;
+ break loop15;
}
} while (true);
@@ -1438,18 +1453,18 @@ public class InternalCSSLexer extends Lexer {
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7664:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7664:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
- int cnt15=0;
- loop15:
+ int cnt16=0;
+ loop16:
do {
- int alt15=2;
- int LA15_0 = input.LA(1);
+ int alt16=2;
+ int LA16_0 = input.LA(1);
- if ( ((LA15_0>='\t' && LA15_0<='\n')||LA15_0=='\r'||LA15_0==' ') ) {
- alt15=1;
+ if ( ((LA16_0>='\t' && LA16_0<='\n')||LA16_0=='\r'||LA16_0==' ') ) {
+ alt16=1;
}
- switch (alt15) {
+ switch (alt16) {
case 1 :
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:
{
@@ -1467,12 +1482,12 @@ public class InternalCSSLexer extends Lexer {
break;
default :
- if ( cnt15 >= 1 ) break loop15;
+ if ( cnt16 >= 1 ) break loop16;
EarlyExitException eee =
- new EarlyExitException(15, input);
+ new EarlyExitException(16, input);
throw eee;
}
- cnt15++;
+ cnt16++;
} while (true);
@@ -1508,9 +1523,9 @@ public class InternalCSSLexer extends Lexer {
public void mTokens() throws RecognitionException {
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:8: ( T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | RULE_HASH | RULE_T_CLASS | RULE_T_IMPORTANT | RULE_PC_UNIT | RULE_LEN_UNIT | RULE_EM_UNIT | RULE_EX_UNIT | RULE_ANGLE_UNIT | RULE_TIME_UNIT | RULE_FREQ_UNIT | RULE_T_NUM | RULE_ID | RULE_STRING | RULE_CDO | RULE_CDC | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER )
- int alt16=40;
- alt16 = dfa16.predict(input);
- switch (alt16) {
+ int alt17=40;
+ alt17 = dfa17.predict(input);
+ switch (alt17) {
case 1 :
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:10: T__22
{
@@ -1798,7 +1813,7 @@ public class InternalCSSLexer extends Lexer {
protected DFA9 dfa9 = new DFA9(this);
- protected DFA16 dfa16 = new DFA16(this);
+ protected DFA17 dfa17 = new DFA17(this);
static final String DFA9_eotS =
"\1\uffff\1\3\2\uffff";
static final String DFA9_eofS =
@@ -1851,49 +1866,49 @@ public class InternalCSSLexer extends Lexer {
return "7652:14: ( ( '0' .. '9' )+ | ( '0' .. '9' )* '.' ( '0' .. '9' )+ )";
}
}
- static final String DFA16_eotS =
- "\2\uffff\1\52\3\uffff\3\47\7\uffff\1\75\1\77\2\uffff\2\47\1\uffff"+
- "\10\75\1\123\1\75\2\uffff\3\47\26\uffff\1\75\11\uffff\5\131\1\123"+
- "\1\75\1\131\1\133\1\134\3\75\1\uffff\1\140\3\uffff\1\75\1\uffff"+
- "\1\140\2\uffff\2\142\1\75\3\uffff\1\142";
- static final String DFA16_eofS =
+ static final String DFA17_eotS =
+ "\2\uffff\1\52\3\uffff\3\47\7\uffff\1\53\1\77\2\uffff\2\47\1\uffff"+
+ "\10\53\1\123\1\53\2\uffff\3\47\27\uffff\1\53\10\uffff\5\131\1\123"+
+ "\1\53\1\131\1\133\1\134\3\53\1\uffff\1\140\3\uffff\1\53\1\uffff"+
+ "\1\140\2\uffff\2\142\1\53\3\uffff\1\142";
+ static final String DFA17_eofS =
"\144\uffff";
- static final String DFA16_minS =
+ static final String DFA17_minS =
"\1\0\1\uffff\1\55\3\uffff\2\75\1\143\7\uffff\1\162\1\52\2\uffff"+
- "\2\60\1\uffff\1\143\1\155\1\150\1\156\1\155\1\145\1\141\1\162\1"+
- "\60\1\172\2\uffff\2\0\1\41\26\uffff\1\154\11\uffff\6\60\1\172\3"+
- "\60\1\147\1\144\1\141\1\uffff\1\60\3\uffff\1\50\1\uffff\1\60\2\uffff"+
- "\2\60\1\144\3\uffff\1\60";
- static final String DFA16_maxS =
- "\1\uffff\1\uffff\1\55\3\uffff\1\75\1\151\1\160\7\uffff\1\162\1"+
+ "\1\60\1\55\1\uffff\1\143\1\155\1\150\1\156\1\155\1\145\1\141\1\162"+
+ "\1\55\1\172\2\uffff\2\0\1\41\27\uffff\1\154\10\uffff\6\55\1\172"+
+ "\3\55\1\147\1\144\1\141\1\uffff\1\55\3\uffff\1\50\1\uffff\1\55\2"+
+ "\uffff\2\55\1\144\3\uffff\1\55";
+ static final String DFA17_maxS =
+ "\1\uffff\1\uffff\1\172\3\uffff\1\75\1\151\1\160\7\uffff\1\162\1"+
"\52\2\uffff\2\172\1\uffff\1\170\1\155\1\163\1\156\1\170\1\145\1"+
- "\141\1\162\2\172\2\uffff\2\uffff\1\41\26\uffff\1\154\11\uffff\12"+
+ "\141\1\162\2\172\2\uffff\2\uffff\1\41\27\uffff\1\154\10\uffff\12"+
"\172\1\147\1\144\1\141\1\uffff\1\172\3\uffff\1\50\1\uffff\1\172"+
"\2\uffff\2\172\1\144\3\uffff\1\172";
- static final String DFA16_acceptS =
+ static final String DFA17_acceptS =
"\1\uffff\1\1\1\uffff\1\3\1\4\1\5\3\uffff\1\11\1\13\1\15\1\16\1"+
"\20\1\21\1\22\2\uffff\1\25\1\26\2\uffff\1\32\12\uffff\1\41\1\42"+
- "\3\uffff\1\47\1\50\1\1\1\45\1\2\1\3\1\4\1\5\1\6\1\7\1\31\1\10\1"+
- "\12\1\14\1\17\1\11\1\13\1\15\1\16\1\20\1\21\1\22\1\uffff\1\42\1"+
+ "\3\uffff\1\47\1\50\1\1\1\45\1\2\1\42\1\3\1\4\1\5\1\6\1\7\1\31\1"+
+ "\10\1\12\1\14\1\17\1\11\1\13\1\15\1\16\1\20\1\21\1\22\1\uffff\1"+
"\46\1\24\1\25\1\26\1\27\1\41\1\30\1\32\15\uffff\1\37\1\uffff\1\43"+
"\1\44\1\47\1\uffff\1\33\1\uffff\1\34\1\35\3\uffff\1\40\1\23\1\36"+
"\1\uffff";
- static final String DFA16_specialS =
+ static final String DFA17_specialS =
"\1\1\42\uffff\1\2\1\0\77\uffff}>";
- static final String[] DFA16_transitionS = {
+ static final String[] DFA17_transitionS = {
"\11\47\2\46\2\47\1\46\22\47\1\46\1\7\1\43\1\24\1\47\1\26\1"+
"\47\1\44\1\16\1\17\1\1\1\3\1\12\1\2\1\25\1\21\12\41\1\15\1\11"+
"\1\45\1\5\1\4\1\47\1\10\32\42\1\22\1\47\1\23\1\47\1\42\1\47"+
"\2\42\1\30\1\34\1\33\1\42\1\36\1\40\1\32\3\42\1\31\2\42\1\27"+
"\1\42\1\35\1\37\1\42\1\20\5\42\1\13\1\47\1\14\1\6\uff81\47",
"",
- "\1\51",
+ "\1\51\23\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
"",
"",
"",
- "\1\56",
- "\1\57\53\uffff\1\60",
- "\1\61\5\uffff\1\62\3\uffff\1\63\2\uffff\1\64",
+ "\1\57",
+ "\1\60\53\uffff\1\61",
+ "\1\62\5\uffff\1\63\3\uffff\1\64\2\uffff\1\65",
"",
"",
"",
@@ -1901,12 +1916,13 @@ public class InternalCSSLexer extends Lexer {
"",
"",
"",
- "\1\74",
+ "\1\75",
"\1\76",
"",
"",
"\12\102\7\uffff\32\102\6\uffff\32\102",
- "\12\103\7\uffff\32\104\4\uffff\1\104\1\uffff\32\104",
+ "\1\104\2\uffff\12\103\7\uffff\32\104\4\uffff\1\104\1\uffff"+
+ "\32\104",
"",
"\1\110\20\uffff\1\107\3\uffff\1\106",
"\1\111",
@@ -1916,7 +1932,8 @@ public class InternalCSSLexer extends Lexer {
"\1\120",
"\1\121",
"\1\122",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75",
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53",
"\1\124",
"",
"",
@@ -1945,8 +1962,8 @@ public class InternalCSSLexer extends Lexer {
"",
"",
"",
- "\1\130",
"",
+ "\1\130",
"",
"",
"",
@@ -1955,66 +1972,80 @@ public class InternalCSSLexer extends Lexer {
"",
"",
"",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75",
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53",
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53",
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53",
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53",
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53",
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53",
"\1\132",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75",
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53",
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53",
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53",
"\1\135",
"\1\136",
"\1\137",
"",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75",
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53",
"",
"",
"",
"\1\141",
"",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75",
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53",
"",
"",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75",
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53",
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53",
"\1\143",
"",
"",
"",
- "\12\75\7\uffff\32\75\4\uffff\1\75\1\uffff\32\75"
+ "\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32"+
+ "\53"
};
- static final short[] DFA16_eot = DFA.unpackEncodedString(DFA16_eotS);
- static final short[] DFA16_eof = DFA.unpackEncodedString(DFA16_eofS);
- static final char[] DFA16_min = DFA.unpackEncodedStringToUnsignedChars(DFA16_minS);
- static final char[] DFA16_max = DFA.unpackEncodedStringToUnsignedChars(DFA16_maxS);
- static final short[] DFA16_accept = DFA.unpackEncodedString(DFA16_acceptS);
- static final short[] DFA16_special = DFA.unpackEncodedString(DFA16_specialS);
- static final short[][] DFA16_transition;
+ static final short[] DFA17_eot = DFA.unpackEncodedString(DFA17_eotS);
+ static final short[] DFA17_eof = DFA.unpackEncodedString(DFA17_eofS);
+ static final char[] DFA17_min = DFA.unpackEncodedStringToUnsignedChars(DFA17_minS);
+ static final char[] DFA17_max = DFA.unpackEncodedStringToUnsignedChars(DFA17_maxS);
+ static final short[] DFA17_accept = DFA.unpackEncodedString(DFA17_acceptS);
+ static final short[] DFA17_special = DFA.unpackEncodedString(DFA17_specialS);
+ static final short[][] DFA17_transition;
static {
- int numStates = DFA16_transitionS.length;
- DFA16_transition = new short[numStates][];
+ int numStates = DFA17_transitionS.length;
+ DFA17_transition = new short[numStates][];
for (int i=0; i<numStates; i++) {
- DFA16_transition[i] = DFA.unpackEncodedString(DFA16_transitionS[i]);
+ DFA17_transition[i] = DFA.unpackEncodedString(DFA17_transitionS[i]);
}
}
- class DFA16 extends DFA {
+ class DFA17 extends DFA {
- public DFA16(BaseRecognizer recognizer) {
+ public DFA17(BaseRecognizer recognizer) {
this.recognizer = recognizer;
- this.decisionNumber = 16;
- this.eot = DFA16_eot;
- this.eof = DFA16_eof;
- this.min = DFA16_min;
- this.max = DFA16_max;
- this.accept = DFA16_accept;
- this.special = DFA16_special;
- this.transition = DFA16_transition;
+ this.decisionNumber = 17;
+ this.eot = DFA17_eot;
+ this.eof = DFA17_eof;
+ this.min = DFA17_min;
+ this.max = DFA17_max;
+ this.accept = DFA17_accept;
+ this.special = DFA17_special;
+ this.transition = DFA17_transition;
}
public String getDescription() {
return "1:1: Tokens : ( T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | RULE_HASH | RULE_T_CLASS | RULE_T_IMPORTANT | RULE_PC_UNIT | RULE_LEN_UNIT | RULE_EM_UNIT | RULE_EX_UNIT | RULE_ANGLE_UNIT | RULE_TIME_UNIT | RULE_FREQ_UNIT | RULE_T_NUM | RULE_ID | RULE_STRING | RULE_CDO | RULE_CDC | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER );";
@@ -2024,104 +2055,104 @@ public class InternalCSSLexer extends Lexer {
int _s = s;
switch ( s ) {
case 0 :
- int LA16_36 = input.LA(1);
+ int LA17_36 = input.LA(1);
s = -1;
- if ( ((LA16_36>='\u0000' && LA16_36<='\uFFFF')) ) {s = 85;}
+ if ( ((LA17_36>='\u0000' && LA17_36<='\uFFFF')) ) {s = 85;}
else s = 39;
if ( s>=0 ) return s;
break;
case 1 :
- int LA16_0 = input.LA(1);
+ int LA17_0 = input.LA(1);
s = -1;
- if ( (LA16_0=='*') ) {s = 1;}
+ if ( (LA17_0=='*') ) {s = 1;}
- else if ( (LA16_0=='-') ) {s = 2;}
+ else if ( (LA17_0=='-') ) {s = 2;}
- else if ( (LA16_0=='+') ) {s = 3;}
+ else if ( (LA17_0=='+') ) {s = 3;}
- else if ( (LA16_0=='>') ) {s = 4;}
+ else if ( (LA17_0=='>') ) {s = 4;}
- else if ( (LA16_0=='=') ) {s = 5;}
+ else if ( (LA17_0=='=') ) {s = 5;}
- else if ( (LA16_0=='~') ) {s = 6;}
+ else if ( (LA17_0=='~') ) {s = 6;}
- else if ( (LA16_0=='!') ) {s = 7;}
+ else if ( (LA17_0=='!') ) {s = 7;}
- else if ( (LA16_0=='@') ) {s = 8;}
+ else if ( (LA17_0=='@') ) {s = 8;}
- else if ( (LA16_0==';') ) {s = 9;}
+ else if ( (LA17_0==';') ) {s = 9;}
- else if ( (LA16_0==',') ) {s = 10;}
+ else if ( (LA17_0==',') ) {s = 10;}
- else if ( (LA16_0=='{') ) {s = 11;}
+ else if ( (LA17_0=='{') ) {s = 11;}
- else if ( (LA16_0=='}') ) {s = 12;}
+ else if ( (LA17_0=='}') ) {s = 12;}
- else if ( (LA16_0==':') ) {s = 13;}
+ else if ( (LA17_0==':') ) {s = 13;}
- else if ( (LA16_0=='(') ) {s = 14;}
+ else if ( (LA17_0=='(') ) {s = 14;}
- else if ( (LA16_0==')') ) {s = 15;}
+ else if ( (LA17_0==')') ) {s = 15;}
- else if ( (LA16_0=='u') ) {s = 16;}
+ else if ( (LA17_0=='u') ) {s = 16;}
- else if ( (LA16_0=='/') ) {s = 17;}
+ else if ( (LA17_0=='/') ) {s = 17;}
- else if ( (LA16_0=='[') ) {s = 18;}
+ else if ( (LA17_0=='[') ) {s = 18;}
- else if ( (LA16_0==']') ) {s = 19;}
+ else if ( (LA17_0==']') ) {s = 19;}
- else if ( (LA16_0=='#') ) {s = 20;}
+ else if ( (LA17_0=='#') ) {s = 20;}
- else if ( (LA16_0=='.') ) {s = 21;}
+ else if ( (LA17_0=='.') ) {s = 21;}
- else if ( (LA16_0=='%') ) {s = 22;}
+ else if ( (LA17_0=='%') ) {s = 22;}
- else if ( (LA16_0=='p') ) {s = 23;}
+ else if ( (LA17_0=='p') ) {s = 23;}
- else if ( (LA16_0=='c') ) {s = 24;}
+ else if ( (LA17_0=='c') ) {s = 24;}
- else if ( (LA16_0=='m') ) {s = 25;}
+ else if ( (LA17_0=='m') ) {s = 25;}
- else if ( (LA16_0=='i') ) {s = 26;}
+ else if ( (LA17_0=='i') ) {s = 26;}
- else if ( (LA16_0=='e') ) {s = 27;}
+ else if ( (LA17_0=='e') ) {s = 27;}
- else if ( (LA16_0=='d') ) {s = 28;}
+ else if ( (LA17_0=='d') ) {s = 28;}
- else if ( (LA16_0=='r') ) {s = 29;}
+ else if ( (LA17_0=='r') ) {s = 29;}
- else if ( (LA16_0=='g') ) {s = 30;}
+ else if ( (LA17_0=='g') ) {s = 30;}
- else if ( (LA16_0=='s') ) {s = 31;}
+ else if ( (LA17_0=='s') ) {s = 31;}
- else if ( (LA16_0=='h') ) {s = 32;}
+ else if ( (LA17_0=='h') ) {s = 32;}
- else if ( ((LA16_0>='0' && LA16_0<='9')) ) {s = 33;}
+ else if ( ((LA17_0>='0' && LA17_0<='9')) ) {s = 33;}
- else if ( ((LA16_0>='A' && LA16_0<='Z')||LA16_0=='_'||(LA16_0>='a' && LA16_0<='b')||LA16_0=='f'||(LA16_0>='j' && LA16_0<='l')||(LA16_0>='n' && LA16_0<='o')||LA16_0=='q'||LA16_0=='t'||(LA16_0>='v' && LA16_0<='z')) ) {s = 34;}
+ else if ( ((LA17_0>='A' && LA17_0<='Z')||LA17_0=='_'||(LA17_0>='a' && LA17_0<='b')||LA17_0=='f'||(LA17_0>='j' && LA17_0<='l')||(LA17_0>='n' && LA17_0<='o')||LA17_0=='q'||LA17_0=='t'||(LA17_0>='v' && LA17_0<='z')) ) {s = 34;}
- else if ( (LA16_0=='\"') ) {s = 35;}
+ else if ( (LA17_0=='\"') ) {s = 35;}
- else if ( (LA16_0=='\'') ) {s = 36;}
+ else if ( (LA17_0=='\'') ) {s = 36;}
- else if ( (LA16_0=='<') ) {s = 37;}
+ else if ( (LA17_0=='<') ) {s = 37;}
- else if ( ((LA16_0>='\t' && LA16_0<='\n')||LA16_0=='\r'||LA16_0==' ') ) {s = 38;}
+ else if ( ((LA17_0>='\t' && LA17_0<='\n')||LA17_0=='\r'||LA17_0==' ') ) {s = 38;}
- else if ( ((LA16_0>='\u0000' && LA16_0<='\b')||(LA16_0>='\u000B' && LA16_0<='\f')||(LA16_0>='\u000E' && LA16_0<='\u001F')||LA16_0=='$'||LA16_0=='&'||LA16_0=='?'||LA16_0=='\\'||LA16_0=='^'||LA16_0=='`'||LA16_0=='|'||(LA16_0>='\u007F' && LA16_0<='\uFFFF')) ) {s = 39;}
+ else if ( ((LA17_0>='\u0000' && LA17_0<='\b')||(LA17_0>='\u000B' && LA17_0<='\f')||(LA17_0>='\u000E' && LA17_0<='\u001F')||LA17_0=='$'||LA17_0=='&'||LA17_0=='?'||LA17_0=='\\'||LA17_0=='^'||LA17_0=='`'||LA17_0=='|'||(LA17_0>='\u007F' && LA17_0<='\uFFFF')) ) {s = 39;}
if ( s>=0 ) return s;
break;
case 2 :
- int LA16_35 = input.LA(1);
+ int LA17_35 = input.LA(1);
s = -1;
- if ( ((LA16_35>='\u0000' && LA16_35<='\uFFFF')) ) {s = 85;}
+ if ( ((LA17_35>='\u0000' && LA17_35<='\uFFFF')) ) {s = 85;}
else s = 39;
@@ -2129,7 +2160,7 @@ public class InternalCSSLexer extends Lexer {
break;
}
NoViableAltException nvae =
- new NoViableAltException(getDescription(), 16, _s, input);
+ new NoViableAltException(getDescription(), 17, _s, input);
error(nvae);
throw nvae;
}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSParser.java
index 2a2fa7ab976..f290d34c887 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSParser.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSParser.java
@@ -1,15 +1,23 @@
package org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.internal;
-import org.antlr.runtime.BaseRecognizer;
-import org.antlr.runtime.BitSet;
-import org.antlr.runtime.NoViableAltException;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.RecognizerSharedState;
-import org.antlr.runtime.TokenStream;
-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
-import org.eclipse.xtext.Grammar;
+import java.io.InputStream;
+import org.eclipse.xtext.*;
+import org.eclipse.xtext.parser.*;
+import org.eclipse.xtext.parser.impl.*;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.DFA;
+import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
+
+
+
+import org.antlr.runtime.*;
+import java.util.Stack;
+import java.util.List;
+import java.util.ArrayList;
@SuppressWarnings("all")
public class InternalCSSParser extends AbstractInternalContentAssistParser {
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/internal/CSSActivator.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/internal/CSSActivator.java
index 4aa9dafbd6d..7f3605eb643 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/internal/CSSActivator.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/internal/CSSActivator.java
@@ -3,19 +3,17 @@
*/
package org.eclipse.papyrus.infra.gmfdiag.ui.internal;
-import static com.google.inject.Guice.createInjector;
-import static com.google.inject.util.Modules.override;
-
-import java.util.concurrent.ExecutionException;
+import java.util.Collections;
+import java.util.Map;
import org.apache.log4j.Logger;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.xtext.ui.shared.SharedStateModule;
+import org.eclipse.xtext.util.Modules2;
import org.osgi.framework.BundleContext;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
+import com.google.common.collect.Maps;
+import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
@@ -25,32 +23,13 @@ import com.google.inject.Module;
*/
public class CSSActivator extends AbstractUIPlugin {
- private static final Logger logger = Logger.getLogger(CSSActivator.class);
+ public static final String ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS = "org.eclipse.papyrus.infra.gmfdiag.CSS";
- private Cache<String, Injector> injectors = CacheBuilder.newBuilder().build(new CacheLoader<String, Injector>() {
- @Override
- public Injector load(String language) throws Exception {
- Module runtimeModule = getRuntimeModule(language);
- Module sharedStateModule = getSharedStateModule();
- Module uiModule = getUiModule(language);
- Module mergedModule = override(override(runtimeModule).with(sharedStateModule)).with(uiModule);
- return createInjector(mergedModule);
- }
- });
+ private static final Logger logger = Logger.getLogger(CSSActivator.class);
private static CSSActivator INSTANCE;
- public static final String ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS = "org.eclipse.papyrus.infra.gmfdiag.CSS";
-
- public Injector getInjector(String languageName) {
- try {
- return injectors.get(languageName);
- } catch(ExecutionException e) {
- logger.error("Failed to create injector for " + languageName);
- logger.error(e.getMessage(), e);
- throw new RuntimeException("Failed to create injector for " + languageName, e);
- }
- }
+ private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
@Override
public void start(BundleContext context) throws Exception {
@@ -60,8 +39,7 @@ public class CSSActivator extends AbstractUIPlugin {
@Override
public void stop(BundleContext context) throws Exception {
- injectors.invalidateAll();
- injectors.cleanUp();
+ injectors.clear();
INSTANCE = null;
super.stop(context);
}
@@ -70,6 +48,30 @@ public class CSSActivator extends AbstractUIPlugin {
return INSTANCE;
}
+ public Injector getInjector(String language) {
+ synchronized (injectors) {
+ Injector injector = injectors.get(language);
+ if (injector == null) {
+ injectors.put(language, injector = createInjector(language));
+ }
+ return injector;
+ }
+ }
+
+ protected Injector createInjector(String language) {
+ try {
+ Module runtimeModule = getRuntimeModule(language);
+ Module sharedStateModule = getSharedStateModule();
+ Module uiModule = getUiModule(language);
+ Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule);
+ return Guice.createInjector(mergedModule);
+ } catch (Exception e) {
+ logger.error("Failed to create injector for " + language);
+ logger.error(e.getMessage(), e);
+ throw new RuntimeException("Failed to create injector for " + language, e);
+ }
+ }
+
protected Module getRuntimeModule(String grammar) {
if (ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS.equals(grammar)) {
return new org.eclipse.papyrus.infra.gmfdiag.CSSRuntimeModule();
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF
index 2aea9d38572..6cc14f69f57 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF
@@ -30,7 +30,5 @@ Bundle-ActivationPolicy: lazy
Bundle-Version: 0.10.0.qualifier
Bundle-Name: CSS Editor (Incubation)
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.xtext;singl
- eton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.xtext;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/AbstractCSSRuntimeModule.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/AbstractCSSRuntimeModule.java
index 8aaa9f3343e..3933620a748 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/AbstractCSSRuntimeModule.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/AbstractCSSRuntimeModule.java
@@ -14,7 +14,7 @@ import com.google.inject.name.Names;
/**
* Manual modifications go to {org.eclipse.papyrus.infra.gmfdiag.CSSRuntimeModule}
*/
-@SuppressWarnings("all")
+ @SuppressWarnings("all")
public abstract class AbstractCSSRuntimeModule extends DefaultRuntimeModule {
protected Properties properties = null;
@@ -24,17 +24,16 @@ public abstract class AbstractCSSRuntimeModule extends DefaultRuntimeModule {
properties = tryBindProperties(binder, "org/eclipse/papyrus/infra/gmfdiag/CSS.properties");
super.configure(binder);
}
-
+
public void configureLanguageName(Binder binder) {
binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("org.eclipse.papyrus.infra.gmfdiag.CSS");
}
-
+
public void configureFileExtensions(Binder binder) {
- if(properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null) {
+ if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null)
binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("css");
- }
}
-
+
// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
return org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess.class;
@@ -42,12 +41,12 @@ public abstract class AbstractCSSRuntimeModule extends DefaultRuntimeModule {
// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
public Class<? extends org.eclipse.xtext.serializer.sequencer.ISemanticSequencer> bindISemanticSequencer() {
- return org.eclipse.papyrus.infra.gmfdiag.serializer.AbstractCSSSemanticSequencer.class;
+ return org.eclipse.papyrus.infra.gmfdiag.serializer.CSSSemanticSequencer.class;
}
// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
public Class<? extends org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer> bindISyntacticSequencer() {
- return org.eclipse.papyrus.infra.gmfdiag.serializer.AbstractCSSSyntacticSequencer.class;
+ return org.eclipse.papyrus.infra.gmfdiag.serializer.CSSSyntacticSequencer.class;
}
// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
@@ -91,8 +90,7 @@ public abstract class AbstractCSSRuntimeModule extends DefaultRuntimeModule {
}
// contributed by org.eclipse.xtext.generator.validation.JavaValidatorFragment
- @org.eclipse.xtext.service.SingletonBinding(eager = true)
- public Class<? extends org.eclipse.papyrus.infra.gmfdiag.validation.CSSJavaValidator> bindCSSJavaValidator() {
+ @org.eclipse.xtext.service.SingletonBinding(eager=true) public Class<? extends org.eclipse.papyrus.infra.gmfdiag.validation.CSSJavaValidator> bindCSSJavaValidator() {
return org.eclipse.papyrus.infra.gmfdiag.validation.CSSJavaValidator.class;
}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.genmodel b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.genmodel
index 44d9b071329..55030d2f5a7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.genmodel
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.genmodel
@@ -5,7 +5,7 @@
modelPluginID="org.eclipse.papyrus.infra.gmfdiag.css.xtext" forceOverwrite="true"
modelName="CSS" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.infra.gmfdiag.css.xtext.edit"
- editorPluginID="org.eclipse.papyrus.infra.gmfdiag.css.xtext.editor">
+ editorPluginID="org.eclipse.papyrus.infra.gmfdiag.css.xtext.editor" runtimeVersion="2.8">
<genPackages prefix="Css" basePackage="org.eclipse.papyrus.infra.gmfdiag" disposableProviderFactory="true"
ecorePackage="CSS.ecore#/">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="CSS.ecore#//UNARY">
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.xmi b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.xmi
index 822fab0c9c0..37c88bb1387 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.xmi
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.xmi
@@ -804,6 +804,7 @@
<classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</type>
<alternatives xsi:type="xtext:Group">
+ <elements xsi:type="xtext:Keyword" cardinality="?" value="-"/>
<elements xsi:type="xtext:Alternatives">
<elements xsi:type="xtext:CharacterRange">
<left value="a"/>
@@ -829,6 +830,7 @@
<left value="0"/>
<right value="9"/>
</elements>
+ <elements xsi:type="xtext:Keyword" value="-"/>
</elements>
</alternatives>
</rules>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSSStandaloneSetupGenerated.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSSStandaloneSetupGenerated.java
index 85a2da23684..df2788fc6c4 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSSStandaloneSetupGenerated.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSSStandaloneSetupGenerated.java
@@ -1,8 +1,9 @@
+
package org.eclipse.papyrus.infra.gmfdiag;
import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.xtext.ISetup;
+import org.eclipse.emf.ecore.resource.Resource;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -15,35 +16,34 @@ public class CSSStandaloneSetupGenerated implements ISetup {
public Injector createInjectorAndDoEMFRegistration() {
// register default ePackages
- if(!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("ecore")) {
- Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("ecore", new org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl());
- }
- if(!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xmi")) {
- Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xmi", new org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl());
- }
- if(!EPackage.Registry.INSTANCE.containsKey(org.eclipse.xtext.XtextPackage.eNS_URI)) {
+ if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("ecore"))
+ Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(
+ "ecore", new org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl());
+ if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xmi"))
+ Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(
+ "xmi", new org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl());
+ if (!EPackage.Registry.INSTANCE.containsKey(org.eclipse.xtext.XtextPackage.eNS_URI))
EPackage.Registry.INSTANCE.put(org.eclipse.xtext.XtextPackage.eNS_URI, org.eclipse.xtext.XtextPackage.eINSTANCE);
- }
Injector injector = createInjector();
register(injector);
return injector;
}
-
+
public Injector createInjector() {
return Guice.createInjector(new org.eclipse.papyrus.infra.gmfdiag.CSSRuntimeModule());
}
-
+
public void register(Injector injector) {
- if(!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/papyrus/infra/gmfdiag/CSS")) {
- EPackage.Registry.INSTANCE.put("http://www.eclipse.org/papyrus/infra/gmfdiag/CSS", org.eclipse.papyrus.infra.gmfdiag.css.CssPackage.eINSTANCE);
- }
+ if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/papyrus/infra/gmfdiag/CSS")) {
+ EPackage.Registry.INSTANCE.put("http://www.eclipse.org/papyrus/infra/gmfdiag/CSS", org.eclipse.papyrus.infra.gmfdiag.css.CssPackage.eINSTANCE);
+ }
org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class);
org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class);
Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("css", resourceFactory);
org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("css", serviceProvider);
-
+
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Expression.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Expression.java
index f8e6bc8194f..b232209a4d6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Expression.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Expression.java
@@ -3,6 +3,7 @@
package org.eclipse.papyrus.infra.gmfdiag.css;
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EObject;
/**
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Import.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Import.java
index 46caaa6b134..cc43c4d9ef6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Import.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Import.java
@@ -3,6 +3,7 @@
package org.eclipse.papyrus.infra.gmfdiag.css;
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EObject;
/**
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Stylesheet.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Stylesheet.java
index d468ae16151..de3a7c97c81 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Stylesheet.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Stylesheet.java
@@ -3,6 +3,7 @@
package org.eclipse.papyrus.infra.gmfdiag.css;
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EObject;
/**
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AngleImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AngleImpl.java
index f1baba3132a..f22a029c637 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AngleImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AngleImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.Angle;
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeImpl.java
index 71a3f5f8d05..6034f06472e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;
import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeValueImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeValueImpl.java
index 08ef6774365..c3165d4d4a1 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeValueImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeValueImpl.java
@@ -3,9 +3,12 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP;
import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CSSIdImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CSSIdImpl.java
index 35021f484c9..b6fc8dc3b8c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CSSIdImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CSSIdImpl.java
@@ -3,8 +3,11 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CSSId;
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ClassImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ClassImpl.java
index cc9f85fb489..af366856dce 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ClassImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ClassImpl.java
@@ -3,8 +3,11 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
/**
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CombinatorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CombinatorImpl.java
index 8a443d31d27..5363af9b82f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CombinatorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CombinatorImpl.java
@@ -3,9 +3,12 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.Combinator;
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.KIND;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CompositeSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CompositeSelectorImpl.java
index f7c965b3a1b..84174cd652d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CompositeSelectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CompositeSelectorImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.Combinator;
import org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector;
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ContentImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ContentImpl.java
index 4d524fc8c0a..9a2bcfd1536 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ContentImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ContentImpl.java
@@ -3,7 +3,9 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.Content;
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssFactoryImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssFactoryImpl.java
index c9b2dec7685..d85c35efae2 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssFactoryImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssFactoryImpl.java
@@ -6,8 +6,11 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
+
import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
import org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP;
import org.eclipse.papyrus.infra.gmfdiag.css.Angle;
import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssPackageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssPackageImpl.java
index c414ebef0d3..3441652cf4f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssPackageImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssPackageImpl.java
@@ -7,7 +7,9 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
+
import org.eclipse.emf.ecore.impl.EPackageImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.Angle;
import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;
import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;
@@ -48,1776 +50,1732 @@ import org.eclipse.papyrus.infra.gmfdiag.css.Uri;
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
* <!-- end-user-doc -->
- *
* @generated
*/
-public class CssPackageImpl extends EPackageImpl implements CssPackage {
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass stylesheetEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass contentEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass importEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass mediaEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pageEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pseudoPageEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass rulesetEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass selectorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass compositeSelectorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass simpleSelectorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass selectorConditionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass combinatorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass declarationEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass expressionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass subtermEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass termEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass functionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass nameEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass numberEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass percentageEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass lengthEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass emsEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass exsEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass angleEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass timeEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass frequencyEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass uriEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass stringValueEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass hexColorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass classEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass attributeEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass attributeValueEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pseudoEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass cssIdEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass unaryOperatorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EEnum unaryEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EEnum kindEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EEnum attributE_OPEEnum = null;
-
- /**
- * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
- * package
- * package URI value.
- * <p>
- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
- * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private CssPackageImpl() {
- super(eNS_URI, CssFactory.eINSTANCE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
- * <p>
- * This method is used to initialize {@link CssPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead,
- * they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static CssPackage init() {
- if(isInited) {
- return (CssPackage)EPackage.Registry.INSTANCE.getEPackage(CssPackage.eNS_URI);
- }
-
- // Obtain or create and register package
- CssPackageImpl theCssPackage = (CssPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CssPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CssPackageImpl());
-
- isInited = true;
-
- // Create package meta-data objects
- theCssPackage.createPackageContents();
-
- // Initialize created meta-data
- theCssPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theCssPackage.freeze();
-
-
- // Update the registry and return the package
- EPackage.Registry.INSTANCE.put(CssPackage.eNS_URI, theCssPackage);
- return theCssPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getStylesheet() {
- return stylesheetEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getStylesheet_Charset() {
- return (EAttribute)stylesheetEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getStylesheet_Imports() {
- return (EReference)stylesheetEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getStylesheet_Contents() {
- return (EReference)stylesheetEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getContent() {
- return contentEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getImport() {
- return importEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getImport_String() {
- return (EAttribute)importEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getImport_Uri() {
- return (EReference)importEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getImport_Media() {
- return (EAttribute)importEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getMedia() {
- return mediaEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getMedia_Media() {
- return (EAttribute)mediaEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getMedia_Rules() {
- return (EReference)mediaEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPage() {
- return pageEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPage_Pseudo() {
- return (EReference)pageEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPage_Declarations() {
- return (EReference)pageEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPseudoPage() {
- return pseudoPageEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPseudoPage_Id() {
- return (EAttribute)pseudoPageEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getRuleset() {
- return rulesetEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getRuleset_Selectors() {
- return (EReference)rulesetEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getRuleset_Properties() {
- return (EReference)rulesetEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getSelector() {
- return selectorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getCompositeSelector() {
- return compositeSelectorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getCompositeSelector_Left() {
- return (EReference)compositeSelectorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getCompositeSelector_Combinator() {
- return (EReference)compositeSelectorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getCompositeSelector_Right() {
- return (EReference)compositeSelectorEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getSimpleSelector() {
- return simpleSelectorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getSimpleSelector_ElementName() {
- return (EAttribute)simpleSelectorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getSimpleSelector_Condition() {
- return (EReference)simpleSelectorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getSelectorCondition() {
- return selectorConditionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getCombinator() {
- return combinatorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getCombinator_Kind() {
- return (EAttribute)combinatorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getDeclaration() {
- return declarationEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getDeclaration_Property() {
- return (EAttribute)declarationEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getDeclaration_Expression() {
- return (EReference)declarationEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getDeclaration_Important() {
- return (EAttribute)declarationEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getExpression() {
- return expressionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getExpression_Terms() {
- return (EReference)expressionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getExpression_Subterms() {
- return (EReference)expressionEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getSubterm() {
- return subtermEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getSubterm_Operator() {
- return (EAttribute)subtermEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getSubterm_Term() {
- return (EReference)subtermEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getTerm() {
- return termEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getFunction() {
- return functionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getFunction_Name() {
- return (EAttribute)functionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getFunction_Args() {
- return (EReference)functionEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getName_() {
- return nameEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getName_Value() {
- return (EAttribute)nameEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getNumber() {
- return numberEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getNumber_Op() {
- return (EReference)numberEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getNumber_Value() {
- return (EAttribute)numberEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPercentage() {
- return percentageEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPercentage_Op() {
- return (EReference)percentageEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPercentage_Value() {
- return (EAttribute)percentageEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPercentage_Unit() {
- return (EAttribute)percentageEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getLength() {
- return lengthEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getLength_Op() {
- return (EReference)lengthEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getLength_Value() {
- return (EAttribute)lengthEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getLength_Unit() {
- return (EAttribute)lengthEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getEms() {
- return emsEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getEms_Op() {
- return (EReference)emsEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getEms_Value() {
- return (EAttribute)emsEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getEms_Unit() {
- return (EAttribute)emsEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getExs() {
- return exsEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getExs_Op() {
- return (EReference)exsEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getExs_Value() {
- return (EAttribute)exsEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getExs_Unit() {
- return (EAttribute)exsEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getAngle() {
- return angleEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getAngle_Op() {
- return (EReference)angleEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getAngle_Value() {
- return (EAttribute)angleEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getAngle_Unit() {
- return (EAttribute)angleEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getTime() {
- return timeEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTime_Op() {
- return (EReference)timeEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getTime_Value() {
- return (EAttribute)timeEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getTime_Unit() {
- return (EAttribute)timeEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getFrequency() {
- return frequencyEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getFrequency_Op() {
- return (EReference)frequencyEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getFrequency_Value() {
- return (EAttribute)frequencyEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getFrequency_Unit() {
- return (EAttribute)frequencyEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getUri() {
- return uriEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getUri_Value() {
- return (EAttribute)uriEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getStringValue() {
- return stringValueEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getStringValue_Value() {
- return (EAttribute)stringValueEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getHexColor() {
- return hexColorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getHexColor_Value() {
- return (EAttribute)hexColorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getClass_() {
- return classEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getClass_Class() {
- return (EAttribute)classEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getAttribute() {
- return attributeEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getAttribute_Name() {
- return (EAttribute)attributeEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getAttribute_Value() {
- return (EReference)attributeEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getAttributeValue() {
- return attributeValueEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getAttributeValue_Operator() {
- return (EAttribute)attributeValueEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getAttributeValue_Value() {
- return (EAttribute)attributeValueEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPseudo() {
- return pseudoEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPseudo_Pseudo() {
- return (EAttribute)pseudoEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPseudo_Args() {
- return (EAttribute)pseudoEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getCSSId() {
- return cssIdEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getCSSId_Value() {
- return (EAttribute)cssIdEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getUnaryOperator() {
- return unaryOperatorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getUnaryOperator_Operator() {
- return (EAttribute)unaryOperatorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EEnum getUNARY() {
- return unaryEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EEnum getKIND() {
- return kindEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EEnum getATTRIBUTE_OP() {
- return attributE_OPEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public CssFactory getCssFactory() {
- return (CssFactory)getEFactoryInstance();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void createPackageContents() {
- if(isCreated) {
- return;
- }
- isCreated = true;
-
- // Create classes and their features
- stylesheetEClass = createEClass(STYLESHEET);
- createEAttribute(stylesheetEClass, STYLESHEET__CHARSET);
- createEReference(stylesheetEClass, STYLESHEET__IMPORTS);
- createEReference(stylesheetEClass, STYLESHEET__CONTENTS);
-
- contentEClass = createEClass(CONTENT);
-
- importEClass = createEClass(IMPORT);
- createEAttribute(importEClass, IMPORT__STRING);
- createEReference(importEClass, IMPORT__URI);
- createEAttribute(importEClass, IMPORT__MEDIA);
-
- mediaEClass = createEClass(MEDIA);
- createEAttribute(mediaEClass, MEDIA__MEDIA);
- createEReference(mediaEClass, MEDIA__RULES);
-
- pageEClass = createEClass(PAGE);
- createEReference(pageEClass, PAGE__PSEUDO);
- createEReference(pageEClass, PAGE__DECLARATIONS);
-
- pseudoPageEClass = createEClass(PSEUDO_PAGE);
- createEAttribute(pseudoPageEClass, PSEUDO_PAGE__ID);
-
- rulesetEClass = createEClass(RULESET);
- createEReference(rulesetEClass, RULESET__SELECTORS);
- createEReference(rulesetEClass, RULESET__PROPERTIES);
-
- selectorEClass = createEClass(SELECTOR);
-
- compositeSelectorEClass = createEClass(COMPOSITE_SELECTOR);
- createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__LEFT);
- createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__COMBINATOR);
- createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__RIGHT);
-
- simpleSelectorEClass = createEClass(SIMPLE_SELECTOR);
- createEAttribute(simpleSelectorEClass, SIMPLE_SELECTOR__ELEMENT_NAME);
- createEReference(simpleSelectorEClass, SIMPLE_SELECTOR__CONDITION);
-
- selectorConditionEClass = createEClass(SELECTOR_CONDITION);
-
- combinatorEClass = createEClass(COMBINATOR);
- createEAttribute(combinatorEClass, COMBINATOR__KIND);
-
- declarationEClass = createEClass(DECLARATION);
- createEAttribute(declarationEClass, DECLARATION__PROPERTY);
- createEReference(declarationEClass, DECLARATION__EXPRESSION);
- createEAttribute(declarationEClass, DECLARATION__IMPORTANT);
-
- expressionEClass = createEClass(EXPRESSION);
- createEReference(expressionEClass, EXPRESSION__TERMS);
- createEReference(expressionEClass, EXPRESSION__SUBTERMS);
-
- subtermEClass = createEClass(SUBTERM);
- createEAttribute(subtermEClass, SUBTERM__OPERATOR);
- createEReference(subtermEClass, SUBTERM__TERM);
-
- termEClass = createEClass(TERM);
-
- functionEClass = createEClass(FUNCTION);
- createEAttribute(functionEClass, FUNCTION__NAME);
- createEReference(functionEClass, FUNCTION__ARGS);
-
- nameEClass = createEClass(NAME);
- createEAttribute(nameEClass, NAME__VALUE);
-
- numberEClass = createEClass(NUMBER);
- createEReference(numberEClass, NUMBER__OP);
- createEAttribute(numberEClass, NUMBER__VALUE);
-
- percentageEClass = createEClass(PERCENTAGE);
- createEReference(percentageEClass, PERCENTAGE__OP);
- createEAttribute(percentageEClass, PERCENTAGE__VALUE);
- createEAttribute(percentageEClass, PERCENTAGE__UNIT);
-
- lengthEClass = createEClass(LENGTH);
- createEReference(lengthEClass, LENGTH__OP);
- createEAttribute(lengthEClass, LENGTH__VALUE);
- createEAttribute(lengthEClass, LENGTH__UNIT);
-
- emsEClass = createEClass(EMS);
- createEReference(emsEClass, EMS__OP);
- createEAttribute(emsEClass, EMS__VALUE);
- createEAttribute(emsEClass, EMS__UNIT);
-
- exsEClass = createEClass(EXS);
- createEReference(exsEClass, EXS__OP);
- createEAttribute(exsEClass, EXS__VALUE);
- createEAttribute(exsEClass, EXS__UNIT);
-
- angleEClass = createEClass(ANGLE);
- createEReference(angleEClass, ANGLE__OP);
- createEAttribute(angleEClass, ANGLE__VALUE);
- createEAttribute(angleEClass, ANGLE__UNIT);
-
- timeEClass = createEClass(TIME);
- createEReference(timeEClass, TIME__OP);
- createEAttribute(timeEClass, TIME__VALUE);
- createEAttribute(timeEClass, TIME__UNIT);
-
- frequencyEClass = createEClass(FREQUENCY);
- createEReference(frequencyEClass, FREQUENCY__OP);
- createEAttribute(frequencyEClass, FREQUENCY__VALUE);
- createEAttribute(frequencyEClass, FREQUENCY__UNIT);
-
- uriEClass = createEClass(URI);
- createEAttribute(uriEClass, URI__VALUE);
-
- stringValueEClass = createEClass(STRING_VALUE);
- createEAttribute(stringValueEClass, STRING_VALUE__VALUE);
-
- hexColorEClass = createEClass(HEX_COLOR);
- createEAttribute(hexColorEClass, HEX_COLOR__VALUE);
-
- classEClass = createEClass(CLASS);
- createEAttribute(classEClass, CLASS__CLASS);
-
- attributeEClass = createEClass(ATTRIBUTE);
- createEAttribute(attributeEClass, ATTRIBUTE__NAME);
- createEReference(attributeEClass, ATTRIBUTE__VALUE);
-
- attributeValueEClass = createEClass(ATTRIBUTE_VALUE);
- createEAttribute(attributeValueEClass, ATTRIBUTE_VALUE__OPERATOR);
- createEAttribute(attributeValueEClass, ATTRIBUTE_VALUE__VALUE);
-
- pseudoEClass = createEClass(PSEUDO);
- createEAttribute(pseudoEClass, PSEUDO__PSEUDO);
- createEAttribute(pseudoEClass, PSEUDO__ARGS);
-
- cssIdEClass = createEClass(CSS_ID);
- createEAttribute(cssIdEClass, CSS_ID__VALUE);
-
- unaryOperatorEClass = createEClass(UNARY_OPERATOR);
- createEAttribute(unaryOperatorEClass, UNARY_OPERATOR__OPERATOR);
-
- // Create enums
- unaryEEnum = createEEnum(UNARY);
- kindEEnum = createEEnum(KIND);
- attributE_OPEEnum = createEEnum(ATTRIBUTE_OP);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void initializePackageContents() {
- if(isInitialized) {
- return;
- }
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Create type parameters
-
- // Set bounds for type parameters
-
- // Add supertypes to classes
- mediaEClass.getESuperTypes().add(this.getContent());
- pageEClass.getESuperTypes().add(this.getContent());
- rulesetEClass.getESuperTypes().add(this.getContent());
- compositeSelectorEClass.getESuperTypes().add(this.getSelector());
- simpleSelectorEClass.getESuperTypes().add(this.getSelector());
- functionEClass.getESuperTypes().add(this.getTerm());
- nameEClass.getESuperTypes().add(this.getTerm());
- numberEClass.getESuperTypes().add(this.getTerm());
- percentageEClass.getESuperTypes().add(this.getTerm());
- lengthEClass.getESuperTypes().add(this.getTerm());
- emsEClass.getESuperTypes().add(this.getTerm());
- exsEClass.getESuperTypes().add(this.getTerm());
- angleEClass.getESuperTypes().add(this.getTerm());
- timeEClass.getESuperTypes().add(this.getTerm());
- frequencyEClass.getESuperTypes().add(this.getTerm());
- uriEClass.getESuperTypes().add(this.getTerm());
- stringValueEClass.getESuperTypes().add(this.getTerm());
- hexColorEClass.getESuperTypes().add(this.getTerm());
- classEClass.getESuperTypes().add(this.getSelectorCondition());
- attributeEClass.getESuperTypes().add(this.getSelectorCondition());
- pseudoEClass.getESuperTypes().add(this.getSelectorCondition());
- cssIdEClass.getESuperTypes().add(this.getSelectorCondition());
-
- // Initialize classes and features; add operations and parameters
- initEClass(stylesheetEClass, Stylesheet.class, "Stylesheet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getStylesheet_Charset(), ecorePackage.getEString(), "charset", null, 0, 1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getStylesheet_Imports(), this.getImport(), null, "imports", null, 0, -1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getStylesheet_Contents(), this.getContent(), null, "contents", null, 0, -1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(contentEClass, Content.class, "Content", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getImport_String(), ecorePackage.getEString(), "string", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getImport_Uri(), this.getUri(), null, "uri", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getImport_Media(), ecorePackage.getEString(), "media", null, 0, -1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(mediaEClass, Media.class, "Media", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getMedia_Media(), ecorePackage.getEString(), "media", null, 0, -1, Media.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getMedia_Rules(), this.getRuleset(), null, "rules", null, 0, -1, Media.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(pageEClass, Page.class, "Page", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPage_Pseudo(), this.getPseudoPage(), null, "pseudo", null, 0, 1, Page.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPage_Declarations(), this.getDeclaration(), null, "declarations", null, 0, -1, Page.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(pseudoPageEClass, PseudoPage.class, "PseudoPage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPseudoPage_Id(), ecorePackage.getEString(), "id", null, 0, 1, PseudoPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(rulesetEClass, Ruleset.class, "Ruleset", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getRuleset_Selectors(), this.getSelector(), null, "selectors", null, 0, -1, Ruleset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getRuleset_Properties(), this.getDeclaration(), null, "properties", null, 0, -1, Ruleset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(selectorEClass, Selector.class, "Selector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(compositeSelectorEClass, CompositeSelector.class, "CompositeSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCompositeSelector_Left(), this.getSimpleSelector(), null, "left", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getCompositeSelector_Combinator(), this.getCombinator(), null, "combinator", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getCompositeSelector_Right(), this.getSelector(), null, "right", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(simpleSelectorEClass, SimpleSelector.class, "SimpleSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getSimpleSelector_ElementName(), ecorePackage.getEString(), "elementName", null, 0, 1, SimpleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getSimpleSelector_Condition(), this.getSelectorCondition(), null, "condition", null, 0, -1, SimpleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(selectorConditionEClass, SelectorCondition.class, "SelectorCondition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(combinatorEClass, Combinator.class, "Combinator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getCombinator_Kind(), this.getKIND(), "kind", null, 0, 1, Combinator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(declarationEClass, Declaration.class, "Declaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getDeclaration_Property(), ecorePackage.getEString(), "property", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getDeclaration_Expression(), this.getExpression(), null, "expression", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getDeclaration_Important(), ecorePackage.getEBoolean(), "important", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(expressionEClass, Expression.class, "Expression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getExpression_Terms(), this.getTerm(), null, "terms", null, 0, 1, Expression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getExpression_Subterms(), this.getSubterm(), null, "subterms", null, 0, -1, Expression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(subtermEClass, Subterm.class, "Subterm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getSubterm_Operator(), ecorePackage.getEString(), "operator", null, 0, 1, Subterm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getSubterm_Term(), this.getTerm(), null, "term", null, 0, 1, Subterm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(termEClass, Term.class, "Term", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(functionEClass, Function.class, "Function", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getFunction_Name(), ecorePackage.getEString(), "name", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getFunction_Args(), this.getExpression(), null, "args", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(nameEClass, Name.class, "Name", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getName_Value(), ecorePackage.getEString(), "value", null, 0, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(numberEClass, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, "Number", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getNumber_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getNumber_Value(), ecorePackage.getEString(), "value", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(percentageEClass, Percentage.class, "Percentage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPercentage_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPercentage_Value(), ecorePackage.getEString(), "value", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPercentage_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(lengthEClass, Length.class, "Length", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getLength_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getLength_Value(), ecorePackage.getEString(), "value", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getLength_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(emsEClass, Ems.class, "Ems", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getEms_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getEms_Value(), ecorePackage.getEString(), "value", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getEms_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(exsEClass, Exs.class, "Exs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getExs_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getExs_Value(), ecorePackage.getEString(), "value", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getExs_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(angleEClass, Angle.class, "Angle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getAngle_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getAngle_Value(), ecorePackage.getEString(), "value", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getAngle_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+public class CssPackageImpl extends EPackageImpl implements CssPackage
+{
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass stylesheetEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass contentEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass importEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass mediaEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass pageEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass pseudoPageEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass rulesetEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass selectorEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass compositeSelectorEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass simpleSelectorEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass selectorConditionEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass combinatorEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass declarationEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass expressionEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass subtermEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass termEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass functionEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass nameEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass numberEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass percentageEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass lengthEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass emsEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass exsEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass angleEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass timeEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass frequencyEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass uriEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass stringValueEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass hexColorEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass classEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass attributeEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass attributeValueEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass pseudoEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass cssIdEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass unaryOperatorEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EEnum unaryEEnum = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EEnum kindEEnum = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EEnum attributE_OPEEnum = null;
+
+ /**
+ * Creates an instance of the model <b>Package</b>, registered with
+ * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * package URI value.
+ * <p>Note: the correct way to create the package is via the static
+ * factory method {@link #init init()}, which also performs
+ * initialization of the package, or returns the registered package,
+ * if one already exists.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.ecore.EPackage.Registry
+ * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#eNS_URI
+ * @see #init()
+ * @generated
+ */
+ private CssPackageImpl()
+ {
+ super(eNS_URI, CssFactory.eINSTANCE);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static boolean isInited = false;
+
+ /**
+ * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+ *
+ * <p>This method is used to initialize {@link CssPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #eNS_URI
+ * @see #createPackageContents()
+ * @see #initializePackageContents()
+ * @generated
+ */
+ public static CssPackage init()
+ {
+ if (isInited) return (CssPackage)EPackage.Registry.INSTANCE.getEPackage(CssPackage.eNS_URI);
+
+ // Obtain or create and register package
+ CssPackageImpl theCssPackage = (CssPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CssPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CssPackageImpl());
+
+ isInited = true;
+
+ // Create package meta-data objects
+ theCssPackage.createPackageContents();
+
+ // Initialize created meta-data
+ theCssPackage.initializePackageContents();
+
+ // Mark meta-data to indicate it can't be changed
+ theCssPackage.freeze();
+
+
+ // Update the registry and return the package
+ EPackage.Registry.INSTANCE.put(CssPackage.eNS_URI, theCssPackage);
+ return theCssPackage;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getStylesheet()
+ {
+ return stylesheetEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getStylesheet_Charset()
+ {
+ return (EAttribute)stylesheetEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getStylesheet_Imports()
+ {
+ return (EReference)stylesheetEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getStylesheet_Contents()
+ {
+ return (EReference)stylesheetEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getContent()
+ {
+ return contentEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getImport()
+ {
+ return importEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getImport_String()
+ {
+ return (EAttribute)importEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getImport_Uri()
+ {
+ return (EReference)importEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getImport_Media()
+ {
+ return (EAttribute)importEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getMedia()
+ {
+ return mediaEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getMedia_Media()
+ {
+ return (EAttribute)mediaEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getMedia_Rules()
+ {
+ return (EReference)mediaEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getPage()
+ {
+ return pageEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getPage_Pseudo()
+ {
+ return (EReference)pageEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getPage_Declarations()
+ {
+ return (EReference)pageEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getPseudoPage()
+ {
+ return pseudoPageEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getPseudoPage_Id()
+ {
+ return (EAttribute)pseudoPageEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getRuleset()
+ {
+ return rulesetEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getRuleset_Selectors()
+ {
+ return (EReference)rulesetEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getRuleset_Properties()
+ {
+ return (EReference)rulesetEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getSelector()
+ {
+ return selectorEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getCompositeSelector()
+ {
+ return compositeSelectorEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getCompositeSelector_Left()
+ {
+ return (EReference)compositeSelectorEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getCompositeSelector_Combinator()
+ {
+ return (EReference)compositeSelectorEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getCompositeSelector_Right()
+ {
+ return (EReference)compositeSelectorEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getSimpleSelector()
+ {
+ return simpleSelectorEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getSimpleSelector_ElementName()
+ {
+ return (EAttribute)simpleSelectorEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getSimpleSelector_Condition()
+ {
+ return (EReference)simpleSelectorEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getSelectorCondition()
+ {
+ return selectorConditionEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getCombinator()
+ {
+ return combinatorEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getCombinator_Kind()
+ {
+ return (EAttribute)combinatorEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getDeclaration()
+ {
+ return declarationEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getDeclaration_Property()
+ {
+ return (EAttribute)declarationEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getDeclaration_Expression()
+ {
+ return (EReference)declarationEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getDeclaration_Important()
+ {
+ return (EAttribute)declarationEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getExpression()
+ {
+ return expressionEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getExpression_Terms()
+ {
+ return (EReference)expressionEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getExpression_Subterms()
+ {
+ return (EReference)expressionEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getSubterm()
+ {
+ return subtermEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getSubterm_Operator()
+ {
+ return (EAttribute)subtermEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getSubterm_Term()
+ {
+ return (EReference)subtermEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getTerm()
+ {
+ return termEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getFunction()
+ {
+ return functionEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getFunction_Name()
+ {
+ return (EAttribute)functionEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getFunction_Args()
+ {
+ return (EReference)functionEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getName_()
+ {
+ return nameEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getName_Value()
+ {
+ return (EAttribute)nameEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getNumber()
+ {
+ return numberEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getNumber_Op()
+ {
+ return (EReference)numberEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getNumber_Value()
+ {
+ return (EAttribute)numberEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getPercentage()
+ {
+ return percentageEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getPercentage_Op()
+ {
+ return (EReference)percentageEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getPercentage_Value()
+ {
+ return (EAttribute)percentageEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getPercentage_Unit()
+ {
+ return (EAttribute)percentageEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getLength()
+ {
+ return lengthEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getLength_Op()
+ {
+ return (EReference)lengthEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getLength_Value()
+ {
+ return (EAttribute)lengthEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getLength_Unit()
+ {
+ return (EAttribute)lengthEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getEms()
+ {
+ return emsEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getEms_Op()
+ {
+ return (EReference)emsEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getEms_Value()
+ {
+ return (EAttribute)emsEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getEms_Unit()
+ {
+ return (EAttribute)emsEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getExs()
+ {
+ return exsEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getExs_Op()
+ {
+ return (EReference)exsEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getExs_Value()
+ {
+ return (EAttribute)exsEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getExs_Unit()
+ {
+ return (EAttribute)exsEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getAngle()
+ {
+ return angleEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getAngle_Op()
+ {
+ return (EReference)angleEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getAngle_Value()
+ {
+ return (EAttribute)angleEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getAngle_Unit()
+ {
+ return (EAttribute)angleEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getTime()
+ {
+ return timeEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getTime_Op()
+ {
+ return (EReference)timeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getTime_Value()
+ {
+ return (EAttribute)timeEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getTime_Unit()
+ {
+ return (EAttribute)timeEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getFrequency()
+ {
+ return frequencyEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getFrequency_Op()
+ {
+ return (EReference)frequencyEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getFrequency_Value()
+ {
+ return (EAttribute)frequencyEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getFrequency_Unit()
+ {
+ return (EAttribute)frequencyEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getUri()
+ {
+ return uriEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getUri_Value()
+ {
+ return (EAttribute)uriEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getStringValue()
+ {
+ return stringValueEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getStringValue_Value()
+ {
+ return (EAttribute)stringValueEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getHexColor()
+ {
+ return hexColorEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getHexColor_Value()
+ {
+ return (EAttribute)hexColorEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getClass_()
+ {
+ return classEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getClass_Class()
+ {
+ return (EAttribute)classEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getAttribute()
+ {
+ return attributeEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getAttribute_Name()
+ {
+ return (EAttribute)attributeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getAttribute_Value()
+ {
+ return (EReference)attributeEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getAttributeValue()
+ {
+ return attributeValueEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getAttributeValue_Operator()
+ {
+ return (EAttribute)attributeValueEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getAttributeValue_Value()
+ {
+ return (EAttribute)attributeValueEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getPseudo()
+ {
+ return pseudoEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getPseudo_Pseudo()
+ {
+ return (EAttribute)pseudoEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getPseudo_Args()
+ {
+ return (EAttribute)pseudoEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getCSSId()
+ {
+ return cssIdEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getCSSId_Value()
+ {
+ return (EAttribute)cssIdEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getUnaryOperator()
+ {
+ return unaryOperatorEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getUnaryOperator_Operator()
+ {
+ return (EAttribute)unaryOperatorEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EEnum getUNARY()
+ {
+ return unaryEEnum;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EEnum getKIND()
+ {
+ return kindEEnum;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EEnum getATTRIBUTE_OP()
+ {
+ return attributE_OPEEnum;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CssFactory getCssFactory()
+ {
+ return (CssFactory)getEFactoryInstance();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private boolean isCreated = false;
+
+ /**
+ * Creates the meta-model objects for the package. This method is
+ * guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void createPackageContents()
+ {
+ if (isCreated) return;
+ isCreated = true;
+
+ // Create classes and their features
+ stylesheetEClass = createEClass(STYLESHEET);
+ createEAttribute(stylesheetEClass, STYLESHEET__CHARSET);
+ createEReference(stylesheetEClass, STYLESHEET__IMPORTS);
+ createEReference(stylesheetEClass, STYLESHEET__CONTENTS);
+
+ contentEClass = createEClass(CONTENT);
+
+ importEClass = createEClass(IMPORT);
+ createEAttribute(importEClass, IMPORT__STRING);
+ createEReference(importEClass, IMPORT__URI);
+ createEAttribute(importEClass, IMPORT__MEDIA);
+
+ mediaEClass = createEClass(MEDIA);
+ createEAttribute(mediaEClass, MEDIA__MEDIA);
+ createEReference(mediaEClass, MEDIA__RULES);
+
+ pageEClass = createEClass(PAGE);
+ createEReference(pageEClass, PAGE__PSEUDO);
+ createEReference(pageEClass, PAGE__DECLARATIONS);
+
+ pseudoPageEClass = createEClass(PSEUDO_PAGE);
+ createEAttribute(pseudoPageEClass, PSEUDO_PAGE__ID);
+
+ rulesetEClass = createEClass(RULESET);
+ createEReference(rulesetEClass, RULESET__SELECTORS);
+ createEReference(rulesetEClass, RULESET__PROPERTIES);
+
+ selectorEClass = createEClass(SELECTOR);
+
+ compositeSelectorEClass = createEClass(COMPOSITE_SELECTOR);
+ createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__LEFT);
+ createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__COMBINATOR);
+ createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__RIGHT);
+
+ simpleSelectorEClass = createEClass(SIMPLE_SELECTOR);
+ createEAttribute(simpleSelectorEClass, SIMPLE_SELECTOR__ELEMENT_NAME);
+ createEReference(simpleSelectorEClass, SIMPLE_SELECTOR__CONDITION);
+
+ selectorConditionEClass = createEClass(SELECTOR_CONDITION);
+
+ combinatorEClass = createEClass(COMBINATOR);
+ createEAttribute(combinatorEClass, COMBINATOR__KIND);
+
+ declarationEClass = createEClass(DECLARATION);
+ createEAttribute(declarationEClass, DECLARATION__PROPERTY);
+ createEReference(declarationEClass, DECLARATION__EXPRESSION);
+ createEAttribute(declarationEClass, DECLARATION__IMPORTANT);
+
+ expressionEClass = createEClass(EXPRESSION);
+ createEReference(expressionEClass, EXPRESSION__TERMS);
+ createEReference(expressionEClass, EXPRESSION__SUBTERMS);
+
+ subtermEClass = createEClass(SUBTERM);
+ createEAttribute(subtermEClass, SUBTERM__OPERATOR);
+ createEReference(subtermEClass, SUBTERM__TERM);
+
+ termEClass = createEClass(TERM);
+
+ functionEClass = createEClass(FUNCTION);
+ createEAttribute(functionEClass, FUNCTION__NAME);
+ createEReference(functionEClass, FUNCTION__ARGS);
+
+ nameEClass = createEClass(NAME);
+ createEAttribute(nameEClass, NAME__VALUE);
+
+ numberEClass = createEClass(NUMBER);
+ createEReference(numberEClass, NUMBER__OP);
+ createEAttribute(numberEClass, NUMBER__VALUE);
+
+ percentageEClass = createEClass(PERCENTAGE);
+ createEReference(percentageEClass, PERCENTAGE__OP);
+ createEAttribute(percentageEClass, PERCENTAGE__VALUE);
+ createEAttribute(percentageEClass, PERCENTAGE__UNIT);
+
+ lengthEClass = createEClass(LENGTH);
+ createEReference(lengthEClass, LENGTH__OP);
+ createEAttribute(lengthEClass, LENGTH__VALUE);
+ createEAttribute(lengthEClass, LENGTH__UNIT);
+
+ emsEClass = createEClass(EMS);
+ createEReference(emsEClass, EMS__OP);
+ createEAttribute(emsEClass, EMS__VALUE);
+ createEAttribute(emsEClass, EMS__UNIT);
+
+ exsEClass = createEClass(EXS);
+ createEReference(exsEClass, EXS__OP);
+ createEAttribute(exsEClass, EXS__VALUE);
+ createEAttribute(exsEClass, EXS__UNIT);
+
+ angleEClass = createEClass(ANGLE);
+ createEReference(angleEClass, ANGLE__OP);
+ createEAttribute(angleEClass, ANGLE__VALUE);
+ createEAttribute(angleEClass, ANGLE__UNIT);
+
+ timeEClass = createEClass(TIME);
+ createEReference(timeEClass, TIME__OP);
+ createEAttribute(timeEClass, TIME__VALUE);
+ createEAttribute(timeEClass, TIME__UNIT);
+
+ frequencyEClass = createEClass(FREQUENCY);
+ createEReference(frequencyEClass, FREQUENCY__OP);
+ createEAttribute(frequencyEClass, FREQUENCY__VALUE);
+ createEAttribute(frequencyEClass, FREQUENCY__UNIT);
+
+ uriEClass = createEClass(URI);
+ createEAttribute(uriEClass, URI__VALUE);
+
+ stringValueEClass = createEClass(STRING_VALUE);
+ createEAttribute(stringValueEClass, STRING_VALUE__VALUE);
+
+ hexColorEClass = createEClass(HEX_COLOR);
+ createEAttribute(hexColorEClass, HEX_COLOR__VALUE);
+
+ classEClass = createEClass(CLASS);
+ createEAttribute(classEClass, CLASS__CLASS);
+
+ attributeEClass = createEClass(ATTRIBUTE);
+ createEAttribute(attributeEClass, ATTRIBUTE__NAME);
+ createEReference(attributeEClass, ATTRIBUTE__VALUE);
+
+ attributeValueEClass = createEClass(ATTRIBUTE_VALUE);
+ createEAttribute(attributeValueEClass, ATTRIBUTE_VALUE__OPERATOR);
+ createEAttribute(attributeValueEClass, ATTRIBUTE_VALUE__VALUE);
+
+ pseudoEClass = createEClass(PSEUDO);
+ createEAttribute(pseudoEClass, PSEUDO__PSEUDO);
+ createEAttribute(pseudoEClass, PSEUDO__ARGS);
+
+ cssIdEClass = createEClass(CSS_ID);
+ createEAttribute(cssIdEClass, CSS_ID__VALUE);
+
+ unaryOperatorEClass = createEClass(UNARY_OPERATOR);
+ createEAttribute(unaryOperatorEClass, UNARY_OPERATOR__OPERATOR);
+
+ // Create enums
+ unaryEEnum = createEEnum(UNARY);
+ kindEEnum = createEEnum(KIND);
+ attributE_OPEEnum = createEEnum(ATTRIBUTE_OP);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private boolean isInitialized = false;
+
+ /**
+ * Complete the initialization of the package and its meta-model. This
+ * method is guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void initializePackageContents()
+ {
+ if (isInitialized) return;
+ isInitialized = true;
+
+ // Initialize package
+ setName(eNAME);
+ setNsPrefix(eNS_PREFIX);
+ setNsURI(eNS_URI);
+
+ // Create type parameters
+
+ // Set bounds for type parameters
+
+ // Add supertypes to classes
+ mediaEClass.getESuperTypes().add(this.getContent());
+ pageEClass.getESuperTypes().add(this.getContent());
+ rulesetEClass.getESuperTypes().add(this.getContent());
+ compositeSelectorEClass.getESuperTypes().add(this.getSelector());
+ simpleSelectorEClass.getESuperTypes().add(this.getSelector());
+ functionEClass.getESuperTypes().add(this.getTerm());
+ nameEClass.getESuperTypes().add(this.getTerm());
+ numberEClass.getESuperTypes().add(this.getTerm());
+ percentageEClass.getESuperTypes().add(this.getTerm());
+ lengthEClass.getESuperTypes().add(this.getTerm());
+ emsEClass.getESuperTypes().add(this.getTerm());
+ exsEClass.getESuperTypes().add(this.getTerm());
+ angleEClass.getESuperTypes().add(this.getTerm());
+ timeEClass.getESuperTypes().add(this.getTerm());
+ frequencyEClass.getESuperTypes().add(this.getTerm());
+ uriEClass.getESuperTypes().add(this.getTerm());
+ stringValueEClass.getESuperTypes().add(this.getTerm());
+ hexColorEClass.getESuperTypes().add(this.getTerm());
+ classEClass.getESuperTypes().add(this.getSelectorCondition());
+ attributeEClass.getESuperTypes().add(this.getSelectorCondition());
+ pseudoEClass.getESuperTypes().add(this.getSelectorCondition());
+ cssIdEClass.getESuperTypes().add(this.getSelectorCondition());
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(stylesheetEClass, Stylesheet.class, "Stylesheet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getStylesheet_Charset(), ecorePackage.getEString(), "charset", null, 0, 1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getStylesheet_Imports(), this.getImport(), null, "imports", null, 0, -1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getStylesheet_Contents(), this.getContent(), null, "contents", null, 0, -1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(contentEClass, Content.class, "Content", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+ initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getImport_String(), ecorePackage.getEString(), "string", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getImport_Uri(), this.getUri(), null, "uri", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getImport_Media(), ecorePackage.getEString(), "media", null, 0, -1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(mediaEClass, Media.class, "Media", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getMedia_Media(), ecorePackage.getEString(), "media", null, 0, -1, Media.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getMedia_Rules(), this.getRuleset(), null, "rules", null, 0, -1, Media.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(pageEClass, Page.class, "Page", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getPage_Pseudo(), this.getPseudoPage(), null, "pseudo", null, 0, 1, Page.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getPage_Declarations(), this.getDeclaration(), null, "declarations", null, 0, -1, Page.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(pseudoPageEClass, PseudoPage.class, "PseudoPage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getPseudoPage_Id(), ecorePackage.getEString(), "id", null, 0, 1, PseudoPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(rulesetEClass, Ruleset.class, "Ruleset", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getRuleset_Selectors(), this.getSelector(), null, "selectors", null, 0, -1, Ruleset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRuleset_Properties(), this.getDeclaration(), null, "properties", null, 0, -1, Ruleset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(selectorEClass, Selector.class, "Selector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+ initEClass(compositeSelectorEClass, CompositeSelector.class, "CompositeSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getCompositeSelector_Left(), this.getSimpleSelector(), null, "left", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCompositeSelector_Combinator(), this.getCombinator(), null, "combinator", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCompositeSelector_Right(), this.getSelector(), null, "right", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(simpleSelectorEClass, SimpleSelector.class, "SimpleSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getSimpleSelector_ElementName(), ecorePackage.getEString(), "elementName", null, 0, 1, SimpleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getSimpleSelector_Condition(), this.getSelectorCondition(), null, "condition", null, 0, -1, SimpleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(selectorConditionEClass, SelectorCondition.class, "SelectorCondition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+ initEClass(combinatorEClass, Combinator.class, "Combinator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getCombinator_Kind(), this.getKIND(), "kind", null, 0, 1, Combinator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(declarationEClass, Declaration.class, "Declaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getDeclaration_Property(), ecorePackage.getEString(), "property", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getDeclaration_Expression(), this.getExpression(), null, "expression", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getDeclaration_Important(), ecorePackage.getEBoolean(), "important", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(expressionEClass, Expression.class, "Expression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getExpression_Terms(), this.getTerm(), null, "terms", null, 0, 1, Expression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getExpression_Subterms(), this.getSubterm(), null, "subterms", null, 0, -1, Expression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(subtermEClass, Subterm.class, "Subterm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getSubterm_Operator(), ecorePackage.getEString(), "operator", null, 0, 1, Subterm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getSubterm_Term(), this.getTerm(), null, "term", null, 0, 1, Subterm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(termEClass, Term.class, "Term", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+ initEClass(functionEClass, Function.class, "Function", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getFunction_Name(), ecorePackage.getEString(), "name", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getFunction_Args(), this.getExpression(), null, "args", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(nameEClass, Name.class, "Name", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getName_Value(), ecorePackage.getEString(), "value", null, 0, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(numberEClass, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, "Number", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getNumber_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getNumber_Value(), ecorePackage.getEString(), "value", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(percentageEClass, Percentage.class, "Percentage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getPercentage_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPercentage_Value(), ecorePackage.getEString(), "value", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPercentage_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(lengthEClass, Length.class, "Length", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getLength_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getLength_Value(), ecorePackage.getEString(), "value", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getLength_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(emsEClass, Ems.class, "Ems", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getEms_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getEms_Value(), ecorePackage.getEString(), "value", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getEms_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(exsEClass, Exs.class, "Exs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getExs_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getExs_Value(), ecorePackage.getEString(), "value", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getExs_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(angleEClass, Angle.class, "Angle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getAngle_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getAngle_Value(), ecorePackage.getEString(), "value", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getAngle_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(timeEClass, Time.class, "Time", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getTime_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getTime_Value(), ecorePackage.getEString(), "value", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getTime_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(timeEClass, Time.class, "Time", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getTime_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTime_Value(), ecorePackage.getEString(), "value", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTime_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(frequencyEClass, Frequency.class, "Frequency", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getFrequency_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getFrequency_Value(), ecorePackage.getEString(), "value", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getFrequency_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(frequencyEClass, Frequency.class, "Frequency", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getFrequency_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getFrequency_Value(), ecorePackage.getEString(), "value", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getFrequency_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(uriEClass, Uri.class, "Uri", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getUri_Value(), ecorePackage.getEString(), "value", null, 0, 1, Uri.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(uriEClass, Uri.class, "Uri", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getUri_Value(), ecorePackage.getEString(), "value", null, 0, 1, Uri.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(stringValueEClass, StringValue.class, "StringValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getStringValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, StringValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(stringValueEClass, StringValue.class, "StringValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getStringValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, StringValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(hexColorEClass, HexColor.class, "HexColor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getHexColor_Value(), ecorePackage.getEString(), "value", null, 0, 1, HexColor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(hexColorEClass, HexColor.class, "HexColor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getHexColor_Value(), ecorePackage.getEString(), "value", null, 0, 1, HexColor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(classEClass, org.eclipse.papyrus.infra.gmfdiag.css.Class.class, "Class", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getClass_Class(), ecorePackage.getEString(), "class", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Class.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(classEClass, org.eclipse.papyrus.infra.gmfdiag.css.Class.class, "Class", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getClass_Class(), ecorePackage.getEString(), "class", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Class.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(attributeEClass, Attribute.class, "Attribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getAttribute_Name(), ecorePackage.getEString(), "name", null, 0, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getAttribute_Value(), this.getAttributeValue(), null, "value", null, 0, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(attributeEClass, Attribute.class, "Attribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getAttribute_Name(), ecorePackage.getEString(), "name", null, 0, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getAttribute_Value(), this.getAttributeValue(), null, "value", null, 0, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(attributeValueEClass, AttributeValue.class, "AttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getAttributeValue_Operator(), this.getATTRIBUTE_OP(), "operator", null, 0, 1, AttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getAttributeValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, AttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(attributeValueEClass, AttributeValue.class, "AttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getAttributeValue_Operator(), this.getATTRIBUTE_OP(), "operator", null, 0, 1, AttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getAttributeValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, AttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(pseudoEClass, Pseudo.class, "Pseudo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPseudo_Pseudo(), ecorePackage.getEString(), "pseudo", null, 0, 1, Pseudo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPseudo_Args(), ecorePackage.getEString(), "args", null, 0, 1, Pseudo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(pseudoEClass, Pseudo.class, "Pseudo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getPseudo_Pseudo(), ecorePackage.getEString(), "pseudo", null, 0, 1, Pseudo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPseudo_Args(), ecorePackage.getEString(), "args", null, 0, 1, Pseudo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(cssIdEClass, CSSId.class, "CSSId", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getCSSId_Value(), ecorePackage.getEString(), "value", null, 0, 1, CSSId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(cssIdEClass, CSSId.class, "CSSId", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getCSSId_Value(), ecorePackage.getEString(), "value", null, 0, 1, CSSId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(unaryOperatorEClass, UnaryOperator.class, "UnaryOperator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getUnaryOperator_Operator(), this.getUNARY(), "operator", null, 0, 1, UnaryOperator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(unaryOperatorEClass, UnaryOperator.class, "UnaryOperator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getUnaryOperator_Operator(), this.getUNARY(), "operator", null, 0, 1, UnaryOperator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- // Initialize enums and add enum literals
- initEEnum(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.class, "UNARY");
- addEEnumLiteral(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.NEG);
- addEEnumLiteral(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.PLUS);
+ // Initialize enums and add enum literals
+ initEEnum(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.class, "UNARY");
+ addEEnumLiteral(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.NEG);
+ addEEnumLiteral(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.PLUS);
- initEEnum(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.class, "KIND");
- addEEnumLiteral(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.FIRST_CHILD);
- addEEnumLiteral(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.SIBLING);
+ initEEnum(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.class, "KIND");
+ addEEnumLiteral(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.FIRST_CHILD);
+ addEEnumLiteral(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.SIBLING);
- initEEnum(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.class, "ATTRIBUTE_OP");
- addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.EQUALS);
- addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.CONTAINS);
- addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.UNEQUALS);
+ initEEnum(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.class, "ATTRIBUTE_OP");
+ addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.EQUALS);
+ addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.CONTAINS);
+ addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.UNEQUALS);
- // Create resource
- createResource(eNS_URI);
- }
+ // Create resource
+ createResource(eNS_URI);
+ }
} //CssPackageImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/DeclarationImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/DeclarationImpl.java
index 701b2d609c4..1537b344b45 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/DeclarationImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/DeclarationImpl.java
@@ -4,10 +4,13 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;
import org.eclipse.papyrus.infra.gmfdiag.css.Expression;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/EmsImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/EmsImpl.java
index ba6e6a61d57..89385d868d3 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/EmsImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/EmsImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Ems;
import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExpressionImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExpressionImpl.java
index e14b7ed307b..d9d585bff1e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExpressionImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExpressionImpl.java
@@ -6,13 +6,18 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Expression;
import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExsImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExsImpl.java
index 5602dc9aaab..9a20e4db92c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExsImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExsImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Exs;
import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FrequencyImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FrequencyImpl.java
index cd68e9da78c..6df8d916760 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FrequencyImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FrequencyImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Frequency;
import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FunctionImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FunctionImpl.java
index a8ff07e1126..b56f34bd762 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FunctionImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FunctionImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Expression;
import org.eclipse.papyrus.infra.gmfdiag.css.Function;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/HexColorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/HexColorImpl.java
index 5ae7e8c6430..3804c1e0966 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/HexColorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/HexColorImpl.java
@@ -3,8 +3,11 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.HexColor;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ImportImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ImportImpl.java
index b64e4a3ad5f..b8b8a949bc7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ImportImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ImportImpl.java
@@ -6,12 +6,17 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.emf.ecore.util.EDataTypeEList;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Import;
import org.eclipse.papyrus.infra.gmfdiag.css.Uri;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/LengthImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/LengthImpl.java
index 3ce7c80f197..acd356a021f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/LengthImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/LengthImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Length;
import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/MediaImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/MediaImpl.java
index 32b770ea226..4d66900207b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/MediaImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/MediaImpl.java
@@ -5,12 +5,16 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.util.EDataTypeEList;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Media;
import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NameImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NameImpl.java
index 43f4c34de24..4d6381e8241 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NameImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NameImpl.java
@@ -3,8 +3,11 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Name;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NumberImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NumberImpl.java
index cafd55c9fda..9be46a88e74 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NumberImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NumberImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PageImpl.java
index 69410ff39f5..fe83bb0dc11 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PageImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PageImpl.java
@@ -6,12 +6,17 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;
import org.eclipse.papyrus.infra.gmfdiag.css.Page;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PercentageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PercentageImpl.java
index 2608281d08f..844badf90d2 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PercentageImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PercentageImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Percentage;
import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoImpl.java
index 5007f6fa75c..f01a5184144 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoImpl.java
@@ -3,8 +3,11 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Pseudo;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoPageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoPageImpl.java
index 014880af7d2..5343eb90382 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoPageImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoPageImpl.java
@@ -3,9 +3,12 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/RulesetImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/RulesetImpl.java
index 6a3ca19de6c..a29424eb27e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/RulesetImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/RulesetImpl.java
@@ -5,11 +5,15 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;
import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorConditionImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorConditionImpl.java
index b42e87d0b5b..5b08fac74be 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorConditionImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorConditionImpl.java
@@ -3,7 +3,9 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorImpl.java
index aaece96052f..229b1628b6a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorImpl.java
@@ -3,7 +3,9 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Selector;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SimpleSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SimpleSelectorImpl.java
index 43f26015872..4851e032e5b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SimpleSelectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SimpleSelectorImpl.java
@@ -6,12 +6,17 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition;
import org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StringValueImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StringValueImpl.java
index 1a98b5a5206..3b59eeaee09 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StringValueImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StringValueImpl.java
@@ -3,8 +3,11 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.StringValue;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StylesheetImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StylesheetImpl.java
index 84e5febc997..c6432233e1e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StylesheetImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StylesheetImpl.java
@@ -6,13 +6,18 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
+
import org.eclipse.papyrus.infra.gmfdiag.css.Content;
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Import;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SubtermImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SubtermImpl.java
index 25db0da44ef..7f7001e48cc 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SubtermImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SubtermImpl.java
@@ -4,10 +4,13 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;
import org.eclipse.papyrus.infra.gmfdiag.css.Term;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TermImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TermImpl.java
index 5325a1d77a0..9700f5aa874 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TermImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TermImpl.java
@@ -3,7 +3,9 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Term;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TimeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TimeImpl.java
index e83f2900678..8f2c7c88153 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TimeImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TimeImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Time;
import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UnaryOperatorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UnaryOperatorImpl.java
index e41254cb82f..3fd5f7ef03f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UnaryOperatorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UnaryOperatorImpl.java
@@ -3,9 +3,12 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.UNARY;
import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UriImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UriImpl.java
index 4383d87dfe3..c6835752567 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UriImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UriImpl.java
@@ -3,8 +3,11 @@
package org.eclipse.papyrus.infra.gmfdiag.css.impl;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
import org.eclipse.papyrus.infra.gmfdiag.css.Uri;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssAdapterFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssAdapterFactory.java
index 9aaa05194ae..f400f17f94c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssAdapterFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssAdapterFactory.java
@@ -4,8 +4,11 @@ package org.eclipse.papyrus.infra.gmfdiag.css.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
+
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
import org.eclipse.emf.ecore.EObject;
+
import org.eclipse.papyrus.infra.gmfdiag.css.Angle;
import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;
import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssSwitch.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssSwitch.java
index 9dd262ecdeb..ca75dea3081 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssSwitch.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssSwitch.java
@@ -4,7 +4,9 @@ package org.eclipse.papyrus.infra.gmfdiag.css.util;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
+
import org.eclipse.emf.ecore.util.Switch;
+
import org.eclipse.papyrus.infra.gmfdiag.css.Angle;
import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;
import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSAntlrTokenFileProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSAntlrTokenFileProvider.java
index bad22803dab..c2dcdf45f4f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSAntlrTokenFileProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSAntlrTokenFileProvider.java
@@ -4,7 +4,6 @@
package org.eclipse.papyrus.infra.gmfdiag.parser.antlr;
import java.io.InputStream;
-
import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
public class CSSAntlrTokenFileProvider implements IAntlrTokenFileProvider {
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSParser.java
index f62972d4dad..3b459a022d0 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSParser.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSParser.java
@@ -3,11 +3,11 @@
*/
package org.eclipse.papyrus.infra.gmfdiag.parser.antlr;
-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
-
import com.google.inject.Inject;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
+import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
+
public class CSSParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
@Inject
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g
index 79c5e0c854d..cb56e470c58 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g
@@ -2777,7 +2777,7 @@ RULE_FREQ_UNIT : ('hz'|'mhz');
RULE_T_NUM : (('0'..'9')+|('0'..'9')* '.' ('0'..'9')+);
-RULE_ID : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+RULE_ID : '-'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'-')*;
RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSLexer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSLexer.java
index 0d39d2da69e..33a0cd7cc5c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSLexer.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSLexer.java
@@ -2,17 +2,14 @@ package org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal;
// Hack: Use our own Lexer superclass by means of import.
// Currently there is no other way to specify the superclass for the lexer.
-import org.antlr.runtime.BaseRecognizer;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.DFA;
-import org.antlr.runtime.EarlyExitException;
-import org.antlr.runtime.IntStream;
-import org.antlr.runtime.MismatchedSetException;
-import org.antlr.runtime.NoViableAltException;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.RecognizerSharedState;
import org.eclipse.xtext.parser.antlr.Lexer;
+
+import org.antlr.runtime.*;
+import java.util.Stack;
+import java.util.List;
+import java.util.ArrayList;
+
@SuppressWarnings("all")
public class InternalCSSLexer extends Lexer {
public static final int RULE_ID=8;
@@ -1112,9 +1109,27 @@ public class InternalCSSLexer extends Lexer {
try {
int _type = RULE_ID;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:9: ( ( '-' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )* )
+ // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:11: ( '-' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )*
{
+ // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:11: ( '-' )?
+ int alt10=2;
+ int LA10_0 = input.LA(1);
+
+ if ( (LA10_0=='-') ) {
+ alt10=1;
+ }
+ switch (alt10) {
+ case 1 :
+ // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:11: '-'
+ {
+ match('-');
+
+ }
+ break;
+
+ }
+
if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
input.consume();
@@ -1124,22 +1139,22 @@ public class InternalCSSLexer extends Lexer {
recover(mse);
throw mse;}
- // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
- loop10:
+ // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )*
+ loop11:
do {
- int alt10=2;
- int LA10_0 = input.LA(1);
+ int alt11=2;
+ int LA11_0 = input.LA(1);
- if ( ((LA10_0>='0' && LA10_0<='9')||(LA10_0>='A' && LA10_0<='Z')||LA10_0=='_'||(LA10_0>='a' && LA10_0<='z')) ) {
- alt10=1;
+ if ( (LA11_0=='-'||(LA11_0>='0' && LA11_0<='9')||(LA11_0>='A' && LA11_0<='Z')||LA11_0=='_'||(LA11_0>='a' && LA11_0<='z')) ) {
+ alt11=1;
}
- switch (alt10) {
+ switch (alt11) {
case 1 :
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:
{
- if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
+ if ( input.LA(1)=='-'||(input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
input.consume();
}
@@ -1153,7 +1168,7 @@ public class InternalCSSLexer extends Lexer {
break;
default :
- break loop10;
+ break loop11;
}
} while (true);
@@ -1177,41 +1192,41 @@ public class InternalCSSLexer extends Lexer {
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
- int alt13=2;
- int LA13_0 = input.LA(1);
+ int alt14=2;
+ int LA14_0 = input.LA(1);
- if ( (LA13_0=='\"') ) {
- alt13=1;
+ if ( (LA14_0=='\"') ) {
+ alt14=1;
}
- else if ( (LA13_0=='\'') ) {
- alt13=2;
+ else if ( (LA14_0=='\'') ) {
+ alt14=2;
}
else {
NoViableAltException nvae =
- new NoViableAltException("", 13, 0, input);
+ new NoViableAltException("", 14, 0, input);
throw nvae;
}
- switch (alt13) {
+ switch (alt14) {
case 1 :
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
- loop11:
+ loop12:
do {
- int alt11=3;
- int LA11_0 = input.LA(1);
+ int alt12=3;
+ int LA12_0 = input.LA(1);
- if ( (LA11_0=='\\') ) {
- alt11=1;
+ if ( (LA12_0=='\\') ) {
+ alt12=1;
}
- else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA11_0>=']' && LA11_0<='\uFFFF')) ) {
- alt11=2;
+ else if ( ((LA12_0>='\u0000' && LA12_0<='!')||(LA12_0>='#' && LA12_0<='[')||(LA12_0>=']' && LA12_0<='\uFFFF')) ) {
+ alt12=2;
}
- switch (alt11) {
+ switch (alt12) {
case 1 :
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
{
@@ -1245,7 +1260,7 @@ public class InternalCSSLexer extends Lexer {
break;
default :
- break loop11;
+ break loop12;
}
} while (true);
@@ -1258,20 +1273,20 @@ public class InternalCSSLexer extends Lexer {
{
match('\'');
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
- loop12:
+ loop13:
do {
- int alt12=3;
- int LA12_0 = input.LA(1);
+ int alt13=3;
+ int LA13_0 = input.LA(1);
- if ( (LA12_0=='\\') ) {
- alt12=1;
+ if ( (LA13_0=='\\') ) {
+ alt13=1;
}
- else if ( ((LA12_0>='\u0000' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='[')||(LA12_0>=']' && LA12_0<='\uFFFF')) ) {
- alt12=2;
+ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA13_0>=']' && LA13_0<='\uFFFF')) ) {
+ alt13=2;
}
- switch (alt12) {
+ switch (alt13) {
case 1 :
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
{
@@ -1305,7 +1320,7 @@ public class InternalCSSLexer extends Lexer {
break;
default :
- break loop12;
+ break loop13;
}
} while (true);
@@ -1380,29 +1395,29 @@ public class InternalCSSLexer extends Lexer {
match("/*");
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2788:24: ( options {greedy=false; } : . )*
- loop14:
+ loop15:
do {
- int alt14=2;
- int LA14_0 = input.LA(1);
+ int alt15=2;
+ int LA15_0 = input.LA(1);
- if ( (LA14_0=='*') ) {
- int LA14_1 = input.LA(2);
+ if ( (LA15_0=='*') ) {
+ int LA15_1 = input.LA(2);
- if ( (LA14_1=='/') ) {
- alt14=2;
+ if ( (LA15_1=='/') ) {
+ alt15=2;
}
- else if ( ((LA14_1>='\u0000' && LA14_1<='.')||(LA14_1>='0' && LA14_1<='\uFFFF')) ) {
- alt14=1;
+ else if ( ((LA15_1>='\u0000' && LA15_1<='.')||(LA15_1>='0' && LA15_1<='\uFFFF')) ) {
+ alt15=1;
}
}
- else if ( ((LA14_0>='\u0000' && LA14_0<=')')||(LA14_0>='+' && LA14_0<='\uFFFF')) ) {
- alt14=1;
+ else if ( ((LA15_0>='\u0000' && LA15_0<=')')||(LA15_0>='+' && LA15_0<='\uFFFF')) ) {
+ alt15=1;
}
- switch (alt14) {
+ switch (alt15) {
case 1 :
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2788:52: .
{
@@ -1412,7 +1427,7 @@ public class InternalCSSLexer extends Lexer {
break;
default :
- break loop14;
+ break loop15;
}
} while (true);
@@ -1438,18 +1453,18 @@ public class InternalCSSLexer extends Lexer {
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2790:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2790:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
- int cnt15=0;
- loop15:
+ int cnt16=0;
+ loop16:
do {
- int alt15=2;
- int LA15_0 = input.LA(1);
+ int alt16=2;
+ int LA16_0 = input.LA(1);
- if ( ((LA15_0>='\t' && LA15_0<='\n')||LA15_0=='\r'||LA15_0==' ') ) {
- alt15=1;
+ if ( ((LA16_0>='\t' && LA16_0<='\n')||LA16_0=='\r'||LA16_0==' ') ) {
+ alt16=1;
}
- switch (alt15) {
+ switch (alt16) {
case 1 :
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:
{
@@ -1467,12 +1482,12 @@ public class InternalCSSLexer extends Lexer {
break;
default :
- if ( cnt15 >= 1 ) break loop15;
+ if ( cnt16 >= 1 ) break loop16;
EarlyExitException eee =
- new EarlyExitException(15, input);
+ new EarlyExitException(16, input);
throw eee;
}
- cnt15++;
+ cnt16++;
} while (true);
@@ -1508,9 +1523,9 @@ public class InternalCSSLexer extends Lexer {
public void mTokens() throws RecognitionException {
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:8: ( T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | RULE_HASH | RULE_T_CLASS | RULE_T_IMPORTANT | RULE_PC_UNIT | RULE_LEN_UNIT | RULE_EM_UNIT | RULE_EX_UNIT | RULE_ANGLE_UNIT | RULE_TIME_UNIT | RULE_FREQ_UNIT | RULE_T_NUM | RULE_ID | RULE_STRING | RULE_CDO | RULE_CDC | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER )
- int alt16=40;
- alt16 = dfa16.predict(input);
- switch (alt16) {
+ int alt17=40;
+ alt17 = dfa17.predict(input);
+ switch (alt17) {
case 1 :
// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:10: T__22
{
@@ -1798,7 +1813,7 @@ public class InternalCSSLexer extends Lexer {
protected DFA9 dfa9 = new DFA9(this);
- protected DFA16 dfa16 = new DFA16(this);
+ protected DFA17 dfa17 = new DFA17(this);
static final String DFA9_eotS =
"\1\uffff\1\3\2\uffff";
static final String DFA9_eofS =
@@ -1851,35 +1866,35 @@ public class InternalCSSLexer extends Lexer {
return "2778:14: ( ( '0' .. '9' )+ | ( '0' .. '9' )* '.' ( '0' .. '9' )+ )";
}
}
- static final String DFA16_eotS =
+ static final String DFA17_eotS =
"\1\uffff\1\47\10\uffff\1\65\1\67\2\uffff\1\73\3\uffff\4\47\1\uffff"+
"\10\65\1\123\1\65\2\uffff\3\47\16\uffff\1\65\21\uffff\5\131\1\123"+
"\1\65\1\131\1\133\1\134\3\65\1\uffff\1\140\3\uffff\1\65\1\uffff"+
"\1\140\2\uffff\2\142\1\65\3\uffff\1\142";
- static final String DFA16_eofS =
+ static final String DFA17_eofS =
"\144\uffff";
- static final String DFA16_minS =
- "\1\0\1\143\10\uffff\1\162\1\52\2\uffff\1\55\3\uffff\2\75\2\60\1"+
- "\uffff\1\143\1\155\1\150\1\156\1\155\1\145\1\141\1\162\1\60\1\172"+
- "\2\uffff\2\0\1\41\16\uffff\1\154\21\uffff\6\60\1\172\3\60\1\147"+
- "\1\144\1\141\1\uffff\1\60\3\uffff\1\50\1\uffff\1\60\2\uffff\2\60"+
- "\1\144\3\uffff\1\60";
- static final String DFA16_maxS =
- "\1\uffff\1\160\10\uffff\1\162\1\52\2\uffff\1\55\3\uffff\1\75\1"+
+ static final String DFA17_minS =
+ "\1\0\1\143\10\uffff\1\162\1\52\2\uffff\1\55\3\uffff\2\75\1\60\1"+
+ "\55\1\uffff\1\143\1\155\1\150\1\156\1\155\1\145\1\141\1\162\1\55"+
+ "\1\172\2\uffff\2\0\1\41\16\uffff\1\154\21\uffff\6\55\1\172\3\55"+
+ "\1\147\1\144\1\141\1\uffff\1\55\3\uffff\1\50\1\uffff\1\55\2\uffff"+
+ "\2\55\1\144\3\uffff\1\55";
+ static final String DFA17_maxS =
+ "\1\uffff\1\160\10\uffff\1\162\1\52\2\uffff\1\172\3\uffff\1\75\1"+
"\151\2\172\1\uffff\1\170\1\155\1\163\1\156\1\170\1\145\1\141\1\162"+
"\2\172\2\uffff\2\uffff\1\41\16\uffff\1\154\21\uffff\12\172\1\147"+
"\1\144\1\141\1\uffff\1\172\3\uffff\1\50\1\uffff\1\172\2\uffff\2"+
"\172\1\144\3\uffff\1\172";
- static final String DFA16_acceptS =
+ static final String DFA17_acceptS =
"\2\uffff\1\2\1\4\1\6\1\7\1\11\1\12\1\13\1\14\2\uffff\1\17\1\20"+
"\1\uffff\1\22\1\23\1\24\4\uffff\1\32\12\uffff\1\41\1\42\3\uffff"+
"\1\47\1\50\1\1\1\3\1\5\1\10\1\2\1\4\1\6\1\7\1\11\1\12\1\13\1\14"+
"\1\uffff\1\42\1\46\1\16\1\17\1\20\1\45\1\21\1\22\1\23\1\24\1\25"+
"\1\26\1\31\1\27\1\41\1\30\1\32\15\uffff\1\37\1\uffff\1\43\1\44\1"+
"\47\1\uffff\1\33\1\uffff\1\34\1\35\3\uffff\1\40\1\15\1\36\1\uffff";
- static final String DFA16_specialS =
- "\1\2\42\uffff\1\1\1\0\77\uffff}>";
- static final String[] DFA16_transitionS = {
+ static final String DFA17_specialS =
+ "\1\1\42\uffff\1\2\1\0\77\uffff}>";
+ static final String[] DFA17_transitionS = {
"\11\47\2\46\2\47\1\46\22\47\1\46\1\23\1\43\1\24\1\47\1\26\1"+
"\47\1\44\1\10\1\11\1\7\1\17\1\3\1\16\1\25\1\13\12\41\1\6\1\2"+
"\1\45\1\21\1\20\1\47\1\1\32\42\1\14\1\47\1\15\1\47\1\42\1\47"+
@@ -1898,14 +1913,15 @@ public class InternalCSSLexer extends Lexer {
"\1\66",
"",
"",
- "\1\72",
+ "\1\72\23\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
"",
"",
"",
"\1\77",
"\1\100\53\uffff\1\101",
"\12\102\7\uffff\32\102\6\uffff\32\102",
- "\12\103\7\uffff\32\104\4\uffff\1\104\1\uffff\32\104",
+ "\1\104\2\uffff\12\103\7\uffff\32\104\4\uffff\1\104\1\uffff"+
+ "\32\104",
"",
"\1\110\20\uffff\1\107\3\uffff\1\106",
"\1\111",
@@ -1915,7 +1931,8 @@ public class InternalCSSLexer extends Lexer {
"\1\120",
"\1\121",
"\1\122",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65",
"\1\124",
"",
"",
@@ -1954,66 +1971,80 @@ public class InternalCSSLexer extends Lexer {
"",
"",
"",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65",
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65",
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65",
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65",
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65",
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65",
"\1\132",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65",
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65",
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65",
"\1\135",
"\1\136",
"\1\137",
"",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65",
"",
"",
"",
"\1\141",
"",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65",
"",
"",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65",
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65",
"\1\143",
"",
"",
"",
- "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65"
+ "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+ "\65"
};
- static final short[] DFA16_eot = DFA.unpackEncodedString(DFA16_eotS);
- static final short[] DFA16_eof = DFA.unpackEncodedString(DFA16_eofS);
- static final char[] DFA16_min = DFA.unpackEncodedStringToUnsignedChars(DFA16_minS);
- static final char[] DFA16_max = DFA.unpackEncodedStringToUnsignedChars(DFA16_maxS);
- static final short[] DFA16_accept = DFA.unpackEncodedString(DFA16_acceptS);
- static final short[] DFA16_special = DFA.unpackEncodedString(DFA16_specialS);
- static final short[][] DFA16_transition;
+ static final short[] DFA17_eot = DFA.unpackEncodedString(DFA17_eotS);
+ static final short[] DFA17_eof = DFA.unpackEncodedString(DFA17_eofS);
+ static final char[] DFA17_min = DFA.unpackEncodedStringToUnsignedChars(DFA17_minS);
+ static final char[] DFA17_max = DFA.unpackEncodedStringToUnsignedChars(DFA17_maxS);
+ static final short[] DFA17_accept = DFA.unpackEncodedString(DFA17_acceptS);
+ static final short[] DFA17_special = DFA.unpackEncodedString(DFA17_specialS);
+ static final short[][] DFA17_transition;
static {
- int numStates = DFA16_transitionS.length;
- DFA16_transition = new short[numStates][];
+ int numStates = DFA17_transitionS.length;
+ DFA17_transition = new short[numStates][];
for (int i=0; i<numStates; i++) {
- DFA16_transition[i] = DFA.unpackEncodedString(DFA16_transitionS[i]);
+ DFA17_transition[i] = DFA.unpackEncodedString(DFA17_transitionS[i]);
}
}
- class DFA16 extends DFA {
+ class DFA17 extends DFA {
- public DFA16(BaseRecognizer recognizer) {
+ public DFA17(BaseRecognizer recognizer) {
this.recognizer = recognizer;
- this.decisionNumber = 16;
- this.eot = DFA16_eot;
- this.eof = DFA16_eof;
- this.min = DFA16_min;
- this.max = DFA16_max;
- this.accept = DFA16_accept;
- this.special = DFA16_special;
- this.transition = DFA16_transition;
+ this.decisionNumber = 17;
+ this.eot = DFA17_eot;
+ this.eof = DFA17_eof;
+ this.min = DFA17_min;
+ this.max = DFA17_max;
+ this.accept = DFA17_accept;
+ this.special = DFA17_special;
+ this.transition = DFA17_transition;
}
public String getDescription() {
return "1:1: Tokens : ( T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | RULE_HASH | RULE_T_CLASS | RULE_T_IMPORTANT | RULE_PC_UNIT | RULE_LEN_UNIT | RULE_EM_UNIT | RULE_EX_UNIT | RULE_ANGLE_UNIT | RULE_TIME_UNIT | RULE_FREQ_UNIT | RULE_T_NUM | RULE_ID | RULE_STRING | RULE_CDO | RULE_CDC | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER );";
@@ -2023,112 +2054,112 @@ public class InternalCSSLexer extends Lexer {
int _s = s;
switch ( s ) {
case 0 :
- int LA16_36 = input.LA(1);
+ int LA17_36 = input.LA(1);
s = -1;
- if ( ((LA16_36>='\u0000' && LA16_36<='\uFFFF')) ) {s = 85;}
+ if ( ((LA17_36>='\u0000' && LA17_36<='\uFFFF')) ) {s = 85;}
else s = 39;
if ( s>=0 ) return s;
break;
case 1 :
- int LA16_35 = input.LA(1);
+ int LA17_0 = input.LA(1);
s = -1;
- if ( ((LA16_35>='\u0000' && LA16_35<='\uFFFF')) ) {s = 85;}
+ if ( (LA17_0=='@') ) {s = 1;}
- else s = 39;
+ else if ( (LA17_0==';') ) {s = 2;}
- if ( s>=0 ) return s;
- break;
- case 2 :
- int LA16_0 = input.LA(1);
+ else if ( (LA17_0==',') ) {s = 3;}
- s = -1;
- if ( (LA16_0=='@') ) {s = 1;}
+ else if ( (LA17_0=='{') ) {s = 4;}
- else if ( (LA16_0==';') ) {s = 2;}
+ else if ( (LA17_0=='}') ) {s = 5;}
- else if ( (LA16_0==',') ) {s = 3;}
+ else if ( (LA17_0==':') ) {s = 6;}
- else if ( (LA16_0=='{') ) {s = 4;}
+ else if ( (LA17_0=='*') ) {s = 7;}
- else if ( (LA16_0=='}') ) {s = 5;}
+ else if ( (LA17_0=='(') ) {s = 8;}
- else if ( (LA16_0==':') ) {s = 6;}
+ else if ( (LA17_0==')') ) {s = 9;}
- else if ( (LA16_0=='*') ) {s = 7;}
+ else if ( (LA17_0=='u') ) {s = 10;}
- else if ( (LA16_0=='(') ) {s = 8;}
+ else if ( (LA17_0=='/') ) {s = 11;}
- else if ( (LA16_0==')') ) {s = 9;}
+ else if ( (LA17_0=='[') ) {s = 12;}
- else if ( (LA16_0=='u') ) {s = 10;}
+ else if ( (LA17_0==']') ) {s = 13;}
- else if ( (LA16_0=='/') ) {s = 11;}
+ else if ( (LA17_0=='-') ) {s = 14;}
- else if ( (LA16_0=='[') ) {s = 12;}
+ else if ( (LA17_0=='+') ) {s = 15;}
- else if ( (LA16_0==']') ) {s = 13;}
+ else if ( (LA17_0=='>') ) {s = 16;}
- else if ( (LA16_0=='-') ) {s = 14;}
+ else if ( (LA17_0=='=') ) {s = 17;}
- else if ( (LA16_0=='+') ) {s = 15;}
+ else if ( (LA17_0=='~') ) {s = 18;}
- else if ( (LA16_0=='>') ) {s = 16;}
+ else if ( (LA17_0=='!') ) {s = 19;}
- else if ( (LA16_0=='=') ) {s = 17;}
+ else if ( (LA17_0=='#') ) {s = 20;}
- else if ( (LA16_0=='~') ) {s = 18;}
+ else if ( (LA17_0=='.') ) {s = 21;}
- else if ( (LA16_0=='!') ) {s = 19;}
+ else if ( (LA17_0=='%') ) {s = 22;}
- else if ( (LA16_0=='#') ) {s = 20;}
+ else if ( (LA17_0=='p') ) {s = 23;}
- else if ( (LA16_0=='.') ) {s = 21;}
+ else if ( (LA17_0=='c') ) {s = 24;}
- else if ( (LA16_0=='%') ) {s = 22;}
+ else if ( (LA17_0=='m') ) {s = 25;}
- else if ( (LA16_0=='p') ) {s = 23;}
+ else if ( (LA17_0=='i') ) {s = 26;}
- else if ( (LA16_0=='c') ) {s = 24;}
+ else if ( (LA17_0=='e') ) {s = 27;}
- else if ( (LA16_0=='m') ) {s = 25;}
+ else if ( (LA17_0=='d') ) {s = 28;}
- else if ( (LA16_0=='i') ) {s = 26;}
+ else if ( (LA17_0=='r') ) {s = 29;}
- else if ( (LA16_0=='e') ) {s = 27;}
+ else if ( (LA17_0=='g') ) {s = 30;}
- else if ( (LA16_0=='d') ) {s = 28;}
+ else if ( (LA17_0=='s') ) {s = 31;}
- else if ( (LA16_0=='r') ) {s = 29;}
+ else if ( (LA17_0=='h') ) {s = 32;}
- else if ( (LA16_0=='g') ) {s = 30;}
+ else if ( ((LA17_0>='0' && LA17_0<='9')) ) {s = 33;}
- else if ( (LA16_0=='s') ) {s = 31;}
+ else if ( ((LA17_0>='A' && LA17_0<='Z')||LA17_0=='_'||(LA17_0>='a' && LA17_0<='b')||LA17_0=='f'||(LA17_0>='j' && LA17_0<='l')||(LA17_0>='n' && LA17_0<='o')||LA17_0=='q'||LA17_0=='t'||(LA17_0>='v' && LA17_0<='z')) ) {s = 34;}
- else if ( (LA16_0=='h') ) {s = 32;}
+ else if ( (LA17_0=='\"') ) {s = 35;}
- else if ( ((LA16_0>='0' && LA16_0<='9')) ) {s = 33;}
+ else if ( (LA17_0=='\'') ) {s = 36;}
- else if ( ((LA16_0>='A' && LA16_0<='Z')||LA16_0=='_'||(LA16_0>='a' && LA16_0<='b')||LA16_0=='f'||(LA16_0>='j' && LA16_0<='l')||(LA16_0>='n' && LA16_0<='o')||LA16_0=='q'||LA16_0=='t'||(LA16_0>='v' && LA16_0<='z')) ) {s = 34;}
+ else if ( (LA17_0=='<') ) {s = 37;}
- else if ( (LA16_0=='\"') ) {s = 35;}
+ else if ( ((LA17_0>='\t' && LA17_0<='\n')||LA17_0=='\r'||LA17_0==' ') ) {s = 38;}
- else if ( (LA16_0=='\'') ) {s = 36;}
+ else if ( ((LA17_0>='\u0000' && LA17_0<='\b')||(LA17_0>='\u000B' && LA17_0<='\f')||(LA17_0>='\u000E' && LA17_0<='\u001F')||LA17_0=='$'||LA17_0=='&'||LA17_0=='?'||LA17_0=='\\'||LA17_0=='^'||LA17_0=='`'||LA17_0=='|'||(LA17_0>='\u007F' && LA17_0<='\uFFFF')) ) {s = 39;}
- else if ( (LA16_0=='<') ) {s = 37;}
+ if ( s>=0 ) return s;
+ break;
+ case 2 :
+ int LA17_35 = input.LA(1);
- else if ( ((LA16_0>='\t' && LA16_0<='\n')||LA16_0=='\r'||LA16_0==' ') ) {s = 38;}
+ s = -1;
+ if ( ((LA17_35>='\u0000' && LA17_35<='\uFFFF')) ) {s = 85;}
- else if ( ((LA16_0>='\u0000' && LA16_0<='\b')||(LA16_0>='\u000B' && LA16_0<='\f')||(LA16_0>='\u000E' && LA16_0<='\u001F')||LA16_0=='$'||LA16_0=='&'||LA16_0=='?'||LA16_0=='\\'||LA16_0=='^'||LA16_0=='`'||LA16_0=='|'||(LA16_0>='\u007F' && LA16_0<='\uFFFF')) ) {s = 39;}
+ else s = 39;
if ( s>=0 ) return s;
break;
}
NoViableAltException nvae =
- new NoViableAltException(getDescription(), 16, _s, input);
+ new NoViableAltException(getDescription(), 17, _s, input);
error(nvae);
throw nvae;
}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSParser.java
index d464a5bb1e8..bb03ab75419 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSParser.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSParser.java
@@ -1,19 +1,23 @@
package org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal;
-import org.antlr.runtime.BaseRecognizer;
-import org.antlr.runtime.BitSet;
-import org.antlr.runtime.DFA;
-import org.antlr.runtime.EarlyExitException;
-import org.antlr.runtime.NoViableAltException;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.RecognizerSharedState;
-import org.antlr.runtime.Token;
-import org.antlr.runtime.TokenStream;
-import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.xtext.*;
+import org.eclipse.xtext.parser.*;
+import org.eclipse.xtext.parser.impl.*;
+import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
+import org.eclipse.emf.common.util.Enumerator;
import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
+import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
+
+
+
+import org.antlr.runtime.*;
+import java.util.Stack;
+import java.util.List;
+import java.util.ArrayList;
@SuppressWarnings("all")
public class InternalCSSParser extends AbstractInternalAntlrParser {
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/AbstractCSSSemanticSequencer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSemanticSequencer.java
index 30c9bc82ff1..af598b77ac2 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/AbstractCSSSemanticSequencer.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSemanticSequencer.java
@@ -1,5 +1,7 @@
package org.eclipse.papyrus.infra.gmfdiag.serializer;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.infra.gmfdiag.css.Angle;
import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;
@@ -36,41 +38,18 @@ import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider;
import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
-import org.eclipse.xtext.serializer.sequencer.AbstractSemanticSequencer;
+import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer;
import org.eclipse.xtext.serializer.sequencer.GenericSequencer;
import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;
import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-
-@SuppressWarnings("restriction")
-public class AbstractCSSSemanticSequencer extends AbstractSemanticSequencer {
+@SuppressWarnings("all")
+public class CSSSemanticSequencer extends AbstractDelegatingSemanticSequencer {
@Inject
- protected CSSGrammarAccess grammarAccess;
-
- @Inject
- protected ISemanticSequencerDiagnosticProvider diagnosticProvider;
-
- @Inject
- protected ITransientValueService transientValues;
-
- @Inject
- @GenericSequencer
- protected Provider<ISemanticSequencer> genericSequencerProvider;
-
- protected ISemanticSequencer genericSequencer;
-
-
- @Override
- public void init(ISemanticSequencer sequencer, ISemanticSequenceAcceptor sequenceAcceptor, Acceptor errorAcceptor) {
- super.init(sequencer, sequenceAcceptor, errorAcceptor);
- this.genericSequencer = genericSequencerProvider.get();
- this.genericSequencer.init(sequencer, sequenceAcceptor, errorAcceptor);
- }
+ private CSSGrammarAccess grammarAccess;
public void createSequence(EObject context, EObject semanticObject) {
if(semanticObject.eClass().getEPackage() == CssPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/AbstractCSSSyntacticSequencer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSyntacticSequencer.java
index 1cf682b829e..2d2978841b6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/AbstractCSSSyntacticSequencer.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSyntacticSequencer.java
@@ -1,7 +1,7 @@
package org.eclipse.papyrus.infra.gmfdiag.serializer;
+import com.google.inject.Inject;
import java.util.List;
-
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
import org.eclipse.xtext.IGrammarAccess;
@@ -15,10 +15,8 @@ import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISyn
import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition;
import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;
-import com.google.inject.Inject;
-
-@SuppressWarnings("restriction")
-public class AbstractCSSSyntacticSequencer extends AbstractSyntacticSequencer {
+@SuppressWarnings("all")
+public class CSSSyntacticSequencer extends AbstractSyntacticSequencer {
protected CSSGrammarAccess grammarAccess;
protected AbstractElementAlias match_AttributeValue_WSTerminalRuleCall_1_a;
@@ -115,21 +113,47 @@ public class AbstractCSSSyntacticSequencer extends AbstractSyntacticSequencer {
return getCDCToken(semanticObject, ruleCall, node);
else if(ruleCall.getRule() == grammarAccess.getCDORule())
return getCDOToken(semanticObject, ruleCall, node);
+ else if(ruleCall.getRule() == grammarAccess.getT_IMPORTANTRule())
+ return getT_IMPORTANTToken(semanticObject, ruleCall, node);
else if(ruleCall.getRule() == grammarAccess.getWSRule())
return getWSToken(semanticObject, ruleCall, node);
return "";
}
+ /**
+ * terminal CDC:
+ * '-->';
+ */
protected String getCDCToken(EObject semanticObject, RuleCall ruleCall, INode node) {
if (node != null)
return getTokenText(node);
return "-->";
}
+
+ /**
+ * terminal CDO:
+ * '<!--';
+ */
protected String getCDOToken(EObject semanticObject, RuleCall ruleCall, INode node) {
if (node != null)
return getTokenText(node);
return "<!--";
}
+
+ /**
+ * terminal T_IMPORTANT:
+ * '!important';
+ */
+ protected String getT_IMPORTANTToken(EObject semanticObject, RuleCall ruleCall, INode node) {
+ if (node != null)
+ return getTokenText(node);
+ return "!important";
+ }
+
+ /**
+ * terminal WS:
+ * (' ' | '\t' | '\r' | '\n')+;
+ */
protected String getWSToken(EObject semanticObject, RuleCall ruleCall, INode node) {
if (node != null)
return getTokenText(node);
@@ -502,7 +526,7 @@ public class AbstractCSSSyntacticSequencer extends AbstractSyntacticSequencer {
/**
* Syntax:
- * (CDC | WS | CDO)*
+ * (WS | CDC | CDO)*
*/
protected void emit_Stylesheet___CDCTerminalRuleCall_1_2_or_CDOTerminalRuleCall_1_1_or_WSTerminalRuleCall_1_0__a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
acceptNodes(transition, nodes);
@@ -510,7 +534,7 @@ public class AbstractCSSSyntacticSequencer extends AbstractSyntacticSequencer {
/**
* Syntax:
- * (CDC | CDO | WS)+
+ * (WS | CDC | CDO)+
*/
protected void emit_Stylesheet___CDCTerminalRuleCall_1_2_or_CDOTerminalRuleCall_1_1_or_WSTerminalRuleCall_1_0__p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
acceptNodes(transition, nodes);
@@ -518,7 +542,7 @@ public class AbstractCSSSyntacticSequencer extends AbstractSyntacticSequencer {
/**
* Syntax:
- * ((CDO WS*) | (CDC WS*))*
+ * ((CDC WS*) | (CDO WS*))*
*/
protected void emit_Stylesheet_____CDCTerminalRuleCall_2_1_1_0_WSTerminalRuleCall_2_1_1_1_a___or___CDOTerminalRuleCall_2_1_0_0_WSTerminalRuleCall_2_1_0_1_a____a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
acceptNodes(transition, nodes);
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/services/CSSGrammarAccess.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/services/CSSGrammarAccess.java
index e479440f10b..758e79f7640 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/services/CSSGrammarAccess.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/services/CSSGrammarAccess.java
@@ -4,23 +4,14 @@
package org.eclipse.papyrus.infra.gmfdiag.services;
-import org.eclipse.xtext.Action;
-import org.eclipse.xtext.Alternatives;
-import org.eclipse.xtext.Assignment;
-import org.eclipse.xtext.EnumLiteralDeclaration;
-import org.eclipse.xtext.EnumRule;
-import org.eclipse.xtext.Grammar;
-import org.eclipse.xtext.GrammarUtil;
-import org.eclipse.xtext.Group;
-import org.eclipse.xtext.Keyword;
-import org.eclipse.xtext.ParserRule;
-import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.TerminalRule;
-import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder;
-import org.eclipse.xtext.service.GrammarProvider;
-
-import com.google.inject.Inject;
import com.google.inject.Singleton;
+import com.google.inject.Inject;
+
+import java.util.List;
+
+import org.eclipse.xtext.*;
+import org.eclipse.xtext.service.GrammarProvider;
+import org.eclipse.xtext.service.AbstractElementFinder.*;
@Singleton
@@ -60,12 +51,19 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cCDCTerminalRuleCall_3_1_1_0 = (RuleCall)cGroup_3_1_1.eContents().get(0);
private final RuleCall cWSTerminalRuleCall_3_1_1_1 = (RuleCall)cGroup_3_1_1.eContents().get(1);
- //Stylesheet:
+ ////Do not create a Stylesheet for WS* (This seems to cause a serialization problem when editing an EMF Model from an Empty file)
+ //
+ //
+ ////Do not ignore WS as @charset must be followed by exactly one Space.
+ // Stylesheet:
+ //
// ("@charset " charset=STRING ";")? (WS | CDO | CDC)* (imports+=Import (CDO WS* | CDC WS*)*)* (contents+=Content (CDO
+ //
// WS* | CDC WS*)*)*;
public ParserRule getRule() { return rule; }
//("@charset " charset=STRING ";")? (WS | CDO | CDC)* (imports+=Import (CDO WS* | CDC WS*)*)* (contents+=Content (CDO WS*
+ //
//| CDC WS*)*)*
public Group getGroup() { return cGroup; }
@@ -165,6 +163,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cPageParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
//Content:
+ //
// Ruleset | Media | Page;
public ParserRule getRule() { return rule; }
@@ -208,6 +207,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cWSTerminalRuleCall_5 = (RuleCall)cGroup.eContents().get(5);
//Import:
+ //
// "@import" (WS* string=STRING | WS uri=Uri) WS* (media+=ID WS* ("," WS* media+=ID)*)? ";" WS*;
public ParserRule getRule() { return rule; }
@@ -302,6 +302,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cWSTerminalRuleCall_9 = (RuleCall)cGroup.eContents().get(9);
//Media:
+ //
// "@media" WS media+=ID WS* ("," WS* media+=ID)* "{" WS* rules+=Ruleset* "}" WS*;
public ParserRule getRule() { return rule; }
@@ -378,7 +379,9 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cWSTerminalRuleCall_9 = (RuleCall)cGroup.eContents().get(9);
//Page:
+ //
// {Page} "@page" WS* pseudo=PseudoPage? "{" WS* declarations+=Declaration? (";" WS* declarations+=Declaration?)* "}"
+ //
// WS*;
public ParserRule getRule() { return rule; }
@@ -443,6 +446,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cWSTerminalRuleCall_2 = (RuleCall)cGroup.eContents().get(2);
//PseudoPage:
+ //
// ":" id=ID WS*;
public ParserRule getRule() { return rule; }
@@ -485,11 +489,14 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cWSTerminalRuleCall_7 = (RuleCall)cGroup.eContents().get(7);
//Ruleset:
+ //
// selectors+=Selector ("," WS* selectors+=Selector)* "{" WS* properties+=Declaration? (";" WS*
+ //
// properties+=Declaration?)* "}" WS*;
public ParserRule getRule() { return rule; }
//selectors+=Selector ("," WS* selectors+=Selector)* "{" WS* properties+=Declaration? (";" WS* properties+=Declaration?)*
+ //
//"}" WS*
public Group getGroup() { return cGroup; }
@@ -557,6 +564,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cCompositeSelectorParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
//Selector:
+ //
// SimpleSelector WS* | CompositeSelector;
public ParserRule getRule() { return rule; }
@@ -591,7 +599,10 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cRightSelectorParserRuleCall_2_0 = (RuleCall)cRightAssignment_2.eContents().get(0);
////left=SimpleSelector (combinator=Combinator right=Selector | WS+ (combinator=Combinator? right=Selector)?)?;
+ //
+ //
//CompositeSelector:
+ //
// left=SimpleSelector (WS+ | WS* combinator=Combinator) right=Selector;
public ParserRule getRule() { return rule; }
@@ -643,6 +654,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cConditionSelectorConditionParserRuleCall_1_0 = (RuleCall)cConditionAssignment_1.eContents().get(0);
//SimpleSelector:
+ //
// elementName=(ID | "*") condition+=SelectorCondition* | condition+=SelectorCondition+;
public ParserRule getRule() { return rule; }
@@ -686,6 +698,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cPseudoParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3);
//SelectorCondition:
+ //
// CSSId | Class | Attribute | Pseudo;
public ParserRule getRule() { return rule; }
@@ -713,6 +726,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cWSTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
//Combinator:
+ //
// kind=KIND WS*;
public ParserRule getRule() { return rule; }
@@ -745,6 +759,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cWSTerminalRuleCall_5_1 = (RuleCall)cGroup_5.eContents().get(1);
//Declaration:
+ //
// property=ID WS* ":" WS* expression=Expression (important?=T_IMPORTANT WS*)?;
public ParserRule getRule() { return rule; }
@@ -794,6 +809,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cSubtermsSubtermParserRuleCall_1_0 = (RuleCall)cSubtermsAssignment_1.eContents().get(0);
//Expression:
+ //
// terms=Term subterms+=Subterm*;
public ParserRule getRule() { return rule; }
@@ -822,6 +838,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cTermTermParserRuleCall_1_0 = (RuleCall)cTermAssignment_1.eContents().get(0);
//Subterm:
+ //
// operator=Operator? term=Term;
public ParserRule getRule() { return rule; }
@@ -861,11 +878,14 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cWSTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
//Term:
- // (Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor | Function)
- // WS*;
+ //
+ // (Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor |
+ //
+ // Function) WS*;
public ParserRule getRule() { return rule; }
//(Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor | Function)
+ //
//WS*
public Group getGroup() { return cGroup; }
@@ -927,6 +947,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cRightParenthesisKeyword_4 = (Keyword)cGroup.eContents().get(4);
//Function:
+ //
// name=ID "(" WS* args=Expression ")";
public ParserRule getRule() { return rule; }
@@ -961,6 +982,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cValueIDTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
//Name:
+ //
// value=ID;
public ParserRule getRule() { return rule; }
@@ -980,7 +1002,8 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cValueT_NUMTerminalRuleCall_1_0 = (RuleCall)cValueAssignment_1.eContents().get(0);
////Terms
- //Number:
+ // Number:
+ //
// op=UnaryOperator? value=T_NUM;
public ParserRule getRule() { return rule; }
@@ -1011,6 +1034,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cUnitPC_UNITTerminalRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
//Percentage:
+ //
// op=UnaryOperator? value=T_NUM unit=PC_UNIT;
public ParserRule getRule() { return rule; }
@@ -1047,6 +1071,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cUnitLEN_UNITTerminalRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
//Length:
+ //
// op=UnaryOperator? value=T_NUM unit=LEN_UNIT;
public ParserRule getRule() { return rule; }
@@ -1083,6 +1108,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cUnitEM_UNITTerminalRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
//Ems:
+ //
// op=UnaryOperator? value=T_NUM unit=EM_UNIT;
public ParserRule getRule() { return rule; }
@@ -1119,6 +1145,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cUnitEX_UNITTerminalRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
//Exs:
+ //
// op=UnaryOperator? value=T_NUM unit=EX_UNIT;
public ParserRule getRule() { return rule; }
@@ -1155,6 +1182,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cUnitANGLE_UNITTerminalRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
//Angle:
+ //
// op=UnaryOperator? value=T_NUM unit=ANGLE_UNIT;
public ParserRule getRule() { return rule; }
@@ -1191,6 +1219,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cUnitTIME_UNITTerminalRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
//Time:
+ //
// op=UnaryOperator? value=T_NUM unit=TIME_UNIT;
public ParserRule getRule() { return rule; }
@@ -1227,6 +1256,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cUnitFREQ_UNITTerminalRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
//Frequency:
+ //
// op=UnaryOperator? value=T_NUM unit=FREQ_UNIT;
public ParserRule getRule() { return rule; }
@@ -1263,7 +1293,8 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cRightParenthesisKeyword_4 = (Keyword)cGroup.eContents().get(4);
/// * | 'url(' WS? url=URL WS? ')' * / //TODO
- //Uri:
+ // Uri:
+ //
// "url(" WS? value=STRING WS? ")";
public ParserRule getRule() { return rule; }
@@ -1295,6 +1326,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cValueSTRINGTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
//StringValue:
+ //
// value=STRING;
public ParserRule getRule() { return rule; }
@@ -1311,16 +1343,23 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cValueHASHTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
////terminal URL:
- //// (('!' | '#' | '$' | '%' | '&' | '*' | '-' | '~') / * | NON_ASCII | ESCAPE * /)*;
+ // // (('!' | '#' | '$' | '%' | '&' | '*' | '-' | '~') / * | NON_ASCII | ESCAPE * /)*;
+ //
+ //
////terminal NON_ASCII:
- //// (\0240..\0377) //Chars 160 to 255
- ////;
- ////terminal UNICODE:
+ // // (\0240..\0377) //Chars 160 to 255
+ // //;
+ // //terminal UNICODE:
+ //
+ //
//// '\\' HEXA (HEXA (HEXA (HEXA (HEXA (HEXA)?)?)?)?)? ('\r\n' | ' ' | '\t' | '\r' | '\n')?;
- ////
- ////terminal ESCAPE:
+ // //
+ // //terminal ESCAPE:
+ //
+ //
//// UNICODE | ('\\' !('\r' | '\n' | '0'..'9' | 'a'..'f' | 'A'..'F'));
- //HexColor:
+ // HexColor:
+ //
// value=HASH;
public ParserRule getRule() { return rule; }
@@ -1342,6 +1381,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cWSTerminalRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
//Operator:
+ //
// "/" WS* | "," WS*;
public ParserRule getRule() { return rule; }
@@ -1373,6 +1413,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cClassT_CLASSTerminalRuleCall_0 = (RuleCall)cClassAssignment.eContents().get(0);
//Class:
+ //
// class=T_CLASS;
public ParserRule getRule() { return rule; }
@@ -1396,6 +1437,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cRightSquareBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
//Attribute:
+ //
// "[" WS* name=ID WS* value=AttributeValue? "]";
public ParserRule getRule() { return rule; }
@@ -1440,6 +1482,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cWSTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3);
//AttributeValue:
+ //
// operator=ATTRIBUTE_OP WS* value=(ID | STRING) WS*;
public ParserRule getRule() { return rule; }
@@ -1490,6 +1533,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cRightParenthesisKeyword_1_1_4 = (Keyword)cGroup_1_1.eContents().get(4);
//Pseudo:
+ //
// ":" (pseudo=ID | pseudo=ID "(" WS* (args=ID WS*)? ")");
public ParserRule getRule() { return rule; }
@@ -1545,6 +1589,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cValueHASHTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
//CSSId:
+ //
// value=HASH;
public ParserRule getRule() { return rule; }
@@ -1561,6 +1606,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cOperatorUNARYEnumRuleCall_0 = (RuleCall)cOperatorAssignment.eContents().get(0);
//UnaryOperator:
+ //
// operator=UNARY;
public ParserRule getRule() { return rule; }
@@ -1581,6 +1627,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cPLUSPlusSignKeyword_1_0 = (Keyword)cPLUSEnumLiteralDeclaration_1.eContents().get(0);
//enum UNARY:
+ //
// NEG="-" | PLUS="+";
public EnumRule getRule() { return rule; }
@@ -1609,6 +1656,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cSIBLINGPlusSignKeyword_1_0 = (Keyword)cSIBLINGEnumLiteralDeclaration_1.eContents().get(0);
//enum KIND:
+ //
// FIRST_CHILD=">" | SIBLING="+";
public EnumRule getRule() { return rule; }
@@ -1639,6 +1687,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cUNEQUALSExclamationMarkEqualsSignKeyword_2_0 = (Keyword)cUNEQUALSEnumLiteralDeclaration_2.eContents().get(0);
//enum ATTRIBUTE_OP:
+ //
// EQUALS="=" | CONTAINS="~=" | UNEQUALS="!=";
public EnumRule getRule() { return rule; }
@@ -1722,21 +1771,44 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
private TerminalRule tWS;
private TerminalRule tANY_OTHER;
- private final GrammarProvider grammarProvider;
+ private final Grammar grammar;
@Inject
public CSSGrammarAccess(GrammarProvider grammarProvider) {
- this.grammarProvider = grammarProvider;
+ this.grammar = internalFindGrammar(grammarProvider);
+ }
+
+ protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
+ Grammar grammar = grammarProvider.getGrammar(this);
+ while (grammar != null) {
+ if ("org.eclipse.papyrus.infra.gmfdiag.CSS".equals(grammar.getName())) {
+ return grammar;
+ }
+ List<Grammar> grammars = grammar.getUsedGrammars();
+ if (!grammars.isEmpty()) {
+ grammar = grammars.iterator().next();
+ } else {
+ return null;
+ }
+ }
+ return grammar;
}
- public Grammar getGrammar() {
- return grammarProvider.getGrammar(this);
+
+ public Grammar getGrammar() {
+ return grammar;
}
- //Stylesheet:
+ ////Do not create a Stylesheet for WS* (This seems to cause a serialization problem when editing an EMF Model from an Empty file)
+ //
+ //
+ ////Do not ignore WS as @charset must be followed by exactly one Space.
+ // Stylesheet:
+ //
// ("@charset " charset=STRING ";")? (WS | CDO | CDC)* (imports+=Import (CDO WS* | CDC WS*)*)* (contents+=Content (CDO
+ //
// WS* | CDC WS*)*)*;
public StylesheetElements getStylesheetAccess() {
return (pStylesheet != null) ? pStylesheet : (pStylesheet = new StylesheetElements());
@@ -1747,6 +1819,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Content:
+ //
// Ruleset | Media | Page;
public ContentElements getContentAccess() {
return (pContent != null) ? pContent : (pContent = new ContentElements());
@@ -1757,6 +1830,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Import:
+ //
// "@import" (WS* string=STRING | WS uri=Uri) WS* (media+=ID WS* ("," WS* media+=ID)*)? ";" WS*;
public ImportElements getImportAccess() {
return (pImport != null) ? pImport : (pImport = new ImportElements());
@@ -1767,6 +1841,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Media:
+ //
// "@media" WS media+=ID WS* ("," WS* media+=ID)* "{" WS* rules+=Ruleset* "}" WS*;
public MediaElements getMediaAccess() {
return (pMedia != null) ? pMedia : (pMedia = new MediaElements());
@@ -1777,7 +1852,9 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Page:
+ //
// {Page} "@page" WS* pseudo=PseudoPage? "{" WS* declarations+=Declaration? (";" WS* declarations+=Declaration?)* "}"
+ //
// WS*;
public PageElements getPageAccess() {
return (pPage != null) ? pPage : (pPage = new PageElements());
@@ -1788,6 +1865,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//PseudoPage:
+ //
// ":" id=ID WS*;
public PseudoPageElements getPseudoPageAccess() {
return (pPseudoPage != null) ? pPseudoPage : (pPseudoPage = new PseudoPageElements());
@@ -1798,7 +1876,9 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Ruleset:
+ //
// selectors+=Selector ("," WS* selectors+=Selector)* "{" WS* properties+=Declaration? (";" WS*
+ //
// properties+=Declaration?)* "}" WS*;
public RulesetElements getRulesetAccess() {
return (pRuleset != null) ? pRuleset : (pRuleset = new RulesetElements());
@@ -1809,6 +1889,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Selector:
+ //
// SimpleSelector WS* | CompositeSelector;
public SelectorElements getSelectorAccess() {
return (pSelector != null) ? pSelector : (pSelector = new SelectorElements());
@@ -1819,7 +1900,10 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
////left=SimpleSelector (combinator=Combinator right=Selector | WS+ (combinator=Combinator? right=Selector)?)?;
+ //
+ //
//CompositeSelector:
+ //
// left=SimpleSelector (WS+ | WS* combinator=Combinator) right=Selector;
public CompositeSelectorElements getCompositeSelectorAccess() {
return (pCompositeSelector != null) ? pCompositeSelector : (pCompositeSelector = new CompositeSelectorElements());
@@ -1830,6 +1914,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//SimpleSelector:
+ //
// elementName=(ID | "*") condition+=SelectorCondition* | condition+=SelectorCondition+;
public SimpleSelectorElements getSimpleSelectorAccess() {
return (pSimpleSelector != null) ? pSimpleSelector : (pSimpleSelector = new SimpleSelectorElements());
@@ -1840,6 +1925,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//SelectorCondition:
+ //
// CSSId | Class | Attribute | Pseudo;
public SelectorConditionElements getSelectorConditionAccess() {
return (pSelectorCondition != null) ? pSelectorCondition : (pSelectorCondition = new SelectorConditionElements());
@@ -1850,6 +1936,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Combinator:
+ //
// kind=KIND WS*;
public CombinatorElements getCombinatorAccess() {
return (pCombinator != null) ? pCombinator : (pCombinator = new CombinatorElements());
@@ -1860,6 +1947,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Declaration:
+ //
// property=ID WS* ":" WS* expression=Expression (important?=T_IMPORTANT WS*)?;
public DeclarationElements getDeclarationAccess() {
return (pDeclaration != null) ? pDeclaration : (pDeclaration = new DeclarationElements());
@@ -1870,6 +1958,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Expression:
+ //
// terms=Term subterms+=Subterm*;
public ExpressionElements getExpressionAccess() {
return (pExpression != null) ? pExpression : (pExpression = new ExpressionElements());
@@ -1880,6 +1969,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Subterm:
+ //
// operator=Operator? term=Term;
public SubtermElements getSubtermAccess() {
return (pSubterm != null) ? pSubterm : (pSubterm = new SubtermElements());
@@ -1890,8 +1980,10 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Term:
- // (Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor | Function)
- // WS*;
+ //
+ // (Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor |
+ //
+ // Function) WS*;
public TermElements getTermAccess() {
return (pTerm != null) ? pTerm : (pTerm = new TermElements());
}
@@ -1901,6 +1993,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Function:
+ //
// name=ID "(" WS* args=Expression ")";
public FunctionElements getFunctionAccess() {
return (pFunction != null) ? pFunction : (pFunction = new FunctionElements());
@@ -1911,6 +2004,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Name:
+ //
// value=ID;
public NameElements getNameAccess() {
return (pName != null) ? pName : (pName = new NameElements());
@@ -1921,7 +2015,8 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
////Terms
- //Number:
+ // Number:
+ //
// op=UnaryOperator? value=T_NUM;
public NumberElements getNumberAccess() {
return (pNumber != null) ? pNumber : (pNumber = new NumberElements());
@@ -1932,6 +2027,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Percentage:
+ //
// op=UnaryOperator? value=T_NUM unit=PC_UNIT;
public PercentageElements getPercentageAccess() {
return (pPercentage != null) ? pPercentage : (pPercentage = new PercentageElements());
@@ -1942,6 +2038,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Length:
+ //
// op=UnaryOperator? value=T_NUM unit=LEN_UNIT;
public LengthElements getLengthAccess() {
return (pLength != null) ? pLength : (pLength = new LengthElements());
@@ -1952,6 +2049,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Ems:
+ //
// op=UnaryOperator? value=T_NUM unit=EM_UNIT;
public EmsElements getEmsAccess() {
return (pEms != null) ? pEms : (pEms = new EmsElements());
@@ -1962,6 +2060,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Exs:
+ //
// op=UnaryOperator? value=T_NUM unit=EX_UNIT;
public ExsElements getExsAccess() {
return (pExs != null) ? pExs : (pExs = new ExsElements());
@@ -1972,6 +2071,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Angle:
+ //
// op=UnaryOperator? value=T_NUM unit=ANGLE_UNIT;
public AngleElements getAngleAccess() {
return (pAngle != null) ? pAngle : (pAngle = new AngleElements());
@@ -1982,6 +2082,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Time:
+ //
// op=UnaryOperator? value=T_NUM unit=TIME_UNIT;
public TimeElements getTimeAccess() {
return (pTime != null) ? pTime : (pTime = new TimeElements());
@@ -1992,6 +2093,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Frequency:
+ //
// op=UnaryOperator? value=T_NUM unit=FREQ_UNIT;
public FrequencyElements getFrequencyAccess() {
return (pFrequency != null) ? pFrequency : (pFrequency = new FrequencyElements());
@@ -2002,7 +2104,8 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
/// * | 'url(' WS? url=URL WS? ')' * / //TODO
- //Uri:
+ // Uri:
+ //
// "url(" WS? value=STRING WS? ")";
public UriElements getUriAccess() {
return (pUri != null) ? pUri : (pUri = new UriElements());
@@ -2013,6 +2116,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//StringValue:
+ //
// value=STRING;
public StringValueElements getStringValueAccess() {
return (pStringValue != null) ? pStringValue : (pStringValue = new StringValueElements());
@@ -2023,16 +2127,23 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
////terminal URL:
- //// (('!' | '#' | '$' | '%' | '&' | '*' | '-' | '~') / * | NON_ASCII | ESCAPE * /)*;
+ // // (('!' | '#' | '$' | '%' | '&' | '*' | '-' | '~') / * | NON_ASCII | ESCAPE * /)*;
+ //
+ //
////terminal NON_ASCII:
- //// (\0240..\0377) //Chars 160 to 255
- ////;
- ////terminal UNICODE:
+ // // (\0240..\0377) //Chars 160 to 255
+ // //;
+ // //terminal UNICODE:
+ //
+ //
//// '\\' HEXA (HEXA (HEXA (HEXA (HEXA (HEXA)?)?)?)?)? ('\r\n' | ' ' | '\t' | '\r' | '\n')?;
- ////
- ////terminal ESCAPE:
+ // //
+ // //terminal ESCAPE:
+ //
+ //
//// UNICODE | ('\\' !('\r' | '\n' | '0'..'9' | 'a'..'f' | 'A'..'F'));
- //HexColor:
+ // HexColor:
+ //
// value=HASH;
public HexColorElements getHexColorAccess() {
return (pHexColor != null) ? pHexColor : (pHexColor = new HexColorElements());
@@ -2043,6 +2154,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Operator:
+ //
// "/" WS* | "," WS*;
public OperatorElements getOperatorAccess() {
return (pOperator != null) ? pOperator : (pOperator = new OperatorElements());
@@ -2053,6 +2165,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Class:
+ //
// class=T_CLASS;
public ClassElements getClassAccess() {
return (pClass != null) ? pClass : (pClass = new ClassElements());
@@ -2063,6 +2176,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Attribute:
+ //
// "[" WS* name=ID WS* value=AttributeValue? "]";
public AttributeElements getAttributeAccess() {
return (pAttribute != null) ? pAttribute : (pAttribute = new AttributeElements());
@@ -2073,6 +2187,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//AttributeValue:
+ //
// operator=ATTRIBUTE_OP WS* value=(ID | STRING) WS*;
public AttributeValueElements getAttributeValueAccess() {
return (pAttributeValue != null) ? pAttributeValue : (pAttributeValue = new AttributeValueElements());
@@ -2083,6 +2198,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//Pseudo:
+ //
// ":" (pseudo=ID | pseudo=ID "(" WS* (args=ID WS*)? ")");
public PseudoElements getPseudoAccess() {
return (pPseudo != null) ? pPseudo : (pPseudo = new PseudoElements());
@@ -2093,6 +2209,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//CSSId:
+ //
// value=HASH;
public CSSIdElements getCSSIdAccess() {
return (pCSSId != null) ? pCSSId : (pCSSId = new CSSIdElements());
@@ -2103,6 +2220,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//UnaryOperator:
+ //
// operator=UNARY;
public UnaryOperatorElements getUnaryOperatorAccess() {
return (pUnaryOperator != null) ? pUnaryOperator : (pUnaryOperator = new UnaryOperatorElements());
@@ -2113,6 +2231,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//enum UNARY:
+ //
// NEG="-" | PLUS="+";
public UNARYElements getUNARYAccess() {
return (unknownRuleUNARY != null) ? unknownRuleUNARY : (unknownRuleUNARY = new UNARYElements());
@@ -2123,6 +2242,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//enum KIND:
+ //
// FIRST_CHILD=">" | SIBLING="+";
public KINDElements getKINDAccess() {
return (unknownRuleKIND != null) ? unknownRuleKIND : (unknownRuleKIND = new KINDElements());
@@ -2133,6 +2253,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//enum ATTRIBUTE_OP:
+ //
// EQUALS="=" | CONTAINS="~=" | UNEQUALS="!=";
public ATTRIBUTE_OPElements getATTRIBUTE_OPAccess() {
return (unknownRuleATTRIBUTE_OP != null) ? unknownRuleATTRIBUTE_OP : (unknownRuleATTRIBUTE_OP = new ATTRIBUTE_OPElements());
@@ -2143,111 +2264,132 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
}
//terminal HASH:
+ //
// "#" ("A".."Z" | "a".."z" | "0".."9")+;
public TerminalRule getHASHRule() {
return (tHASH != null) ? tHASH : (tHASH = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "HASH"));
}
//terminal T_CLASS:
+ //
// "." ID;
public TerminalRule getT_CLASSRule() {
return (tT_CLASS != null) ? tT_CLASS : (tT_CLASS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "T_CLASS"));
}
////This is not the exact CSS Grammar
- //terminal T_IMPORTANT:
+ // terminal T_IMPORTANT:
+ //
// "!important";
public TerminalRule getT_IMPORTANTRule() {
return (tT_IMPORTANT != null) ? tT_IMPORTANT : (tT_IMPORTANT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "T_IMPORTANT"));
}
//terminal PC_UNIT:
+ //
// "%";
public TerminalRule getPC_UNITRule() {
return (tPC_UNIT != null) ? tPC_UNIT : (tPC_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "PC_UNIT"));
}
//terminal LEN_UNIT:
+ //
// "px" | "cm" | "mm" | "in" | "pt" | "pc";
public TerminalRule getLEN_UNITRule() {
return (tLEN_UNIT != null) ? tLEN_UNIT : (tLEN_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "LEN_UNIT"));
}
//terminal EM_UNIT:
+ //
// "em";
public TerminalRule getEM_UNITRule() {
return (tEM_UNIT != null) ? tEM_UNIT : (tEM_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "EM_UNIT"));
}
//terminal EX_UNIT:
+ //
// "ex";
public TerminalRule getEX_UNITRule() {
return (tEX_UNIT != null) ? tEX_UNIT : (tEX_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "EX_UNIT"));
}
//terminal ANGLE_UNIT:
+ //
// "deg" | "rad" | "grad";
public TerminalRule getANGLE_UNITRule() {
return (tANGLE_UNIT != null) ? tANGLE_UNIT : (tANGLE_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ANGLE_UNIT"));
}
//terminal TIME_UNIT:
+ //
// "s" | "ms";
public TerminalRule getTIME_UNITRule() {
return (tTIME_UNIT != null) ? tTIME_UNIT : (tTIME_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "TIME_UNIT"));
}
//terminal FREQ_UNIT:
+ //
// "hz" | "mhz";
public TerminalRule getFREQ_UNITRule() {
return (tFREQ_UNIT != null) ? tFREQ_UNIT : (tFREQ_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "FREQ_UNIT"));
}
//terminal T_NUM:
+ //
// "0".."9"+ | "0".."9"* "." "0".."9"+;
public TerminalRule getT_NUMRule() {
return (tT_NUM != null) ? tT_NUM : (tT_NUM = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "T_NUM"));
}
//terminal ID:
- // ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
+ //
+ // "-"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9" | "-")*;
public TerminalRule getIDRule() {
return (tID != null) ? tID : (tID = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ID"));
}
//terminal STRING:
+ //
// "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
+ //
// "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
public TerminalRule getSTRINGRule() {
return (tSTRING != null) ? tSTRING : (tSTRING = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "STRING"));
}
//terminal CDO:
+ //
// "<!--";
public TerminalRule getCDORule() {
return (tCDO != null) ? tCDO : (tCDO = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "CDO"));
}
//terminal CDC:
+ //
// "-->";
public TerminalRule getCDCRule() {
return (tCDC != null) ? tCDC : (tCDC = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "CDC"));
}
////Doesn't exactly match CSS Comments... * / can be protected by \ : \* / doesn't close the comment in XText, while it does in CSS
+ //
+ //
//terminal ML_COMMENT:
+ //
// "/ *"->"* /";
public TerminalRule getML_COMMENTRule() {
return (tML_COMMENT != null) ? tML_COMMENT : (tML_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ML_COMMENT"));
}
//terminal WS:
+ //
// (" " | "\t" | "\r" | "\n")+;
public TerminalRule getWSRule() {
return (tWS != null) ? tWS : (tWS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "WS"));
}
//terminal ANY_OTHER:
+ //
// .;
public TerminalRule getANY_OTHERRule() {
return (tANY_OTHER != null) ? tANY_OTHER : (tANY_OTHER = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ANY_OTHER"));
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSS.xtext b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSS.xtext
index 2d9c3b9c2df..005d09ed8c0 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSS.xtext
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSS.xtext
@@ -186,7 +186,7 @@ terminal T_NUM:
('0'..'9')+ | ('0'..'9')* "." ('0'..'9')+;
terminal ID:
- ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;
+ '-'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9' | '-')*;
terminal STRING:
'"' ('\\' ('b' | 't' | 'n' | 'f' | 'r' | 'u' | '"' | "'" | '\\') | !('\\' | '"'))* '"' |
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/OperationParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/OperationParser.java
index 1d2d3cd3322..f0ccf484082 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/OperationParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/OperationParser.java
@@ -20,6 +20,7 @@ import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
@@ -29,7 +30,8 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCo
import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;
import org.eclipse.uml2.uml.Operation;
@@ -68,25 +70,33 @@ public class OperationParser implements IParser {
final Operation operation = ((Operation)((EObjectAdapter)element).getRealObject());
final String result = newString;
- AbstractTransactionalCommand tc = new AbstractTransactionalCommand(EditorUtils.getTransactionalEditingDomain(), "Edit Operation", (List)null) {
+ final TransactionalEditingDomain editingDomain;
+ try {
+ editingDomain = ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(operation);
+ } catch (ServiceException ex) {
+ return null;
+ }
+
+ AbstractTransactionalCommand tc = new AbstractTransactionalCommand(editingDomain, "Edit Operation", (List)null) {
@Override
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
SafeRunnable.run(new SafeRunnable() {
public void run() {
- RecordingCommand rc = new RecordingCommand(EditorUtils.getTransactionalEditingDomain()) {
+ RecordingCommand rc = new RecordingCommand(getEditingDomain()) {
+ @Override
protected void doExecute() {
operation.setName(result);
}
};
- EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(rc);
+ getEditingDomain().getCommandStack().execute(rc);
}
});
return CommandResult.newOKCommandResult();
- };
+ }
};
return tc;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/PropertyParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/PropertyParser.java
index cccb3b8ee27..77b953f2b80 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/PropertyParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/PropertyParser.java
@@ -20,6 +20,7 @@ import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
@@ -29,7 +30,8 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCo
import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;
import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;
import org.eclipse.papyrus.uml.tools.utils.PropertyUtil;
@@ -71,25 +73,34 @@ public class PropertyParser implements IParser {
final Property property = ((Property)((EObjectAdapter)element).getRealObject());
final String result = newString;
- AbstractTransactionalCommand tc = new AbstractTransactionalCommand(EditorUtils.getTransactionalEditingDomain(), "Edit Property", (List)null) {
+
+ final TransactionalEditingDomain editingDomain;
+ try {
+ editingDomain = ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(property);
+ } catch (ServiceException ex) {
+ return null;
+ }
+
+ AbstractTransactionalCommand tc = new AbstractTransactionalCommand(editingDomain, "Edit Property", (List)null) {
@Override
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
SafeRunnable.run(new SafeRunnable() {
public void run() {
- RecordingCommand rc = new RecordingCommand(EditorUtils.getTransactionalEditingDomain()) {
+ RecordingCommand rc = new RecordingCommand(getEditingDomain()) {
+ @Override
protected void doExecute() {
property.setName(result);
}
};
- EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(rc);
+ getEditingDomain().getCommandStack().execute(rc);
}
});
return CommandResult.newOKCommandResult();
- };
+ }
};
return tc;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
index 3ef5721c1c8..d6eda50625c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.emf.transaction;bundle-version="1.4.0",
org.eclipse.uml2.uml;bundle-version="4.0.0",
org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",
- org.eclipse.emf.edit.ui;bundle-version="2.8.0"
+ org.eclipse.emf.edit.ui;bundle-version="2.8.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.10.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.10.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/src/org/eclipse/papyrus/uml/diagram/common/palette/customaction/toolbox/AbstractToolWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/src/org/eclipse/papyrus/uml/diagram/common/palette/customaction/toolbox/AbstractToolWizard.java
index bf8d5859ada..242336c1826 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/src/org/eclipse/papyrus/uml/diagram/common/palette/customaction/toolbox/AbstractToolWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/src/org/eclipse/papyrus/uml/diagram/common/palette/customaction/toolbox/AbstractToolWizard.java
@@ -19,20 +19,22 @@ import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
import org.eclipse.papyrus.uml.diagram.common.palette.customaction.providers.ITool;
import org.eclipse.swt.widgets.Display;
/**
* A Wizard util if clients want to create a wizard for tool actions
+ *
* @author tfaure
- *
+ *
*/
public abstract class AbstractToolWizard extends Wizard implements ITool {
private EditPart currentEditPart;
+
private RecordingCommand command;
+
private TransactionalEditingDomain domain;
public AbstractToolWizard(EditPart part) {
@@ -41,8 +43,8 @@ public abstract class AbstractToolWizard extends Wizard implements ITool {
public EObject getEObject() {
Object model = currentEditPart.getModel();
- if (model instanceof View) {
- View view = (View) model;
+ if(model instanceof View) {
+ View view = (View)model;
return view.getElement();
}
return null;
@@ -79,24 +81,20 @@ public abstract class AbstractToolWizard extends Wizard implements ITool {
public void run(EditPart editPart) {
try {
- final TransactionalEditingDomain editingDomain = ServiceUtils
- .getInstance().getTransactionalEditingDomain(
- EditorUtils.getMultiDiagramEditor()
- .getServicesRegistry());
+ final TransactionalEditingDomain editingDomain = ServiceUtilsForEditPart.getInstance().getTransactionalEditingDomain(editPart);
setTransactionalEditingDomain(editingDomain);
- WizardDialog dialog = new WizardDialog(Display.getDefault()
- .getActiveShell(), this);
- if (dialog.open() == WizardDialog.OK) {
+ WizardDialog dialog = new WizardDialog(Display.getDefault().getActiveShell(), this);
+ if(dialog.open() == WizardDialog.OK) {
final RecordingCommand iCmd = getCommand();
- if (iCmd.canExecute()) {
+ if(iCmd.canExecute()) {
// execute the command
editingDomain.runExclusive(new Runnable() {
public void run() {
Display.getCurrent().asyncExec(new Runnable() {
+
public void run() {
- editingDomain.getCommandStack().execute(
- iCmd);
+ editingDomain.getCommandStack().execute(iCmd);
}
});
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShapeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShapeEditPart.java
index dd28bf1a16c..b9c7ba8a9d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShapeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShapeEditPart.java
@@ -22,8 +22,8 @@ import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.core.editorsfactory.IPageIconsRegistry;
import org.eclipse.papyrus.infra.core.editorsfactory.PageIconsRegistry;
import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
import org.eclipse.papyrus.uml.appearance.helper.AppliedStereotypeHelper;
import org.eclipse.papyrus.uml.diagram.common.Activator;
import org.eclipse.papyrus.uml.diagram.common.figure.node.ShapeNamedElementFigure;
@@ -61,7 +61,7 @@ public abstract class AbstractShapeEditPart extends AbstractBorderedShapeEditPar
*/
protected IPageIconsRegistry createEditorRegistry() {
try {
- return EditorUtils.getServiceRegistry().getService(IPageIconsRegistry.class);
+ return ServiceUtilsForEditPart.getInstance().getService(IPageIconsRegistry.class, this);
} catch (ServiceException e) {
// Not found, return an empty one which return null for each
// request.
@@ -121,7 +121,7 @@ public abstract class AbstractShapeEditPart extends AbstractBorderedShapeEditPar
String firstStereotypeName = tokenizer.nextToken();
Stereotype stereotype = getUMLElement().getAppliedStereotype(firstStereotypeName);
org.eclipse.uml2.uml.Image icon = ElementUtil.getStereotypeImage(getUMLElement(), stereotype, SHAPE_CONSTANT);
- if(icon!=null){
+ if(icon != null) {
if(icon.getLocation() != "" && icon.getLocation() != null) {
try {
getPrimaryShape().setIcon(icon.getLocation());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShortCutDiagramEditPart.java
index 8d3cf9914bd..ac6f25aada0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShortCutDiagramEditPart.java
@@ -23,19 +23,14 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditDomain;
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.core.editorsfactory.IPageIconsRegistry;
import org.eclipse.papyrus.infra.core.editorsfactory.PageIconsRegistry;
import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
import org.eclipse.papyrus.uml.diagram.common.figure.node.DiagramNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
-import org.eclipse.ui.IWorkbenchPart;
/**
* this class is used to constraint the behavior of a node to obtain the
@@ -56,22 +51,6 @@ public abstract class AbstractShortCutDiagramEditPart extends AbstractBorderedSh
}
/**
- *
- * @return the service registry from the backbone. it can return null if it
- * does not found the {@link DiagramEditDomain}
- */
- public ServicesRegistry getServicesRegistry() {
- IDiagramEditDomain domain = getDiagramEditDomain();
- if(domain instanceof DiagramEditDomain) {
- IWorkbenchPart part = ((DiagramEditDomain)domain).getEditorPart().getEditorSite().getPart();
- if(part instanceof UmlGmfDiagramEditor) {
- return ((UmlGmfDiagramEditor)part).getServicesRegistry();
- }
- }
- return null;
- }
-
- /**
* Return the EditorRegistry for nested editor descriptors. Subclass should
* implements this method in order to return the registry associated to the
* extension point namespace.
@@ -81,13 +60,7 @@ public abstract class AbstractShortCutDiagramEditPart extends AbstractBorderedSh
*/
protected IPageIconsRegistry createEditorRegistry() {
try {
- ServicesRegistry servicesRegistry = getServicesRegistry();
-
- if(servicesRegistry != null) {
- return servicesRegistry.getService(IPageIconsRegistry.class);
- } else {
- return EditorUtils.getServiceRegistry().getService(IPageIconsRegistry.class);
- }
+ return ServiceUtilsForEditPart.getInstance().getService(IPageIconsRegistry.class, this);
} catch (ServiceException e) {
// Not found, return an empty one which return null for each
// request.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/ShortCutDiagramEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/ShortCutDiagramEditPolicy.java
index b6f3feaadad..80703362114 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/ShortCutDiagramEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/ShortCutDiagramEditPolicy.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.OpenEditPolicy;
import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
/**
* This class is used to open a new diagram when the double click is detected.
@@ -62,7 +62,7 @@ public class ShortCutDiagramEditPolicy extends OpenEditPolicy {
@Override
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
try {
- IPageMngr pageMngr = EditorUtils.getIPageMngr();
+ IPageMngr pageMngr = ServiceUtilsForEObject.getInstance().getIPageMngr(diagramToOpen);
if(pageMngr.isOpen(diagramToOpen)) {
pageMngr.closePage(diagramToOpen);
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
index fa7e6291fda..0e7feb92090 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
@@ -773,8 +773,7 @@
<specializationType
id="org.eclipse.papyrus.uml.diagram.deployment.Device_16"
name="%metatype.name.Device_16"
- kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
- edithelperadvice="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.">
+ kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
<specializes id="org.eclipse.papyrus.uml.diagram.deployment.Device_2003"/>
<param name="semanticHint" value="16"/>
</specializationType>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java
index 76a7c411962..8d19091ae24 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.core.listenerservice.IPapyrusListener;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
import org.eclipse.papyrus.uml.diagram.common.Activator;
import org.eclipse.papyrus.uml.diagram.profile.custom.helper.ExtensionHelper;
import org.eclipse.swt.widgets.Display;
@@ -128,9 +128,8 @@ public class ExtensionCustomNameEditPolicy extends AbstractEditPolicy implements
if(hostSemanticElement instanceof Extension) {
if(((Extension)hostSemanticElement).getStereotype() instanceof Stereotype) {
- // final TransactionalEditingDomain domain = ((GraphicalEditPart)getHost()).getEditingDomain();
- final TransactionalEditingDomain domain = EditorUtils.getTransactionalEditingDomain();//((GraphicalEditPart)getHost()).getEditingDomain();
try {
+ final TransactionalEditingDomain domain = ServiceUtilsForEditPart.getInstance().getTransactionalEditingDomain(getHost());
((IGraphicalEditPart)getHost()).getEditingDomain().runExclusive(new Runnable() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java
index 5506a0bd767..d46c58acc6f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java
@@ -33,6 +33,7 @@ import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.emf.transaction.RollbackException;
import org.eclipse.emf.transaction.Transaction;
import org.eclipse.emf.transaction.TransactionalCommandStack;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
import org.eclipse.emf.transaction.impl.TransactionalCommandStackImpl;
import org.eclipse.gef.EditDomain;
@@ -45,7 +46,8 @@ import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.window.Window;
import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
import org.eclipse.papyrus.uml.diagram.common.util.MessageDirection;
import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;
import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;
@@ -314,8 +316,9 @@ public class CommandHelper {
if(parentsOwner instanceof InteractionFragment) {
EList<Lifeline> lifelines = ((InteractionFragment)parentsOwner).getCovereds();
for(Lifeline l : lifelines) {
- if(l.getRepresents() != null && l.getRepresents().getType() != null)
+ if(l.getRepresents() != null && l.getRepresents().getType() != null) {
types.add(l.getRepresents().getType());
+ }
boolean result = addParentsFromLifeline(l, mapTypesPossibleParents);
if(result) {
existingParent = true;
@@ -323,8 +326,9 @@ public class CommandHelper {
}
} else if(parentsOwner instanceof Lifeline) {
Lifeline l = (Lifeline)parentsOwner;
- if(l.getRepresents() != null && l.getRepresents().getType() != null)
+ if(l.getRepresents() != null && l.getRepresents().getType() != null) {
types.add(l.getRepresents().getType());
+ }
existingParent = addParentsFromLifeline(l, mapTypesPossibleParents);
}
@@ -338,9 +342,17 @@ public class CommandHelper {
// fix bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=383420, remove connection feedbacks before opening dialog
clearConnectionFeedback();
-
+
+ TransactionalEditingDomain editingDomain;
+ try {
+ editingDomain = ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(model);
+ } catch (ServiceException ex) {
+ UMLDiagramEditorPlugin.log.error(ex);
+ return Collections.<NamedElement> emptyList();
+ }
+
// Open the selection dialog
- SelectOrCreateDialog dialog = new SelectOrCreateDialog(Display.getCurrent().getActiveShell(), Messages.CommandHelper_CreateMessage, createTypeLabelProvider(), new AdapterFactoryLabelProvider(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()), EditorUtils.getTransactionalEditingDomain(), existingElements, mapTypesPossibleParents, types);
+ SelectOrCreateDialog dialog = new SelectOrCreateDialog(Display.getCurrent().getActiveShell(), Messages.CommandHelper_CreateMessage, createTypeLabelProvider(), new AdapterFactoryLabelProvider(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()), editingDomain, existingElements, mapTypesPossibleParents, types);
// Get the selected result
if(dialog.open() == Window.OK) {
@@ -357,22 +369,22 @@ public class CommandHelper {
return null;
}
-
+
private static void clearConnectionFeedback() {
AspectUnspecifiedTypeConnectionToolEx conTool = null;
IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
if(editor instanceof CoreMultiDiagramEditor) {
- editor = ((CoreMultiDiagramEditor) editor).getActiveEditor();
- if(editor instanceof DiagramEditor){
+ editor = ((CoreMultiDiagramEditor)editor).getActiveEditor();
+ if(editor instanceof DiagramEditor) {
DiagramEditor de = (DiagramEditor)editor;
DiagramEditPart diagramEP = de.getDiagramEditPart();
EditDomain domain = diagramEP.getRoot().getViewer().getEditDomain();
Tool tool = domain.getActiveTool();
- if(tool instanceof AspectUnspecifiedTypeConnectionToolEx){
+ if(tool instanceof AspectUnspecifiedTypeConnectionToolEx) {
conTool = (AspectUnspecifiedTypeConnectionToolEx)tool;
conTool.clearConnectionFeedback();
}
- }
+ }
}
}
@@ -391,14 +403,15 @@ public class CommandHelper {
for(EObject parent : parents) {
if(parent instanceof Classifier) {
existingElements.addAll(((Classifier)parent).getAllOperations());
-
+
// add operations from port
EList<Property> attrs = ((Classifier)parent).getAllAttributes();
- for(Property p : attrs)
- if(p instanceof Port && p.getType() instanceof Classifier){
+ for(Property p : attrs) {
+ if(p instanceof Port && p.getType() instanceof Classifier) {
existingElements.addAll(((Classifier)p.getType()).getAllOperations());
}
-
+ }
+
} else if(parent instanceof Package) {
EList<Element> ownedElements = ((Package)parent).allOwnedElements();
for(Element e : ownedElements) {
@@ -476,7 +489,7 @@ public class CommandHelper {
// and the packages to signal
List<EObject> possiblePackages = mapTypesPossibleParents.get(UMLPackage.eINSTANCE.getSignal());
- if(possiblePackages != null && type.getPackage()!= null) {
+ if(possiblePackages != null && type.getPackage() != null) {
Package package_ = type.getPackage();
possiblePackages.add(package_);
// add the owners of the package
@@ -541,7 +554,7 @@ public class CommandHelper {
e.printStackTrace();
}
}
-
+
/**
* Execute a EMF command without history
*
@@ -551,11 +564,11 @@ public class CommandHelper {
* The command
* @param flag
*/
- public static void executeCommandWithoutHistory(EditingDomain editingDomain, org.eclipse.emf.common.command.Command command,boolean flag) {
+ public static void executeCommandWithoutHistory(EditingDomain editingDomain, org.eclipse.emf.common.command.Command command, boolean flag) {
TransactionalCommandStackImpl stack = new TransactionalCommandStackImpl();
stack.setEditingDomain((InternalTransactionalEditingDomain)editingDomain);
try {
- stack.execute(command,Collections.singletonMap(Transaction.OPTION_UNPROTECTED, Boolean.TRUE));
+ stack.execute(command, Collections.singletonMap(Transaction.OPTION_UNPROTECTED, Boolean.TRUE));
} catch (InterruptedException e) {
e.printStackTrace();
} catch (RollbackException e) {
@@ -869,34 +882,31 @@ public class CommandHelper {
if(element instanceof Interaction) {
gate = ((Interaction)element).createFormalGate(null);
} else if(element instanceof CombinedFragment) {
- CombinedFragment combinedFragment = (CombinedFragment) element;
+ CombinedFragment combinedFragment = (CombinedFragment)element;
EList<Gate> cfragmentGates = combinedFragment.getCfragmentGates();
- if (cfragmentGates.isEmpty()) {
- gate = ((CombinedFragment) element).createCfragmentGate(null);
+ if(cfragmentGates.isEmpty()) {
+ gate = ((CombinedFragment)element).createCfragmentGate(null);
} else {
// remove connection feedbacks before opening dialog
clearConnectionFeedback();
-
+
Shell shell = Display.getCurrent().getActiveShell();
- ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
- UMLDiagramEditorPlugin.getInstance()
- .getItemProvidersAdapterFactory());
- ElementListSelectionDialog dialog = new ElementListSelectionDialog(
- shell, labelProvider);
+ ILabelProvider labelProvider = new AdapterFactoryLabelProvider(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());
+ ElementListSelectionDialog dialog = new ElementListSelectionDialog(shell, labelProvider);
dialog.setTitle("Gates of the CombinedFragment has");
dialog.setMessage(CHOOSE_GATE_DIALOG_MSG);
dialog.setMultipleSelection(false);
-
+
List<Gate> gates = new ArrayList<Gate>();
- for (Gate actualGate : cfragmentGates) {
+ for(Gate actualGate : cfragmentGates) {
gates.add(actualGate);
}
-
+
dialog.setElements(gates.toArray());
- if (dialog.open() == Window.OK) {
- gate = (Gate) dialog.getFirstResult();
- }else{ // cancel button
- throw new OperationCanceledException();
+ if(dialog.open() == Window.OK) {
+ gate = (Gate)dialog.getFirstResult();
+ } else { // cancel button
+ throw new OperationCanceledException();
}
}
} else if(element instanceof InteractionUse) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
index 2e32477c3fc..00ffa67b100 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
@@ -76,7 +76,8 @@ Require-Bundle: org.eclipse.core.expressions,
org.eclipse.emf.ecore.edit;visibility:=reexport,
org.eclipse.emf.validation.ocl;visibility:=reexport,
org.eclipse.gef,
- org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0"
+ org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="0.10.0"
Bundle-Vendor: %providerName
Ant-Version: Apache Ant 1.7.0
Eclipse-LazyStart: true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/TransitionPropertiesParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/TransitionPropertiesParser.java
index 07b0487e41f..2eba156edbc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/TransitionPropertiesParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/TransitionPropertiesParser.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
@@ -36,7 +37,8 @@ import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.CallEvent;
@@ -74,15 +76,23 @@ public class TransitionPropertiesParser implements IParser, ISemanticParser {
final Transition transition = ((Transition)((EObjectAdapter)element).getRealObject());
final String result = newString;
- AbstractTransactionalCommand tc = new AbstractTransactionalCommand(EditorUtils.getTransactionalEditingDomain(), "Edit Transition Properties", (List)null) { //$NON-NLS-1$
+ final TransactionalEditingDomain editingDomain;
+ try {
+ editingDomain = ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(transition);
+ } catch (ServiceException ex) {
+ return null;
+ }
+
+ AbstractTransactionalCommand tc = new AbstractTransactionalCommand(editingDomain, "Edit Transition Properties", (List)null) { //$NON-NLS-1$
@Override
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
SafeRunnable.run(new SafeRunnable() {
public void run() {
- RecordingCommand rc = new RecordingCommand(EditorUtils.getTransactionalEditingDomain()) {
+ RecordingCommand rc = new RecordingCommand(getEditingDomain()) {
+ @Override
protected void doExecute() {
// 1. Cherchez dans le model, si une contrainst
// avec le meme nom existe
@@ -90,7 +100,7 @@ public class TransitionPropertiesParser implements IParser, ISemanticParser {
EList<Element> elements = (transition.getModel()).allOwnedElements();
Iterator<Element> modelElement = elements.iterator();
while(modelElement.hasNext()) {
- Element pElement = (Element)modelElement.next();
+ Element pElement = modelElement.next();
if(pElement instanceof Constraint && (result.equals(((NamedElement)pElement).getName()))) {
guardConstraint = (Constraint)pElement;
transition.setGuard(guardConstraint);
@@ -107,12 +117,12 @@ public class TransitionPropertiesParser implements IParser, ISemanticParser {
// transition.setName(result);
}
};
- EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(rc);
+ getEditingDomain().getCommandStack().execute(rc);
}
});
return CommandResult.newOKCommandResult();
- };
+ }
};
return tc;
}
@@ -129,8 +139,9 @@ public class TransitionPropertiesParser implements IParser, ISemanticParser {
if(event instanceof Notification) {
int notificationType = ((Notification)event).getEventType();
if(Notification.SET == notificationType) {
- if(((Notification)event).getNewValue() instanceof Constraint)
+ if(((Notification)event).getNewValue() instanceof Constraint) {
guardConstraint = (Constraint)((Notification)event).getNewValue();
+ }
return true;
}
@@ -214,22 +225,25 @@ public class TransitionPropertiesParser implements IParser, ISemanticParser {
boolean isFirstTrigger = true;
for(Trigger t : trans.getTriggers()) {
if(t != null) {
- if(!isFirstTrigger)
+ if(!isFirstTrigger) {
result.append(", "); //$NON-NLS-1$
- else
+ } else {
isFirstTrigger = false;
+ }
Event e = t.getEvent();
if(e instanceof CallEvent) {
- if(((CallEvent)e).getOperation() != null)
+ if(((CallEvent)e).getOperation() != null) {
result.append(((CallEvent)e).getOperation().getName());
- else
+ } else {
result.append(((CallEvent)e).getName());
+ }
} else if(e instanceof SignalEvent) {
- if(((SignalEvent)e).getSignal() != null)
+ if(((SignalEvent)e).getSignal() != null) {
result.append(((SignalEvent)e).getSignal().getName());
- else
+ } else {
result.append(((SignalEvent)e).getName());
+ }
} else if(e instanceof ChangeEvent) {
result.append("when ").append("\"").append(retrieveBody((OpaqueExpression)((ChangeEvent)e).getChangeExpression(), "Natural language")).append("\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
} else if(e instanceof TimeEvent) {
@@ -299,15 +313,17 @@ public class TransitionPropertiesParser implements IParser, ISemanticParser {
private String retrieveBody(OpaqueExpression exp, String languageName) {
String body = EMPTY_STRING;
- if(exp == null)
+ if(exp == null) {
return body;
+ }
int index = 0;
for(String _languageName : exp.getLanguages()) {
if(_languageName.equals(languageName)) {
- if(index < exp.getBodies().size())
+ if(index < exp.getBodies().size()) {
return exp.getBodies().get(index);
- else
+ } else {
return EMPTY_STRING;
+ }
}
index++;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/CreateExtensionPointCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/CreateExtensionPointCommand.java
index aafca16c4df..6c9e9adfd53 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/CreateExtensionPointCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/CreateExtensionPointCommand.java
@@ -17,6 +17,7 @@ import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.CompoundCommand;
import org.eclipse.gef.editparts.AbstractEditPart;
@@ -30,12 +31,14 @@ import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ExtensionPointCreateCommand;
import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointEditPart;
import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsEditPartTN;
import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInComponentEditPart;
import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInPackageEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;
import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;
import org.eclipse.uml2.uml.Extend;
import org.eclipse.uml2.uml.ExtensionPoint;
@@ -101,7 +104,15 @@ public class CreateExtensionPointCommand extends Command {
* @return the command to create model element or null
*/
private ICommandProxy getExtensionPointAddCommand(Extend extend, ExtensionPoint extPoint) {
- SetExtensionPropertyCmd cmd = new SetExtensionPropertyCmd(extend, extPoint);
+ TransactionalEditingDomain editingDomain;
+ try {
+ editingDomain = ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(extend);
+ } catch (ServiceException ex) {
+ UMLDiagramEditorPlugin.getInstance().logError(ex.getMessage(), ex);
+ return null;
+ }
+
+ SetExtensionPropertyCmd cmd = new SetExtensionPropertyCmd(editingDomain, extend, extPoint);
return new ICommandProxy(cmd);
}
@@ -187,7 +198,7 @@ public class CreateExtensionPointCommand extends Command {
}
}
if(!alreadyDrawn) {
- ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(new EObjectAdapter((EObject)extensionPoint), Node.class, type.getSemanticHint(), useCasePointEP.getDiagramPreferencesHint());
+ ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(new EObjectAdapter(extensionPoint), Node.class, type.getSemanticHint(), useCasePointEP.getDiagramPreferencesHint());
CreateViewRequest request = new CreateViewRequest(descriptor);
Command nodeCreationCommand = useCasePointEP.getCommand(request);
viewsCreationCommand.add(nodeCreationCommand);
@@ -223,8 +234,8 @@ public class CreateExtensionPointCommand extends Command {
private Extend extend;
- public SetExtensionPropertyCmd(Extend extend, ExtensionPoint extensionPoint) {
- super(EditorUtils.getTransactionalEditingDomain(), "Set extension point property", null);
+ public SetExtensionPropertyCmd(TransactionalEditingDomain editingDomain, Extend extend, ExtensionPoint extensionPoint) {
+ super(editingDomain, "Set extension point property", null);
this.extend = extend;
this.extPoint = extensionPoint;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java
index 1b961be38c2..62af4d8ac3c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java
@@ -49,7 +49,7 @@ import org.eclipse.jface.preference.PreferenceConverter;
import org.eclipse.papyrus.infra.core.editorsfactory.IPageIconsRegistry;
import org.eclipse.papyrus.infra.core.editorsfactory.PageIconsRegistry;
import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortCutDiagramEditPart;
@@ -136,12 +136,14 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
protected LayoutEditPolicy createLayoutEditPolicy() {
org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
+ @Override
protected EditPolicy createChildEditPolicy(EditPart child) {
View childView = (View)child.getModel();
switch(UMLVisualIDRegistry.getVisualID(childView)) {
case DiagramNameEditPart.VISUAL_ID:
return new BorderItemSelectionEditPolicy() {
+ @Override
protected List createSelectionHandles() {
MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());
mh.setBorder(null);
@@ -156,10 +158,12 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
return result;
}
+ @Override
protected Command getMoveChildrenCommand(Request request) {
return null;
}
+ @Override
protected Command getCreateCommand(CreateRequest request) {
return null;
}
@@ -306,7 +310,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
@Override
protected IPageIconsRegistry createEditorRegistry() {
try {
- return EditorUtils.getServiceRegistry().getService(IPageIconsRegistry.class);
+ return ServiceUtilsForEditPart.getInstance().getService(IPageIconsRegistry.class, this);
} catch (ServiceException e) {
// Not found, return an empty one which return null for each request.
return new PageIconsRegistry();
@@ -370,7 +374,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
prefColor = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_FILL);
}
- result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
+ result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
String prefGradient = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/src/org/eclipse/papyrus/uml/modelexplorer/widgets/ProfileContentProvider.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/src/org/eclipse/papyrus/uml/modelexplorer/widgets/ProfileContentProvider.java
deleted file mode 100644
index 1cf946a9fa6..00000000000
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/src/org/eclipse/papyrus/uml/modelexplorer/widgets/ProfileContentProvider.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.modelexplorer.widgets;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.resource.ModelUtils;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
-import org.eclipse.papyrus.uml.tools.model.UmlModel;
-import org.eclipse.papyrus.uml.tools.model.UmlUtils;
-import org.eclipse.papyrus.views.modelexplorer.widgets.MetamodelContentProvider;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Profile;
-
-
-public class ProfileContentProvider extends MetamodelContentProvider {
- @Override
- public Object[] getElements(Object inputElement){
- Object[] parentElements = super.getElements(inputElement);
-
- List<Object> result = new LinkedList<Object>(Arrays.asList(parentElements));
-
- result.addAll(getAppliedProfile(inputElement));
-
- return result.toArray();
- }
-
- /**
- *
- * @return all profile without doublon. it is never null
- *
- * @throws ServiceException
- */
- protected HashSet<Profile> getAppliedProfile(Object root) {
- HashSet<Profile> profileList = new HashSet<Profile>();
- //a root has been given.
- if(root != null && root instanceof Package) {
- profileList.addAll(((Package)root).getAllAppliedProfiles());
- return profileList;
-
- }
- //look for from contentprovider
- ServicesRegistry servicesRegistry = EditorUtils.getMultiDiagramEditor().getServicesRegistry();
- if(servicesRegistry != null) {
- UmlModel umlModel = null;
- try {
- ModelSet modelSet = ModelUtils.getModelSetChecked(servicesRegistry);
- umlModel = (UmlUtils.getUmlModel(modelSet));
-
- } catch (Exception e) {
- Activator.log.error("Cannot succeed to access to modelSet by using service Registry", e);
- }
- if(umlModel == null) {
- return profileList;
- }
- EList<EObject> contents = umlModel.getResource().getContents();
- Iterator<EObject> iterator = contents.iterator();
- while(iterator.hasNext()) {
- EObject eObject = iterator.next();
- if(eObject instanceof Package) {
- profileList.addAll(((Package)eObject).getAllAppliedProfiles());
- }
- }
- }
- return profileList;
- }
-}
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
index 8e3ad833fb3..b170da0b8aa 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;
org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
org.eclipse.xtext.gmf.glue;bundle-version="0.9.0",
org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0"
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="0.10.0"
Export-Package: org.eclipse.papyrus.uml.textedit.connectionpointrefere
nce.xtext.ui.contentassist.antlr
Bundle-Vendor: %providerName
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/src/org/eclipse/papyrus/uml/textedit/connectionpointreference/xtext/ui/contributions/ConnectionPointReferencePopupEditorConfiguration.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/src/org/eclipse/papyrus/uml/textedit/connectionpointreference/xtext/ui/contributions/ConnectionPointReferencePopupEditorConfiguration.java
index 773c2585bf7..7ac15d31ded 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/src/org/eclipse/papyrus/uml/textedit/connectionpointreference/xtext/ui/contributions/ConnectionPointReferencePopupEditorConfiguration.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/src/org/eclipse/papyrus/uml/textedit/connectionpointreference/xtext/ui/contributions/ConnectionPointReferencePopupEditorConfiguration.java
@@ -13,7 +13,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
import org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.uMLConnectionPointReference.ConnectionPointReferenceRule;
import org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.internal.UMLConnectionPointReferenceActivator;
import org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.validation.UMLConnectionPointReferenceJavaValidator;
@@ -27,49 +28,47 @@ import com.google.inject.Injector;
public class ConnectionPointReferencePopupEditorConfiguration extends PopupEditorConfiguration {
- private ConnectionPointReference connectionPoint ;
+ private ConnectionPointReference connectionPoint;
- private List<Pseudostate> newEntries = new ArrayList<Pseudostate>() ;
- private List<Pseudostate> newExits = new ArrayList<Pseudostate>() ;
+ private List<Pseudostate> newEntries = new ArrayList<Pseudostate>();
+
+ private List<Pseudostate> newExits = new ArrayList<Pseudostate>();
public ConnectionPointReferencePopupEditorConfiguration() {
- super() ;
+ super();
}
@Override
public String getTextToEdit(Object editedObject) {
- if (editedObject instanceof ConnectionPointReference) {
- ConnectionPointReference ref = (ConnectionPointReference)editedObject ;
- String label = "" ;
- if (!ref.getEntries().isEmpty()) {
- label += "entry " ;
- boolean first = true ;
- for (Pseudostate p : ref.getEntries()) {
- if (!first) {
- label += ", " ;
- }
- else {
- first = false ;
+ if(editedObject instanceof ConnectionPointReference) {
+ ConnectionPointReference ref = (ConnectionPointReference)editedObject;
+ String label = "";
+ if(!ref.getEntries().isEmpty()) {
+ label += "entry ";
+ boolean first = true;
+ for(Pseudostate p : ref.getEntries()) {
+ if(!first) {
+ label += ", ";
+ } else {
+ first = false;
}
- label += p.getName() ;
+ label += p.getName();
}
- }
- else if (!ref.getExits().isEmpty()) {
- label += "exit " ;
- boolean first = true ;
- for (Pseudostate p : ref.getExits()) {
- if (!first) {
- label += ", " ;
+ } else if(!ref.getExits().isEmpty()) {
+ label += "exit ";
+ boolean first = true;
+ for(Pseudostate p : ref.getExits()) {
+ if(!first) {
+ label += ", ";
+ } else {
+ first = false;
}
- else {
- first = false ;
- }
- label += p.getName() ;
+ label += p.getName();
}
}
- return label ;
+ return label;
}
- return "not a ConnectionPointReference" ;
+ return "not a ConnectionPointReference";
}
@Override
@@ -85,7 +84,7 @@ public class ConnectionPointReferencePopupEditorConfiguration extends PopupEdito
}
connectionPoint = (ConnectionPointReference)graphicalEditPart.resolveSemanticElement();
- UMLConnectionPointReferenceJavaValidator.init(connectionPoint) ;
+ UMLConnectionPointReferenceJavaValidator.init(connectionPoint);
// retrieves the XText injector
Injector injector = UMLConnectionPointReferenceActivator.getInstance().getInjector("org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.UMLConnectionPointReference");
@@ -101,22 +100,25 @@ public class ConnectionPointReferencePopupEditorConfiguration extends PopupEdito
public void reconcile(EObject modelObject, EObject xtextObject) {
- newEntries = new ArrayList<Pseudostate>() ;
- newExits = new ArrayList<Pseudostate>() ;
+ newEntries = new ArrayList<Pseudostate>();
+ newExits = new ArrayList<Pseudostate>();
- ConnectionPointReferenceRule rule = (ConnectionPointReferenceRule)xtextObject ;
- if (! rule.getEntry().isEmpty()) {
- newEntries.addAll(rule.getEntry()) ;
- }
- else if (! rule.getExit().isEmpty()) {
- newExits.addAll(rule.getExit()) ;
+ ConnectionPointReferenceRule rule = (ConnectionPointReferenceRule)xtextObject;
+ if(!rule.getEntry().isEmpty()) {
+ newEntries.addAll(rule.getEntry());
+ } else if(!rule.getExit().isEmpty()) {
+ newExits.addAll(rule.getExit());
}
// Creates and executes the update command
UpdateConnectionPointReferenceCommand updateCommand = new UpdateConnectionPointReferenceCommand(connectionPoint);
- TransactionalEditingDomain dom = EditorUtils.getTransactionalEditingDomain();
- dom.getCommandStack().execute(new GMFtoEMFCommandWrapper(updateCommand));
+ try {
+ TransactionalEditingDomain domain = ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(modelObject);
+ domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(updateCommand));
+ } catch (ServiceException ex) {
+ ex.printStackTrace(System.err);
+ }
}
};
return super.createPopupEditorHelper(graphicalEditPart, injector, reconciler, textToEdit, fileExtension, new DefaultXtextSemanticValidator());
@@ -124,34 +126,45 @@ public class ConnectionPointReferencePopupEditorConfiguration extends PopupEdito
/**
* @author CEA LIST
- *
- * A command for updating the context UML model
+ *
+ * A command for updating the context UML model
*/
protected class UpdateConnectionPointReferenceCommand extends AbstractTransactionalCommand {
- private ConnectionPointReference connectionPointReference ;
+ private ConnectionPointReference connectionPointReference;
- /* (non-Javadoc)
- * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor
+ * , org.eclipse.core.runtime.IAdaptable)
*/
@Override
- protected CommandResult doExecuteWithResult(IProgressMonitor arg0,
- IAdaptable arg1) throws ExecutionException {
+ protected CommandResult doExecuteWithResult(IProgressMonitor arg0, IAdaptable arg1) throws ExecutionException {
- connectionPointReference.getEntries().clear() ;
- connectionPointReference.getExits().clear() ;
+ connectionPointReference.getEntries().clear();
+ connectionPointReference.getExits().clear();
- connectionPointReference.getEntries().addAll(newEntries) ;
- connectionPointReference.getExits().addAll(newExits) ;
+ connectionPointReference.getEntries().addAll(newEntries);
+ connectionPointReference.getExits().addAll(newExits);
return CommandResult.newOKCommandResult(connectionPointReference);
}
public UpdateConnectionPointReferenceCommand(ConnectionPointReference connectionPointReference) {
- super(EditorUtils.getTransactionalEditingDomain(),
- "ConnectionPointReference Update",
- getWorkspaceFiles(connectionPointReference));
- this.connectionPointReference = connectionPointReference ;
+ super(ConnectionPointReferencePopupEditorConfiguration.getEditingDomain(connectionPointReference), "ConnectionPointReference Update", getWorkspaceFiles(connectionPointReference));
+ this.connectionPointReference = connectionPointReference;
+ }
+
+ }
+
+ static TransactionalEditingDomain getEditingDomain(EObject context) {
+ try {
+ return ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(context);
+ } catch (ServiceException ex) {
+ ex.printStackTrace(System.err);
}
+ return null;
}
}
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF
index 7bb122d95ef..57e219dae03 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.message.xtext;bundle-version="0
org.eclipse.xtext.gmf.glue;bundle-version="0.9.0",
org.apache.log4j;bundle-version="1.2.15",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0"
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="0.10.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.10.0.qualifier
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contributions/MessagePopupEditor.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contributions/MessagePopupEditor.java
index 138132d10c6..d5fb3555b69 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contributions/MessagePopupEditor.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/src/org/eclipse/papyrus/uml/textedit/message/xtext/ui/contributions/MessagePopupEditor.java
@@ -25,7 +25,8 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
import org.eclipse.papyrus.uml.textedit.message.xtext.ui.internal.UmlMessageActivator;
import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule;
import org.eclipse.uml2.uml.Interaction;
@@ -66,7 +67,7 @@ public class MessagePopupEditor extends PopupEditorConfiguration {
/**
* @see org.eclipse.xtext.gmf.glue.PopupEditorConfiguration#getTextToEdit(java.lang.Object)
- *
+ *
* @param editedObject
* @return the text to edit
*/
@@ -101,7 +102,7 @@ public class MessagePopupEditor extends PopupEditorConfiguration {
/**
* @see org.eclipse.xtext.gmf.glue.PopupEditorConfiguration#createPopupEditorHelper(java.lang.Object)
- *
+ *
* @param editPart
* @return the popup editor helper
*/
@@ -174,20 +175,15 @@ public class MessagePopupEditor extends PopupEditorConfiguration {
// Creates and executes the update command
UpdateUMLMessageCommand updateCommand = new UpdateUMLMessageCommand(message);
- TransactionalEditingDomain dom = EditorUtils.getTransactionalEditingDomain();
- dom.getCommandStack().execute(new GMFtoEMFCommandWrapper(updateCommand));
+ TransactionalEditingDomain domain = getEditingDomain(modelObject);
+ domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(updateCommand));
}
};
- return super.createPopupEditorHelper(graphicalEditPart,
- injector,
- reconciler,
- textToEdit,
- fileExtension,
- new DefaultXtextSemanticValidator());
+ return super.createPopupEditorHelper(graphicalEditPart, injector, reconciler, textToEdit, fileExtension, new DefaultXtextSemanticValidator());
}
/**
@@ -206,8 +202,9 @@ public class MessagePopupEditor extends PopupEditorConfiguration {
* , org.eclipse.core.runtime.IAdaptable)
*/
/**
- * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- *
+ * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor,
+ * org.eclipse.core.runtime.IAdaptable)
+ *
* @param arg0
* @param arg1
* @return
@@ -225,14 +222,24 @@ public class MessagePopupEditor extends PopupEditorConfiguration {
/**
* Instantiates a new update uml message command.
- *
- * @param message the message
+ *
+ * @param message
+ * the message
*/
public UpdateUMLMessageCommand(Message message) {
- super(EditorUtils.getTransactionalEditingDomain(), "Message Update", getWorkspaceFiles(message));
+ super(MessagePopupEditor.getEditingDomain(message), "Message Update", getWorkspaceFiles(message));
this.message = message;
}
}
+ static TransactionalEditingDomain getEditingDomain(EObject context) {
+ try {
+ return ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(context);
+ } catch (ServiceException ex) {
+ ex.printStackTrace(System.err);
+ }
+ return null;
+ }
+
}
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF
index 4dc908bf4b5..9f2e9144588 100755
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.state.xtext;bundle-version="0.1
org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
org.eclipse.xtext.gmf.glue;bundle-version="0.9.0",
org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0"
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="0.10.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.10.0.qualifier
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/src/org/eclipse/papyrus/uml/textedit/state/xtext/ui/contributions/StatePopupEditorConfigurationContribution.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/src/org/eclipse/papyrus/uml/textedit/state/xtext/ui/contributions/StatePopupEditorConfigurationContribution.java
index 9b5b2eaed83..99d2cf62537 100755
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/src/org/eclipse/papyrus/uml/textedit/state/xtext/ui/contributions/StatePopupEditorConfigurationContribution.java
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/src/org/eclipse/papyrus/uml/textedit/state/xtext/ui/contributions/StatePopupEditorConfigurationContribution.java
@@ -23,7 +23,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
import org.eclipse.papyrus.uml.textedit.state.xtext.ui.contentassist.UmlStateProposalProvider;
import org.eclipse.papyrus.uml.textedit.state.xtext.ui.internal.UmlStateActivator;
import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind;
@@ -52,7 +53,7 @@ public class StatePopupEditorConfigurationContribution extends PopupEditorConfig
private State state = null;
- private StateMachine newSubmachine = null ;
+ private StateMachine newSubmachine = null;
private String newStateName;
@@ -93,7 +94,7 @@ public class StatePopupEditorConfigurationContribution extends PopupEditorConfig
}
state = (State)graphicalEditPart.resolveSemanticElement();
- UmlStateJavaValidator.init(state) ;
+ UmlStateJavaValidator.init(state);
// retrieves the XText injector
Injector injector = UmlStateActivator.getInstance().getInjector("org.eclipse.papyrus.uml.textedit.state.xtext.UmlState");
@@ -124,14 +125,14 @@ public class StatePopupEditorConfigurationContribution extends PopupEditorConfig
// Retrieves the information to be populated in modelObject
newStateName = "" + stateRuleObject.getName();
- newSubmachine = null ;
+ newSubmachine = null;
newEntryName = "";
newDoName = "";
newExitName = "";
- if (stateRuleObject.getSubmachine() != null) {
- newSubmachine = stateRuleObject.getSubmachine().getSubmachine() ;
+ if(stateRuleObject.getSubmachine() != null) {
+ newSubmachine = stateRuleObject.getSubmachine().getSubmachine();
}
if(stateRuleObject.getEntry() != null) {
@@ -158,16 +159,11 @@ public class StatePopupEditorConfigurationContribution extends PopupEditorConfig
// Creates and executes the update command
UpdateUMLStateCommand updateCommand = new UpdateUMLStateCommand(state);
- TransactionalEditingDomain dom = EditorUtils.getTransactionalEditingDomain();
- dom.getCommandStack().execute(new GMFtoEMFCommandWrapper(updateCommand));
+ TransactionalEditingDomain domain = getEditingDomain(modelObject);
+ domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(updateCommand));
}
};
- return super.createPopupEditorHelper(graphicalEditPart,
- injector,
- reconciler,
- textToEdit,
- fileExtension,
- new SemanticValidator());
+ return super.createPopupEditorHelper(graphicalEditPart, injector, reconciler, textToEdit, fileExtension, new SemanticValidator());
}
/*
@@ -184,8 +180,8 @@ public class StatePopupEditorConfigurationContribution extends PopupEditorConfig
// name
textToEdit = textToEdit + state.getName();
- if (state.isSubmachineState()) {
- textToEdit += " : " + UmlStateProposalProvider.getSubmachineLabel(state.getSubmachine()) ;
+ if(state.isSubmachineState()) {
+ textToEdit += " : " + UmlStateProposalProvider.getSubmachineLabel(state.getSubmachine());
}
// entryActivity
@@ -232,7 +228,7 @@ public class StatePopupEditorConfigurationContribution extends PopupEditorConfig
protected CommandResult doExecuteWithResult(IProgressMonitor arg0, IAdaptable arg1) throws ExecutionException {
state.setName(newStateName);
- state.setSubmachine(newSubmachine) ;
+ state.setSubmachine(newSubmachine);
state.setEntry(updateOrCreateBehavior(BehaviorRole_Local.ENTRY, newEntryKind, newEntryName));
state.setDoActivity(updateOrCreateBehavior(BehaviorRole_Local.DO, newDoKind, newDoName));
state.setExit(updateOrCreateBehavior(BehaviorRole_Local.EXIT, newExitKind, newExitName));
@@ -240,11 +236,20 @@ public class StatePopupEditorConfigurationContribution extends PopupEditorConfig
}
public UpdateUMLStateCommand(State state) {
- super(EditorUtils.getTransactionalEditingDomain(), "State Update", getWorkspaceFiles(state));
+ super(StatePopupEditorConfigurationContribution.getEditingDomain(state), "State Update", getWorkspaceFiles(state));
this.state = state;
}
}
+ static TransactionalEditingDomain getEditingDomain(EObject context) {
+ try {
+ return ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(context);
+ } catch (ServiceException ex) {
+ ex.printStackTrace(System.err);
+ }
+ return null;
+ }
+
private String behaviorKindAsString(Behavior b) {
if(b instanceof Activity) {
return "Activity";
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/OwnerObservableValue.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/OwnerObservableValue.java
index 05c7f10339e..7c8dea6a61b 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/OwnerObservableValue.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/OwnerObservableValue.java
@@ -57,8 +57,6 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @author Camille Letavernier
*/
-//TODO : To be refactored
-//This observable should rely on Papyrus UML Tools
public class OwnerObservableValue extends AbstractObservableValue implements IChangeListener, AggregatedObservable, CommandBasedObservableValue {
private Property memberEnd;
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/actions/GenericTransformer.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/actions/GenericTransformer.java
index f56765a31ef..a438b915af8 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/actions/GenericTransformer.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/actions/GenericTransformer.java
@@ -67,7 +67,6 @@ import org.eclipse.gmf.runtime.notation.Node;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.views.modelexplorer.Activator;
import org.eclipse.papyrus.views.modelexplorer.commands.EObjectInheritanceCopyCommand;
@@ -179,7 +178,7 @@ public class GenericTransformer {
// maybe extension point for stereotypes
EObject model = (EObject)AdapterFactoryEditingDomain.unwrap(element);
// get mixed editing domain to do transaction
- TransactionalEditingDomain domain = EditorUtils.getTransactionalEditingDomain();
+ TransactionalEditingDomain domain = (TransactionalEditingDomain)EMFHelper.resolveEditingDomain(model);
commandModel = new EObjectInheritanceCopyCommand(model, eclass, domain);
globalCommand.add(commandModel);
if(graphCopy) {
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java
index 13c7bd3b4ce..64553d287db 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.facet.infra.browser.uicore.internal.model.LinkItem;
import org.eclipse.emf.facet.infra.browser.uicore.internal.model.ModelElementItem;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
@@ -53,9 +54,10 @@ import org.eclipse.papyrus.commands.ICreationCommand;
import org.eclipse.papyrus.commands.ICreationCommandRegistry;
import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.core.editor.BackboneException;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
@@ -64,8 +66,6 @@ import org.eclipse.papyrus.views.modelexplorer.commands.MoveOpenableCommand;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DropTargetEvent;
import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.navigator.CommonDropAdapter;
/**
@@ -78,8 +78,10 @@ public class CommonDropAdapterAssistant extends org.eclipse.ui.navigator.CommonD
@Override
public IStatus handleDrop(CommonDropAdapter dropAdapter, DropTargetEvent dropTargetEvent, Object dropTarget) {
- Object targetElement = dropTarget;
- execute(getDrop(targetElement));
+ System.out.println("handleDrop");
+ EObject targetElement = EMFHelper.getEObject(dropTarget);
+
+ execute(getEditingDomain(targetElement), getDrop(dropTarget));
return null;
}
@@ -281,8 +283,8 @@ public class CommonDropAdapterAssistant extends org.eclipse.ui.navigator.CommonD
return commandList;
}
- protected void execute(Command dropCommand) {
- getEditingDomain().getCommandStack().execute(dropCommand);
+ protected void execute(EditingDomain domain, Command dropCommand) {
+ domain.getCommandStack().execute(dropCommand);
}
/**
@@ -293,6 +295,7 @@ public class CommonDropAdapterAssistant extends org.eclipse.ui.navigator.CommonD
* @return the list of command
*/
public CompoundCommand getDrop(Object target) {
+ System.out.println("getDrop target = " + target);
CommonDropAdapter dropAdapter = getCommonDropAdapter();
List<Command> commandList = new ArrayList<Command>();
switch(dropAdapter.getCurrentOperation()) {
@@ -318,6 +321,7 @@ public class CommonDropAdapterAssistant extends org.eclipse.ui.navigator.CommonD
}
break;
}
+ System.out.println("Target = " + target);
return new CompoundCommand(commandList);
}
@@ -343,6 +347,7 @@ public class CommonDropAdapterAssistant extends org.eclipse.ui.navigator.CommonD
@Override
public IStatus validateDrop(Object target, int operation, TransferData transferType) {
+ System.out.println("ValidateDrop");
Command dropCommand = getDrop(target);
if(dropCommand.canExecute()) {
return Status.OK_STATUS;
@@ -394,14 +399,16 @@ public class CommonDropAdapterAssistant extends org.eclipse.ui.navigator.CommonD
// result.addAll(getDropDiagramIntoCommand(getEditingDomain(), targetEObject,(Diagram) eObjectchild));
// }
- if(getEditors().contains(eObjectchild)) {
- result.addAll(getDropDiagramIntoCommand(getEditingDomain(), targetEObject, (Diagram)eObjectchild));
+ //FIXME: Editors are not necessarily diagrams
+ //Temporary fix: Check whether the eObjectChild is an instanceof Diagram
+ if(eObjectchild instanceof Diagram && getEditors(targetEObject).contains(eObjectchild)) {
+ result.addAll(getDropDiagramIntoCommand(getEditingDomain(targetEObject), targetEObject, (Diagram)eObjectchild));
}
//test if object is an eobject
else if(eObjectchild != null) {
- result.addAll(getDropIntoCommand(getEditingDomain(), targetEObject, eObjectchild, eref));
+ result.addAll(getDropIntoCommand(getEditingDomain(targetEObject), targetEObject, eObjectchild, eref));
}
}
@@ -415,8 +422,12 @@ public class CommonDropAdapterAssistant extends org.eclipse.ui.navigator.CommonD
* @return
* the list of the editors
*/
- private List<Object> getEditors() {
- return EditorUtils.getIPageMngr().allPages();
+ private List<Object> getEditors(EObject context) {
+ try {
+ return ServiceUtilsForEObject.getInstance().getIPageMngr(context).allPages();
+ } catch (ServiceException ex) {
+ return Collections.emptyList();
+ }
}
/**
@@ -455,7 +466,7 @@ public class CommonDropAdapterAssistant extends org.eclipse.ui.navigator.CommonD
//test if object is an eobject
if(eObjectchild != null && objectOwner != null) {
- result.addAll(getOrderChangeCommand(getEditingDomain(), objectOwner, objectLocation, eObjectchild, before));
+ result.addAll(getOrderChangeCommand(getEditingDomain(eObjectchild), objectOwner, objectLocation, eObjectchild, before));
}
}
}
@@ -468,19 +479,12 @@ public class CommonDropAdapterAssistant extends org.eclipse.ui.navigator.CommonD
*
* @return get the Transaction Editing Domain
*/
- protected TransactionalEditingDomain getEditingDomain() {
- return EditorUtils.getTransactionalEditingDomain();
- }
-
- /**
- *
- * @return multiDiagramEditor
- */
- protected IMultiDiagramEditor getMultiDiagramEditor() {
- IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- if(editorPart instanceof IMultiDiagramEditor) {
- return (IMultiDiagramEditor)editorPart;
+ protected TransactionalEditingDomain getEditingDomain(EObject context) {
+ try {
+ return ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(context);
+ } catch (ServiceException ex) {
+ Activator.log.error(ex);
+ return null;
}
- return null;
}
}
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElement.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElement.java
index 3aa0e1310f8..cf40594c4ef 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElement.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElement.java
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.infra.emf.databinding.EMFObservableValue;
import org.eclipse.papyrus.infra.emf.providers.EMFContentProvider;
import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
@@ -199,7 +199,7 @@ public class EMFModelElement extends AbstractModelElement {
@Override
public ILabelProvider getLabelProvider(String propertyPath) {
try {
- return ServiceUtilsForResource.getInstance().getServiceRegistry(source.eResource()).getService(LabelProviderService.class).getLabelProvider();
+ return ServiceUtilsForEObject.getInstance().getServiceRegistry(source).getService(LabelProviderService.class).getLabelProvider();
} catch (ServiceException ex) {
Activator.log.error(ex);
return new EMFLabelProvider();

Back to the top