Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeremie.tatibouet2016-05-02 10:23:57 +0000
committerGerrit Code Review @ Eclipse.org2016-05-04 13:46:24 +0000
commit47cb24662d263b1eb3bb7f3de22966d94f3d2f23 (patch)
treebd16aba9435e443bfa6572a14440cee881bde98f
parentddc1830866e80b49138a0adc0119d2a74fc1a927 (diff)
downloadorg.eclipse.papyrus-2.0.0M7.tar.gz
org.eclipse.papyrus-2.0.0M7.tar.xz
org.eclipse.papyrus-2.0.0M7.zip
Remove contribution of alf.common.ui to preference page2.0.0M7
Regenerate plugins (alf.common and alf.common.ui) content Change-Id: I7cbd4aaeefa7e46ea50cd49842c2f4159b96f341 Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr>
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF34
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/plugin.xml43
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/plugin.xml_gen466
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/AbstractCommonUiModule.java63
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/CommonExecutableExtensionFactory.java57
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/contentassist/AbstractCommonProposalProvider.java66
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/internal/CommonActivator.java190
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF48
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/AbstractCommonRuntimeModule.java136
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/Common.xtextbinbin2588 -> 2480 bytes
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/CommonStandaloneSetupGenerated.java70
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/serializer/CommonSemanticSequencer.java41
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/serializer/CommonSyntacticSequencer.java43
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/services/CommonGrammarAccess.java267
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/validation/AbstractCommonJavaValidator.java42
15 files changed, 745 insertions, 821 deletions
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF
index 875f5172d0e..54b3bdb84bc 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF
@@ -1,16 +1,18 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.alf.ui.contentassist
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.alf.ui.internal.CommonActivator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.common.ui;singleton:=true
-Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.alf.ui.contentassist
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.ui.editors,
+ org.eclipse.ui
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.alf.ui.internal.CommonActivator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.common.ui;singleton:=true
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/plugin.xml b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/plugin.xml
index 1ea6150e434..b7f6245f836 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/plugin.xml
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/plugin.xml
@@ -78,49 +78,6 @@
</definition>
</extension>
<extension
- point="org.eclipse.ui.preferencePages">
- <page
- category="org.eclipse.papyrus.embeddededitors"
- class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
- id="org.eclipse.papyrus.uml.alf.Common"
- name="Common">
- <keywordReference id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"/>
- </page>
- <page
- category="org.eclipse.papyrus.uml.alf.Common"
- class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
- id="org.eclipse.papyrus.uml.alf.Common.coloring"
- name="Syntax Coloring">
- <keywordReference id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"/>
- </page>
- <page
- category="org.eclipse.papyrus.uml.alf.Common"
- class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
- id="org.eclipse.papyrus.uml.alf.Common.templates"
- name="Templates">
- <keywordReference id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"/>
- </page>
- </extension>
- <extension
- point="org.eclipse.ui.propertyPages">
- <page
- class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
- id="org.eclipse.papyrus.uml.alf.Common"
- name="Common">
- <keywordReference id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"/>
- <enabledWhen>
- <adapt type="org.eclipse.core.resources.IProject"/>
- </enabledWhen>
- <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
- </page>
- </extension>
- <extension
- point="org.eclipse.ui.keywords">
- <keyword
- id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"
- label="Common"/>
- </extension>
- <extension
point="org.eclipse.ui.commands">
<command
description="Trigger expensive validation"
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/plugin.xml_gen b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/plugin.xml_gen
index b3fe7c1aa80..a7059c65c00 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/plugin.xml_gen
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/plugin.xml_gen
@@ -1,233 +1,233 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension
- point="org.eclipse.ui.editors">
- <editor
- class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
- contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
- default="true"
- extensions="common"
- id="org.eclipse.papyrus.uml.alf.Common"
- name="Common Editor">
- </editor>
- </extension>
- <extension
- point="org.eclipse.ui.handlers">
- <handler
- class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"
- commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
- <activeWhen>
- <reference
- definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened">
- </reference>
- </activeWhen>
- </handler>
- <handler
- class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
- commandId="org.eclipse.papyrus.uml.alf.Common.validate">
- <activeWhen>
- <reference
- definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened">
- </reference>
- </activeWhen>
- </handler>
- <!-- copy qualified name -->
- <handler
- class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
- commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
- <activeWhen>
- <reference definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened" />
- </activeWhen>
- </handler>
- <handler
- class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
- commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
- <activeWhen>
- <and>
- <reference definitionId="org.eclipse.papyrus.uml.alf.Common.XtextEditor.opened" />
- <iterate>
- <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
- </iterate>
- </and>
- </activeWhen>
- </handler>
- </extension>
- <extension point="org.eclipse.core.expressions.definitions">
- <definition id="org.eclipse.papyrus.uml.alf.Common.Editor.opened">
- <and>
- <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
- <with variable="activeEditor">
- <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
- value="org.eclipse.papyrus.uml.alf.Common"
- forcePluginActivation="true"/>
- </with>
- </and>
- </definition>
- <definition id="org.eclipse.papyrus.uml.alf.Common.XtextEditor.opened">
- <and>
- <reference definitionId="isXtextEditorActive"/>
- <with variable="activeEditor">
- <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
- value="org.eclipse.papyrus.uml.alf.Common"
- forcePluginActivation="true"/>
- </with>
- </and>
- </definition>
- </extension>
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
- id="org.eclipse.papyrus.uml.alf.Common"
- name="Common">
- <keywordReference id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"/>
- </page>
- <page
- category="org.eclipse.papyrus.uml.alf.Common"
- class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
- id="org.eclipse.papyrus.uml.alf.Common.coloring"
- name="Syntax Coloring">
- <keywordReference id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"/>
- </page>
- <page
- category="org.eclipse.papyrus.uml.alf.Common"
- class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
- id="org.eclipse.papyrus.uml.alf.Common.templates"
- name="Templates">
- <keywordReference id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"/>
- </page>
- </extension>
- <extension
- point="org.eclipse.ui.propertyPages">
- <page
- class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
- id="org.eclipse.papyrus.uml.alf.Common"
- name="Common">
- <keywordReference id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"/>
- <enabledWhen>
- <adapt type="org.eclipse.core.resources.IProject"/>
- </enabledWhen>
- <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
- </page>
- </extension>
- <extension
- point="org.eclipse.ui.keywords">
- <keyword
- id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"
- label="Common"/>
- </extension>
- <extension
- point="org.eclipse.ui.commands">
- <command
- description="Trigger expensive validation"
- id="org.eclipse.papyrus.uml.alf.Common.validate"
- name="Validate">
- </command>
- <!-- copy qualified name -->
- <command
- id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
- categoryId="org.eclipse.ui.category.edit"
- description="Copy the qualified name for the selected element"
- name="Copy Qualified Name">
- </command>
- <command
- id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
- categoryId="org.eclipse.ui.category.edit"
- description="Copy the qualified name for the selected element"
- name="Copy Qualified Name">
- </command>
- </extension>
- <extension point="org.eclipse.ui.menus">
- <menuContribution
- locationURI="popup:#TextEditorContext?after=group.edit">
- <command
- commandId="org.eclipse.papyrus.uml.alf.Common.validate"
- style="push"
- tooltip="Trigger expensive validation">
- <visibleWhen checkEnabled="false">
- <reference
- definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened">
- </reference>
- </visibleWhen>
- </command>
- </menuContribution>
- <!-- copy qualified name -->
- <menuContribution locationURI="popup:#TextEditorContext?after=copy">
- <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
- style="push" tooltip="Copy Qualified Name">
- <visibleWhen checkEnabled="false">
- <reference definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened" />
- </visibleWhen>
- </command>
- </menuContribution>
- <menuContribution locationURI="menu:edit?after=copy">
- <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
- style="push" tooltip="Copy Qualified Name">
- <visibleWhen checkEnabled="false">
- <reference definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened" />
- </visibleWhen>
- </command>
- </menuContribution>
- <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
- <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
- style="push" tooltip="Copy Qualified Name">
- <visibleWhen checkEnabled="false">
- <and>
- <reference definitionId="org.eclipse.papyrus.uml.alf.Common.XtextEditor.opened" />
- <iterate>
- <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
- </iterate>
- </and>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
- <extension point="org.eclipse.ui.menus">
- <menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
- <command commandId="org.eclipse.xtext.ui.editor.FindReferences">
- <visibleWhen checkEnabled="false">
- <reference definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened">
- </reference>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
- <extension point="org.eclipse.ui.handlers">
- <handler
- class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"
- commandId="org.eclipse.xtext.ui.editor.FindReferences">
- <activeWhen>
- <reference
- definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened">
- </reference>
- </activeWhen>
- </handler>
- </extension>
-
- <!-- marker definitions for org.eclipse.papyrus.uml.alf.Common -->
- <extension
- id="common.check.fast"
- name="Common Problem"
- point="org.eclipse.core.resources.markers">
- <super type="org.eclipse.xtext.ui.check.fast"/>
- <persistent value="true"/>
- </extension>
- <extension
- id="common.check.normal"
- name="Common Problem"
- point="org.eclipse.core.resources.markers">
- <super type="org.eclipse.xtext.ui.check.normal"/>
- <persistent value="true"/>
- </extension>
- <extension
- id="common.check.expensive"
- name="Common Problem"
- point="org.eclipse.core.resources.markers">
- <super type="org.eclipse.xtext.ui.check.expensive"/>
- <persistent value="true"/>
- </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<plugin>
+
+ <extension
+ point="org.eclipse.ui.editors">
+ <editor
+ class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
+ contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+ default="true"
+ extensions="common"
+ id="org.eclipse.papyrus.uml.alf.Common"
+ name="Common Editor">
+ </editor>
+ </extension>
+ <extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"
+ commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
+ <activeWhen>
+ <reference
+ definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened">
+ </reference>
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
+ commandId="org.eclipse.papyrus.uml.alf.Common.validate">
+ <activeWhen>
+ <reference
+ definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened">
+ </reference>
+ </activeWhen>
+ </handler>
+ <!-- copy qualified name -->
+ <handler
+ class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
+ <activeWhen>
+ <reference definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened" />
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
+ <activeWhen>
+ <and>
+ <reference definitionId="org.eclipse.papyrus.uml.alf.Common.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </activeWhen>
+ </handler>
+ </extension>
+ <extension point="org.eclipse.core.expressions.definitions">
+ <definition id="org.eclipse.papyrus.uml.alf.Common.Editor.opened">
+ <and>
+ <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
+ <with variable="activeEditor">
+ <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+ value="org.eclipse.papyrus.uml.alf.Common"
+ forcePluginActivation="true"/>
+ </with>
+ </and>
+ </definition>
+ <definition id="org.eclipse.papyrus.uml.alf.Common.XtextEditor.opened">
+ <and>
+ <reference definitionId="isXtextEditorActive"/>
+ <with variable="activeEditor">
+ <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+ value="org.eclipse.papyrus.uml.alf.Common"
+ forcePluginActivation="true"/>
+ </with>
+ </and>
+ </definition>
+ </extension>
+ <extension
+ point="org.eclipse.ui.preferencePages">
+ <page
+ class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+ id="org.eclipse.papyrus.uml.alf.Common"
+ name="Common">
+ <keywordReference id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"/>
+ </page>
+ <page
+ category="org.eclipse.papyrus.uml.alf.Common"
+ class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
+ id="org.eclipse.papyrus.uml.alf.Common.coloring"
+ name="Syntax Coloring">
+ <keywordReference id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"/>
+ </page>
+ <page
+ category="org.eclipse.papyrus.uml.alf.Common"
+ class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
+ id="org.eclipse.papyrus.uml.alf.Common.templates"
+ name="Templates">
+ <keywordReference id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"/>
+ </page>
+ </extension>
+ <extension
+ point="org.eclipse.ui.propertyPages">
+ <page
+ class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+ id="org.eclipse.papyrus.uml.alf.Common"
+ name="Common">
+ <keywordReference id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"/>
+ <enabledWhen>
+ <adapt type="org.eclipse.core.resources.IProject"/>
+ </enabledWhen>
+ <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+ </page>
+ </extension>
+ <extension
+ point="org.eclipse.ui.keywords">
+ <keyword
+ id="org.eclipse.papyrus.uml.alf.ui.keyword_Common"
+ label="Common"/>
+ </extension>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ description="Trigger expensive validation"
+ id="org.eclipse.papyrus.uml.alf.Common.validate"
+ name="Validate">
+ </command>
+ <!-- copy qualified name -->
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
+ </extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="popup:#TextEditorContext?after=group.edit">
+ <command
+ commandId="org.eclipse.papyrus.uml.alf.Common.validate"
+ style="push"
+ tooltip="Trigger expensive validation">
+ <visibleWhen checkEnabled="false">
+ <reference
+ definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened">
+ </reference>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <!-- copy qualified name -->
+ <menuContribution locationURI="popup:#TextEditorContext?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="menu:edit?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <and>
+ <reference definitionId="org.eclipse.papyrus.uml.alf.Common.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
+ <command commandId="org.eclipse.xtext.ui.editor.FindReferences">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened">
+ </reference>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+ <extension point="org.eclipse.ui.handlers">
+ <handler
+ class="org.eclipse.papyrus.uml.alf.ui.CommonExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"
+ commandId="org.eclipse.xtext.ui.editor.FindReferences">
+ <activeWhen>
+ <reference
+ definitionId="org.eclipse.papyrus.uml.alf.Common.Editor.opened">
+ </reference>
+ </activeWhen>
+ </handler>
+ </extension>
+
+ <!-- marker definitions for org.eclipse.papyrus.uml.alf.Common -->
+ <extension
+ id="common.check.fast"
+ name="Common Problem"
+ point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.xtext.ui.check.fast"/>
+ <persistent value="true"/>
+ </extension>
+ <extension
+ id="common.check.normal"
+ name="Common Problem"
+ point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.xtext.ui.check.normal"/>
+ <persistent value="true"/>
+ </extension>
+ <extension
+ id="common.check.expensive"
+ name="Common Problem"
+ point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.xtext.ui.check.expensive"/>
+ <persistent value="true"/>
+ </extension>
+
+</plugin>
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/AbstractCommonUiModule.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/AbstractCommonUiModule.java
index 819240fc538..9b612b8faf8 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/AbstractCommonUiModule.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/AbstractCommonUiModule.java
@@ -1,32 +1,31 @@
-
-/*
- * generated by Xtext
- */
-package org.eclipse.papyrus.uml.alf.ui;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.xtext.ui.DefaultUiModule;
-
-/**
- * Manual modifications go to {org.eclipse.papyrus.uml.alf.ui.CommonUiModule}
- */
-@SuppressWarnings("all")
-public abstract class AbstractCommonUiModule extends DefaultUiModule {
-
- public AbstractCommonUiModule(AbstractUIPlugin plugin) {
- super(plugin);
- }
-
-
- // contributed by org.eclipse.xtext.ui.generator.ImplicitUiFragment
- public com.google.inject.Provider<org.eclipse.xtext.resource.containers.IAllContainersState> provideIAllContainersState() {
- return org.eclipse.xtext.ui.shared.Access.getJavaProjectsState();
- }
-
- // contributed by org.eclipse.xtext.ui.generator.contentAssist.JavaBasedContentAssistFragment
- public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider> bindIContentProposalProvider() {
- return org.eclipse.papyrus.uml.alf.ui.contentassist.CommonProposalProvider.class;
- }
-
-
-}
+
+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.uml.alf.ui;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+/**
+ * Manual modifications go to {org.eclipse.papyrus.uml.alf.ui.CommonUiModule}
+ */
+@SuppressWarnings("all")
+public abstract class AbstractCommonUiModule extends org.eclipse.xtext.ui.DefaultUiModule {
+
+ public AbstractCommonUiModule(AbstractUIPlugin plugin) {
+ super(plugin);
+ }
+
+
+ // contributed by org.eclipse.xtext.ui.generator.ImplicitUiFragment
+ public com.google.inject.Provider<org.eclipse.xtext.resource.containers.IAllContainersState> provideIAllContainersState() {
+ return org.eclipse.xtext.ui.shared.Access.getJavaProjectsState();
+ }
+
+ // contributed by org.eclipse.xtext.ui.generator.contentAssist.JavaBasedContentAssistFragment
+ public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider> bindIContentProposalProvider() {
+ return org.eclipse.papyrus.uml.alf.ui.contentassist.CommonProposalProvider.class;
+ }
+
+
+}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/CommonExecutableExtensionFactory.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/CommonExecutableExtensionFactory.java
index 3318b045bf2..b12467028de 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/CommonExecutableExtensionFactory.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/CommonExecutableExtensionFactory.java
@@ -1,28 +1,29 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.papyrus.uml.alf.ui;
-
-import org.eclipse.papyrus.uml.alf.ui.internal.CommonActivator;
-import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
-import org.osgi.framework.Bundle;
-
-import com.google.inject.Injector;
-
-/**
- * This class was generated. Customizations should only happen in a newly
- * introduced subclass.
- */
-public class CommonExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
-
- @Override
- protected Bundle getBundle() {
- return CommonActivator.getInstance().getBundle();
- }
-
- @Override
- protected Injector getInjector() {
- return CommonActivator.getInstance().getInjector(CommonActivator.ORG_ECLIPSE_PAPYRUS_UML_ALF_COMMON);
- }
-
-}
+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.uml.alf.ui;
+
+import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
+import org.osgi.framework.Bundle;
+
+import com.google.inject.Injector;
+
+import org.eclipse.papyrus.uml.alf.ui.internal.CommonActivator;
+
+/**
+ * This class was generated. Customizations should only happen in a newly
+ * introduced subclass.
+ */
+public class CommonExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
+
+ @Override
+ protected Bundle getBundle() {
+ return CommonActivator.getInstance().getBundle();
+ }
+
+ @Override
+ protected Injector getInjector() {
+ return CommonActivator.getInstance().getInjector(CommonActivator.ORG_ECLIPSE_PAPYRUS_UML_ALF_COMMON);
+ }
+
+}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/contentassist/AbstractCommonProposalProvider.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/contentassist/AbstractCommonProposalProvider.java
index ed02314ec1d..a14a87e3fe6 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/contentassist/AbstractCommonProposalProvider.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/contentassist/AbstractCommonProposalProvider.java
@@ -1,43 +1,23 @@
-/*
-* generated by Xtext
-*/
-package org.eclipse.papyrus.uml.alf.ui.contentassist;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
-import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
-
-/**
- * Represents a generated, default implementation of superclass {@link org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider}.
- * Methods are dynamically dispatched on the first parameter, i.e., you can override them
- * with a more concrete subtype.
- */
-@SuppressWarnings("all")
-public class AbstractCommonProposalProvider extends org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider {
-
-
- @Override
- public void complete_ID(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- // subclasses may override
- }
- @Override
- public void complete_STRING(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- // subclasses may override
- }
- @Override
- public void complete_ML_COMMENT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- // subclasses may override
- }
- @Override
- public void complete_SL_COMMENT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- // subclasses may override
- }
- @Override
- public void complete_INT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- // subclasses may override
- }
- public void complete_INTEGER_VALUE(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- // subclasses may override
- }
-}
+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.uml.alf.ui.contentassist;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.*;
+import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
+import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
+
+/**
+ * Represents a generated, default implementation of superclass {@link org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider}.
+ * Methods are dynamically dispatched on the first parameter, i.e., you can override them
+ * with a more concrete subtype.
+ */
+@SuppressWarnings("all")
+public class AbstractCommonProposalProvider extends org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider {
+
+
+ public void complete_INTEGER_VALUE(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+ // subclasses may override
+ }
+}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/internal/CommonActivator.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/internal/CommonActivator.java
index 939e64caf4f..de866b82b81 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/internal/CommonActivator.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/src-gen/org/eclipse/papyrus/uml/alf/ui/internal/CommonActivator.java
@@ -1,95 +1,95 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.papyrus.uml.alf.ui.internal;
-
-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.collect.Maps;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-
-/**
- * This class was generated. Customizations should only happen in a newly
- * introduced subclass.
- */
-public class CommonActivator extends AbstractUIPlugin {
-
- public static final String ORG_ECLIPSE_PAPYRUS_UML_ALF_COMMON = "org.eclipse.papyrus.uml.alf.Common";
-
- private static final Logger logger = Logger.getLogger(CommonActivator.class);
-
- private static CommonActivator INSTANCE;
-
- private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- INSTANCE = this;
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- injectors.clear();
- INSTANCE = null;
- super.stop(context);
- }
-
- public static CommonActivator getInstance() {
- 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_UML_ALF_COMMON.equals(grammar)) {
- return new org.eclipse.papyrus.uml.alf.CommonRuntimeModule();
- }
-
- throw new IllegalArgumentException(grammar);
- }
-
- protected Module getUiModule(String grammar) {
- if (ORG_ECLIPSE_PAPYRUS_UML_ALF_COMMON.equals(grammar)) {
- return new org.eclipse.papyrus.uml.alf.ui.CommonUiModule(this);
- }
-
- throw new IllegalArgumentException(grammar);
- }
-
- protected Module getSharedStateModule() {
- return new SharedStateModule();
- }
-
-}
+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.uml.alf.ui.internal;
+
+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.collect.Maps;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+
+/**
+ * This class was generated. Customizations should only happen in a newly
+ * introduced subclass.
+ */
+public class CommonActivator extends AbstractUIPlugin {
+
+ public static final String ORG_ECLIPSE_PAPYRUS_UML_ALF_COMMON = "org.eclipse.papyrus.uml.alf.Common";
+
+ private static final Logger logger = Logger.getLogger(CommonActivator.class);
+
+ private static CommonActivator INSTANCE;
+
+ private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ INSTANCE = this;
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ injectors.clear();
+ INSTANCE = null;
+ super.stop(context);
+ }
+
+ public static CommonActivator getInstance() {
+ 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_UML_ALF_COMMON.equals(grammar)) {
+ return new org.eclipse.papyrus.uml.alf.CommonRuntimeModule();
+ }
+
+ throw new IllegalArgumentException(grammar);
+ }
+
+ protected Module getUiModule(String grammar) {
+ if (ORG_ECLIPSE_PAPYRUS_UML_ALF_COMMON.equals(grammar)) {
+ return new org.eclipse.papyrus.uml.alf.ui.CommonUiModule(this);
+ }
+
+ throw new IllegalArgumentException(grammar);
+ }
+
+ protected Module getSharedStateModule() {
+ return new SharedStateModule();
+ }
+
+}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF
index eb0e4c2e8b1..57ae572bce7 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF
@@ -1,23 +1,25 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.alf,
- org.eclipse.papyrus.uml.alf.naming,
- org.eclipse.papyrus.uml.alf.serializer,
- org.eclipse.papyrus.uml.alf.services,
- org.eclipse.papyrus.uml.alf.validation
-Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
- org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
- org.eclipse.emf.codegen.ecore;bundle-version="[2.12.0,3.0.0)";resolution:=optional,
- org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
- org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.common;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.alf,
+ org.eclipse.papyrus.uml.alf.naming,
+ org.eclipse.papyrus.uml.alf.serializer,
+ org.eclipse.papyrus.uml.alf.services,
+ org.eclipse.papyrus.uml.alf.validation
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.12.0,3.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.core.runtime;bundle-version="3.12.0",
+ org.eclipse.xtext.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.common;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/AbstractCommonRuntimeModule.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/AbstractCommonRuntimeModule.java
index e1ed88d098c..9fa8ae58cbe 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/AbstractCommonRuntimeModule.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/AbstractCommonRuntimeModule.java
@@ -1,70 +1,66 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.papyrus.uml.alf;
-
-import java.util.Properties;
-
-import org.eclipse.xtext.Constants;
-import org.eclipse.xtext.service.DefaultRuntimeModule;
-
-import com.google.inject.Binder;
-import com.google.inject.name.Names;
-
-/**
- * Manual modifications go to {org.eclipse.papyrus.uml.alf.CommonRuntimeModule}
- */
- @SuppressWarnings("all")
-public abstract class AbstractCommonRuntimeModule extends DefaultRuntimeModule {
-
- protected Properties properties = null;
-
- @Override
- public void configure(Binder binder) {
- properties = tryBindProperties(binder, "org/eclipse/papyrus/uml/alf/Common.properties");
- super.configure(binder);
- }
-
- public void configureLanguageName(Binder binder) {
- binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("org.eclipse.papyrus.uml.alf.Common");
- }
-
- public void configureFileExtensions(Binder binder) {
- if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null) {
- binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("common");
- }
- }
-
- // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
- public java.lang.ClassLoader bindClassLoaderToInstance() {
- return getClass().getClassLoader();
- }
-
- // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
- public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
- return org.eclipse.papyrus.uml.alf.services.CommonGrammarAccess.class;
- }
-
- // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
- @Override
- public Class<? extends org.eclipse.xtext.serializer.sequencer.ISemanticSequencer> bindISemanticSequencer() {
- return org.eclipse.papyrus.uml.alf.serializer.CommonSemanticSequencer.class;
- }
-
- // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
- public Class<? extends org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer> bindISyntacticSequencer() {
- return org.eclipse.papyrus.uml.alf.serializer.CommonSyntacticSequencer.class;
- }
-
- // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
- @Override
- public Class<? extends org.eclipse.xtext.serializer.ISerializer> bindISerializer() {
- return org.eclipse.xtext.serializer.impl.Serializer.class;
- }
-
- // contributed by org.eclipse.xtext.generator.validation.JavaValidatorFragment
- @org.eclipse.xtext.service.SingletonBinding(eager=true) public Class<? extends org.eclipse.papyrus.uml.alf.validation.CommonJavaValidator> bindCommonJavaValidator() {
- return org.eclipse.papyrus.uml.alf.validation.CommonJavaValidator.class;
- }
-
-}
+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.uml.alf;
+
+import java.util.Properties;
+
+import org.eclipse.xtext.Constants;
+
+import com.google.inject.Binder;
+import com.google.inject.name.Names;
+
+/**
+ * Manual modifications go to {org.eclipse.papyrus.uml.alf.CommonRuntimeModule}
+ */
+@SuppressWarnings("all")
+public abstract class AbstractCommonRuntimeModule extends org.eclipse.xtext.service.DefaultRuntimeModule {
+
+ protected Properties properties = null;
+
+ @Override
+ public void configure(Binder binder) {
+ properties = tryBindProperties(binder, "org/eclipse/papyrus/uml/alf/Common.properties");
+ super.configure(binder);
+ }
+
+ public void configureLanguageName(Binder binder) {
+ binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("org.eclipse.papyrus.uml.alf.Common");
+ }
+
+ public void configureFileExtensions(Binder binder) {
+ if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null)
+ binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("common");
+ }
+
+ // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
+ public java.lang.ClassLoader bindClassLoaderToInstance() {
+ return getClass().getClassLoader();
+ }
+
+ // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
+ public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
+ return org.eclipse.papyrus.uml.alf.services.CommonGrammarAccess.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
+ public Class<? extends org.eclipse.xtext.serializer.sequencer.ISemanticSequencer> bindISemanticSequencer() {
+ return org.eclipse.papyrus.uml.alf.serializer.CommonSemanticSequencer.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
+ public Class<? extends org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer> bindISyntacticSequencer() {
+ return org.eclipse.papyrus.uml.alf.serializer.CommonSyntacticSequencer.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
+ public Class<? extends org.eclipse.xtext.serializer.ISerializer> bindISerializer() {
+ return org.eclipse.xtext.serializer.impl.Serializer.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.validation.JavaValidatorFragment
+ @org.eclipse.xtext.service.SingletonBinding(eager=true) public Class<? extends org.eclipse.papyrus.uml.alf.validation.CommonJavaValidator> bindCommonJavaValidator() {
+ return org.eclipse.papyrus.uml.alf.validation.CommonJavaValidator.class;
+ }
+
+}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/Common.xtextbin b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/Common.xtextbin
index 1a1293c93f5..5dddf022a58 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/Common.xtextbin
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/Common.xtextbin
Binary files differ
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/CommonStandaloneSetupGenerated.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/CommonStandaloneSetupGenerated.java
index 874464ad463..76586a49e78 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/CommonStandaloneSetupGenerated.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/CommonStandaloneSetupGenerated.java
@@ -1,34 +1,36 @@
-/*
-* generated by Xtext
-*/
-package org.eclipse.papyrus.uml.alf;
-
-import org.eclipse.xtext.ISetup;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Generated from StandaloneSetup.xpt!
- */
-@SuppressWarnings("all")
-public class CommonStandaloneSetupGenerated implements ISetup {
-
- @Override
- public Injector createInjectorAndDoEMFRegistration() {
- org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
-
- Injector injector = createInjector();
- register(injector);
- return injector;
- }
-
- public Injector createInjector() {
- return Guice.createInjector(new org.eclipse.papyrus.uml.alf.CommonRuntimeModule());
- }
-
- public void register(Injector injector) {
-
-
- }
-}
+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.uml.alf;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ISetup;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * Generated from StandaloneSetup.xpt!
+ */
+@SuppressWarnings("all")
+public class CommonStandaloneSetupGenerated implements ISetup {
+
+ @Override
+ public Injector createInjectorAndDoEMFRegistration() {
+ org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
+
+ Injector injector = createInjector();
+ register(injector);
+ return injector;
+ }
+
+ public Injector createInjector() {
+ return Guice.createInjector(new org.eclipse.papyrus.uml.alf.CommonRuntimeModule());
+ }
+
+ public void register(Injector injector) {
+
+
+ }
+}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/serializer/CommonSemanticSequencer.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/serializer/CommonSemanticSequencer.java
index aed1b47448e..cc215012da6 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/serializer/CommonSemanticSequencer.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/serializer/CommonSemanticSequencer.java
@@ -1,22 +1,33 @@
-package org.eclipse.papyrus.uml.alf.serializer;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.uml.alf.services.CommonGrammarAccess;
-import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer;
-
-import com.google.inject.Inject;
-
+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.uml.alf.serializer;
+
+import com.google.inject.Inject;
+import java.util.Set;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.papyrus.uml.alf.services.CommonGrammarAccess;
+import org.eclipse.xtext.Action;
+import org.eclipse.xtext.Parameter;
+import org.eclipse.xtext.ParserRule;
+import org.eclipse.xtext.serializer.ISerializationContext;
+import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer;
+
@SuppressWarnings("all")
public class CommonSemanticSequencer extends AbstractDelegatingSemanticSequencer {
@Inject
private CommonGrammarAccess grammarAccess;
-
- @Override
- public void createSequence(EObject context, EObject semanticObject) {
- if (errorAcceptor != null) {
- errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
- }
+
+ @Override
+ public void sequence(ISerializationContext context, EObject semanticObject) {
+ EPackage epackage = semanticObject.eClass().getEPackage();
+ ParserRule rule = context.getParserRule();
+ Action action = context.getAssignedAction();
+ Set<Parameter> parameters = context.getEnabledBooleanParameters();
+ if (errorAcceptor != null)
+ errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
}
-
+
}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/serializer/CommonSyntacticSequencer.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/serializer/CommonSyntacticSequencer.java
index 1033aa1259a..4087ecfe420 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/serializer/CommonSyntacticSequencer.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/serializer/CommonSyntacticSequencer.java
@@ -1,39 +1,38 @@
-package org.eclipse.papyrus.uml.alf.serializer;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.uml.alf.services.CommonGrammarAccess;
-import org.eclipse.xtext.IGrammarAccess;
-import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.nodemodel.INode;
-import org.eclipse.xtext.serializer.analysis.GrammarAlias.AbstractElementAlias;
-import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition;
-import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;
-
-import com.google.inject.Inject;
-
+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.uml.alf.serializer;
+
+import com.google.inject.Inject;
+import java.util.List;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.uml.alf.services.CommonGrammarAccess;
+import org.eclipse.xtext.IGrammarAccess;
+import org.eclipse.xtext.RuleCall;
+import org.eclipse.xtext.nodemodel.INode;
+import org.eclipse.xtext.serializer.analysis.GrammarAlias.AbstractElementAlias;
+import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition;
+import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;
+
@SuppressWarnings("all")
public class CommonSyntacticSequencer extends AbstractSyntacticSequencer {
protected CommonGrammarAccess grammarAccess;
-
+
@Inject
protected void init(IGrammarAccess access) {
grammarAccess = (CommonGrammarAccess) access;
}
-
+
@Override
protected String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {
return "";
}
-
-
+
+
@Override
protected void emitUnassignedTokens(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {
- if (transition.getAmbiguousSyntaxes().isEmpty()) {
- return;
- }
+ if (transition.getAmbiguousSyntaxes().isEmpty()) return;
List<INode> transitionNodes = collectNodes(fromNode, toNode);
for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/services/CommonGrammarAccess.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/services/CommonGrammarAccess.java
index 9873be82956..0b5f6705344 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/services/CommonGrammarAccess.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/services/CommonGrammarAccess.java
@@ -1,146 +1,121 @@
-/*
-* generated by Xtext
-*/
-package org.eclipse.papyrus.uml.alf.services;
-
-import java.util.List;
-
-import org.eclipse.xtext.Grammar;
-import org.eclipse.xtext.GrammarUtil;
-import org.eclipse.xtext.TerminalRule;
-import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
-import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder;
-import org.eclipse.xtext.service.GrammarProvider;
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
-@Singleton
-public class CommonGrammarAccess extends AbstractGrammarElementFinder {
-
-
-
- private TerminalRule tID;
- private TerminalRule tSTRING;
- private TerminalRule tML_COMMENT;
- private TerminalRule tSL_COMMENT;
- private TerminalRule tINT;
- private TerminalRule tINTEGER_VALUE;
-
- private final Grammar grammar;
-
- private TerminalsGrammarAccess gaTerminals;
-
- @Inject
- public CommonGrammarAccess(GrammarProvider grammarProvider,
- TerminalsGrammarAccess gaTerminals) {
- this.grammar = internalFindGrammar(grammarProvider);
- this.gaTerminals = gaTerminals;
- }
-
- protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
- Grammar grammar = grammarProvider.getGrammar(this);
- while (grammar != null) {
- if ("org.eclipse.papyrus.uml.alf.Common".equals(grammar.getName())) {
- return grammar;
- }
- List<Grammar> grammars = grammar.getUsedGrammars();
- if (!grammars.isEmpty()) {
- grammar = grammars.iterator().next();
- } else {
- return null;
- }
- }
- return grammar;
- }
-
-
- @Override
- public Grammar getGrammar() {
- return grammar;
- }
-
-
- public TerminalsGrammarAccess getTerminalsGrammarAccess() {
- return gaTerminals;
- }
-
-
- //terminal ID:
- //
- // ("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" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"";
- public TerminalRule getSTRINGRule() {
- return (tSTRING != null) ? tSTRING : (tSTRING = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "STRING"));
- }
-
- //terminal ML_COMMENT:
- //
- // "/ *" !"@"->"* /";
- public TerminalRule getML_COMMENTRule() {
- return (tML_COMMENT != null) ? tML_COMMENT : (tML_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ML_COMMENT"));
- }
-
- //terminal SL_COMMENT:
- //
- // "//" !("\n" | "\r" | "@")* ("\r"? "\n")?;
- public TerminalRule getSL_COMMENTRule() {
- return (tSL_COMMENT != null) ? tSL_COMMENT : (tSL_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "SL_COMMENT"));
- }
-
- //terminal INT returns ecore::EInt:
- //
- // "0".."9"+;
- public TerminalRule getINTRule() {
- return (tINT != null) ? tINT : (tINT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "INT"));
- }
-
- ////terminal DOUBLE_COLON : '::' ;
- //
- ////terminal IDENTIFIER : ID ;
- //
- ////terminal IDENTIFIER : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')* | ('\'' -> '\'') ;
- //
- ////terminal DOCUMENTATION_COMMENT : '/ *' -> '* /' ;
- //
- ////terminal ML_COMMENT : '/' -> '/';
- //
- ////terminal SL_COMMENT : '' !('\n'|'\r')* ('\r'? '\n')?;
- //
- ////terminal WS : (' '|'\t'|'\r'|'\n')+; terminal INTEGER_VALUE:
- //
- // ("0" | "1".."9" ("_"? "0".."9")*) //DECIMAL
- //
- // // BINARY
- //
- // // HEX
- //
- // // OCT
- //
- // | ("0b" | "0B") "0".."1" ("_"? "0".."1")* | ("0x" | "0X") ("0".."9" | "a".."f" | "A".."F") ("_"? ("0".."9" | "a".."f" |
- //
- // "A".."F"))* | "0" "_"? "0".."7" ("_"? "0".."7")*;
- public TerminalRule getINTEGER_VALUERule() {
- return (tINTEGER_VALUE != null) ? tINTEGER_VALUE : (tINTEGER_VALUE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "INTEGER_VALUE"));
- }
-
- //terminal WS:
- //
- // (" " | "\t" | "\r" | "\n")+;
- public TerminalRule getWSRule() {
- return gaTerminals.getWSRule();
- }
-
- //terminal ANY_OTHER:
- //
- // .;
- public TerminalRule getANY_OTHERRule() {
- return gaTerminals.getANY_OTHERRule();
- }
-}
+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.uml.alf.services;
+
+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.*;
+
+import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
+
+@Singleton
+public class CommonGrammarAccess extends AbstractGrammarElementFinder {
+
+
+
+ private final TerminalRule tID;
+ private final TerminalRule tSTRING;
+ private final TerminalRule tML_COMMENT;
+ private final TerminalRule tSL_COMMENT;
+ private final TerminalRule tINT;
+ private final TerminalRule tINTEGER_VALUE;
+
+ private final Grammar grammar;
+
+ private final TerminalsGrammarAccess gaTerminals;
+
+ @Inject
+ public CommonGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess gaTerminals) {
+ this.grammar = internalFindGrammar(grammarProvider);
+ this.gaTerminals = gaTerminals;
+ this.tID = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.alf.Common.ID");
+ this.tSTRING = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.alf.Common.STRING");
+ this.tML_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.alf.Common.ML_COMMENT");
+ this.tSL_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.alf.Common.SL_COMMENT");
+ this.tINT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.alf.Common.INT");
+ this.tINTEGER_VALUE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.alf.Common.INTEGER_VALUE");
+ }
+
+ protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
+ Grammar grammar = grammarProvider.getGrammar(this);
+ while (grammar != null) {
+ if ("org.eclipse.papyrus.uml.alf.Common".equals(grammar.getName())) {
+ return grammar;
+ }
+ List<Grammar> grammars = grammar.getUsedGrammars();
+ if (!grammars.isEmpty()) {
+ grammar = grammars.iterator().next();
+ } else {
+ return null;
+ }
+ }
+ return grammar;
+ }
+
+ @Override
+ public Grammar getGrammar() {
+ return grammar;
+ }
+
+
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return gaTerminals;
+ }
+
+
+ //terminal ID:
+ // ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')* | '\''->'\'';
+ public TerminalRule getIDRule() {
+ return tID;
+ }
+
+ //terminal STRING:
+ // '"' ('\\' ('b' | 't' | 'n' | 'f' | 'r' | '"' | "'" | '\\') | !('\\' | '"'))* '"';
+ public TerminalRule getSTRINGRule() {
+ return tSTRING;
+ }
+
+ //terminal ML_COMMENT:
+ // '/ *' !'@'->'* /';
+ public TerminalRule getML_COMMENTRule() {
+ return tML_COMMENT;
+ }
+
+ //terminal SL_COMMENT:
+ // '//' !('\n' | '\r' | '@')* ('\r'? '\n')?;
+ public TerminalRule getSL_COMMENTRule() {
+ return tSL_COMMENT;
+ }
+
+ //terminal INT returns ecore::EInt:
+ // '0'..'9'+;
+ public TerminalRule getINTRule() {
+ return tINT;
+ }
+
+ //terminal INTEGER_VALUE:
+ // ('0' | '1'..'9' ('_'? '0'..'9')*) | ('0b' | '0B') '0'..'1' ('_'? '0'..'1')* | ('0x' | '0X') ('0'..'9' | 'a'..'f' |
+ // 'A'..'F') ('_'? ('0'..'9' | 'a'..'f' | 'A'..'F'))* | '0' '_'? '0'..'7' ('_'? '0'..'7')*;
+ public TerminalRule getINTEGER_VALUERule() {
+ return tINTEGER_VALUE;
+ }
+
+ //terminal WS:
+ // ' ' | '\t' | '\r' | '\n'+;
+ public TerminalRule getWSRule() {
+ return gaTerminals.getWSRule();
+ }
+
+ //terminal ANY_OTHER:
+ // .;
+ public TerminalRule getANY_OTHERRule() {
+ return gaTerminals.getANY_OTHERRule();
+ }
+}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/validation/AbstractCommonJavaValidator.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/validation/AbstractCommonJavaValidator.java
index 88b84df6eb8..ef2b42ac19d 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/validation/AbstractCommonJavaValidator.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/src-gen/org/eclipse/papyrus/uml/alf/validation/AbstractCommonJavaValidator.java
@@ -1,21 +1,21 @@
-/*
-* generated by Xtext
-*/
-package org.eclipse.papyrus.uml.alf.validation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.validation.ComposedChecks;
-
-@ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class})
-public class AbstractCommonJavaValidator extends org.eclipse.xtext.validation.AbstractDeclarativeValidator {
-
- @Override
- protected List<EPackage> getEPackages() {
- List<EPackage> result = new ArrayList<EPackage>();
- return result;
- }
-
-}
+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.uml.alf.validation;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.validation.ComposedChecks;
+
+@ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class})
+public class AbstractCommonJavaValidator extends org.eclipse.xtext.validation.AbstractDeclarativeValidator {
+
+ @Override
+ protected List<EPackage> getEPackages() {
+ List<EPackage> result = new ArrayList<EPackage>();
+ return result;
+ }
+
+}

Back to the top