Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2016-03-16 10:21:42 -0400
committerTom Schindl2016-03-16 10:21:42 -0400
commitc012411794c3f0ae66df270d4f9b7affb895a3ad (patch)
tree56386c8134312736edfb6ac5769f0f89fc2acffc
parent63f338ab515119116616568c317c80a15dd72b48 (diff)
parentaa71c74f50697dada863b88cdbb5debd9f3334b1 (diff)
downloadorg.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.tar.gz
org.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.tar.xz
org.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.zip
Merge branch 'master' of ssh://tschindl@git.eclipse.org:29418/efxclipse/org.eclipse.efxclipse
Conflicts: bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextArea.java
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.e4/META-INF/MANIFEST.MF3
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.e4/OSGI-INF/services/org.eclipse.fx.code.editor.e4.internal.NavigationProviderTypeProviderCF2.xml9
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.e4/src/org/eclipse/fx/code/editor/e4/internal/NavigationProviderTypeProviderCF2.java29
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.fx.themes/css/dark-highlight.css5
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.fx.themes/css/highlight.css9
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.fx/META-INF/MANIFEST.MF5
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/SimpleSourceTextEditorBuilder.java8
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/TextEditor.java18
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/services/internal/DefaultSourceViewerConfiguration.java104
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.sdk/.project17
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.sdk/build.properties1
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.sdk/feature.xml17
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.tests/.classpath9
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.tests/.gitignore1
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.tests/.project34
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.tests/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.tests/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.tests/META-INF/MANIFEST.MF24
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.tests/build.properties5
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.tests/org.eclipse.fx.code.editor.ldef.tests.launch13
-rw-r--r--bundles/code/org.eclipse.fx.code.editor/META-INF/MANIFEST.MF1
-rw-r--r--bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/Constants.java2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/SourceSelection.java14
-rw-r--r--bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/services/NavigationProvider.java12
-rw-r--r--bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/services/NavigationProviderTypeProvider.java5
-rw-r--r--bundles/code/org.eclipse.fx.text.ui/META-INF/MANIFEST.MF1
-rw-r--r--bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/source/SourceViewer.java15
-rw-r--r--bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/source/SourceViewerConfiguration.java9
-rw-r--r--bundles/code/org.eclipse.fx.text/META-INF/MANIFEST.MF1
-rw-r--r--bundles/code/org.eclipse.fx.text/src/org/eclipse/fx/text/navigation/NavigationRegion.java10
-rw-r--r--bundles/code/org.eclipse.fx.text/src/org/eclipse/fx/text/navigation/NavigationTarget.java8
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/DecorationStrategyFactory.java4
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextArea.java47
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextNode.java503
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/UnderlineStrategyFactory.java30
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/StyledTextBehavior.java73
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/TextPositionSupport.java40
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/ContentView.java28
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineNode.java17
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/TextNode.java222
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/model/DecorationStrategy.java40
-rw-r--r--bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/skin/StyledTextSkin.java6
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF/MANIFEST.MF6
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/pom.xml2
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.gmodel.ui/META-INF/MANIFEST.MF3
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSLLexer.java186
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSLParser.java1573
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/GModelDSLStandaloneSetupGenerated.java2
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g20
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSLLexer.java186
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSLParser.java525
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/serializer/GModelDSLSemanticSequencer.java54
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/services/GModelDSLGrammarAccess.java152
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.NLSDslProposalProvider.xtendbinbin1715 -> 1715 bytes
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.StringReplacementHandler.xtendbinbin4109 -> 4109 bytes
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingCalculator.xtendbinbin3325 -> 3325 bytes
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingConfiguration.xtendbinbin3189 -> 3189 bytes
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.TokenToAttributeIdMapper.xtendbinbin2660 -> 2660 bytes
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslDescriptionLabelProvider.xtendbinbin1821 -> 1821 bytes
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslLabelProvider.xtendbinbin2377 -> 2377 bytes
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.NLSDslOutlineTreeProvider.xtendbinbin1700 -> 1700 bytes
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.NLSDslQuickfixProvider.xtendbinbin1657 -> 1657 bytes
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.NLSDslFormatter.xtendbinbin2138 -> 2138 bytes
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.NLSDslGenerator.xtendbinbin10951 -> 10951 bytes
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.NLSDslScopeProvider.xtendbinbin1682 -> 1682 bytes
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.NLSDslValidator.xtendbinbin1609 -> 1609 bytes
-rw-r--r--demos/org.eclipse.fx.simplycode.app.feature/feature.xml46
-rw-r--r--demos/org.eclipse.fx.simplycode.app.product/org.eclipse.fx.simplycode.app.product.product.launch2
-rw-r--r--demos/org.eclipse.fx.simplycode.app.releng/pom.xml11
-rw-r--r--demos/org.eclipse.fx.simplycode.app/Application.e4xmi2
-rw-r--r--demos/org.eclipse.fx.simplycode.app/META-INF/MANIFEST.MF7
-rw-r--r--demos/org.eclipse.fx.testcases.dnd.app.jemmy/bin/.gitignore1
-rw-r--r--demos/org.eclipse.fx.testcases.dnd.app/.project5
-rw-r--r--demos/org.eclipse.fx.testcases.dnd.app/META-INF/MANIFEST.MF1
-rw-r--r--demos/org.eclipse.fx.testcases.dnd.app/build.properties9
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.app/OSGI-INF/services/org.eclipse.fx.code.compensator.app.DarkTheme.xml4
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.app/OSGI-INF/services/org.eclipse.fx.code.compensator.app.DefaultTheme.xml4
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/ApplicationLifecycle.classbin1980 -> 1095 bytes
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/DirtyStateTrackerAddon.classbin3719 -> 1398 bytes
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/LoadFile.classbin3348 -> 1169 bytes
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/LoadFolder.classbin2994 -> 1182 bytes
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/OpenFile.classbin4144 -> 1509 bytes
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/BugTrackerImpl.java1
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/CISystemImpl.java1
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/LocalProjectImpl.java1
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ModuleContainerImpl.java1
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ModuleImpl.java1
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ProjectImpl.java1
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/RemoteProjectImpl.java1
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/VCSRepositoryImpl.java1
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/xtend-gen/org/eclipse/fx/code/compensator/project/jdt/handler/.NewClassTemplate.xtendbinbin1989 -> 1989 bytes
-rw-r--r--experimental/swt/org.eclipse.fx.runtime.examples.swt/.classpath2
-rw-r--r--experimental/swt/org.eclipse.fx.runtime.examples.swt/META-INF/MANIFEST.MF4
-rw-r--r--experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Control.java75
-rw-r--r--experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Shell.java436
-rw-r--r--experimental/swt/org.eclipse.fx.sample.singlesource.app/bin/.gitignore1
-rw-r--r--releng/cmdtools/org.eclipse.fx.code.editor.ldef.app/bnd.bnd4
-rw-r--r--releng/maven-deploy/efxclipse/animation.xml39
-rw-r--r--releng/maven-deploy/efxclipse/code_editor.xml48
-rw-r--r--releng/maven-deploy/efxclipse/code_editor_fx.xml73
-rw-r--r--releng/maven-deploy/efxclipse/controls.xml60
-rw-r--r--releng/maven-deploy/efxclipse/core.xml58
-rw-r--r--releng/maven-deploy/efxclipse/core_di.xml53
-rw-r--r--releng/maven-deploy/efxclipse/panes.xml39
-rw-r--r--releng/maven-deploy/efxclipse/text.xml43
-rw-r--r--releng/maven-deploy/efxclipse/text_ui.xml64
-rw-r--r--releng/maven-deploy/platform/di_annotation.xml30
-rw-r--r--releng/maven-deploy/platform/eclipse_text.xml37
-rw-r--r--releng/maven-deploy/platform/equinox_common.xml30
-rw-r--r--releng/maven-deploy/platform/icu_base.xml29
-rw-r--r--releng/maven-deploy/platform/jdt_annotation.xml29
-rw-r--r--releng/maven-deploy/publish.sh176
-rwxr-xr-xtestcases/org.eclipse.fx.testcases.e4/Application.e4xmi7
113 files changed, 2257 insertions, 3297 deletions
diff --git a/bundles/code/org.eclipse.fx.code.editor.e4/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.e4/META-INF/MANIFEST.MF
index 8d58226fe..c22a2526e 100644
--- a/bundles/code/org.eclipse.fx.code.editor.e4/META-INF/MANIFEST.MF
+++ b/bundles/code/org.eclipse.fx.code.editor.e4/META-INF/MANIFEST.MF
@@ -31,5 +31,6 @@ Service-Component: OSGI-INF/services/org.eclipse.fx.code.editor.e4.internal.Docu
OSGI-INF/services/org.eclipse.fx.code.editor.e4.internal.ProposalComputerTypeProviderContextFunction.xml,
OSGI-INF/services/org.eclipse.fx.code.editor.e4.internal.HoverInformationProviderTypeProviderCF.xml,
OSGI-INF/services/org.eclipse.fx.code.editor.e4.internal.SearchProviderTypeProviderCF.xml,
- OSGI-INF/services/org.eclipse.fx.code.editor.e4.internal.InputContextContextFunction.xml
+ OSGI-INF/services/org.eclipse.fx.code.editor.e4.internal.InputContextContextFunction.xml,
+ OSGI-INF/services/org.eclipse.fx.code.editor.e4.internal.NavigationProviderTypeProviderCF2.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/code/org.eclipse.fx.code.editor.e4/OSGI-INF/services/org.eclipse.fx.code.editor.e4.internal.NavigationProviderTypeProviderCF2.xml b/bundles/code/org.eclipse.fx.code.editor.e4/OSGI-INF/services/org.eclipse.fx.code.editor.e4.internal.NavigationProviderTypeProviderCF2.xml
new file mode 100644
index 000000000..f7387b6e4
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.e4/OSGI-INF/services/org.eclipse.fx.code.editor.e4.internal.NavigationProviderTypeProviderCF2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0" name="org.eclipse.fx.code.editor.e4.internal.NavigationProviderTypeProviderCF2">
+ <property name="service.context.key" value="org.eclipse.fx.code.editor.services.NavigationProvider"/>
+ <service>
+ <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
+ </service>
+ <reference bind="registerService" cardinality="0..n" interface="org.eclipse.fx.code.editor.services.NavigationProviderTypeProvider" name="registerService" policy="dynamic" policy-option="greedy" unbind="unregisterService"/>
+ <implementation class="org.eclipse.fx.code.editor.e4.internal.NavigationProviderTypeProviderCF2"/>
+</scr:component> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.e4/src/org/eclipse/fx/code/editor/e4/internal/NavigationProviderTypeProviderCF2.java b/bundles/code/org.eclipse.fx.code.editor.e4/src/org/eclipse/fx/code/editor/e4/internal/NavigationProviderTypeProviderCF2.java
new file mode 100644
index 000000000..c69a67903
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.e4/src/org/eclipse/fx/code/editor/e4/internal/NavigationProviderTypeProviderCF2.java
@@ -0,0 +1,29 @@
+package org.eclipse.fx.code.editor.e4.internal;
+
+import java.util.Map;
+
+import org.eclipse.e4.core.contexts.IContextFunction;
+import org.eclipse.fx.code.editor.e4.InputBasedContextFunction;
+import org.eclipse.fx.code.editor.services.NavigationProvider;
+import org.eclipse.fx.code.editor.services.NavigationProviderTypeProvider;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
+
+@SuppressWarnings("restriction")
+@Component(service=IContextFunction.class, property={"service.context.key=org.eclipse.fx.code.editor.services.NavigationProvider"})
+public class NavigationProviderTypeProviderCF2 extends InputBasedContextFunction<NavigationProvider, NavigationProviderTypeProvider> {
+
+ @Override
+ @Reference(cardinality=ReferenceCardinality.MULTIPLE, policy=ReferencePolicy.DYNAMIC, policyOption=ReferencePolicyOption.GREEDY)
+ public void registerService(NavigationProviderTypeProvider service, Map<String, Object> properties) {
+ super.registerService(service, properties);
+ }
+
+ @Override
+ public void unregisterService(NavigationProviderTypeProvider service) {
+ super.unregisterService(service);
+ }
+}
diff --git a/bundles/code/org.eclipse.fx.code.editor.fx.themes/css/dark-highlight.css b/bundles/code/org.eclipse.fx.code.editor.fx.themes/css/dark-highlight.css
index 4e0fc4837..ee546bdbf 100644
--- a/bundles/code/org.eclipse.fx.code.editor.fx.themes/css/dark-highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.fx.themes/css/dark-highlight.css
@@ -2,6 +2,11 @@
-type-info-color: lightgray;
}
+.styled-text-area .dart.quick_link {
+ -styled-text-color: lightblue !important;
+ -efx-decoration: "underline";
+}
+
.styled-text-area .list-view {
-source-editor-code: #b8c4d1;
-source-editor-operator: #b8c4d1;
diff --git a/bundles/code/org.eclipse.fx.code.editor.fx.themes/css/highlight.css b/bundles/code/org.eclipse.fx.code.editor.fx.themes/css/highlight.css
index b25c6418e..8dc69af8b 100644
--- a/bundles/code/org.eclipse.fx.code.editor.fx.themes/css/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.fx.themes/css/highlight.css
@@ -2,6 +2,15 @@
-type-info-color: darkgray;
}
+.styled-text-area .dart.quick_link {
+ -styled-text-color: blue !important;
+ -efx-decoration: "underline";
+}
+
+.styled-text-area .dart.quick_link Text {
+ -fx-fill: red !important;
+}
+
.styled-text-area .list-view {
-fx-background-color: white;
diff --git a/bundles/code/org.eclipse.fx.code.editor.fx/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.fx/META-INF/MANIFEST.MF
index ea1facf96..fb05ad63c 100644
--- a/bundles/code/org.eclipse.fx.code.editor.fx/META-INF/MANIFEST.MF
+++ b/bundles/code/org.eclipse.fx.code.editor.fx/META-INF/MANIFEST.MF
@@ -4,14 +4,17 @@ Bundle-Name: Basic editor APIs for JavaFX
Bundle-SymbolicName: org.eclipse.fx.code.editor.fx
Bundle-Version: 2.3.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: javax.inject,
+Import-Package: com.google.common.collect;version="15.0.0",
+ javax.inject,
org.eclipse.e4.ui.di,
org.eclipse.fx.code.editor;version="2.3.0",
org.eclipse.fx.code.editor.services;version="2.3.0",
org.eclipse.fx.core;version="2.3.0",
org.eclipse.fx.core.di;version="2.3.0",
+ org.eclipse.fx.core.event;version="2.3.0",
org.eclipse.fx.core.preferences;version="2.3.0",
org.eclipse.fx.text.hover,
+ org.eclipse.fx.text.navigation,
org.eclipse.fx.text.rules;version="2.3.0",
org.eclipse.fx.text.ui;version="2.3.0",
org.eclipse.fx.text.ui.contentassist;version="2.3.0",
diff --git a/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/SimpleSourceTextEditorBuilder.java b/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/SimpleSourceTextEditorBuilder.java
index 48003ceca..478645475 100644
--- a/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/SimpleSourceTextEditorBuilder.java
+++ b/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/SimpleSourceTextEditorBuilder.java
@@ -18,8 +18,11 @@ import org.eclipse.fx.code.editor.Input;
import org.eclipse.fx.code.editor.LocalSourceFileInput;
import org.eclipse.fx.code.editor.fx.services.CompletionProposalPresenter;
import org.eclipse.fx.code.editor.fx.services.internal.DefaultSourceViewerConfiguration;
+import org.eclipse.fx.code.editor.services.EditorOpener;
import org.eclipse.fx.code.editor.services.HoverInformationProvider;
+import org.eclipse.fx.code.editor.services.NavigationProvider;
import org.eclipse.fx.code.editor.services.ProposalComputer;
+import org.eclipse.fx.code.editor.services.SearchProvider;
import org.eclipse.fx.text.rules.CombinedWordRule;
import org.eclipse.fx.text.rules.JavaLikeWordDetector;
import org.eclipse.fx.text.ui.presentation.PresentationReconciler;
@@ -62,6 +65,9 @@ public class SimpleSourceTextEditorBuilder {
private final String languageName;
private CompletionProposalPresenter completionProposalPresenter;
private HoverInformationProvider hoverInformationProvider;
+ private SearchProvider searchProvider;
+ private NavigationProvider navigationProvider;
+ private EditorOpener editorOpener;
static class MultiLine {
private final String start;
@@ -164,7 +170,7 @@ public class SimpleSourceTextEditorBuilder {
}
editor.setPartitioner(new FastPartitioner(new PartitionerImpl(this), contentTypes.toArray(new String[0])));
- editor.setSourceViewerConfiguration(new DefaultSourceViewerConfiguration(input, new ReconcilerImpl(this), proposalComputer, annotationModel, annotationPresenter, hoverInformationProvider, completionProposalPresenter));
+ editor.setSourceViewerConfiguration(new DefaultSourceViewerConfiguration(input, new ReconcilerImpl(this), proposalComputer, annotationModel, annotationPresenter, hoverInformationProvider, completionProposalPresenter, searchProvider, navigationProvider, editorOpener));
return editor;
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/TextEditor.java b/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/TextEditor.java
index 42161be88..a4624bcb4 100644
--- a/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/TextEditor.java
+++ b/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/TextEditor.java
@@ -17,10 +17,15 @@ import javax.inject.Inject;
import org.eclipse.e4.core.di.annotations.Optional;
import org.eclipse.e4.ui.di.Focus;
import org.eclipse.e4.ui.di.Persist;
+import org.eclipse.fx.code.editor.Constants;
import org.eclipse.fx.code.editor.Input;
+import org.eclipse.fx.code.editor.SourceSelection;
+import org.eclipse.fx.code.editor.services.URIProvider;
import org.eclipse.fx.core.di.ContextValue;
+import org.eclipse.fx.core.event.EventBus;
import org.eclipse.fx.text.ui.source.SourceViewer;
import org.eclipse.fx.text.ui.source.SourceViewerConfiguration;
+import org.eclipse.fx.ui.controls.styledtext.TextSelection;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentExtension3;
import org.eclipse.jface.text.IDocumentPartitioner;
@@ -46,6 +51,8 @@ public class TextEditor {
private SourceViewer viewer;
+
+
@Inject
public void setDocument(IDocument document) {
if( viewer != null ) {
@@ -87,7 +94,7 @@ public class TextEditor {
}
@PostConstruct
- public void initUI(BorderPane pane) {
+ public void initUI(BorderPane pane, EventBus eventBus) {
viewer = createSourceViewer();
if( document instanceof IDocumentExtension3 ) {
((IDocumentExtension3)document).setDocumentPartitioner(configuration.getConfiguredDocumentPartitioning(viewer),partitioner);
@@ -103,6 +110,15 @@ public class TextEditor {
if( activeInput != null ) {
activeInput.setValue(input);
}
+
+ eventBus.subscribe(Constants.TOPIC_SELECT_SOURCE, EventBus.data(this::onSourceSelect));
+ }
+
+ private void onSourceSelect(SourceSelection data) {
+ if (((URIProvider)input).getURI().equals(data.uri)) {
+ getSourceViewer().getTextWidget().setSelection(new TextSelection(data.selection.getOffset(), data.selection.getLength()));
+ getSourceViewer().getTextWidget().revealCaret();
+ }
}
protected SourceViewer createSourceViewer() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/services/internal/DefaultSourceViewerConfiguration.java b/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/services/internal/DefaultSourceViewerConfiguration.java
index 51240797f..d0b37b893 100644
--- a/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/services/internal/DefaultSourceViewerConfiguration.java
+++ b/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/services/internal/DefaultSourceViewerConfiguration.java
@@ -1,9 +1,14 @@
package org.eclipse.fx.code.editor.fx.services.internal;
+import java.net.URI;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Function;
import java.util.stream.Collectors;
import javax.inject.Inject;
@@ -11,13 +16,21 @@ import javax.inject.Inject;
import org.eclipse.e4.core.di.annotations.Optional;
import org.eclipse.fx.code.editor.Constants;
import org.eclipse.fx.code.editor.Input;
+import org.eclipse.fx.code.editor.SourceSelection;
import org.eclipse.fx.code.editor.fx.services.CompletionProposalPresenter;
import org.eclipse.fx.code.editor.services.CompletionProposal;
+import org.eclipse.fx.code.editor.services.EditorOpener;
import org.eclipse.fx.code.editor.services.HoverInformationProvider;
+import org.eclipse.fx.code.editor.services.NavigationProvider;
import org.eclipse.fx.code.editor.services.ProposalComputer;
import org.eclipse.fx.code.editor.services.ProposalComputer.ProposalContext;
+import org.eclipse.fx.code.editor.services.SearchProvider;
+import org.eclipse.fx.code.editor.services.URIProvider;
+import org.eclipse.fx.core.event.EventBus;
import org.eclipse.fx.core.preferences.Preference;
import org.eclipse.fx.text.hover.HoverInfo;
+import org.eclipse.fx.text.navigation.NavigationRegion;
+import org.eclipse.fx.text.navigation.NavigationTarget;
import org.eclipse.fx.text.ui.Feature;
import org.eclipse.fx.text.ui.ITextHover;
import org.eclipse.fx.text.ui.ITextViewer;
@@ -31,12 +44,18 @@ import org.eclipse.fx.text.ui.presentation.PresentationReconciler;
import org.eclipse.fx.text.ui.source.AnnotationPresenter;
import org.eclipse.fx.text.ui.source.ISourceViewer;
import org.eclipse.fx.text.ui.source.SourceViewerConfiguration;
+import org.eclipse.fx.ui.controls.styledtext.StyledTextArea.QuickLink;
+import org.eclipse.fx.ui.controls.styledtext.StyledTextArea.QuickLinkable;
+import org.eclipse.fx.ui.controls.styledtext.StyledTextArea.SimpleQuickLink;
+import org.eclipse.fx.ui.controls.styledtext.StyledTextArea.CustomQuickLink;
import org.eclipse.fx.ui.controls.styledtext.TextSelection;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.source.Annotation;
import org.eclipse.jface.text.source.IAnnotationModel;
+import com.google.common.collect.Range;
+
import javafx.beans.property.SetProperty;
import javafx.beans.property.SimpleSetProperty;
import javafx.collections.FXCollections;
@@ -51,6 +70,12 @@ public class DefaultSourceViewerConfiguration extends SourceViewerConfiguration
private final AnnotationPresenter annotationPresenter;
private final HoverInformationProvider hoverInformationProvider;
private final CompletionProposalPresenter proposalPresenter;
+ private final SearchProvider searchProvider;
+ private final NavigationProvider navigationProvider;
+ private final EditorOpener editorOpener;
+
+ @Inject private EventBus eventBus;
+
private ContentAssistant contentAssistant;
private SetProperty<Feature> featureSet = new SimpleSetProperty<Feature>(this, "featureSet", FXCollections.observableSet());
@@ -62,7 +87,10 @@ public class DefaultSourceViewerConfiguration extends SourceViewerConfiguration
@Optional IAnnotationModel annotationModel,
@Optional AnnotationPresenter annotationPresenter,
@Optional HoverInformationProvider hoverInformationProvider,
- @Optional CompletionProposalPresenter proposalPresenter
+ @Optional CompletionProposalPresenter proposalPresenter,
+ @Optional SearchProvider searchProvider,
+ @Optional NavigationProvider navigationProvider,
+ @Optional EditorOpener editorOpener
) {
this.input = input;
this.hoverInformationProvider = hoverInformationProvider;
@@ -72,6 +100,9 @@ public class DefaultSourceViewerConfiguration extends SourceViewerConfiguration
this.proposalPresenter = proposalPresenter == null ? DefaultProposal::new : proposalPresenter;
this.annotationPresenter = annotationPresenter;
+ this.searchProvider = searchProvider;
+ this.navigationProvider = navigationProvider;
+ this.editorOpener = editorOpener;
}
@Inject
@@ -84,6 +115,77 @@ public class DefaultSourceViewerConfiguration extends SourceViewerConfiguration
}
}
+ private Range<Integer> convertRegion(IRegion region) {
+ return Range.closed(region.getOffset(), region.getOffset() + region.getLength());
+ }
+
+ private QuickLink convertNavigationTarget(NavigationTarget target) {
+ return new CustomQuickLink() {
+
+ @Override
+ public String getLabel() {
+ // TODO
+ return "need some label here!";
+ }
+
+ @Override
+ public Runnable getAction() {
+ return () -> {
+ editorOpener.openEditor(target.getFile().toString());
+ eventBus.publish(Constants.TOPIC_SELECT_SOURCE, new SourceSelection(target.getFile().toString(), target.getRegion()), true);
+ };
+ }
+
+ @Override
+ public String toString() {
+ return "CustombQuickLink in " + target.getFile() + " @ " + target.getRegion();
+ }
+
+ };
+ }
+
+ private QuickLinkable convertNavigationRegion(NavigationRegion region) {
+ return new QuickLinkable() {
+ @Override
+ public Range<Integer> getRegion() {
+ return convertRegion(region.getRegion());
+ }
+
+ @Override
+ public List<QuickLink> getLinks() {
+ return region.getTargets().stream().map(DefaultSourceViewerConfiguration.this::convertNavigationTarget).collect(Collectors.toList());
+ }
+ };
+ }
+
+ @Override
+ public Function<Integer, java.util.Optional<QuickLinkable>> getQuicklinkCallback() {
+
+ if (navigationProvider != null) {
+
+ return (offset) -> {
+ try {
+ Future<List<NavigationRegion>> navigationRegions = navigationProvider.getNavigationRegions();
+ List<NavigationRegion> list = navigationRegions.get(400, TimeUnit.MILLISECONDS);
+
+ for (NavigationRegion region : list) {
+ if (region.getRegion().getOffset() <= offset && region.getRegion().getOffset() + region.getRegion().getLength() > offset) {
+ return java.util.Optional.of(convertNavigationRegion(region));
+ }
+ }
+ }
+ catch (InterruptedException | TimeoutException | ExecutionException e) {
+ e.printStackTrace();
+ }
+
+ return java.util.Optional.empty();
+ };
+ }
+ else {
+ return super.getQuicklinkCallback();
+ }
+ }
+
@Override
public SetProperty<Feature> getFeatures() {
return this.featureSet;
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.sdk/.project b/bundles/code/org.eclipse.fx.code.editor.ldef.sdk/.project
deleted file mode 100644
index abad96a33..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.sdk/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.fx.code.editor.ldef.sdk</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.sdk/build.properties b/bundles/code/org.eclipse.fx.code.editor.ldef.sdk/build.properties
deleted file mode 100644
index 442bd78b6..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.sdk/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes =feature.xml
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.sdk/feature.xml b/bundles/code/org.eclipse.fx.code.editor.ldef.sdk/feature.xml
deleted file mode 100644
index ec7bf635f..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.sdk/feature.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.fx.code.editor.ldef.sdk"
- label="LDef SDK Feature "
- version="1.0.0.qualifier">
- <plugin
- id="org.eclipse.fx.code.editor.ldef"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
- <plugin
- id="org.eclipse.fx.code.editor.ldef.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-</feature>
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.classpath b/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.classpath
deleted file mode 100644
index 9081d4f70..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.gitignore b/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.gitignore
deleted file mode 100644
index ae3c17260..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin/
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.project b/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.project
deleted file mode 100644
index 6838d43e4..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.fx.code.editor.ldef.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.settings/org.eclipse.core.resources.prefs b/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.settings/org.eclipse.jdt.core.prefs b/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.ldef.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index e6e143415..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.fx.code.editor.ldef.tests
-Bundle-Vendor: My Company
-Bundle-Version: 1.0.0.qualifier
-Bundle-SymbolicName: org.eclipse.fx.code.editor.ldef.tests; singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.fx.code.editor.ldef,
- org.eclipse.fx.code.editor.ldef.ui,
- org.eclipse.core.runtime,
- org.eclipse.xtext.junit4,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.ui.workbench;resolution:=optional,
- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional
-Import-Package: org.apache.log4j,
- org.junit;version="4.5.0",
- org.junit.runner;version="4.5.0",
- org.junit.runner.manipulation;version="4.5.0",
- org.junit.runner.notification;version="4.5.0",
- org.junit.runners;version="4.5.0",
- org.junit.runners.model;version="4.5.0",
- org.hamcrest.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.fx.code.editor.ldef
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/build.properties b/bundles/code/org.eclipse.fx.code.editor.ldef.tests/build.properties
deleted file mode 100644
index c22eebe28..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/,\
- src-gen/,\
- xtend-gen/
-bin.includes = META-INF/,\
- .
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/org.eclipse.fx.code.editor.ldef.tests.launch b/bundles/code/org.eclipse.fx.code.editor.ldef.tests/org.eclipse.fx.code.editor.ldef.tests.launch
deleted file mode 100644
index 7c77f8c95..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/org.eclipse.fx.code.editor.ldef.tests.launch
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.fx.code.editor.ldef.tests"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.fx.code.editor.ldef.tests"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.fx.code.editor.ldef.tests"/>
-</launchConfiguration>
diff --git a/bundles/code/org.eclipse.fx.code.editor/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor/META-INF/MANIFEST.MF
index 5ee6d1018..7a207d51e 100644
--- a/bundles/code/org.eclipse.fx.code.editor/META-INF/MANIFEST.MF
+++ b/bundles/code/org.eclipse.fx.code.editor/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Import-Package: javax.inject,
org.eclipse.fx.core.event;version="2.3.0",
org.eclipse.fx.core.function;version="2.3.0",
org.eclipse.fx.text.hover,
+ org.eclipse.fx.text.navigation,
org.eclipse.jface.text.rules,
org.osgi.service.component.annotations;version="1.2.0"
Require-Bundle: org.eclipse.text;bundle-version="3.5.400",
diff --git a/bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/Constants.java b/bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/Constants.java
index 3bc0854c3..a22446b18 100644
--- a/bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/Constants.java
+++ b/bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/Constants.java
@@ -12,6 +12,8 @@ public class Constants {
public static final Topic<SourceFileInput> TOPIC_SOURCE_FILE_INPUT_DISPOSED = new Topic<>("at/bestsolution/dart/editor/file-input/disposed");
public static final Topic<SourceFileInput> TOPIC_SOURCE_FILE_INPUT_SAVED = new Topic<>("at/bestsolution/dart/editor/file-input/saved");
+ public static final Topic<SourceSelection> TOPIC_SELECT_SOURCE = new Topic<>("at/bestsolution/dart/editor/select-source");
+
public static final String DOCUMENT_URL = "documentUrl";
public static final String VCS_URL = "vcsUrl";
diff --git a/bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/SourceSelection.java b/bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/SourceSelection.java
new file mode 100644
index 000000000..832ee717c
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/SourceSelection.java
@@ -0,0 +1,14 @@
+package org.eclipse.fx.code.editor;
+
+import org.eclipse.jface.text.IRegion;
+
+public class SourceSelection {
+ public final String uri;
+ public final IRegion selection;
+
+ public SourceSelection(String uri, IRegion selection) {
+ this.uri = uri;
+ this.selection = selection;
+ }
+
+}
diff --git a/bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/services/NavigationProvider.java b/bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/services/NavigationProvider.java
new file mode 100644
index 000000000..bf1b6b5f6
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/services/NavigationProvider.java
@@ -0,0 +1,12 @@
+package org.eclipse.fx.code.editor.services;
+
+import java.util.List;
+import java.util.concurrent.Future;
+
+import org.eclipse.fx.text.navigation.NavigationRegion;
+
+
+public interface NavigationProvider {
+
+ Future<List<NavigationRegion>> getNavigationRegions();
+}
diff --git a/bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/services/NavigationProviderTypeProvider.java b/bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/services/NavigationProviderTypeProvider.java
new file mode 100644
index 000000000..51ba38a4a
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/services/NavigationProviderTypeProvider.java
@@ -0,0 +1,5 @@
+package org.eclipse.fx.code.editor.services;
+
+public interface NavigationProviderTypeProvider extends InputDependentTypeProviderService<NavigationProvider> {
+
+}
diff --git a/bundles/code/org.eclipse.fx.text.ui/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.text.ui/META-INF/MANIFEST.MF
index e4b5b683c..0cd243dd8 100644
--- a/bundles/code/org.eclipse.fx.text.ui/META-INF/MANIFEST.MF
+++ b/bundles/code/org.eclipse.fx.text.ui/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@ Bundle-Vendor: Eclipse.org
Import-Package: com.google.common.collect;version="15.0.0",
org.eclipse.fx.core;version="2.3.0",
org.eclipse.fx.text.hover,
+ org.eclipse.fx.text.navigation,
org.eclipse.fx.ui.controls.list;version="2.3.0",
org.eclipse.fx.ui.controls.styledtext;version="2.3.0",
org.eclipse.fx.ui.controls.styledtext.events;version="2.3.0",
diff --git a/bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/source/SourceViewer.java b/bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/source/SourceViewer.java
index 38055949e..8fef58f23 100644
--- a/bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/source/SourceViewer.java
+++ b/bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/source/SourceViewer.java
@@ -12,12 +12,17 @@
*******************************************************************************/
package org.eclipse.fx.text.ui.source;
+import java.net.URI;
+import java.util.List;
+import java.util.Optional;
import java.util.Set;
import java.util.function.BiFunction;
import java.util.function.Function;
+import java.util.stream.Collectors;
import org.eclipse.fx.text.hover.HoverInfo;
-import org.eclipse.fx.text.ui.Feature;
+import org.eclipse.fx.text.navigation.NavigationRegion;
+import org.eclipse.fx.text.navigation.NavigationTarget;
import org.eclipse.fx.text.ui.ITextViewerExtension2;
import org.eclipse.fx.text.ui.TextViewer;
import org.eclipse.fx.text.ui.contentassist.ContentAssistant;
@@ -28,7 +33,9 @@ import org.eclipse.fx.text.ui.internal.WrappedLineRulerAnnotationPresenter;
import org.eclipse.fx.text.ui.internal.WrappedTextAnnotationPresenter;
import org.eclipse.fx.text.ui.presentation.IPresentationReconciler;
import org.eclipse.fx.text.ui.reconciler.IReconciler;
-import org.eclipse.fx.ui.controls.styledtext.VerifyEvent;
+import org.eclipse.fx.ui.controls.styledtext.StyledTextArea.QuickLink;
+import org.eclipse.fx.ui.controls.styledtext.StyledTextArea.QuickLinkable;
+import org.eclipse.fx.ui.controls.styledtext.StyledTextArea.SimpleQuickLink;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ISynchronizable;
@@ -39,6 +46,8 @@ import org.eclipse.jface.text.source.AnnotationModel;
import org.eclipse.jface.text.source.IAnnotationModel;
import org.eclipse.jface.text.source.IAnnotationModelExtension;
+import com.google.common.collect.Range;
+
public class SourceViewer extends TextViewer implements ISourceViewer, ISourceViewerExtension, ISourceViewerExtension2, ISourceViewerExtension3, ISourceViewerExtension4 {
private IPresentationReconciler fPresentationReconciler;
@@ -232,6 +241,8 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
// });
}
+ getTextWidget().setQuickLinkCallback(configuration.getQuicklinkCallback());
+
new SimpleSmartIndent(this);
diff --git a/bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/source/SourceViewerConfiguration.java b/bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/source/SourceViewerConfiguration.java
index 144414baf..3d7772786 100644
--- a/bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/source/SourceViewerConfiguration.java
+++ b/bundles/code/org.eclipse.fx.text.ui/src/org/eclipse/fx/text/ui/source/SourceViewerConfiguration.java
@@ -11,10 +11,12 @@
package org.eclipse.fx.text.ui.source;
import java.util.Collections;
-import java.util.List;
+import java.util.Optional;
import java.util.Set;
+import java.util.function.Function;
import org.eclipse.fx.text.hover.HoverInfo;
+import org.eclipse.fx.text.navigation.NavigationRegion;
import org.eclipse.fx.text.ui.DefaultUndoManager;
import org.eclipse.fx.text.ui.Feature;
import org.eclipse.fx.text.ui.ITextHover;
@@ -23,6 +25,7 @@ import org.eclipse.fx.text.ui.contentassist.IContentAssistant;
import org.eclipse.fx.text.ui.presentation.IPresentationReconciler;
import org.eclipse.fx.text.ui.presentation.PresentationReconciler;
import org.eclipse.fx.text.ui.reconciler.IReconciler;
+import org.eclipse.fx.ui.controls.styledtext.StyledTextArea.QuickLinkable;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentExtension3;
import org.eclipse.jface.text.source.Annotation;
@@ -91,4 +94,8 @@ public abstract class SourceViewerConfiguration {
return ".";
}
+ public Function<Integer, Optional<QuickLinkable>> getQuicklinkCallback() {
+ return (offset) -> Optional.empty();
+ }
+
}
diff --git a/bundles/code/org.eclipse.fx.text/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.text/META-INF/MANIFEST.MF
index 1985562d3..cd04a5414 100644
--- a/bundles/code/org.eclipse.fx.text/META-INF/MANIFEST.MF
+++ b/bundles/code/org.eclipse.fx.text/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.fx.text
Bundle-Version: 2.3.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.fx.text.hover,
+ org.eclipse.fx.text.navigation,
org.eclipse.fx.text.rules;version="2.3.0";x-internal:=true
Require-Bundle: org.eclipse.text;bundle-version="3.5.300",
org.eclipse.equinox.common;bundle-version="3.6.200"
diff --git a/bundles/code/org.eclipse.fx.text/src/org/eclipse/fx/text/navigation/NavigationRegion.java b/bundles/code/org.eclipse.fx.text/src/org/eclipse/fx/text/navigation/NavigationRegion.java
new file mode 100644
index 000000000..14306c9d1
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.text/src/org/eclipse/fx/text/navigation/NavigationRegion.java
@@ -0,0 +1,10 @@
+package org.eclipse.fx.text.navigation;
+
+import java.util.List;
+
+import org.eclipse.jface.text.IRegion;
+
+public interface NavigationRegion {
+ IRegion getRegion();
+ List<NavigationTarget> getTargets();
+}
diff --git a/bundles/code/org.eclipse.fx.text/src/org/eclipse/fx/text/navigation/NavigationTarget.java b/bundles/code/org.eclipse.fx.text/src/org/eclipse/fx/text/navigation/NavigationTarget.java
new file mode 100644
index 000000000..1262561bb
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.text/src/org/eclipse/fx/text/navigation/NavigationTarget.java
@@ -0,0 +1,8 @@
+package org.eclipse.fx.text.navigation;
+
+import org.eclipse.jface.text.IRegion;
+
+public interface NavigationTarget {
+ String getFile();
+ IRegion getRegion();
+}
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/DecorationStrategyFactory.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/DecorationStrategyFactory.java
index d3b5a3e16..a349144b1 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/DecorationStrategyFactory.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/DecorationStrategyFactory.java
@@ -11,7 +11,7 @@
package org.eclipse.fx.ui.controls.styledtext;
import org.eclipse.fx.core.RankedService;
-import org.eclipse.fx.ui.controls.styledtext.StyledTextNode.DecorationStrategy;
+import org.eclipse.fx.ui.controls.styledtext.model.DecorationStrategy;
import org.eclipse.jdt.annotation.NonNull;
/**
@@ -26,7 +26,7 @@ public interface DecorationStrategyFactory extends RankedService {
/**
* Create a strategy
- *
+ *
* @param definition
* the definition as found in the css
* @return (shared) instance of a strategy
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextArea.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextArea.java
index 8c3fc2661..1ebd4944f 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextArea.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextArea.java
@@ -13,9 +13,12 @@
package org.eclipse.fx.ui.controls.styledtext;
import java.lang.ref.WeakReference;
+import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
import org.eclipse.fx.ui.controls.styledtext.StyledTextContent.TextChangeListener;
import org.eclipse.fx.ui.controls.styledtext.model.AnnotationPresenter;
@@ -24,6 +27,8 @@ import org.eclipse.fx.ui.controls.styledtext.skin.StyledTextSkin;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import com.google.common.collect.Range;
+
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.DoubleProperty;
import javafx.beans.property.IntegerProperty;
@@ -168,6 +173,42 @@ public class StyledTextArea extends Control {
return this.annotationProvider;
}
+ public static interface QuickLinkable {
+ Range<Integer> getRegion();
+ List<QuickLink> getLinks();
+ }
+
+ public static interface QuickLink {
+ String getLabel();
+ }
+
+ public static interface SimpleQuickLink extends QuickLink {
+ Range<Integer> getRegion();
+ }
+
+ public static interface CustomQuickLink extends QuickLink {
+ Runnable getAction();
+ }
+
+ private ObjectProperty<Function<Integer, Optional<QuickLinkable>>> quickLinkCallbackProperty = new SimpleObjectProperty<>(this, "quickLinkCallback", (offset)->Optional.empty());
+
+ /**
+ * sets the quick link callback.
+ * <p>If the callback returns one ore more entries, quick linking is available for the cursor position</p>
+ * @param callback the quick linking callback
+ */
+ public void setQuickLinkCallback(Function<Integer, Optional<QuickLinkable>> callback) {
+ this.quickLinkCallbackProperty.set(callback);
+ }
+
+ /**
+ * returns the quick link callback.
+ * @return the quick linking callback
+ */
+ public Function<Integer, Optional<QuickLinkable>> getQuickLinkCallback() {
+ return this.quickLinkCallbackProperty.get();
+ }
+
private int anchor;
// private int lastTextChangeStart;
@@ -1456,7 +1497,7 @@ public class StyledTextArea extends Control {
if (selection.length == 0) {
setCaretOffset(selection.offset);
} else {
- // this.caretOffsetProperty.set(selection.offset+selection.length);
+ this.caretOffsetProperty.set(selection.offset+selection.length);
this.currentSelection.set(selection);
}
}
@@ -1746,4 +1787,8 @@ public class StyledTextArea extends Control {
public @NonNull IntegerProperty tabAvanceProperty() {
return this.tabAdvance;
}
+
+ public void revealCaret() {
+ // TODO reveal caret
+ }
}
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextNode.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextNode.java
deleted file mode 100644
index 8ced0733b..000000000
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextNode.java
+++ /dev/null
@@ -1,503 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.fx.ui.controls.styledtext;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.eclipse.fx.core.Util;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
-
-import com.sun.javafx.css.converters.PaintConverter;
-
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.value.ObservableValue;
-import javafx.collections.ObservableList;
-import javafx.css.CssMetaData;
-import javafx.css.ParsedValue;
-import javafx.css.SimpleStyleableIntegerProperty;
-import javafx.css.SimpleStyleableObjectProperty;
-import javafx.css.StyleConverter;
-import javafx.css.Styleable;
-import javafx.css.StyleableProperty;
-import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
-import javafx.scene.Node;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Region;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.text.Font;
-import javafx.scene.text.Text;
-import javafx.scene.text.TextBoundsType;
-
-/**
- * A node who allows to decorate the text
- *
- * @since 2.0
- */
-@SuppressWarnings("restriction")
-public class StyledTextNode extends Region {
-
- /**
- * A strategy to decorate the text
- */
- public interface DecorationStrategy {
- /**
- * Attach the decoration on the text
- *
- * @param node
- * the node the decoration is attached to
- * @param textNode
- * the text node decorated
- */
- public void attach(StyledTextNode node, Node textNode);
-
- /**
- * Remove the decoration from the text
- *
- * @param node
- * the node the decoration is attached to
- * @param textNode
- * the text node decorated
- */
- public void unattach(StyledTextNode node, Node textNode);
-
- /**
- * Layout the decoration
- *
- * @param node
- * the node the layout pass is done on
- * @param textNode
- * the text node decorated
- */
- public void layout(StyledTextNode node, Node textNode);
- }
-
- @SuppressWarnings("null")
- @NonNull
- private static final CssMetaData<StyledTextNode, @NonNull Paint> FILL = new CssMetaData<StyledTextNode, @NonNull Paint>("-fx-fill", PaintConverter.getInstance(), Color.BLACK) { //$NON-NLS-1$
-
- @Override
- public boolean isSettable(StyledTextNode styleable) {
- return !styleable.fillProperty().isBound();
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public StyleableProperty<@NonNull Paint> getStyleableProperty(StyledTextNode styleable) {
- return (StyleableProperty<@NonNull Paint>) styleable.fill;
- }
-
- };
- @SuppressWarnings("null")
- @NonNull
- final ObjectProperty<@NonNull Paint> fill = new SimpleStyleableObjectProperty<>(FILL, this, "fill", Color.BLACK); //$NON-NLS-1$
-
- /**
- * The paint used to fill the text
- *
- * @return the property to observe
- */
- public final @NonNull ObjectProperty<@NonNull Paint> fillProperty() {
- return (ObjectProperty<@NonNull Paint>) this.fill;
- }
-
- /**
- * @return the paint used to fill the text
- */
- public final @NonNull Paint getFill() {
- return this.fillProperty().get();
- }
-
- /**
- * Set a new paint
- *
- * @param color
- * the paint used to fill the text
- */
- public final void setFill(final @NonNull Paint color) {
- this.fillProperty().set(color);
- }
-
- static class DecorationStyleConverter extends StyleConverter<ParsedValue<?, DecorationStrategy>, DecorationStrategy> {
- private static Map<String, DecorationStrategyFactory> FACTORIES;
-
- @SuppressWarnings("null")
- @Override
- public DecorationStrategy convert(ParsedValue<ParsedValue<?, DecorationStrategy>, DecorationStrategy> value, Font font) {
- String definition = value.getValue() + ""; //$NON-NLS-1$
-
- if (FACTORIES == null) {
- FACTORIES = Util.lookupServiceList(getClass(), DecorationStrategyFactory.class).stream().sorted((f1, f2) -> -1 * Integer.compare(f1.getRanking(), f2.getRanking())).collect(Collectors.toMap(f -> f.getDecorationStrategyName(), f -> f));
- }
-
- String type;
- if (definition.contains("(")) { //$NON-NLS-1$
- type = definition.substring(0, definition.indexOf('('));
- } else {
- type = definition + ""; //$NON-NLS-1$
- }
-
- DecorationStrategyFactory strategy = FACTORIES.get(type);
- if (strategy != null) {
- return strategy.create(definition.contains("(") ? definition.substring(definition.indexOf('(') + 1, definition.lastIndexOf(')')) : null); //$NON-NLS-1$
- }
-
- return null;
- }
- }
-
- @NonNull
- private static final DecorationStyleConverter CONVERTER = new DecorationStyleConverter();
-
- @SuppressWarnings("null")
- @NonNull
- private static final CssMetaData<StyledTextNode, @Nullable DecorationStrategy> DECORATIONSTRATEGY = new CssMetaData<StyledTextNode, @Nullable DecorationStrategy>("-efx-decoration", CONVERTER, null) { //$NON-NLS-1$
-
- @Override
- public boolean isSettable(StyledTextNode node) {
- return !node.decorationStrategyProperty().isBound();
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public StyleableProperty<@Nullable DecorationStrategy> getStyleableProperty(StyledTextNode node) {
- return (StyleableProperty<@Nullable DecorationStrategy>) node.decorationStrategyProperty();
- }
-
- };
-
- @SuppressWarnings("null")
- @NonNull
- private static final CssMetaData<StyledTextNode, @NonNull Number> TABCHARADANCE = new CssMetaData<StyledTextNode, @NonNull Number>("-efx-tab-char-advance", StyleConverter.getSizeConverter(), Integer.valueOf(4)) { //$NON-NLS-1$
-
- @Override
- public boolean isSettable(StyledTextNode styleable) {
- return !styleable.tabCharAdvanceProperty().isBound();
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public StyleableProperty<@NonNull Number> getStyleableProperty(StyledTextNode styleable) {
- return (StyleableProperty<@NonNull Number>) styleable.tabCharAdvance;
- }
-
- };
-
- private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-
- static {
- final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<CssMetaData<? extends Styleable, ?>>(Region.getClassCssMetaData());
- styleables.add(DECORATIONSTRATEGY);
- styleables.add(FILL);
- STYLEABLES = Collections.unmodifiableList(styleables);
- }
-
- public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
- return STYLEABLES;
- }
-
- @Override
- public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
- return getClassCssMetaData();
- }
-
- private @NonNull ObjectProperty<@Nullable DecorationStrategy> decorationStrategy = new SimpleStyleableObjectProperty<@Nullable DecorationStrategy>(DECORATIONSTRATEGY, this, "decorationStrategy"); //$NON-NLS-1$
-
- /**
- * The current strategy used for decoration
- *
- * @return the property to observe
- */
- public final @NonNull ObjectProperty<@Nullable DecorationStrategy> decorationStrategyProperty() {
- return this.decorationStrategy;
- }
-
- /**
- * @return strategy used for decoration
- */
- public final @Nullable DecorationStrategy getDecorationStrategy() {
- return this.decorationStrategyProperty().get();
- }
-
- /**
- * Set a new strategy used for decoration
- *
- * @param strategy
- * the strategy
- */
- public final void setDecorationStrategy(final @Nullable DecorationStrategy strategy) {
- this.decorationStrategyProperty().set(strategy);
- }
-
- @NonNull
- IntegerProperty tabCharAdvance = new SimpleStyleableIntegerProperty(TABCHARADANCE, this, "tabCharAdvance", Integer.valueOf(4)); //$NON-NLS-1$
-
- /**
- * Number of chars to use for tab advance (default is 4)
- *
- * @return the property to observe
- */
- public final IntegerProperty tabCharAdvanceProperty() {
- return this.tabCharAdvance;
- }
-
- /**
- * @return the number of chars to use for tab advance (default is 4)
- */
- public final int getTabCharAdvance() {
- return this.tabCharAdvanceProperty().get();
- }
-
- /**
- * Set a new number for chars to advance for a tab
- *
- * @param tabCharAdvance
- * the number of chars to use for tab advance (default is 4)
- */
- public final void setTabCharAdvance(final int tabCharAdvance) {
- this.tabCharAdvanceProperty().set(tabCharAdvance);
- }
-
- private int startOffset;
- private List<Integer> tabPositions = new ArrayList<>();
- private String originalText;
- private final HBox textNode;
-// private final Text textNode;
-
- /**
- * Create a new styled text node
- *
- * @param text
- * the text
- */
- public StyledTextNode(String text) {
- getStyleClass().add("styled-text-node"); //$NON-NLS-1$
- this.originalText = text;
-
- this.textNode = new HBox();
-
- this.textNode.getChildren().setAll(rebuildText(text));
-
- getChildren().add(this.textNode);
- this.decorationStrategy.addListener(this::handleDecorationChange);
-
- this.tabCharAdvance.addListener(o -> {
- this.textNode.getChildren().setAll(rebuildText(text));
- });
- }
-
- private List<Text> rebuildText(String text) {
- List<Text> l = new ArrayList<>();
- for( char c : processText(text).toCharArray() ) {
- Text textNode = new Text(c+""); //$NON-NLS-1$
- textNode.setBoundsType(TextBoundsType.LOGICAL_VERTICAL_CENTER);
- textNode.fillProperty().bind(fillProperty());
- l.add(textNode);
- }
- return l;
- }
-
- private String processText(String text) {
- String tmp = text;
- StringBuilder b = new StringBuilder();
- for (int i = 0; i < this.tabCharAdvance.get(); i++) {
- b.append(" "); //$NON-NLS-1$
- }
- int position = -1;
- this.tabPositions.clear();
- while ((position = tmp.indexOf('\t')) != -1) {
- tmp = tmp.replaceFirst("\t", b.toString()); //$NON-NLS-1$
- this.tabPositions.add(Integer.valueOf(position));
- }
- return tmp;
- }
-
- private void handleDecorationChange(ObservableValue<? extends DecorationStrategy> observable, DecorationStrategy oldValue, DecorationStrategy newValue) {
- if (oldValue != null) {
- oldValue.unattach(this, this.textNode);
- }
-
- if (newValue != null) {
- newValue.attach(this, this.textNode);
- }
- }
-
- void setStartOffset(int startOffset) {
- this.startOffset = startOffset;
- }
-
- /**
- * @return the start offset in the file
- */
- public int getStartOffset() {
- return this.startOffset;
- }
-
- /**
- * @return the end offset in the file
- */
- public int getEndOffset() {
- return this.startOffset + getText().length();
- }
-
- /**
- * Check if the text node intersects with the start and end locations
- *
- * @param start
- * the start
- * @param end
- * the end
- * @return <code>true</code> if intersects
- */
- public boolean intersectOffset(int start, int end) {
- if (getStartOffset() > end) {
- return false;
- } else if (getEndOffset() < start) {
- return false;
- }
- return true;
- }
-
- @Override
- public String toString() {
- return "'" + this.originalText + "'"; //$NON-NLS-1$//$NON-NLS-2$
- }
-
- @Override
- public ObservableList<Node> getChildren() {
- return super.getChildren();
- }
-
- /**
- * @return the text
- */
- public String getText() {
- return this.originalText;
- }
-
- @Override
- protected void layoutChildren() {
- super.layoutChildren();
- this.textNode.relocate(0, 0);
- DecorationStrategy decorationStrategy2 = this.decorationStrategy.get();
- if (decorationStrategy2 != null) {
- decorationStrategy2.layout(this, this.textNode);
- }
- }
-
- /**
- * Get the caret index at the given point
- *
- * @param point
- * the point relative to this node
- * @return the index or <code>-1</code>
- */
- public int getCaretIndexAtPoint(Point2D point) {
- Point2D local = this.textNode.sceneToLocal(localToScene(point));
-// System.err.println(local);
-
- Optional<Node> charNode = this.textNode.getChildren().stream().filter( n -> n.getBoundsInParent().contains(local)).findFirst();
- if( charNode.isPresent() ) {
- Node node = charNode.get();
- int idx = this.textNode.getChildren().indexOf(node);
- Bounds bounds = node.getBoundsInParent();
-
- // if it is the 2nd half of the character
- if( bounds.getMinX() + bounds.getWidth() / 2 < local.getX() ) {
- idx += 1;
- }
-
- int toRemove = 0;
- for (Integer i : this.tabPositions) {
- if (i.intValue() <= idx && idx < i.intValue() + this.tabCharAdvance.get()) {
- toRemove += idx - i.intValue();
- // If we are in the 2nd half of the tab we
- // simply move one past the value
- if ((idx - i.intValue()) % this.tabCharAdvance.get() >= this.tabCharAdvance.get() / 2) {
- idx += 1;
- }
- break;
- } else if (i.intValue() < idx) {
- toRemove += this.tabCharAdvance.get() - 1;
- }
- }
- idx -= toRemove;
- return idx;
- } else {
-// System.err.println("COULD NOT FIND NODE AT: " + local);
-// this.textNode.getChildren().stream().map( n -> n.getBoundsInParent()).forEach(System.err::println);
- }
-
-// @SuppressWarnings("deprecation")
-// HitInfo info = this.textNode.impl_hitTestChar(this.textNode.sceneToLocal(localToScene(point)));
-// if (info != null) {
-// int idx = info.getInsertionIndex();
-// int toRemove = 0;
-// for (Integer i : this.tabPositions) {
-// if (i.intValue() <= idx && idx < i.intValue() + this.tabCharAdvance.get()) {
-// toRemove += idx - i.intValue();
-// // If we are in the 2nd half of the tab we
-// // simply move one past the value
-// if ((idx - i.intValue()) % this.tabCharAdvance.get() >= this.tabCharAdvance.get() / 2) {
-// idx += 1;
-// }
-// break;
-// } else if (i.intValue() < idx) {
-// toRemove += this.tabCharAdvance.get() - 1;
-// }
-// }
-// idx -= toRemove;
-// return idx;
-// }
- return -1;
- }
-
- /**
- * Find the x coordinate where we the character for the given index starts
- *
- * @param index
- * the index
- * @return the location or <code>0</code> if not found
- */
- public double getCharLocation(int index) {
- int realIndex = index;
- for (Integer i : this.tabPositions) {
- if (i.intValue() < realIndex) {
- realIndex += this.tabCharAdvance.get() - 1;
- }
- }
-
- if( realIndex >= 0 && realIndex < this.textNode.getChildren().size() ) {
- return this.textNode.localToParent(this.textNode.getChildren().get(realIndex).getBoundsInParent()).getMinX();
- } else if( ! this.textNode.getChildren().isEmpty() ) {
- return this.textNode.localToParent(this.textNode.getChildren().get(this.textNode.getChildren().size()-1).getBoundsInParent()).getMaxX();
- }
-
- return 0.0;
-
-// this.textNode.setImpl_caretPosition(realIndex);
-// PathElement[] pathElements = this.textNode.getImpl_caretShape();
-// for (PathElement e : pathElements) {
-// if (e instanceof MoveTo) {
-// return this.textNode.localToParent(((MoveTo) e).getX(), 0).getX();
-// }
-// }
-
- }
-} \ No newline at end of file
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/UnderlineStrategyFactory.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/UnderlineStrategyFactory.java
index c8070238f..458431fb7 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/UnderlineStrategyFactory.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/UnderlineStrategyFactory.java
@@ -10,14 +10,16 @@
*******************************************************************************/
package org.eclipse.fx.ui.controls.styledtext;
-import javafx.scene.Node;
-import javafx.scene.shape.Line;
-import javafx.scene.text.Text;
-
-import org.eclipse.fx.ui.controls.styledtext.StyledTextNode.DecorationStrategy;
+import org.eclipse.fx.ui.controls.styledtext.internal.TextNode;
+import org.eclipse.fx.ui.controls.styledtext.model.DecorationStrategy;
import org.eclipse.jdt.annotation.NonNull;
import org.osgi.service.component.annotations.Component;
+import javafx.scene.Node;
+import javafx.scene.layout.Pane;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Line;
+
/**
* Strategy who creates an underlined text
*/
@@ -41,29 +43,39 @@ public class UnderlineStrategyFactory implements DecorationStrategyFactory {
static class UnderlineStrategy implements DecorationStrategy {
@Override
- public void attach(StyledTextNode node, Node textNode) {
+ public void attach(Pane node, TextNode textNode) {
+ System.err.println("underline-attach");
Line l = (Line) textNode.getUserData();
if( l == null ) {
l = new Line();
+ l.setMouseTransparent(true);
l.setManaged(false);
+ l.setStartY(textNode.getBoundsInLocal().getHeight() - 2);
+ l.strokeProperty().bind(textNode.fillProperty());
+ l.setEndY(textNode.getBoundsInLocal().getHeight() - 2 );
l.setEndX(textNode.getBoundsInLocal().getWidth());
- l.setTranslateY(textNode.getBaselineOffset() + 2.0);
+ //l.setTranslateY(textNode.getBaselineOffset() + 2.0);
textNode.setUserData(l);
+
+ System.err.println();
}
node.getChildren().add(l);
}
@Override
- public void unattach(StyledTextNode node, Node textNode) {
+ public void unattach(Pane node, TextNode textNode) {
+ System.err.println("underline-detach");
Line l = (Line) textNode.getUserData();
if( l != null ) {
textNode.setUserData(null);
node.getChildren().remove(l);
+ l.fillProperty().unbind();
}
}
@Override
- public void layout(StyledTextNode node, Node textNode) {
+ public void layout(Pane node, TextNode textNode) {
+ System.err.println("underline-layout");
Line l = (Line) textNode.getUserData();
if( l != null ) {
l.setEndX(node.getWidth());
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/StyledTextBehavior.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/StyledTextBehavior.java
index 8cb7f9059..9acae1a88 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/StyledTextBehavior.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/StyledTextBehavior.java
@@ -48,16 +48,23 @@ import org.eclipse.fx.core.Util;
import org.eclipse.fx.ui.controls.styledtext.ActionEvent;
import org.eclipse.fx.ui.controls.styledtext.ActionEvent.ActionType;
import org.eclipse.fx.ui.controls.styledtext.StyledTextArea;
+import org.eclipse.fx.ui.controls.styledtext.StyledTextArea.CustomQuickLink;
+import org.eclipse.fx.ui.controls.styledtext.StyledTextArea.QuickLink;
+import org.eclipse.fx.ui.controls.styledtext.StyledTextArea.QuickLinkable;
+import org.eclipse.fx.ui.controls.styledtext.StyledTextArea.SimpleQuickLink;
import org.eclipse.fx.ui.controls.styledtext.StyledTextContent;
import org.eclipse.fx.ui.controls.styledtext.TextSelection;
import org.eclipse.fx.ui.controls.styledtext.VerifyEvent;
import org.eclipse.fx.ui.controls.styledtext.behavior.StyledTextBehavior.KeyMapping.InputAction;
import org.eclipse.fx.ui.controls.styledtext.behavior.StyledTextBehavior.KeyMapping.KeyCombo;
import org.eclipse.fx.ui.controls.styledtext.events.TextPositionEvent;
+import org.eclipse.fx.ui.controls.styledtext.internal.TextNode;
import org.eclipse.fx.ui.controls.styledtext.skin.StyledTextSkin;
import org.eclipse.jdt.annotation.NonNull;
import javafx.event.Event;
+import javafx.geometry.Point2D;
+import javafx.scene.Cursor;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;
import javafx.scene.input.MouseButton;
@@ -87,6 +94,7 @@ public class StyledTextBehavior {
styledText.addEventHandler(KeyEvent.KEY_TYPED, this::onKeyTyped);
styledText.addEventHandler(MouseEvent.MOUSE_PRESSED, this::onMousePressed);
+ styledText.addEventHandler(TextPositionEvent.TEXT_POSITION_MOVED, this::onTextPositionMoved);
initKeymapping(this.keyMapping);
@@ -95,6 +103,7 @@ public class StyledTextBehavior {
styledText.addEventHandler(TextPositionEvent.TEXT_POSITION_RELEASED, this::onTextPositionReleased);
styledText.addEventHandler(TextPositionEvent.TEXT_POSITION_DRAGGED, this::onTextPositionDragged);
styledText.addEventHandler(TextPositionEvent.TEXT_POSITION_DRAG_DETECTED, this::onTextPositionDragDetected);
+
}
/**
@@ -329,6 +338,17 @@ public class StyledTextBehavior {
}
}
+ private void doLink(QuickLink link) {
+ if (link instanceof SimpleQuickLink) {
+ SimpleQuickLink simple = (SimpleQuickLink) link;
+ getControl().setSelection(new TextSelection(simple.getRegion().lowerEndpoint(), simple.getRegion().upperEndpoint() - simple.getRegion().lowerEndpoint()));
+ }
+ else if (link instanceof CustomQuickLink) {
+ CustomQuickLink custom = (CustomQuickLink) link;
+ custom.getAction().run();
+ }
+ }
+
private void onTextPositionClicked(TextPositionEvent event) {
if (event.isStillSincePress()) {
if (event.getClickCount() == 2 && event.getButton() == MouseButton.PRIMARY) {
@@ -340,6 +360,21 @@ public class StyledTextBehavior {
event.consume();
}
}
+
+ if (event.isControlDown()) {
+ Optional<QuickLinkable> linkable = getControl().getQuickLinkCallback().apply(event.getOffset());
+ linkable.ifPresent((l) -> {
+ if (l.getLinks().size() == 1) {
+ doLink(l.getLinks().get(0));
+ }
+ else {
+ // TODO handle case of multiple links
+ System.err.println("multiple targets: " + l.getLinks());
+ }
+ });
+
+ }
+
}
/**
@@ -353,6 +388,44 @@ public class StyledTextBehavior {
getControl().requestFocus();
}
+ private Optional<TextNode> currentQuickLinkNode = Optional.empty();
+
+ private void setCurrentQuickLinkNode(Optional<TextNode> node) {
+ this.currentQuickLinkNode.ifPresent(n->n.getStyleClass().remove("quick_link")); //$NON-NLS-1$
+ this.currentQuickLinkNode.ifPresent(n->n.setCursor(null));
+ this.currentQuickLinkNode.ifPresent(n->n.requestLayout());
+ this.currentQuickLinkNode = node;
+ this.currentQuickLinkNode.ifPresent(n->n.getStyleClass().add("quick_link")); //$NON-NLS-1$
+ this.currentQuickLinkNode.ifPresent(n->n.setCursor(Cursor.HAND));
+ this.currentQuickLinkNode.ifPresent(n->n.requestLayout());
+ }
+
+ private void onTextPositionMoved(TextPositionEvent event) {
+ if (event.isControlDown()) {
+ Optional<QuickLinkable> linkable = getControl().getQuickLinkCallback().apply(event.getOffset());
+ if (linkable.isPresent()) {
+ Point2D screenLocation = new Point2D(event.getScreenX(), event.getScreenY());
+ Optional<TextNode> node = ((StyledTextSkin)getControl().getSkin()).findTextNode(screenLocation);
+
+ System.err.println("NODE: " + node);
+
+ if (!this.currentQuickLinkNode.equals(node)) {
+ // changed
+ setCurrentQuickLinkNode(node);
+ }
+
+ System.err.println("node2: " + node.map(n->n.getStyleClass()));
+ }
+ else {
+ setCurrentQuickLinkNode(Optional.empty());
+ }
+
+ }
+ else {
+ setCurrentQuickLinkNode(Optional.empty());
+ }
+ }
+
private int computeCurrentLineNumber() {
final int offset = getControl().getCaretOffset();
return getControl().getLineAtOffset(offset);
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/TextPositionSupport.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/TextPositionSupport.java
index 4e14cb5e3..3f4241659 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/TextPositionSupport.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/TextPositionSupport.java
@@ -78,46 +78,6 @@ public class TextPositionSupport {
*/
protected int computeCursorOffset(MouseEvent event) {
return this.textArea.getOffsetAtPosition(event.getX(), event.getY());
-
- // List<LineCell> visibleCells = ((StyledTextSkin)
- // this.textArea.getSkin()).getCurrentVisibleCells();
- //
- // LineCell lastCell = null;
- //
- // int result = this.textArea.getContent().getCharCount();
- //
- // for (LineCell tmp : visibleCells) {
- // Bounds boundsInParent = tmp.getBoundsInParent();
- // if (boundsInParent.getMinY() > event.getY()) {
- // if (lastCell == null) {
- // lastCell = tmp;
- // }
- //
- // if (lastCell.getDomainElement() != null) {
- // LineNode n = (LineNode) lastCell.getGraphic();
- //// StyledTextLayoutContainer n = (StyledTextLayoutContainer)
- // lastCell.getGraphic();
- // if (n.localToScene(n.getBoundsInLocal()).contains(event.getSceneX(),
- // event.getSceneY())) {
- // int index = n.getCaretIndexAtPoint(n.sceneToLocal(event.getSceneX(),
- // event.getSceneY()));
- // if (index >= 0) {
- // return n.getStartOffset() + index;
- // }
- // }
- //
- // final double minX = n.localToScene(n.getBoundsInLocal()).getMinX();
- // final double mouseX = event.getSceneX();
- // final boolean left = minX >= mouseX;
- //
- // result = lastCell.getDomainElement().getLineOffset() + (left ? 0 :
- // lastCell.getDomainElement().getLineLength());
- // }
- // break;
- // }
- // lastCell = tmp;
- // }
- // return result;
}
}
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/ContentView.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/ContentView.java
index 6e6f0eb9e..682a1ee76 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/ContentView.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/ContentView.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.fx.ui.controls.styledtext.internal;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -28,10 +27,10 @@ import org.eclipse.fx.ui.controls.styledtext.StyledTextArea;
import org.eclipse.fx.ui.controls.styledtext.StyledTextArea.LineLocation;
import org.eclipse.fx.ui.controls.styledtext.StyledTextContent;
import org.eclipse.fx.ui.controls.styledtext.StyledTextContent.TextChangeListener;
-import org.eclipse.fx.ui.controls.styledtext.events.HoverTarget;
import org.eclipse.fx.ui.controls.styledtext.TextChangedEvent;
import org.eclipse.fx.ui.controls.styledtext.TextChangingEvent;
import org.eclipse.fx.ui.controls.styledtext.TextSelection;
+import org.eclipse.fx.ui.controls.styledtext.events.HoverTarget;
import org.eclipse.fx.ui.controls.styledtext.model.TextAnnotationPresenter;
import com.google.common.collect.ContiguousSet;
@@ -187,21 +186,28 @@ public class ContentView extends Pane {
}
-// protected void permutate(int a, int b) {
-// LineNode nodeA = existingNodes.get(a);
-// LineNode nodeB = existingNodes.get(b);
-//
-// existingNodes.put(a, nodeB);
-// existingNodes.put(b, nodeA);
-//
-// System.err.println(" . permutate " + a + " -> " + b);
-// }
+
+ public Optional<TextNode> findTextNode(Point2D localLocation) {
+ ContiguousSet<Integer> visibleLineIndexes = ContiguousSet.create(ContentView.this.visibleLines.get(), DiscreteDomain.integers());
+ return visibleLineIndexes.stream()
+ .map(lineIndex->getVisibleNode(lineIndex))
+ .filter(x->x.isPresent())
+ .filter(x->x.get().getBoundsInParent().contains(localLocation))
+ .findFirst()
+ .flatMap(x->x.get().findTextNode(x.get().parentToLocal(localLocation)));
+ }
+
}
public List<HoverTarget> findHoverTargets(Point2D localLocation) {
return this.lineLayer.findHoverTargets(localLocation);
}
+ public Optional<TextNode> findTextNode(Point2D localLocation) {
+ localLocation = this.lineLayer.sceneToLocal(this.localToScene(localLocation));
+ return this.lineLayer.findTextNode(localLocation);
+ }
+
private StackPane contentBody = new StackPane();
private LineLayer lineLayer = new LineLayer(()->new LineNode(), (n, m)->{
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineNode.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineNode.java
index 11b6830bb..968407ba9 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineNode.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineNode.java
@@ -19,6 +19,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -56,6 +57,7 @@ public class LineNode extends StackPane {
DebugMarker debugUpdateCaret;
private HBox debugBox;
+ /** line index */
int index;
LineHelper lineHelper;
@@ -241,6 +243,17 @@ public class LineNode extends StackPane {
return Collections.emptyList();
}
+
+ public Optional<TextNode> findTextNode(Point2D localLocation) {
+ for (TextNode t : this.currentTextNodes) {
+ Bounds segmentBounds = t.getBoundsInParent();
+ if (segmentBounds.contains(localLocation)) {
+ return Optional.of(t);
+ }
+ }
+ return Optional.empty();
+ }
+
}
public class SelectionLayer extends Region {
@@ -738,6 +751,10 @@ public class LineNode extends StackPane {
return results;
}
+ public Optional<TextNode> findTextNode(Point2D localLocation) {
+ return this.textLayer.findTextNode(localLocation);
+ }
+
/**
* Check if the offset is between the start and end
*
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/TextNode.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/TextNode.java
index b1556b958..1d804b088 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/TextNode.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/TextNode.java
@@ -13,14 +13,23 @@ package org.eclipse.fx.ui.controls.styledtext.internal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import java.util.Optional;
+import java.util.stream.Collectors;
+import org.eclipse.fx.core.Subscription;
+import org.eclipse.fx.core.Util;
+import org.eclipse.fx.ui.controls.styledtext.DecorationStrategyFactory;
+import org.eclipse.fx.ui.controls.styledtext.model.DecorationStrategy;
import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
import javafx.beans.property.IntegerProperty;
import javafx.beans.property.ObjectProperty;
+import javafx.beans.value.ObservableValue;
import javafx.collections.ObservableList;
import javafx.css.CssMetaData;
+import javafx.css.ParsedValue;
import javafx.css.SimpleStyleableIntegerProperty;
import javafx.css.SimpleStyleableObjectProperty;
import javafx.css.StyleConverter;
@@ -33,47 +42,13 @@ import javafx.scene.layout.HBox;
import javafx.scene.layout.Region;
import javafx.scene.paint.Color;
import javafx.scene.paint.Paint;
+import javafx.scene.text.Font;
import javafx.scene.text.Text;
import javafx.scene.text.TextBoundsType;
@SuppressWarnings("javadoc")
public class TextNode extends HBox {
- /**
- * A strategy to decorate the text
- */
- public interface DecorationStrategy {
- /**
- * Attach the decoration on the text
- *
- * @param node
- * the node the decoration is attached to
- * @param textNode
- * the text node decorated
- */
- public void attach(TextNode node, Node textNode);
-
- /**
- * Remove the decoration from the text
- *
- * @param node
- * the node the decoration is attached to
- * @param textNode
- * the text node decorated
- */
- public void unattach(TextNode node, Node textNode);
-
- /**
- * Layout the decoration
- *
- * @param node
- * the node the layout pass is done on
- * @param textNode
- * the text node decorated
- */
- public void layout(TextNode node, Node textNode);
- }
-
@SuppressWarnings("null")
@NonNull
private static final CssMetaData<TextNode, @NonNull Paint> FILL = new CssMetaData<TextNode, @NonNull Paint>("-fx-fill", StyleConverter.getPaintConverter(), Color.BLACK) { //$NON-NLS-1$
@@ -136,53 +111,53 @@ public class TextNode extends HBox {
this.fillProperty().set(color);
}
-// static class DecorationStyleConverter extends StyleConverter<ParsedValue<?, DecorationStrategy>, DecorationStrategy> {
-// private static Map<String, DecorationStrategyFactory> FACTORIES;
-//
-// @SuppressWarnings("null")
-// @Override
-// public DecorationStrategy convert(ParsedValue<ParsedValue<?, DecorationStrategy>, DecorationStrategy> value, Font font) {
-// String definition = value.getValue() + ""; //$NON-NLS-1$
-//
-// if (FACTORIES == null) {
-// FACTORIES = Util.lookupServiceList(getClass(), DecorationStrategyFactory.class).stream().sorted((f1, f2) -> -1 * Integer.compare(f1.getRanking(), f2.getRanking())).collect(Collectors.toMap(f -> f.getDecorationStrategyName(), f -> f));
-// }
-//
-// String type;
-// if (definition.contains("(")) { //$NON-NLS-1$
-// type = definition.substring(0, definition.indexOf('('));
-// } else {
-// type = definition + ""; //$NON-NLS-1$
-// }
-//
-// DecorationStrategyFactory strategy = FACTORIES.get(type);
-// if (strategy != null) {
-// return strategy.create(definition.contains("(") ? definition.substring(definition.indexOf('(') + 1, definition.lastIndexOf(')')) : null); //$NON-NLS-1$
-// }
-//
-// return null;
-// }
-// }
+ static class DecorationStyleConverter extends StyleConverter<ParsedValue<?, DecorationStrategy>, DecorationStrategy> {
+ private static Map<String, DecorationStrategyFactory> FACTORIES;
-// @NonNull
-// private static final DecorationStyleConverter CONVERTER = new DecorationStyleConverter();
+ @SuppressWarnings("null")
+ @Override
+ public DecorationStrategy convert(ParsedValue<ParsedValue<?, DecorationStrategy>, DecorationStrategy> value, Font font) {
+ String definition = value.getValue() + ""; //$NON-NLS-1$
-// @SuppressWarnings("null")
-// @NonNull
-// private static final CssMetaData<TextNode, @Nullable DecorationStrategy> DECORATIONSTRATEGY = new CssMetaData<TextNode, @Nullable DecorationStrategy>("-efx-decoration", CONVERTER, null) { //$NON-NLS-1$
-//
-// @Override
-// public boolean isSettable(TextNode node) {
-// return !node.decorationStrategyProperty().isBound();
-// }
-//
-// @SuppressWarnings("unchecked")
-// @Override
-// public StyleableProperty<@Nullable DecorationStrategy> getStyleableProperty(TextNode node) {
-// return (StyleableProperty<@Nullable DecorationStrategy>) node.decorationStrategyProperty();
-// }
-//
-// };
+ if (FACTORIES == null) {
+ FACTORIES = Util.lookupServiceList(getClass(), DecorationStrategyFactory.class).stream().sorted((f1, f2) -> -1 * Integer.compare(f1.getRanking(), f2.getRanking())).collect(Collectors.toMap(f -> f.getDecorationStrategyName(), f -> f));
+ }
+
+ String type;
+ if (definition.contains("(")) { //$NON-NLS-1$
+ type = definition.substring(0, definition.indexOf('('));
+ } else {
+ type = definition + ""; //$NON-NLS-1$
+ }
+
+ DecorationStrategyFactory strategy = FACTORIES.get(type);
+ if (strategy != null) {
+ return strategy.create(definition.contains("(") ? definition.substring(definition.indexOf('(') + 1, definition.lastIndexOf(')')) : null); //$NON-NLS-1$
+ }
+
+ return null;
+ }
+ }
+
+ @NonNull
+ private static final DecorationStyleConverter CONVERTER = new DecorationStyleConverter();
+
+ @SuppressWarnings("null")
+ @NonNull
+ private static final CssMetaData<TextNode, @Nullable DecorationStrategy> DECORATIONSTRATEGY = new CssMetaData<TextNode, @Nullable DecorationStrategy>("-efx-decoration", CONVERTER, null) { //$NON-NLS-1$
+
+ @Override
+ public boolean isSettable(TextNode node) {
+ return !node.decorationStrategyProperty().isBound();
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public StyleableProperty<@Nullable DecorationStrategy> getStyleableProperty(TextNode node) {
+ return (StyleableProperty<@Nullable DecorationStrategy>) node.decorationStrategyProperty();
+ }
+
+ };
@SuppressWarnings("null")
@NonNull
@@ -205,7 +180,7 @@ public class TextNode extends HBox {
static {
final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<CssMetaData<? extends Styleable, ?>>(Region.getClassCssMetaData());
-// styleables.add(DECORATIONSTRATEGY);
+ styleables.add(DECORATIONSTRATEGY);
styleables.add(FILL);
STYLEABLES = Collections.unmodifiableList(styleables);
}
@@ -219,33 +194,33 @@ public class TextNode extends HBox {
return getClassCssMetaData();
}
-// private @NonNull ObjectProperty<@Nullable DecorationStrategy> decorationStrategy = new SimpleStyleableObjectProperty<@Nullable DecorationStrategy>(DECORATIONSTRATEGY, this, "decorationStrategy"); //$NON-NLS-1$
+ private @NonNull ObjectProperty<@Nullable DecorationStrategy> decorationStrategy = new SimpleStyleableObjectProperty<@Nullable DecorationStrategy>(DECORATIONSTRATEGY, this, "decorationStrategy"); //$NON-NLS-1$
-// /**
-// * The current strategy used for decoration
-// *
-// * @return the property to observe
-// */
-// public final @NonNull ObjectProperty<@Nullable DecorationStrategy> decorationStrategyProperty() {
-// return this.decorationStrategy;
-// }
+ /**
+ * The current strategy used for decoration
+ *
+ * @return the property to observe
+ */
+ public final @NonNull ObjectProperty<@Nullable DecorationStrategy> decorationStrategyProperty() {
+ return this.decorationStrategy;
+ }
-// /**
-// * @return strategy used for decoration
-// */
-// public final @Nullable DecorationStrategy getDecorationStrategy() {
-// return this.decorationStrategyProperty().get();
-// }
+ /**
+ * @return strategy used for decoration
+ */
+ public final @Nullable DecorationStrategy getDecorationStrategy() {
+ return this.decorationStrategyProperty().get();
+ }
-// /**
-// * Set a new strategy used for decoration
-// *
-// * @param strategy
-// * the strategy
-// */
-// public final void setDecorationStrategy(final @Nullable DecorationStrategy strategy) {
-// this.decorationStrategyProperty().set(strategy);
-// }
+ /**
+ * Set a new strategy used for decoration
+ *
+ * @param strategy
+ * the strategy
+ */
+ public final void setDecorationStrategy(final @Nullable DecorationStrategy strategy) {
+ this.decorationStrategyProperty().set(strategy);
+ }
@NonNull
IntegerProperty tabCharAdvance = new SimpleStyleableIntegerProperty(TABCHARADANCE, this, "tabCharAdvance", Integer.valueOf(4)); //$NON-NLS-1$
@@ -327,6 +302,17 @@ public class TextNode extends HBox {
});
// setStyle("-fx-border-width: 0.1px; -fx-border-color: blue");
+
+
+ decorationStrategy.addListener((x, o, n)->{
+ System.err.println("deco start changed: " + n);
+ });
+
+ this.decorationStrategy.addListener(this::handleDecorationChange);
+ }
+
+ public Subscription setStyledRange(String clazz, int start, int end) {
+ return null;
}
public void updateText(String text) {
@@ -361,15 +347,15 @@ public class TextNode extends HBox {
return tmp;
}
-// private void handleDecorationChange(ObservableValue<? extends DecorationStrategy> observable, DecorationStrategy oldValue, DecorationStrategy newValue) {
-// if (oldValue != null) {
-// oldValue.unattach(this, this.textNode);
-// }
-//
-// if (newValue != null) {
-// newValue.attach(this, this.textNode);
-// }
-// }
+ private void handleDecorationChange(ObservableValue<? extends DecorationStrategy> observable, DecorationStrategy oldValue, DecorationStrategy newValue) {
+ if (oldValue != null) {
+ oldValue.unattach(this, this);
+ }
+
+ if (newValue != null) {
+ newValue.attach(this, this);
+ }
+ }
void setStartOffset(int startOffset) {
this.startOffset = startOffset;
@@ -442,10 +428,10 @@ public class TextNode extends HBox {
// }
// this.textNode.relocate(0, 0);
-// DecorationStrategy decorationStrategy2 = this.decorationStrategy.get();
-// if (decorationStrategy2 != null) {
-// decorationStrategy2.layout(this, this.textNode);
-// }
+ DecorationStrategy decorationStrategy2 = this.decorationStrategy.get();
+ if (decorationStrategy2 != null) {
+ decorationStrategy2.layout(this, this);
+ }
}
/**
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/model/DecorationStrategy.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/model/DecorationStrategy.java
new file mode 100644
index 000000000..12bfb7ef3
--- /dev/null
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/model/DecorationStrategy.java
@@ -0,0 +1,40 @@
+package org.eclipse.fx.ui.controls.styledtext.model;
+
+import org.eclipse.fx.ui.controls.styledtext.internal.TextNode;
+
+import javafx.scene.layout.Pane;
+
+/**
+ * A strategy to decorate the text
+ */
+ public interface DecorationStrategy {
+ /**
+ * Attach the decoration on the text
+ *
+ * @param node
+ * the node the decoration is attached to
+ * @param textNode
+ * the text node decorated
+ */
+ public void attach(Pane node, TextNode textNode);
+
+ /**
+ * Remove the decoration from the text
+ *
+ * @param node
+ * the node the decoration is attached to
+ * @param textNode
+ * the text node decorated
+ */
+ public void unattach(Pane node, TextNode textNode);
+
+ /**
+ * Layout the decoration
+ *
+ * @param node
+ * the node the layout pass is done on
+ * @param textNode
+ * the text node decorated
+ */
+ public void layout(Pane node, TextNode textNode);
+ } \ No newline at end of file
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/skin/StyledTextSkin.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/skin/StyledTextSkin.java
index 081583e8f..d3a57129e 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/skin/StyledTextSkin.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/skin/StyledTextSkin.java
@@ -35,6 +35,7 @@ import org.eclipse.fx.ui.controls.styledtext.internal.LineHelper;
import org.eclipse.fx.ui.controls.styledtext.internal.LineRuler;
import org.eclipse.fx.ui.controls.styledtext.internal.ScrollbarPane;
import org.eclipse.fx.ui.controls.styledtext.internal.Scroller;
+import org.eclipse.fx.ui.controls.styledtext.internal.TextNode;
import org.eclipse.fx.ui.controls.styledtext.model.Annotation;
import org.eclipse.fx.ui.controls.styledtext.model.AnnotationPresenter;
import org.eclipse.fx.ui.controls.styledtext.model.AnnotationProvider;
@@ -342,6 +343,11 @@ public class StyledTextSkin extends SkinBase<StyledTextArea> {
}
+ public Optional<TextNode> findTextNode(Point2D screenLocation) {
+ Point2D contentLocalLocation = this.content.screenToLocal(screenLocation);
+ return this.content.findTextNode(contentLocalLocation);
+ }
+
private void scrollColumnIntoView(int colIndex) {
double w = 8;
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF/MANIFEST.MF
index f37a8a3d7..3fdcd9e6b 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Proposals
Bundle-SymbolicName: org.eclipse.fx.ide.css.cssext.proposals
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.3.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.fx.ui.controls;bundle-version="2.2.0",
- org.eclipse.fx.ide.css.cssext;bundle-version="2.2.0",
+Require-Bundle: org.eclipse.fx.ui.controls;bundle-version="2.3.0",
+ org.eclipse.fx.ide.css.cssext;bundle-version="2.3.0",
org.eclipse.swt,
org.eclipse.jface;bundle-version="3.10.0"
Import-Package: org.eclipse.fx.ide.css.extapi,
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/pom.xml b/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/pom.xml
index bc8c8ec79..50d7ae161 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.eclipse.fx.ide</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/META-INF/MANIFEST.MF
index 8e2b73687..1d5744329 100644
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/META-INF/MANIFEST.MF
@@ -21,5 +21,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.fx.ide.gmodel.ui.quickfix,
org.eclipse.fx.ide.gmodel.ui.contentassist,
org.eclipse.fx.ide.gmodel.ui.internal,
- org.eclipse.fx.ide.gmodel.ui.contentassist.antlr
+ org.eclipse.fx.ide.gmodel.ui.contentassist.antlr,
+ org.eclipse.fx.ide.gmodel.ui.contentassist.antlr.internal
Bundle-Activator: org.eclipse.fx.ide.gmodel.ui.internal.GModelDSLActivator
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSLLexer.java b/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSLLexer.java
index 4340ad6c8..2ff06a0a2 100644
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSLLexer.java
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSLLexer.java
@@ -47,15 +47,15 @@ public class InternalGModelDSLLexer extends Lexer {
super(input,state);
}
- public String getGrammarFileName() { return "../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g"; }
+ public String getGrammarFileName() { return "InternalGModelDSL.g"; }
// $ANTLR start "T__11"
public final void mT__11() throws RecognitionException {
try {
int _type = T__11;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:11:7: ( 'Int' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:11:9: 'Int'
+ // InternalGModelDSL.g:11:7: ( 'Int' )
+ // InternalGModelDSL.g:11:9: 'Int'
{
match("Int");
@@ -75,8 +75,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__12;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:12:7: ( 'Double' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:12:9: 'Double'
+ // InternalGModelDSL.g:12:7: ( 'Double' )
+ // InternalGModelDSL.g:12:9: 'Double'
{
match("Double");
@@ -96,8 +96,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__13;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:13:7: ( 'String' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:13:9: 'String'
+ // InternalGModelDSL.g:13:7: ( 'String' )
+ // InternalGModelDSL.g:13:9: 'String'
{
match("String");
@@ -117,8 +117,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__14;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:14:7: ( 'Boolean' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:14:9: 'Boolean'
+ // InternalGModelDSL.g:14:7: ( 'Boolean' )
+ // InternalGModelDSL.g:14:9: 'Boolean'
{
match("Boolean");
@@ -138,8 +138,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__15;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:15:7: ( 'package' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:15:9: 'package'
+ // InternalGModelDSL.g:15:7: ( 'package' )
+ // InternalGModelDSL.g:15:9: 'package'
{
match("package");
@@ -159,8 +159,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__16;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:16:7: ( '{' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:16:9: '{'
+ // InternalGModelDSL.g:16:7: ( '{' )
+ // InternalGModelDSL.g:16:9: '{'
{
match('{');
@@ -179,8 +179,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__17;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:17:7: ( '}' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:17:9: '}'
+ // InternalGModelDSL.g:17:7: ( '}' )
+ // InternalGModelDSL.g:17:9: '}'
{
match('}');
@@ -199,8 +199,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__18;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:18:7: ( 'type' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:18:9: 'type'
+ // InternalGModelDSL.g:18:7: ( 'type' )
+ // InternalGModelDSL.g:18:9: 'type'
{
match("type");
@@ -220,8 +220,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__19;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:19:7: ( 'extends' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:19:9: 'extends'
+ // InternalGModelDSL.g:19:7: ( 'extends' )
+ // InternalGModelDSL.g:19:9: 'extends'
{
match("extends");
@@ -241,8 +241,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__20;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:20:7: ( ', ' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:20:9: ', '
+ // InternalGModelDSL.g:20:7: ( ', ' )
+ // InternalGModelDSL.g:20:9: ', '
{
match(", ");
@@ -262,8 +262,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__21;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:21:7: ( 'map' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:21:9: 'map'
+ // InternalGModelDSL.g:21:7: ( 'map' )
+ // InternalGModelDSL.g:21:9: 'map'
{
match("map");
@@ -283,8 +283,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__22;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:22:7: ( ';' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:22:9: ';'
+ // InternalGModelDSL.g:22:7: ( ';' )
+ // InternalGModelDSL.g:22:9: ';'
{
match(';');
@@ -303,8 +303,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__23;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:23:7: ( '=' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:23:9: '='
+ // InternalGModelDSL.g:23:7: ( '=' )
+ // InternalGModelDSL.g:23:9: '='
{
match('=');
@@ -323,8 +323,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__24;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:24:7: ( '.' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:24:9: '.'
+ // InternalGModelDSL.g:24:7: ( '.' )
+ // InternalGModelDSL.g:24:9: '.'
{
match('.');
@@ -343,8 +343,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__25;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:25:7: ( '[]' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:25:9: '[]'
+ // InternalGModelDSL.g:25:7: ( '[]' )
+ // InternalGModelDSL.g:25:9: '[]'
{
match("[]");
@@ -364,10 +364,10 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = RULE_ID;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1780:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1780:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // InternalGModelDSL.g:1780:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // InternalGModelDSL.g:1780:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1780:11: ( '^' )?
+ // InternalGModelDSL.g:1780:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -376,7 +376,7 @@ public class InternalGModelDSLLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1780:11: '^'
+ // InternalGModelDSL.g:1780:11: '^'
{
match('^');
@@ -394,7 +394,7 @@ public class InternalGModelDSLLexer extends Lexer {
recover(mse);
throw mse;}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1780:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // InternalGModelDSL.g:1780:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -407,7 +407,7 @@ public class InternalGModelDSLLexer extends Lexer {
switch (alt2) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:
+ // InternalGModelDSL.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') ) {
input.consume();
@@ -443,10 +443,10 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = RULE_INT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1782:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1782:12: ( '0' .. '9' )+
+ // InternalGModelDSL.g:1782:10: ( ( '0' .. '9' )+ )
+ // InternalGModelDSL.g:1782:12: ( '0' .. '9' )+
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1782:12: ( '0' .. '9' )+
+ // InternalGModelDSL.g:1782:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -460,7 +460,7 @@ public class InternalGModelDSLLexer extends Lexer {
switch (alt3) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1782:13: '0' .. '9'
+ // InternalGModelDSL.g:1782:13: '0' .. '9'
{
matchRange('0','9');
@@ -492,10 +492,10 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = RULE_STRING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1784:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1784:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // InternalGModelDSL.g:1784:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // InternalGModelDSL.g:1784:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1784:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // InternalGModelDSL.g:1784:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -513,10 +513,10 @@ public class InternalGModelDSLLexer extends Lexer {
}
switch (alt6) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1784:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // InternalGModelDSL.g:1784:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1784:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+ // InternalGModelDSL.g:1784:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -532,7 +532,7 @@ public class InternalGModelDSLLexer extends Lexer {
switch (alt4) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1784:21: '\\\\' .
+ // InternalGModelDSL.g:1784:21: '\\\\' .
{
match('\\');
matchAny();
@@ -540,7 +540,7 @@ public class InternalGModelDSLLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1784:28: ~ ( ( '\\\\' | '\"' ) )
+ // InternalGModelDSL.g:1784:28: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -565,10 +565,10 @@ public class InternalGModelDSLLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1784:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // InternalGModelDSL.g:1784:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1784:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // InternalGModelDSL.g:1784:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -584,7 +584,7 @@ public class InternalGModelDSLLexer extends Lexer {
switch (alt5) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1784:54: '\\\\' .
+ // InternalGModelDSL.g:1784:54: '\\\\' .
{
match('\\');
matchAny();
@@ -592,7 +592,7 @@ public class InternalGModelDSLLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1784:61: ~ ( ( '\\\\' | '\\'' ) )
+ // InternalGModelDSL.g:1784:61: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -635,12 +635,12 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = RULE_ML_COMMENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1786:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1786:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // InternalGModelDSL.g:1786:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // InternalGModelDSL.g:1786:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1786:24: ( options {greedy=false; } : . )*
+ // InternalGModelDSL.g:1786:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -665,7 +665,7 @@ public class InternalGModelDSLLexer extends Lexer {
switch (alt7) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1786:52: .
+ // InternalGModelDSL.g:1786:52: .
{
matchAny();
@@ -695,12 +695,12 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = RULE_SL_COMMENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1788:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1788:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // InternalGModelDSL.g:1788:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // InternalGModelDSL.g:1788:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1788:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // InternalGModelDSL.g:1788:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
@@ -713,7 +713,7 @@ public class InternalGModelDSLLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1788:24: ~ ( ( '\\n' | '\\r' ) )
+ // InternalGModelDSL.g:1788:24: ~ ( ( '\\n' | '\\r' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -733,7 +733,7 @@ public class InternalGModelDSLLexer extends Lexer {
}
} while (true);
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1788:40: ( ( '\\r' )? '\\n' )?
+ // InternalGModelDSL.g:1788:40: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -742,9 +742,9 @@ public class InternalGModelDSLLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1788:41: ( '\\r' )? '\\n'
+ // InternalGModelDSL.g:1788:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1788:41: ( '\\r' )?
+ // InternalGModelDSL.g:1788:41: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -753,7 +753,7 @@ public class InternalGModelDSLLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1788:41: '\\r'
+ // InternalGModelDSL.g:1788:41: '\\r'
{
match('\r');
@@ -785,10 +785,10 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = RULE_WS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1790:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1790:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // InternalGModelDSL.g:1790:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // InternalGModelDSL.g:1790:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1790:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // InternalGModelDSL.g:1790:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -802,7 +802,7 @@ public class InternalGModelDSLLexer extends Lexer {
switch (alt11) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:
+ // InternalGModelDSL.g:
{
if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
input.consume();
@@ -842,8 +842,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = RULE_ANY_OTHER;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1792:16: ( . )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1792:18: .
+ // InternalGModelDSL.g:1792:16: ( . )
+ // InternalGModelDSL.g:1792:18: .
{
matchAny();
@@ -858,159 +858,159 @@ public class InternalGModelDSLLexer extends Lexer {
// $ANTLR end "RULE_ANY_OTHER"
public void mTokens() throws RecognitionException {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+ // InternalGModelDSL.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
int alt12=22;
alt12 = dfa12.predict(input);
switch (alt12) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:10: T__11
+ // InternalGModelDSL.g:1:10: T__11
{
mT__11();
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:16: T__12
+ // InternalGModelDSL.g:1:16: T__12
{
mT__12();
}
break;
case 3 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:22: T__13
+ // InternalGModelDSL.g:1:22: T__13
{
mT__13();
}
break;
case 4 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:28: T__14
+ // InternalGModelDSL.g:1:28: T__14
{
mT__14();
}
break;
case 5 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:34: T__15
+ // InternalGModelDSL.g:1:34: T__15
{
mT__15();
}
break;
case 6 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:40: T__16
+ // InternalGModelDSL.g:1:40: T__16
{
mT__16();
}
break;
case 7 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:46: T__17
+ // InternalGModelDSL.g:1:46: T__17
{
mT__17();
}
break;
case 8 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:52: T__18
+ // InternalGModelDSL.g:1:52: T__18
{
mT__18();
}
break;
case 9 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:58: T__19
+ // InternalGModelDSL.g:1:58: T__19
{
mT__19();
}
break;
case 10 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:64: T__20
+ // InternalGModelDSL.g:1:64: T__20
{
mT__20();
}
break;
case 11 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:70: T__21
+ // InternalGModelDSL.g:1:70: T__21
{
mT__21();
}
break;
case 12 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:76: T__22
+ // InternalGModelDSL.g:1:76: T__22
{
mT__22();
}
break;
case 13 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:82: T__23
+ // InternalGModelDSL.g:1:82: T__23
{
mT__23();
}
break;
case 14 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:88: T__24
+ // InternalGModelDSL.g:1:88: T__24
{
mT__24();
}
break;
case 15 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:94: T__25
+ // InternalGModelDSL.g:1:94: T__25
{
mT__25();
}
break;
case 16 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:100: RULE_ID
+ // InternalGModelDSL.g:1:100: RULE_ID
{
mRULE_ID();
}
break;
case 17 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:108: RULE_INT
+ // InternalGModelDSL.g:1:108: RULE_INT
{
mRULE_INT();
}
break;
case 18 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:117: RULE_STRING
+ // InternalGModelDSL.g:1:117: RULE_STRING
{
mRULE_STRING();
}
break;
case 19 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:129: RULE_ML_COMMENT
+ // InternalGModelDSL.g:1:129: RULE_ML_COMMENT
{
mRULE_ML_COMMENT();
}
break;
case 20 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:145: RULE_SL_COMMENT
+ // InternalGModelDSL.g:1:145: RULE_SL_COMMENT
{
mRULE_SL_COMMENT();
}
break;
case 21 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:161: RULE_WS
+ // InternalGModelDSL.g:1:161: RULE_WS
{
mRULE_WS();
}
break;
case 22 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1:169: RULE_ANY_OTHER
+ // InternalGModelDSL.g:1:169: RULE_ANY_OTHER
{
mRULE_ANY_OTHER();
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSLParser.java b/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSLParser.java
index dd363f04c..a5e1123e1 100644
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSLParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSLParser.java
@@ -63,7 +63,7 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
public String[] getTokenNames() { return InternalGModelDSLParser.tokenNames; }
- public String getGrammarFileName() { return "../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g"; }
+ public String getGrammarFileName() { return "InternalGModelDSL.g"; }
@@ -87,16 +87,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "entryRuleGModel"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:61:1: entryRuleGModel : ruleGModel EOF ;
+ // InternalGModelDSL.g:61:1: entryRuleGModel : ruleGModel EOF ;
public final void entryRuleGModel() throws RecognitionException {
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:62:1: ( ruleGModel EOF )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:63:1: ruleGModel EOF
+ // InternalGModelDSL.g:62:1: ( ruleGModel EOF )
+ // InternalGModelDSL.g:63:1: ruleGModel EOF
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGModelRule());
}
- pushFollow(FOLLOW_ruleGModel_in_entryRuleGModel67);
+ pushFollow(FOLLOW_1);
ruleGModel();
state._fsp--;
@@ -104,7 +104,7 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
if ( state.backtracking==0 ) {
after(grammarAccess.getGModelRule());
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleGModel74); if (state.failed) return ;
+ match(input,EOF,FOLLOW_2); if (state.failed) return ;
}
@@ -121,25 +121,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "ruleGModel"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:70:1: ruleGModel : ( ( rule__GModel__Group__0 ) ) ;
+ // InternalGModelDSL.g:70:1: ruleGModel : ( ( rule__GModel__Group__0 ) ) ;
public final void ruleGModel() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:74:2: ( ( ( rule__GModel__Group__0 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:75:1: ( ( rule__GModel__Group__0 ) )
+ // InternalGModelDSL.g:74:2: ( ( ( rule__GModel__Group__0 ) ) )
+ // InternalGModelDSL.g:75:1: ( ( rule__GModel__Group__0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:75:1: ( ( rule__GModel__Group__0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:76:1: ( rule__GModel__Group__0 )
+ // InternalGModelDSL.g:75:1: ( ( rule__GModel__Group__0 ) )
+ // InternalGModelDSL.g:76:1: ( rule__GModel__Group__0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGModelAccess().getGroup());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:77:1: ( rule__GModel__Group__0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:77:2: rule__GModel__Group__0
+ // InternalGModelDSL.g:77:1: ( rule__GModel__Group__0 )
+ // InternalGModelDSL.g:77:2: rule__GModel__Group__0
{
- pushFollow(FOLLOW_rule__GModel__Group__0_in_ruleGModel100);
+ pushFollow(FOLLOW_2);
rule__GModel__Group__0();
state._fsp--;
@@ -172,16 +172,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "entryRuleGDomainElement"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:89:1: entryRuleGDomainElement : ruleGDomainElement EOF ;
+ // InternalGModelDSL.g:89:1: entryRuleGDomainElement : ruleGDomainElement EOF ;
public final void entryRuleGDomainElement() throws RecognitionException {
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:90:1: ( ruleGDomainElement EOF )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:91:1: ruleGDomainElement EOF
+ // InternalGModelDSL.g:90:1: ( ruleGDomainElement EOF )
+ // InternalGModelDSL.g:91:1: ruleGDomainElement EOF
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementRule());
}
- pushFollow(FOLLOW_ruleGDomainElement_in_entryRuleGDomainElement127);
+ pushFollow(FOLLOW_1);
ruleGDomainElement();
state._fsp--;
@@ -189,7 +189,7 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainElementRule());
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleGDomainElement134); if (state.failed) return ;
+ match(input,EOF,FOLLOW_2); if (state.failed) return ;
}
@@ -206,25 +206,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "ruleGDomainElement"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:98:1: ruleGDomainElement : ( ( rule__GDomainElement__Group__0 ) ) ;
+ // InternalGModelDSL.g:98:1: ruleGDomainElement : ( ( rule__GDomainElement__Group__0 ) ) ;
public final void ruleGDomainElement() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:102:2: ( ( ( rule__GDomainElement__Group__0 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:103:1: ( ( rule__GDomainElement__Group__0 ) )
+ // InternalGModelDSL.g:102:2: ( ( ( rule__GDomainElement__Group__0 ) ) )
+ // InternalGModelDSL.g:103:1: ( ( rule__GDomainElement__Group__0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:103:1: ( ( rule__GDomainElement__Group__0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:104:1: ( rule__GDomainElement__Group__0 )
+ // InternalGModelDSL.g:103:1: ( ( rule__GDomainElement__Group__0 ) )
+ // InternalGModelDSL.g:104:1: ( rule__GDomainElement__Group__0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getGroup());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:105:1: ( rule__GDomainElement__Group__0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:105:2: rule__GDomainElement__Group__0
+ // InternalGModelDSL.g:105:1: ( rule__GDomainElement__Group__0 )
+ // InternalGModelDSL.g:105:2: rule__GDomainElement__Group__0
{
- pushFollow(FOLLOW_rule__GDomainElement__Group__0_in_ruleGDomainElement160);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__Group__0();
state._fsp--;
@@ -257,16 +257,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "entryRuleGDomainMap"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:117:1: entryRuleGDomainMap : ruleGDomainMap EOF ;
+ // InternalGModelDSL.g:117:1: entryRuleGDomainMap : ruleGDomainMap EOF ;
public final void entryRuleGDomainMap() throws RecognitionException {
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:118:1: ( ruleGDomainMap EOF )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:119:1: ruleGDomainMap EOF
+ // InternalGModelDSL.g:118:1: ( ruleGDomainMap EOF )
+ // InternalGModelDSL.g:119:1: ruleGDomainMap EOF
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainMapRule());
}
- pushFollow(FOLLOW_ruleGDomainMap_in_entryRuleGDomainMap187);
+ pushFollow(FOLLOW_1);
ruleGDomainMap();
state._fsp--;
@@ -274,7 +274,7 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainMapRule());
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleGDomainMap194); if (state.failed) return ;
+ match(input,EOF,FOLLOW_2); if (state.failed) return ;
}
@@ -291,25 +291,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "ruleGDomainMap"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:126:1: ruleGDomainMap : ( ( rule__GDomainMap__Group__0 ) ) ;
+ // InternalGModelDSL.g:126:1: ruleGDomainMap : ( ( rule__GDomainMap__Group__0 ) ) ;
public final void ruleGDomainMap() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:130:2: ( ( ( rule__GDomainMap__Group__0 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:131:1: ( ( rule__GDomainMap__Group__0 ) )
+ // InternalGModelDSL.g:130:2: ( ( ( rule__GDomainMap__Group__0 ) ) )
+ // InternalGModelDSL.g:131:1: ( ( rule__GDomainMap__Group__0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:131:1: ( ( rule__GDomainMap__Group__0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:132:1: ( rule__GDomainMap__Group__0 )
+ // InternalGModelDSL.g:131:1: ( ( rule__GDomainMap__Group__0 ) )
+ // InternalGModelDSL.g:132:1: ( rule__GDomainMap__Group__0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainMapAccess().getGroup());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:133:1: ( rule__GDomainMap__Group__0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:133:2: rule__GDomainMap__Group__0
+ // InternalGModelDSL.g:133:1: ( rule__GDomainMap__Group__0 )
+ // InternalGModelDSL.g:133:2: rule__GDomainMap__Group__0
{
- pushFollow(FOLLOW_rule__GDomainMap__Group__0_in_ruleGDomainMap220);
+ pushFollow(FOLLOW_2);
rule__GDomainMap__Group__0();
state._fsp--;
@@ -342,16 +342,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "entryRuleGDomainProperty"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:145:1: entryRuleGDomainProperty : ruleGDomainProperty EOF ;
+ // InternalGModelDSL.g:145:1: entryRuleGDomainProperty : ruleGDomainProperty EOF ;
public final void entryRuleGDomainProperty() throws RecognitionException {
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:146:1: ( ruleGDomainProperty EOF )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:147:1: ruleGDomainProperty EOF
+ // InternalGModelDSL.g:146:1: ( ruleGDomainProperty EOF )
+ // InternalGModelDSL.g:147:1: ruleGDomainProperty EOF
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyRule());
}
- pushFollow(FOLLOW_ruleGDomainProperty_in_entryRuleGDomainProperty247);
+ pushFollow(FOLLOW_1);
ruleGDomainProperty();
state._fsp--;
@@ -359,7 +359,7 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainPropertyRule());
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleGDomainProperty254); if (state.failed) return ;
+ match(input,EOF,FOLLOW_2); if (state.failed) return ;
}
@@ -376,25 +376,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "ruleGDomainProperty"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:154:1: ruleGDomainProperty : ( ( rule__GDomainProperty__Group__0 ) ) ;
+ // InternalGModelDSL.g:154:1: ruleGDomainProperty : ( ( rule__GDomainProperty__Group__0 ) ) ;
public final void ruleGDomainProperty() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:158:2: ( ( ( rule__GDomainProperty__Group__0 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:159:1: ( ( rule__GDomainProperty__Group__0 ) )
+ // InternalGModelDSL.g:158:2: ( ( ( rule__GDomainProperty__Group__0 ) ) )
+ // InternalGModelDSL.g:159:1: ( ( rule__GDomainProperty__Group__0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:159:1: ( ( rule__GDomainProperty__Group__0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:160:1: ( rule__GDomainProperty__Group__0 )
+ // InternalGModelDSL.g:159:1: ( ( rule__GDomainProperty__Group__0 ) )
+ // InternalGModelDSL.g:160:1: ( rule__GDomainProperty__Group__0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getGroup());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:161:1: ( rule__GDomainProperty__Group__0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:161:2: rule__GDomainProperty__Group__0
+ // InternalGModelDSL.g:161:1: ( rule__GDomainProperty__Group__0 )
+ // InternalGModelDSL.g:161:2: rule__GDomainProperty__Group__0
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group__0_in_ruleGDomainProperty280);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group__0();
state._fsp--;
@@ -427,16 +427,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "entryRuleGDefault"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:173:1: entryRuleGDefault : ruleGDefault EOF ;
+ // InternalGModelDSL.g:173:1: entryRuleGDefault : ruleGDefault EOF ;
public final void entryRuleGDefault() throws RecognitionException {
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:174:1: ( ruleGDefault EOF )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:175:1: ruleGDefault EOF
+ // InternalGModelDSL.g:174:1: ( ruleGDefault EOF )
+ // InternalGModelDSL.g:175:1: ruleGDefault EOF
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDefaultRule());
}
- pushFollow(FOLLOW_ruleGDefault_in_entryRuleGDefault307);
+ pushFollow(FOLLOW_1);
ruleGDefault();
state._fsp--;
@@ -444,7 +444,7 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
if ( state.backtracking==0 ) {
after(grammarAccess.getGDefaultRule());
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleGDefault314); if (state.failed) return ;
+ match(input,EOF,FOLLOW_2); if (state.failed) return ;
}
@@ -461,25 +461,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "ruleGDefault"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:182:1: ruleGDefault : ( ( rule__GDefault__Alternatives ) ) ;
+ // InternalGModelDSL.g:182:1: ruleGDefault : ( ( rule__GDefault__Alternatives ) ) ;
public final void ruleGDefault() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:186:2: ( ( ( rule__GDefault__Alternatives ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:187:1: ( ( rule__GDefault__Alternatives ) )
+ // InternalGModelDSL.g:186:2: ( ( ( rule__GDefault__Alternatives ) ) )
+ // InternalGModelDSL.g:187:1: ( ( rule__GDefault__Alternatives ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:187:1: ( ( rule__GDefault__Alternatives ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:188:1: ( rule__GDefault__Alternatives )
+ // InternalGModelDSL.g:187:1: ( ( rule__GDefault__Alternatives ) )
+ // InternalGModelDSL.g:188:1: ( rule__GDefault__Alternatives )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDefaultAccess().getAlternatives());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:189:1: ( rule__GDefault__Alternatives )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:189:2: rule__GDefault__Alternatives
+ // InternalGModelDSL.g:189:1: ( rule__GDefault__Alternatives )
+ // InternalGModelDSL.g:189:2: rule__GDefault__Alternatives
{
- pushFollow(FOLLOW_rule__GDefault__Alternatives_in_ruleGDefault340);
+ pushFollow(FOLLOW_2);
rule__GDefault__Alternatives();
state._fsp--;
@@ -512,16 +512,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "entryRuleValidID"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:201:1: entryRuleValidID : ruleValidID EOF ;
+ // InternalGModelDSL.g:201:1: entryRuleValidID : ruleValidID EOF ;
public final void entryRuleValidID() throws RecognitionException {
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:202:1: ( ruleValidID EOF )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:203:1: ruleValidID EOF
+ // InternalGModelDSL.g:202:1: ( ruleValidID EOF )
+ // InternalGModelDSL.g:203:1: ruleValidID EOF
{
if ( state.backtracking==0 ) {
before(grammarAccess.getValidIDRule());
}
- pushFollow(FOLLOW_ruleValidID_in_entryRuleValidID367);
+ pushFollow(FOLLOW_1);
ruleValidID();
state._fsp--;
@@ -529,7 +529,7 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
if ( state.backtracking==0 ) {
after(grammarAccess.getValidIDRule());
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleValidID374); if (state.failed) return ;
+ match(input,EOF,FOLLOW_2); if (state.failed) return ;
}
@@ -546,22 +546,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "ruleValidID"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:210:1: ruleValidID : ( RULE_ID ) ;
+ // InternalGModelDSL.g:210:1: ruleValidID : ( RULE_ID ) ;
public final void ruleValidID() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:214:2: ( ( RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:215:1: ( RULE_ID )
+ // InternalGModelDSL.g:214:2: ( ( RULE_ID ) )
+ // InternalGModelDSL.g:215:1: ( RULE_ID )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:215:1: ( RULE_ID )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:216:1: RULE_ID
+ // InternalGModelDSL.g:215:1: ( RULE_ID )
+ // InternalGModelDSL.g:216:1: RULE_ID
{
if ( state.backtracking==0 ) {
before(grammarAccess.getValidIDAccess().getIDTerminalRuleCall());
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleValidID400); if (state.failed) return ;
+ match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getValidIDAccess().getIDTerminalRuleCall());
}
@@ -587,16 +587,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "entryRuleQualifiedName"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:229:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
+ // InternalGModelDSL.g:229:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
public final void entryRuleQualifiedName() throws RecognitionException {
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:230:1: ( ruleQualifiedName EOF )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:231:1: ruleQualifiedName EOF
+ // InternalGModelDSL.g:230:1: ( ruleQualifiedName EOF )
+ // InternalGModelDSL.g:231:1: ruleQualifiedName EOF
{
if ( state.backtracking==0 ) {
before(grammarAccess.getQualifiedNameRule());
}
- pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName426);
+ pushFollow(FOLLOW_1);
ruleQualifiedName();
state._fsp--;
@@ -604,7 +604,7 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
if ( state.backtracking==0 ) {
after(grammarAccess.getQualifiedNameRule());
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName433); if (state.failed) return ;
+ match(input,EOF,FOLLOW_2); if (state.failed) return ;
}
@@ -621,25 +621,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "ruleQualifiedName"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:238:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
+ // InternalGModelDSL.g:238:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
public final void ruleQualifiedName() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:242:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:243:1: ( ( rule__QualifiedName__Group__0 ) )
+ // InternalGModelDSL.g:242:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
+ // InternalGModelDSL.g:243:1: ( ( rule__QualifiedName__Group__0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:243:1: ( ( rule__QualifiedName__Group__0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:244:1: ( rule__QualifiedName__Group__0 )
+ // InternalGModelDSL.g:243:1: ( ( rule__QualifiedName__Group__0 ) )
+ // InternalGModelDSL.g:244:1: ( rule__QualifiedName__Group__0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getQualifiedNameAccess().getGroup());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:245:1: ( rule__QualifiedName__Group__0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:245:2: rule__QualifiedName__Group__0
+ // InternalGModelDSL.g:245:1: ( rule__QualifiedName__Group__0 )
+ // InternalGModelDSL.g:245:2: rule__QualifiedName__Group__0
{
- pushFollow(FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName459);
+ pushFollow(FOLLOW_2);
rule__QualifiedName__Group__0();
state._fsp--;
@@ -672,13 +672,13 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Alternatives_4"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:257:1: rule__GDomainElement__Alternatives_4 : ( ( ( rule__GDomainElement__MapAssignment_4_0 ) ) | ( ( rule__GDomainElement__PropertyListAssignment_4_1 )* ) );
+ // InternalGModelDSL.g:257:1: rule__GDomainElement__Alternatives_4 : ( ( ( rule__GDomainElement__MapAssignment_4_0 ) ) | ( ( rule__GDomainElement__PropertyListAssignment_4_1 )* ) );
public final void rule__GDomainElement__Alternatives_4() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:261:1: ( ( ( rule__GDomainElement__MapAssignment_4_0 ) ) | ( ( rule__GDomainElement__PropertyListAssignment_4_1 )* ) )
+ // InternalGModelDSL.g:261:1: ( ( ( rule__GDomainElement__MapAssignment_4_0 ) ) | ( ( rule__GDomainElement__PropertyListAssignment_4_1 )* ) )
int alt2=2;
int LA2_0 = input.LA(1);
@@ -697,18 +697,18 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
switch (alt2) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:262:1: ( ( rule__GDomainElement__MapAssignment_4_0 ) )
+ // InternalGModelDSL.g:262:1: ( ( rule__GDomainElement__MapAssignment_4_0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:262:1: ( ( rule__GDomainElement__MapAssignment_4_0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:263:1: ( rule__GDomainElement__MapAssignment_4_0 )
+ // InternalGModelDSL.g:262:1: ( ( rule__GDomainElement__MapAssignment_4_0 ) )
+ // InternalGModelDSL.g:263:1: ( rule__GDomainElement__MapAssignment_4_0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getMapAssignment_4_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:264:1: ( rule__GDomainElement__MapAssignment_4_0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:264:2: rule__GDomainElement__MapAssignment_4_0
+ // InternalGModelDSL.g:264:1: ( rule__GDomainElement__MapAssignment_4_0 )
+ // InternalGModelDSL.g:264:2: rule__GDomainElement__MapAssignment_4_0
{
- pushFollow(FOLLOW_rule__GDomainElement__MapAssignment_4_0_in_rule__GDomainElement__Alternatives_4495);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__MapAssignment_4_0();
state._fsp--;
@@ -726,15 +726,15 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:268:6: ( ( rule__GDomainElement__PropertyListAssignment_4_1 )* )
+ // InternalGModelDSL.g:268:6: ( ( rule__GDomainElement__PropertyListAssignment_4_1 )* )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:268:6: ( ( rule__GDomainElement__PropertyListAssignment_4_1 )* )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:269:1: ( rule__GDomainElement__PropertyListAssignment_4_1 )*
+ // InternalGModelDSL.g:268:6: ( ( rule__GDomainElement__PropertyListAssignment_4_1 )* )
+ // InternalGModelDSL.g:269:1: ( rule__GDomainElement__PropertyListAssignment_4_1 )*
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getPropertyListAssignment_4_1());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:270:1: ( rule__GDomainElement__PropertyListAssignment_4_1 )*
+ // InternalGModelDSL.g:270:1: ( rule__GDomainElement__PropertyListAssignment_4_1 )*
loop1:
do {
int alt1=2;
@@ -747,9 +747,9 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
switch (alt1) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:270:2: rule__GDomainElement__PropertyListAssignment_4_1
+ // InternalGModelDSL.g:270:2: rule__GDomainElement__PropertyListAssignment_4_1
{
- pushFollow(FOLLOW_rule__GDomainElement__PropertyListAssignment_4_1_in_rule__GDomainElement__Alternatives_4513);
+ pushFollow(FOLLOW_3);
rule__GDomainElement__PropertyListAssignment_4_1();
state._fsp--;
@@ -790,13 +790,13 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainMap__Alternatives_1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:279:1: rule__GDomainMap__Alternatives_1 : ( ( ( rule__GDomainMap__BuiltInAssignment_1_0 ) ) | ( ( rule__GDomainMap__RefAssignment_1_1 ) ) );
+ // InternalGModelDSL.g:279:1: rule__GDomainMap__Alternatives_1 : ( ( ( rule__GDomainMap__BuiltInAssignment_1_0 ) ) | ( ( rule__GDomainMap__RefAssignment_1_1 ) ) );
public final void rule__GDomainMap__Alternatives_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:283:1: ( ( ( rule__GDomainMap__BuiltInAssignment_1_0 ) ) | ( ( rule__GDomainMap__RefAssignment_1_1 ) ) )
+ // InternalGModelDSL.g:283:1: ( ( ( rule__GDomainMap__BuiltInAssignment_1_0 ) ) | ( ( rule__GDomainMap__RefAssignment_1_1 ) ) )
int alt3=2;
int LA3_0 = input.LA(1);
@@ -815,18 +815,18 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
switch (alt3) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:284:1: ( ( rule__GDomainMap__BuiltInAssignment_1_0 ) )
+ // InternalGModelDSL.g:284:1: ( ( rule__GDomainMap__BuiltInAssignment_1_0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:284:1: ( ( rule__GDomainMap__BuiltInAssignment_1_0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:285:1: ( rule__GDomainMap__BuiltInAssignment_1_0 )
+ // InternalGModelDSL.g:284:1: ( ( rule__GDomainMap__BuiltInAssignment_1_0 ) )
+ // InternalGModelDSL.g:285:1: ( rule__GDomainMap__BuiltInAssignment_1_0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainMapAccess().getBuiltInAssignment_1_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:286:1: ( rule__GDomainMap__BuiltInAssignment_1_0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:286:2: rule__GDomainMap__BuiltInAssignment_1_0
+ // InternalGModelDSL.g:286:1: ( rule__GDomainMap__BuiltInAssignment_1_0 )
+ // InternalGModelDSL.g:286:2: rule__GDomainMap__BuiltInAssignment_1_0
{
- pushFollow(FOLLOW_rule__GDomainMap__BuiltInAssignment_1_0_in_rule__GDomainMap__Alternatives_1547);
+ pushFollow(FOLLOW_2);
rule__GDomainMap__BuiltInAssignment_1_0();
state._fsp--;
@@ -844,18 +844,18 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:290:6: ( ( rule__GDomainMap__RefAssignment_1_1 ) )
+ // InternalGModelDSL.g:290:6: ( ( rule__GDomainMap__RefAssignment_1_1 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:290:6: ( ( rule__GDomainMap__RefAssignment_1_1 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:291:1: ( rule__GDomainMap__RefAssignment_1_1 )
+ // InternalGModelDSL.g:290:6: ( ( rule__GDomainMap__RefAssignment_1_1 ) )
+ // InternalGModelDSL.g:291:1: ( rule__GDomainMap__RefAssignment_1_1 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainMapAccess().getRefAssignment_1_1());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:292:1: ( rule__GDomainMap__RefAssignment_1_1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:292:2: rule__GDomainMap__RefAssignment_1_1
+ // InternalGModelDSL.g:292:1: ( rule__GDomainMap__RefAssignment_1_1 )
+ // InternalGModelDSL.g:292:2: rule__GDomainMap__RefAssignment_1_1
{
- pushFollow(FOLLOW_rule__GDomainMap__RefAssignment_1_1_in_rule__GDomainMap__Alternatives_1565);
+ pushFollow(FOLLOW_2);
rule__GDomainMap__RefAssignment_1_1();
state._fsp--;
@@ -890,13 +890,13 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainMap__BuiltInAlternatives_1_0_0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:301:1: rule__GDomainMap__BuiltInAlternatives_1_0_0 : ( ( 'Int' ) | ( 'Double' ) | ( 'String' ) | ( 'Boolean' ) );
+ // InternalGModelDSL.g:301:1: rule__GDomainMap__BuiltInAlternatives_1_0_0 : ( ( 'Int' ) | ( 'Double' ) | ( 'String' ) | ( 'Boolean' ) );
public final void rule__GDomainMap__BuiltInAlternatives_1_0_0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:305:1: ( ( 'Int' ) | ( 'Double' ) | ( 'String' ) | ( 'Boolean' ) )
+ // InternalGModelDSL.g:305:1: ( ( 'Int' ) | ( 'Double' ) | ( 'String' ) | ( 'Boolean' ) )
int alt4=4;
switch ( input.LA(1) ) {
case 11:
@@ -929,15 +929,15 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
switch (alt4) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:306:1: ( 'Int' )
+ // InternalGModelDSL.g:306:1: ( 'Int' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:306:1: ( 'Int' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:307:1: 'Int'
+ // InternalGModelDSL.g:306:1: ( 'Int' )
+ // InternalGModelDSL.g:307:1: 'Int'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainMapAccess().getBuiltInIntKeyword_1_0_0_0());
}
- match(input,11,FOLLOW_11_in_rule__GDomainMap__BuiltInAlternatives_1_0_0599); if (state.failed) return ;
+ match(input,11,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainMapAccess().getBuiltInIntKeyword_1_0_0_0());
}
@@ -948,15 +948,15 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:314:6: ( 'Double' )
+ // InternalGModelDSL.g:314:6: ( 'Double' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:314:6: ( 'Double' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:315:1: 'Double'
+ // InternalGModelDSL.g:314:6: ( 'Double' )
+ // InternalGModelDSL.g:315:1: 'Double'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainMapAccess().getBuiltInDoubleKeyword_1_0_0_1());
}
- match(input,12,FOLLOW_12_in_rule__GDomainMap__BuiltInAlternatives_1_0_0619); if (state.failed) return ;
+ match(input,12,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainMapAccess().getBuiltInDoubleKeyword_1_0_0_1());
}
@@ -967,15 +967,15 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
break;
case 3 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:322:6: ( 'String' )
+ // InternalGModelDSL.g:322:6: ( 'String' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:322:6: ( 'String' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:323:1: 'String'
+ // InternalGModelDSL.g:322:6: ( 'String' )
+ // InternalGModelDSL.g:323:1: 'String'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainMapAccess().getBuiltInStringKeyword_1_0_0_2());
}
- match(input,13,FOLLOW_13_in_rule__GDomainMap__BuiltInAlternatives_1_0_0639); if (state.failed) return ;
+ match(input,13,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainMapAccess().getBuiltInStringKeyword_1_0_0_2());
}
@@ -986,15 +986,15 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
break;
case 4 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:330:6: ( 'Boolean' )
+ // InternalGModelDSL.g:330:6: ( 'Boolean' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:330:6: ( 'Boolean' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:331:1: 'Boolean'
+ // InternalGModelDSL.g:330:6: ( 'Boolean' )
+ // InternalGModelDSL.g:331:1: 'Boolean'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainMapAccess().getBuiltInBooleanKeyword_1_0_0_3());
}
- match(input,14,FOLLOW_14_in_rule__GDomainMap__BuiltInAlternatives_1_0_0659); if (state.failed) return ;
+ match(input,14,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainMapAccess().getBuiltInBooleanKeyword_1_0_0_3());
}
@@ -1022,13 +1022,13 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Alternatives_0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:343:1: rule__GDomainProperty__Alternatives_0 : ( ( ( rule__GDomainProperty__Group_0_0__0 ) ) | ( ( rule__GDomainProperty__Group_0_1__0 ) ) );
+ // InternalGModelDSL.g:343:1: rule__GDomainProperty__Alternatives_0 : ( ( ( rule__GDomainProperty__Group_0_0__0 ) ) | ( ( rule__GDomainProperty__Group_0_1__0 ) ) );
public final void rule__GDomainProperty__Alternatives_0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:347:1: ( ( ( rule__GDomainProperty__Group_0_0__0 ) ) | ( ( rule__GDomainProperty__Group_0_1__0 ) ) )
+ // InternalGModelDSL.g:347:1: ( ( ( rule__GDomainProperty__Group_0_0__0 ) ) | ( ( rule__GDomainProperty__Group_0_1__0 ) ) )
int alt5=2;
int LA5_0 = input.LA(1);
@@ -1047,18 +1047,18 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
switch (alt5) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:348:1: ( ( rule__GDomainProperty__Group_0_0__0 ) )
+ // InternalGModelDSL.g:348:1: ( ( rule__GDomainProperty__Group_0_0__0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:348:1: ( ( rule__GDomainProperty__Group_0_0__0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:349:1: ( rule__GDomainProperty__Group_0_0__0 )
+ // InternalGModelDSL.g:348:1: ( ( rule__GDomainProperty__Group_0_0__0 ) )
+ // InternalGModelDSL.g:349:1: ( rule__GDomainProperty__Group_0_0__0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getGroup_0_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:350:1: ( rule__GDomainProperty__Group_0_0__0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:350:2: rule__GDomainProperty__Group_0_0__0
+ // InternalGModelDSL.g:350:1: ( rule__GDomainProperty__Group_0_0__0 )
+ // InternalGModelDSL.g:350:2: rule__GDomainProperty__Group_0_0__0
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_0__0_in_rule__GDomainProperty__Alternatives_0693);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group_0_0__0();
state._fsp--;
@@ -1076,18 +1076,18 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:354:6: ( ( rule__GDomainProperty__Group_0_1__0 ) )
+ // InternalGModelDSL.g:354:6: ( ( rule__GDomainProperty__Group_0_1__0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:354:6: ( ( rule__GDomainProperty__Group_0_1__0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:355:1: ( rule__GDomainProperty__Group_0_1__0 )
+ // InternalGModelDSL.g:354:6: ( ( rule__GDomainProperty__Group_0_1__0 ) )
+ // InternalGModelDSL.g:355:1: ( rule__GDomainProperty__Group_0_1__0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getGroup_0_1());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:356:1: ( rule__GDomainProperty__Group_0_1__0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:356:2: rule__GDomainProperty__Group_0_1__0
+ // InternalGModelDSL.g:356:1: ( rule__GDomainProperty__Group_0_1__0 )
+ // InternalGModelDSL.g:356:2: rule__GDomainProperty__Group_0_1__0
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_1__0_in_rule__GDomainProperty__Alternatives_0711);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group_0_1__0();
state._fsp--;
@@ -1122,13 +1122,13 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__BuiltInAlternatives_0_0_0_0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:365:1: rule__GDomainProperty__BuiltInAlternatives_0_0_0_0 : ( ( 'Int' ) | ( 'Double' ) | ( 'String' ) | ( 'Boolean' ) );
+ // InternalGModelDSL.g:365:1: rule__GDomainProperty__BuiltInAlternatives_0_0_0_0 : ( ( 'Int' ) | ( 'Double' ) | ( 'String' ) | ( 'Boolean' ) );
public final void rule__GDomainProperty__BuiltInAlternatives_0_0_0_0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:369:1: ( ( 'Int' ) | ( 'Double' ) | ( 'String' ) | ( 'Boolean' ) )
+ // InternalGModelDSL.g:369:1: ( ( 'Int' ) | ( 'Double' ) | ( 'String' ) | ( 'Boolean' ) )
int alt6=4;
switch ( input.LA(1) ) {
case 11:
@@ -1161,15 +1161,15 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
switch (alt6) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:370:1: ( 'Int' )
+ // InternalGModelDSL.g:370:1: ( 'Int' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:370:1: ( 'Int' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:371:1: 'Int'
+ // InternalGModelDSL.g:370:1: ( 'Int' )
+ // InternalGModelDSL.g:371:1: 'Int'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getBuiltInIntKeyword_0_0_0_0_0());
}
- match(input,11,FOLLOW_11_in_rule__GDomainProperty__BuiltInAlternatives_0_0_0_0745); if (state.failed) return ;
+ match(input,11,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainPropertyAccess().getBuiltInIntKeyword_0_0_0_0_0());
}
@@ -1180,15 +1180,15 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:378:6: ( 'Double' )
+ // InternalGModelDSL.g:378:6: ( 'Double' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:378:6: ( 'Double' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:379:1: 'Double'
+ // InternalGModelDSL.g:378:6: ( 'Double' )
+ // InternalGModelDSL.g:379:1: 'Double'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getBuiltInDoubleKeyword_0_0_0_0_1());
}
- match(input,12,FOLLOW_12_in_rule__GDomainProperty__BuiltInAlternatives_0_0_0_0765); if (state.failed) return ;
+ match(input,12,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainPropertyAccess().getBuiltInDoubleKeyword_0_0_0_0_1());
}
@@ -1199,15 +1199,15 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
break;
case 3 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:386:6: ( 'String' )
+ // InternalGModelDSL.g:386:6: ( 'String' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:386:6: ( 'String' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:387:1: 'String'
+ // InternalGModelDSL.g:386:6: ( 'String' )
+ // InternalGModelDSL.g:387:1: 'String'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getBuiltInStringKeyword_0_0_0_0_2());
}
- match(input,13,FOLLOW_13_in_rule__GDomainProperty__BuiltInAlternatives_0_0_0_0785); if (state.failed) return ;
+ match(input,13,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainPropertyAccess().getBuiltInStringKeyword_0_0_0_0_2());
}
@@ -1218,15 +1218,15 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
break;
case 4 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:394:6: ( 'Boolean' )
+ // InternalGModelDSL.g:394:6: ( 'Boolean' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:394:6: ( 'Boolean' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:395:1: 'Boolean'
+ // InternalGModelDSL.g:394:6: ( 'Boolean' )
+ // InternalGModelDSL.g:395:1: 'Boolean'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getBuiltInBooleanKeyword_0_0_0_0_3());
}
- match(input,14,FOLLOW_14_in_rule__GDomainProperty__BuiltInAlternatives_0_0_0_0805); if (state.failed) return ;
+ match(input,14,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainPropertyAccess().getBuiltInBooleanKeyword_0_0_0_0_3());
}
@@ -1254,13 +1254,13 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDefault__Alternatives"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:407:1: rule__GDefault__Alternatives : ( ( ( rule__GDefault__StringValAssignment_0 ) ) | ( ( rule__GDefault__IntValAssignment_1 ) ) );
+ // InternalGModelDSL.g:407:1: rule__GDefault__Alternatives : ( ( ( rule__GDefault__StringValAssignment_0 ) ) | ( ( rule__GDefault__IntValAssignment_1 ) ) );
public final void rule__GDefault__Alternatives() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:411:1: ( ( ( rule__GDefault__StringValAssignment_0 ) ) | ( ( rule__GDefault__IntValAssignment_1 ) ) )
+ // InternalGModelDSL.g:411:1: ( ( ( rule__GDefault__StringValAssignment_0 ) ) | ( ( rule__GDefault__IntValAssignment_1 ) ) )
int alt7=2;
int LA7_0 = input.LA(1);
@@ -1279,18 +1279,18 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
switch (alt7) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:412:1: ( ( rule__GDefault__StringValAssignment_0 ) )
+ // InternalGModelDSL.g:412:1: ( ( rule__GDefault__StringValAssignment_0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:412:1: ( ( rule__GDefault__StringValAssignment_0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:413:1: ( rule__GDefault__StringValAssignment_0 )
+ // InternalGModelDSL.g:412:1: ( ( rule__GDefault__StringValAssignment_0 ) )
+ // InternalGModelDSL.g:413:1: ( rule__GDefault__StringValAssignment_0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDefaultAccess().getStringValAssignment_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:414:1: ( rule__GDefault__StringValAssignment_0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:414:2: rule__GDefault__StringValAssignment_0
+ // InternalGModelDSL.g:414:1: ( rule__GDefault__StringValAssignment_0 )
+ // InternalGModelDSL.g:414:2: rule__GDefault__StringValAssignment_0
{
- pushFollow(FOLLOW_rule__GDefault__StringValAssignment_0_in_rule__GDefault__Alternatives839);
+ pushFollow(FOLLOW_2);
rule__GDefault__StringValAssignment_0();
state._fsp--;
@@ -1308,18 +1308,18 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:418:6: ( ( rule__GDefault__IntValAssignment_1 ) )
+ // InternalGModelDSL.g:418:6: ( ( rule__GDefault__IntValAssignment_1 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:418:6: ( ( rule__GDefault__IntValAssignment_1 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:419:1: ( rule__GDefault__IntValAssignment_1 )
+ // InternalGModelDSL.g:418:6: ( ( rule__GDefault__IntValAssignment_1 ) )
+ // InternalGModelDSL.g:419:1: ( rule__GDefault__IntValAssignment_1 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDefaultAccess().getIntValAssignment_1());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:420:1: ( rule__GDefault__IntValAssignment_1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:420:2: rule__GDefault__IntValAssignment_1
+ // InternalGModelDSL.g:420:1: ( rule__GDefault__IntValAssignment_1 )
+ // InternalGModelDSL.g:420:2: rule__GDefault__IntValAssignment_1
{
- pushFollow(FOLLOW_rule__GDefault__IntValAssignment_1_in_rule__GDefault__Alternatives857);
+ pushFollow(FOLLOW_2);
rule__GDefault__IntValAssignment_1();
state._fsp--;
@@ -1354,21 +1354,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GModel__Group__0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:431:1: rule__GModel__Group__0 : rule__GModel__Group__0__Impl rule__GModel__Group__1 ;
+ // InternalGModelDSL.g:431:1: rule__GModel__Group__0 : rule__GModel__Group__0__Impl rule__GModel__Group__1 ;
public final void rule__GModel__Group__0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:435:1: ( rule__GModel__Group__0__Impl rule__GModel__Group__1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:436:2: rule__GModel__Group__0__Impl rule__GModel__Group__1
+ // InternalGModelDSL.g:435:1: ( rule__GModel__Group__0__Impl rule__GModel__Group__1 )
+ // InternalGModelDSL.g:436:2: rule__GModel__Group__0__Impl rule__GModel__Group__1
{
- pushFollow(FOLLOW_rule__GModel__Group__0__Impl_in_rule__GModel__Group__0888);
+ pushFollow(FOLLOW_4);
rule__GModel__Group__0__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GModel__Group__1_in_rule__GModel__Group__0891);
+ pushFollow(FOLLOW_2);
rule__GModel__Group__1();
state._fsp--;
@@ -1392,22 +1392,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GModel__Group__0__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:443:1: rule__GModel__Group__0__Impl : ( 'package' ) ;
+ // InternalGModelDSL.g:443:1: rule__GModel__Group__0__Impl : ( 'package' ) ;
public final void rule__GModel__Group__0__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:447:1: ( ( 'package' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:448:1: ( 'package' )
+ // InternalGModelDSL.g:447:1: ( ( 'package' ) )
+ // InternalGModelDSL.g:448:1: ( 'package' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:448:1: ( 'package' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:449:1: 'package'
+ // InternalGModelDSL.g:448:1: ( 'package' )
+ // InternalGModelDSL.g:449:1: 'package'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGModelAccess().getPackageKeyword_0());
}
- match(input,15,FOLLOW_15_in_rule__GModel__Group__0__Impl919); if (state.failed) return ;
+ match(input,15,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGModelAccess().getPackageKeyword_0());
}
@@ -1433,21 +1433,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GModel__Group__1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:462:1: rule__GModel__Group__1 : rule__GModel__Group__1__Impl rule__GModel__Group__2 ;
+ // InternalGModelDSL.g:462:1: rule__GModel__Group__1 : rule__GModel__Group__1__Impl rule__GModel__Group__2 ;
public final void rule__GModel__Group__1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:466:1: ( rule__GModel__Group__1__Impl rule__GModel__Group__2 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:467:2: rule__GModel__Group__1__Impl rule__GModel__Group__2
+ // InternalGModelDSL.g:466:1: ( rule__GModel__Group__1__Impl rule__GModel__Group__2 )
+ // InternalGModelDSL.g:467:2: rule__GModel__Group__1__Impl rule__GModel__Group__2
{
- pushFollow(FOLLOW_rule__GModel__Group__1__Impl_in_rule__GModel__Group__1950);
+ pushFollow(FOLLOW_5);
rule__GModel__Group__1__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GModel__Group__2_in_rule__GModel__Group__1953);
+ pushFollow(FOLLOW_2);
rule__GModel__Group__2();
state._fsp--;
@@ -1471,25 +1471,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GModel__Group__1__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:474:1: rule__GModel__Group__1__Impl : ( ( rule__GModel__NameAssignment_1 ) ) ;
+ // InternalGModelDSL.g:474:1: rule__GModel__Group__1__Impl : ( ( rule__GModel__NameAssignment_1 ) ) ;
public final void rule__GModel__Group__1__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:478:1: ( ( ( rule__GModel__NameAssignment_1 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:479:1: ( ( rule__GModel__NameAssignment_1 ) )
+ // InternalGModelDSL.g:478:1: ( ( ( rule__GModel__NameAssignment_1 ) ) )
+ // InternalGModelDSL.g:479:1: ( ( rule__GModel__NameAssignment_1 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:479:1: ( ( rule__GModel__NameAssignment_1 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:480:1: ( rule__GModel__NameAssignment_1 )
+ // InternalGModelDSL.g:479:1: ( ( rule__GModel__NameAssignment_1 ) )
+ // InternalGModelDSL.g:480:1: ( rule__GModel__NameAssignment_1 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGModelAccess().getNameAssignment_1());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:481:1: ( rule__GModel__NameAssignment_1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:481:2: rule__GModel__NameAssignment_1
+ // InternalGModelDSL.g:481:1: ( rule__GModel__NameAssignment_1 )
+ // InternalGModelDSL.g:481:2: rule__GModel__NameAssignment_1
{
- pushFollow(FOLLOW_rule__GModel__NameAssignment_1_in_rule__GModel__Group__1__Impl980);
+ pushFollow(FOLLOW_2);
rule__GModel__NameAssignment_1();
state._fsp--;
@@ -1522,21 +1522,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GModel__Group__2"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:491:1: rule__GModel__Group__2 : rule__GModel__Group__2__Impl rule__GModel__Group__3 ;
+ // InternalGModelDSL.g:491:1: rule__GModel__Group__2 : rule__GModel__Group__2__Impl rule__GModel__Group__3 ;
public final void rule__GModel__Group__2() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:495:1: ( rule__GModel__Group__2__Impl rule__GModel__Group__3 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:496:2: rule__GModel__Group__2__Impl rule__GModel__Group__3
+ // InternalGModelDSL.g:495:1: ( rule__GModel__Group__2__Impl rule__GModel__Group__3 )
+ // InternalGModelDSL.g:496:2: rule__GModel__Group__2__Impl rule__GModel__Group__3
{
- pushFollow(FOLLOW_rule__GModel__Group__2__Impl_in_rule__GModel__Group__21010);
+ pushFollow(FOLLOW_6);
rule__GModel__Group__2__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GModel__Group__3_in_rule__GModel__Group__21013);
+ pushFollow(FOLLOW_2);
rule__GModel__Group__3();
state._fsp--;
@@ -1560,22 +1560,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GModel__Group__2__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:503:1: rule__GModel__Group__2__Impl : ( '{' ) ;
+ // InternalGModelDSL.g:503:1: rule__GModel__Group__2__Impl : ( '{' ) ;
public final void rule__GModel__Group__2__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:507:1: ( ( '{' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:508:1: ( '{' )
+ // InternalGModelDSL.g:507:1: ( ( '{' ) )
+ // InternalGModelDSL.g:508:1: ( '{' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:508:1: ( '{' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:509:1: '{'
+ // InternalGModelDSL.g:508:1: ( '{' )
+ // InternalGModelDSL.g:509:1: '{'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGModelAccess().getLeftCurlyBracketKeyword_2());
}
- match(input,16,FOLLOW_16_in_rule__GModel__Group__2__Impl1041); if (state.failed) return ;
+ match(input,16,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGModelAccess().getLeftCurlyBracketKeyword_2());
}
@@ -1601,21 +1601,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GModel__Group__3"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:522:1: rule__GModel__Group__3 : rule__GModel__Group__3__Impl rule__GModel__Group__4 ;
+ // InternalGModelDSL.g:522:1: rule__GModel__Group__3 : rule__GModel__Group__3__Impl rule__GModel__Group__4 ;
public final void rule__GModel__Group__3() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:526:1: ( rule__GModel__Group__3__Impl rule__GModel__Group__4 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:527:2: rule__GModel__Group__3__Impl rule__GModel__Group__4
+ // InternalGModelDSL.g:526:1: ( rule__GModel__Group__3__Impl rule__GModel__Group__4 )
+ // InternalGModelDSL.g:527:2: rule__GModel__Group__3__Impl rule__GModel__Group__4
{
- pushFollow(FOLLOW_rule__GModel__Group__3__Impl_in_rule__GModel__Group__31072);
+ pushFollow(FOLLOW_7);
rule__GModel__Group__3__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GModel__Group__4_in_rule__GModel__Group__31075);
+ pushFollow(FOLLOW_2);
rule__GModel__Group__4();
state._fsp--;
@@ -1639,28 +1639,28 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GModel__Group__3__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:534:1: rule__GModel__Group__3__Impl : ( ( ( rule__GModel__TypeListAssignment_3 ) ) ( ( rule__GModel__TypeListAssignment_3 )* ) ) ;
+ // InternalGModelDSL.g:534:1: rule__GModel__Group__3__Impl : ( ( ( rule__GModel__TypeListAssignment_3 ) ) ( ( rule__GModel__TypeListAssignment_3 )* ) ) ;
public final void rule__GModel__Group__3__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:538:1: ( ( ( ( rule__GModel__TypeListAssignment_3 ) ) ( ( rule__GModel__TypeListAssignment_3 )* ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:539:1: ( ( ( rule__GModel__TypeListAssignment_3 ) ) ( ( rule__GModel__TypeListAssignment_3 )* ) )
+ // InternalGModelDSL.g:538:1: ( ( ( ( rule__GModel__TypeListAssignment_3 ) ) ( ( rule__GModel__TypeListAssignment_3 )* ) ) )
+ // InternalGModelDSL.g:539:1: ( ( ( rule__GModel__TypeListAssignment_3 ) ) ( ( rule__GModel__TypeListAssignment_3 )* ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:539:1: ( ( ( rule__GModel__TypeListAssignment_3 ) ) ( ( rule__GModel__TypeListAssignment_3 )* ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:540:1: ( ( rule__GModel__TypeListAssignment_3 ) ) ( ( rule__GModel__TypeListAssignment_3 )* )
+ // InternalGModelDSL.g:539:1: ( ( ( rule__GModel__TypeListAssignment_3 ) ) ( ( rule__GModel__TypeListAssignment_3 )* ) )
+ // InternalGModelDSL.g:540:1: ( ( rule__GModel__TypeListAssignment_3 ) ) ( ( rule__GModel__TypeListAssignment_3 )* )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:540:1: ( ( rule__GModel__TypeListAssignment_3 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:541:1: ( rule__GModel__TypeListAssignment_3 )
+ // InternalGModelDSL.g:540:1: ( ( rule__GModel__TypeListAssignment_3 ) )
+ // InternalGModelDSL.g:541:1: ( rule__GModel__TypeListAssignment_3 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGModelAccess().getTypeListAssignment_3());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:542:1: ( rule__GModel__TypeListAssignment_3 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:542:2: rule__GModel__TypeListAssignment_3
+ // InternalGModelDSL.g:542:1: ( rule__GModel__TypeListAssignment_3 )
+ // InternalGModelDSL.g:542:2: rule__GModel__TypeListAssignment_3
{
- pushFollow(FOLLOW_rule__GModel__TypeListAssignment_3_in_rule__GModel__Group__3__Impl1104);
+ pushFollow(FOLLOW_8);
rule__GModel__TypeListAssignment_3();
state._fsp--;
@@ -1674,13 +1674,13 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:545:1: ( ( rule__GModel__TypeListAssignment_3 )* )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:546:1: ( rule__GModel__TypeListAssignment_3 )*
+ // InternalGModelDSL.g:545:1: ( ( rule__GModel__TypeListAssignment_3 )* )
+ // InternalGModelDSL.g:546:1: ( rule__GModel__TypeListAssignment_3 )*
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGModelAccess().getTypeListAssignment_3());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:547:1: ( rule__GModel__TypeListAssignment_3 )*
+ // InternalGModelDSL.g:547:1: ( rule__GModel__TypeListAssignment_3 )*
loop8:
do {
int alt8=2;
@@ -1693,9 +1693,9 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
switch (alt8) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:547:2: rule__GModel__TypeListAssignment_3
+ // InternalGModelDSL.g:547:2: rule__GModel__TypeListAssignment_3
{
- pushFollow(FOLLOW_rule__GModel__TypeListAssignment_3_in_rule__GModel__Group__3__Impl1116);
+ pushFollow(FOLLOW_8);
rule__GModel__TypeListAssignment_3();
state._fsp--;
@@ -1737,16 +1737,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GModel__Group__4"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:558:1: rule__GModel__Group__4 : rule__GModel__Group__4__Impl ;
+ // InternalGModelDSL.g:558:1: rule__GModel__Group__4 : rule__GModel__Group__4__Impl ;
public final void rule__GModel__Group__4() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:562:1: ( rule__GModel__Group__4__Impl )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:563:2: rule__GModel__Group__4__Impl
+ // InternalGModelDSL.g:562:1: ( rule__GModel__Group__4__Impl )
+ // InternalGModelDSL.g:563:2: rule__GModel__Group__4__Impl
{
- pushFollow(FOLLOW_rule__GModel__Group__4__Impl_in_rule__GModel__Group__41149);
+ pushFollow(FOLLOW_2);
rule__GModel__Group__4__Impl();
state._fsp--;
@@ -1770,22 +1770,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GModel__Group__4__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:569:1: rule__GModel__Group__4__Impl : ( '}' ) ;
+ // InternalGModelDSL.g:569:1: rule__GModel__Group__4__Impl : ( '}' ) ;
public final void rule__GModel__Group__4__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:573:1: ( ( '}' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:574:1: ( '}' )
+ // InternalGModelDSL.g:573:1: ( ( '}' ) )
+ // InternalGModelDSL.g:574:1: ( '}' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:574:1: ( '}' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:575:1: '}'
+ // InternalGModelDSL.g:574:1: ( '}' )
+ // InternalGModelDSL.g:575:1: '}'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGModelAccess().getRightCurlyBracketKeyword_4());
}
- match(input,17,FOLLOW_17_in_rule__GModel__Group__4__Impl1177); if (state.failed) return ;
+ match(input,17,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGModelAccess().getRightCurlyBracketKeyword_4());
}
@@ -1811,21 +1811,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group__0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:598:1: rule__GDomainElement__Group__0 : rule__GDomainElement__Group__0__Impl rule__GDomainElement__Group__1 ;
+ // InternalGModelDSL.g:598:1: rule__GDomainElement__Group__0 : rule__GDomainElement__Group__0__Impl rule__GDomainElement__Group__1 ;
public final void rule__GDomainElement__Group__0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:602:1: ( rule__GDomainElement__Group__0__Impl rule__GDomainElement__Group__1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:603:2: rule__GDomainElement__Group__0__Impl rule__GDomainElement__Group__1
+ // InternalGModelDSL.g:602:1: ( rule__GDomainElement__Group__0__Impl rule__GDomainElement__Group__1 )
+ // InternalGModelDSL.g:603:2: rule__GDomainElement__Group__0__Impl rule__GDomainElement__Group__1
{
- pushFollow(FOLLOW_rule__GDomainElement__Group__0__Impl_in_rule__GDomainElement__Group__01218);
+ pushFollow(FOLLOW_4);
rule__GDomainElement__Group__0__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainElement__Group__1_in_rule__GDomainElement__Group__01221);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__Group__1();
state._fsp--;
@@ -1849,22 +1849,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group__0__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:610:1: rule__GDomainElement__Group__0__Impl : ( 'type' ) ;
+ // InternalGModelDSL.g:610:1: rule__GDomainElement__Group__0__Impl : ( 'type' ) ;
public final void rule__GDomainElement__Group__0__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:614:1: ( ( 'type' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:615:1: ( 'type' )
+ // InternalGModelDSL.g:614:1: ( ( 'type' ) )
+ // InternalGModelDSL.g:615:1: ( 'type' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:615:1: ( 'type' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:616:1: 'type'
+ // InternalGModelDSL.g:615:1: ( 'type' )
+ // InternalGModelDSL.g:616:1: 'type'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getTypeKeyword_0());
}
- match(input,18,FOLLOW_18_in_rule__GDomainElement__Group__0__Impl1249); if (state.failed) return ;
+ match(input,18,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainElementAccess().getTypeKeyword_0());
}
@@ -1890,21 +1890,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group__1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:629:1: rule__GDomainElement__Group__1 : rule__GDomainElement__Group__1__Impl rule__GDomainElement__Group__2 ;
+ // InternalGModelDSL.g:629:1: rule__GDomainElement__Group__1 : rule__GDomainElement__Group__1__Impl rule__GDomainElement__Group__2 ;
public final void rule__GDomainElement__Group__1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:633:1: ( rule__GDomainElement__Group__1__Impl rule__GDomainElement__Group__2 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:634:2: rule__GDomainElement__Group__1__Impl rule__GDomainElement__Group__2
+ // InternalGModelDSL.g:633:1: ( rule__GDomainElement__Group__1__Impl rule__GDomainElement__Group__2 )
+ // InternalGModelDSL.g:634:2: rule__GDomainElement__Group__1__Impl rule__GDomainElement__Group__2
{
- pushFollow(FOLLOW_rule__GDomainElement__Group__1__Impl_in_rule__GDomainElement__Group__11280);
+ pushFollow(FOLLOW_9);
rule__GDomainElement__Group__1__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainElement__Group__2_in_rule__GDomainElement__Group__11283);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__Group__2();
state._fsp--;
@@ -1928,25 +1928,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group__1__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:641:1: rule__GDomainElement__Group__1__Impl : ( ( rule__GDomainElement__NameAssignment_1 ) ) ;
+ // InternalGModelDSL.g:641:1: rule__GDomainElement__Group__1__Impl : ( ( rule__GDomainElement__NameAssignment_1 ) ) ;
public final void rule__GDomainElement__Group__1__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:645:1: ( ( ( rule__GDomainElement__NameAssignment_1 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:646:1: ( ( rule__GDomainElement__NameAssignment_1 ) )
+ // InternalGModelDSL.g:645:1: ( ( ( rule__GDomainElement__NameAssignment_1 ) ) )
+ // InternalGModelDSL.g:646:1: ( ( rule__GDomainElement__NameAssignment_1 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:646:1: ( ( rule__GDomainElement__NameAssignment_1 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:647:1: ( rule__GDomainElement__NameAssignment_1 )
+ // InternalGModelDSL.g:646:1: ( ( rule__GDomainElement__NameAssignment_1 ) )
+ // InternalGModelDSL.g:647:1: ( rule__GDomainElement__NameAssignment_1 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getNameAssignment_1());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:648:1: ( rule__GDomainElement__NameAssignment_1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:648:2: rule__GDomainElement__NameAssignment_1
+ // InternalGModelDSL.g:648:1: ( rule__GDomainElement__NameAssignment_1 )
+ // InternalGModelDSL.g:648:2: rule__GDomainElement__NameAssignment_1
{
- pushFollow(FOLLOW_rule__GDomainElement__NameAssignment_1_in_rule__GDomainElement__Group__1__Impl1310);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__NameAssignment_1();
state._fsp--;
@@ -1979,21 +1979,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group__2"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:658:1: rule__GDomainElement__Group__2 : rule__GDomainElement__Group__2__Impl rule__GDomainElement__Group__3 ;
+ // InternalGModelDSL.g:658:1: rule__GDomainElement__Group__2 : rule__GDomainElement__Group__2__Impl rule__GDomainElement__Group__3 ;
public final void rule__GDomainElement__Group__2() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:662:1: ( rule__GDomainElement__Group__2__Impl rule__GDomainElement__Group__3 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:663:2: rule__GDomainElement__Group__2__Impl rule__GDomainElement__Group__3
+ // InternalGModelDSL.g:662:1: ( rule__GDomainElement__Group__2__Impl rule__GDomainElement__Group__3 )
+ // InternalGModelDSL.g:663:2: rule__GDomainElement__Group__2__Impl rule__GDomainElement__Group__3
{
- pushFollow(FOLLOW_rule__GDomainElement__Group__2__Impl_in_rule__GDomainElement__Group__21340);
+ pushFollow(FOLLOW_9);
rule__GDomainElement__Group__2__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainElement__Group__3_in_rule__GDomainElement__Group__21343);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__Group__3();
state._fsp--;
@@ -2017,22 +2017,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group__2__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:670:1: rule__GDomainElement__Group__2__Impl : ( ( rule__GDomainElement__Group_2__0 )? ) ;
+ // InternalGModelDSL.g:670:1: rule__GDomainElement__Group__2__Impl : ( ( rule__GDomainElement__Group_2__0 )? ) ;
public final void rule__GDomainElement__Group__2__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:674:1: ( ( ( rule__GDomainElement__Group_2__0 )? ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:675:1: ( ( rule__GDomainElement__Group_2__0 )? )
+ // InternalGModelDSL.g:674:1: ( ( ( rule__GDomainElement__Group_2__0 )? ) )
+ // InternalGModelDSL.g:675:1: ( ( rule__GDomainElement__Group_2__0 )? )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:675:1: ( ( rule__GDomainElement__Group_2__0 )? )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:676:1: ( rule__GDomainElement__Group_2__0 )?
+ // InternalGModelDSL.g:675:1: ( ( rule__GDomainElement__Group_2__0 )? )
+ // InternalGModelDSL.g:676:1: ( rule__GDomainElement__Group_2__0 )?
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getGroup_2());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:677:1: ( rule__GDomainElement__Group_2__0 )?
+ // InternalGModelDSL.g:677:1: ( rule__GDomainElement__Group_2__0 )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -2041,9 +2041,9 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
switch (alt9) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:677:2: rule__GDomainElement__Group_2__0
+ // InternalGModelDSL.g:677:2: rule__GDomainElement__Group_2__0
{
- pushFollow(FOLLOW_rule__GDomainElement__Group_2__0_in_rule__GDomainElement__Group__2__Impl1370);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__Group_2__0();
state._fsp--;
@@ -2079,21 +2079,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group__3"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:687:1: rule__GDomainElement__Group__3 : rule__GDomainElement__Group__3__Impl rule__GDomainElement__Group__4 ;
+ // InternalGModelDSL.g:687:1: rule__GDomainElement__Group__3 : rule__GDomainElement__Group__3__Impl rule__GDomainElement__Group__4 ;
public final void rule__GDomainElement__Group__3() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:691:1: ( rule__GDomainElement__Group__3__Impl rule__GDomainElement__Group__4 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:692:2: rule__GDomainElement__Group__3__Impl rule__GDomainElement__Group__4
+ // InternalGModelDSL.g:691:1: ( rule__GDomainElement__Group__3__Impl rule__GDomainElement__Group__4 )
+ // InternalGModelDSL.g:692:2: rule__GDomainElement__Group__3__Impl rule__GDomainElement__Group__4
{
- pushFollow(FOLLOW_rule__GDomainElement__Group__3__Impl_in_rule__GDomainElement__Group__31401);
+ pushFollow(FOLLOW_10);
rule__GDomainElement__Group__3__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainElement__Group__4_in_rule__GDomainElement__Group__31404);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__Group__4();
state._fsp--;
@@ -2117,22 +2117,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group__3__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:699:1: rule__GDomainElement__Group__3__Impl : ( '{' ) ;
+ // InternalGModelDSL.g:699:1: rule__GDomainElement__Group__3__Impl : ( '{' ) ;
public final void rule__GDomainElement__Group__3__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:703:1: ( ( '{' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:704:1: ( '{' )
+ // InternalGModelDSL.g:703:1: ( ( '{' ) )
+ // InternalGModelDSL.g:704:1: ( '{' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:704:1: ( '{' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:705:1: '{'
+ // InternalGModelDSL.g:704:1: ( '{' )
+ // InternalGModelDSL.g:705:1: '{'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getLeftCurlyBracketKeyword_3());
}
- match(input,16,FOLLOW_16_in_rule__GDomainElement__Group__3__Impl1432); if (state.failed) return ;
+ match(input,16,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainElementAccess().getLeftCurlyBracketKeyword_3());
}
@@ -2158,21 +2158,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group__4"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:718:1: rule__GDomainElement__Group__4 : rule__GDomainElement__Group__4__Impl rule__GDomainElement__Group__5 ;
+ // InternalGModelDSL.g:718:1: rule__GDomainElement__Group__4 : rule__GDomainElement__Group__4__Impl rule__GDomainElement__Group__5 ;
public final void rule__GDomainElement__Group__4() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:722:1: ( rule__GDomainElement__Group__4__Impl rule__GDomainElement__Group__5 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:723:2: rule__GDomainElement__Group__4__Impl rule__GDomainElement__Group__5
+ // InternalGModelDSL.g:722:1: ( rule__GDomainElement__Group__4__Impl rule__GDomainElement__Group__5 )
+ // InternalGModelDSL.g:723:2: rule__GDomainElement__Group__4__Impl rule__GDomainElement__Group__5
{
- pushFollow(FOLLOW_rule__GDomainElement__Group__4__Impl_in_rule__GDomainElement__Group__41463);
+ pushFollow(FOLLOW_7);
rule__GDomainElement__Group__4__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainElement__Group__5_in_rule__GDomainElement__Group__41466);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__Group__5();
state._fsp--;
@@ -2196,25 +2196,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group__4__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:730:1: rule__GDomainElement__Group__4__Impl : ( ( rule__GDomainElement__Alternatives_4 ) ) ;
+ // InternalGModelDSL.g:730:1: rule__GDomainElement__Group__4__Impl : ( ( rule__GDomainElement__Alternatives_4 ) ) ;
public final void rule__GDomainElement__Group__4__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:734:1: ( ( ( rule__GDomainElement__Alternatives_4 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:735:1: ( ( rule__GDomainElement__Alternatives_4 ) )
+ // InternalGModelDSL.g:734:1: ( ( ( rule__GDomainElement__Alternatives_4 ) ) )
+ // InternalGModelDSL.g:735:1: ( ( rule__GDomainElement__Alternatives_4 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:735:1: ( ( rule__GDomainElement__Alternatives_4 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:736:1: ( rule__GDomainElement__Alternatives_4 )
+ // InternalGModelDSL.g:735:1: ( ( rule__GDomainElement__Alternatives_4 ) )
+ // InternalGModelDSL.g:736:1: ( rule__GDomainElement__Alternatives_4 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getAlternatives_4());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:737:1: ( rule__GDomainElement__Alternatives_4 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:737:2: rule__GDomainElement__Alternatives_4
+ // InternalGModelDSL.g:737:1: ( rule__GDomainElement__Alternatives_4 )
+ // InternalGModelDSL.g:737:2: rule__GDomainElement__Alternatives_4
{
- pushFollow(FOLLOW_rule__GDomainElement__Alternatives_4_in_rule__GDomainElement__Group__4__Impl1493);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__Alternatives_4();
state._fsp--;
@@ -2247,16 +2247,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group__5"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:747:1: rule__GDomainElement__Group__5 : rule__GDomainElement__Group__5__Impl ;
+ // InternalGModelDSL.g:747:1: rule__GDomainElement__Group__5 : rule__GDomainElement__Group__5__Impl ;
public final void rule__GDomainElement__Group__5() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:751:1: ( rule__GDomainElement__Group__5__Impl )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:752:2: rule__GDomainElement__Group__5__Impl
+ // InternalGModelDSL.g:751:1: ( rule__GDomainElement__Group__5__Impl )
+ // InternalGModelDSL.g:752:2: rule__GDomainElement__Group__5__Impl
{
- pushFollow(FOLLOW_rule__GDomainElement__Group__5__Impl_in_rule__GDomainElement__Group__51523);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__Group__5__Impl();
state._fsp--;
@@ -2280,22 +2280,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group__5__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:758:1: rule__GDomainElement__Group__5__Impl : ( '}' ) ;
+ // InternalGModelDSL.g:758:1: rule__GDomainElement__Group__5__Impl : ( '}' ) ;
public final void rule__GDomainElement__Group__5__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:762:1: ( ( '}' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:763:1: ( '}' )
+ // InternalGModelDSL.g:762:1: ( ( '}' ) )
+ // InternalGModelDSL.g:763:1: ( '}' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:763:1: ( '}' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:764:1: '}'
+ // InternalGModelDSL.g:763:1: ( '}' )
+ // InternalGModelDSL.g:764:1: '}'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getRightCurlyBracketKeyword_5());
}
- match(input,17,FOLLOW_17_in_rule__GDomainElement__Group__5__Impl1551); if (state.failed) return ;
+ match(input,17,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainElementAccess().getRightCurlyBracketKeyword_5());
}
@@ -2321,21 +2321,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group_2__0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:789:1: rule__GDomainElement__Group_2__0 : rule__GDomainElement__Group_2__0__Impl rule__GDomainElement__Group_2__1 ;
+ // InternalGModelDSL.g:789:1: rule__GDomainElement__Group_2__0 : rule__GDomainElement__Group_2__0__Impl rule__GDomainElement__Group_2__1 ;
public final void rule__GDomainElement__Group_2__0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:793:1: ( rule__GDomainElement__Group_2__0__Impl rule__GDomainElement__Group_2__1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:794:2: rule__GDomainElement__Group_2__0__Impl rule__GDomainElement__Group_2__1
+ // InternalGModelDSL.g:793:1: ( rule__GDomainElement__Group_2__0__Impl rule__GDomainElement__Group_2__1 )
+ // InternalGModelDSL.g:794:2: rule__GDomainElement__Group_2__0__Impl rule__GDomainElement__Group_2__1
{
- pushFollow(FOLLOW_rule__GDomainElement__Group_2__0__Impl_in_rule__GDomainElement__Group_2__01594);
+ pushFollow(FOLLOW_4);
rule__GDomainElement__Group_2__0__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainElement__Group_2__1_in_rule__GDomainElement__Group_2__01597);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__Group_2__1();
state._fsp--;
@@ -2359,22 +2359,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group_2__0__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:801:1: rule__GDomainElement__Group_2__0__Impl : ( 'extends' ) ;
+ // InternalGModelDSL.g:801:1: rule__GDomainElement__Group_2__0__Impl : ( 'extends' ) ;
public final void rule__GDomainElement__Group_2__0__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:805:1: ( ( 'extends' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:806:1: ( 'extends' )
+ // InternalGModelDSL.g:805:1: ( ( 'extends' ) )
+ // InternalGModelDSL.g:806:1: ( 'extends' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:806:1: ( 'extends' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:807:1: 'extends'
+ // InternalGModelDSL.g:806:1: ( 'extends' )
+ // InternalGModelDSL.g:807:1: 'extends'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getExtendsKeyword_2_0());
}
- match(input,19,FOLLOW_19_in_rule__GDomainElement__Group_2__0__Impl1625); if (state.failed) return ;
+ match(input,19,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainElementAccess().getExtendsKeyword_2_0());
}
@@ -2400,21 +2400,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group_2__1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:820:1: rule__GDomainElement__Group_2__1 : rule__GDomainElement__Group_2__1__Impl rule__GDomainElement__Group_2__2 ;
+ // InternalGModelDSL.g:820:1: rule__GDomainElement__Group_2__1 : rule__GDomainElement__Group_2__1__Impl rule__GDomainElement__Group_2__2 ;
public final void rule__GDomainElement__Group_2__1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:824:1: ( rule__GDomainElement__Group_2__1__Impl rule__GDomainElement__Group_2__2 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:825:2: rule__GDomainElement__Group_2__1__Impl rule__GDomainElement__Group_2__2
+ // InternalGModelDSL.g:824:1: ( rule__GDomainElement__Group_2__1__Impl rule__GDomainElement__Group_2__2 )
+ // InternalGModelDSL.g:825:2: rule__GDomainElement__Group_2__1__Impl rule__GDomainElement__Group_2__2
{
- pushFollow(FOLLOW_rule__GDomainElement__Group_2__1__Impl_in_rule__GDomainElement__Group_2__11656);
+ pushFollow(FOLLOW_11);
rule__GDomainElement__Group_2__1__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainElement__Group_2__2_in_rule__GDomainElement__Group_2__11659);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__Group_2__2();
state._fsp--;
@@ -2438,25 +2438,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group_2__1__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:832:1: rule__GDomainElement__Group_2__1__Impl : ( ( rule__GDomainElement__SuperTypeListAssignment_2_1 ) ) ;
+ // InternalGModelDSL.g:832:1: rule__GDomainElement__Group_2__1__Impl : ( ( rule__GDomainElement__SuperTypeListAssignment_2_1 ) ) ;
public final void rule__GDomainElement__Group_2__1__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:836:1: ( ( ( rule__GDomainElement__SuperTypeListAssignment_2_1 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:837:1: ( ( rule__GDomainElement__SuperTypeListAssignment_2_1 ) )
+ // InternalGModelDSL.g:836:1: ( ( ( rule__GDomainElement__SuperTypeListAssignment_2_1 ) ) )
+ // InternalGModelDSL.g:837:1: ( ( rule__GDomainElement__SuperTypeListAssignment_2_1 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:837:1: ( ( rule__GDomainElement__SuperTypeListAssignment_2_1 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:838:1: ( rule__GDomainElement__SuperTypeListAssignment_2_1 )
+ // InternalGModelDSL.g:837:1: ( ( rule__GDomainElement__SuperTypeListAssignment_2_1 ) )
+ // InternalGModelDSL.g:838:1: ( rule__GDomainElement__SuperTypeListAssignment_2_1 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getSuperTypeListAssignment_2_1());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:839:1: ( rule__GDomainElement__SuperTypeListAssignment_2_1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:839:2: rule__GDomainElement__SuperTypeListAssignment_2_1
+ // InternalGModelDSL.g:839:1: ( rule__GDomainElement__SuperTypeListAssignment_2_1 )
+ // InternalGModelDSL.g:839:2: rule__GDomainElement__SuperTypeListAssignment_2_1
{
- pushFollow(FOLLOW_rule__GDomainElement__SuperTypeListAssignment_2_1_in_rule__GDomainElement__Group_2__1__Impl1686);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__SuperTypeListAssignment_2_1();
state._fsp--;
@@ -2489,16 +2489,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group_2__2"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:849:1: rule__GDomainElement__Group_2__2 : rule__GDomainElement__Group_2__2__Impl ;
+ // InternalGModelDSL.g:849:1: rule__GDomainElement__Group_2__2 : rule__GDomainElement__Group_2__2__Impl ;
public final void rule__GDomainElement__Group_2__2() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:853:1: ( rule__GDomainElement__Group_2__2__Impl )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:854:2: rule__GDomainElement__Group_2__2__Impl
+ // InternalGModelDSL.g:853:1: ( rule__GDomainElement__Group_2__2__Impl )
+ // InternalGModelDSL.g:854:2: rule__GDomainElement__Group_2__2__Impl
{
- pushFollow(FOLLOW_rule__GDomainElement__Group_2__2__Impl_in_rule__GDomainElement__Group_2__21716);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__Group_2__2__Impl();
state._fsp--;
@@ -2522,22 +2522,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group_2__2__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:860:1: rule__GDomainElement__Group_2__2__Impl : ( ( rule__GDomainElement__Group_2_2__0 )* ) ;
+ // InternalGModelDSL.g:860:1: rule__GDomainElement__Group_2__2__Impl : ( ( rule__GDomainElement__Group_2_2__0 )* ) ;
public final void rule__GDomainElement__Group_2__2__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:864:1: ( ( ( rule__GDomainElement__Group_2_2__0 )* ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:865:1: ( ( rule__GDomainElement__Group_2_2__0 )* )
+ // InternalGModelDSL.g:864:1: ( ( ( rule__GDomainElement__Group_2_2__0 )* ) )
+ // InternalGModelDSL.g:865:1: ( ( rule__GDomainElement__Group_2_2__0 )* )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:865:1: ( ( rule__GDomainElement__Group_2_2__0 )* )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:866:1: ( rule__GDomainElement__Group_2_2__0 )*
+ // InternalGModelDSL.g:865:1: ( ( rule__GDomainElement__Group_2_2__0 )* )
+ // InternalGModelDSL.g:866:1: ( rule__GDomainElement__Group_2_2__0 )*
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getGroup_2_2());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:867:1: ( rule__GDomainElement__Group_2_2__0 )*
+ // InternalGModelDSL.g:867:1: ( rule__GDomainElement__Group_2_2__0 )*
loop10:
do {
int alt10=2;
@@ -2550,9 +2550,9 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
switch (alt10) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:867:2: rule__GDomainElement__Group_2_2__0
+ // InternalGModelDSL.g:867:2: rule__GDomainElement__Group_2_2__0
{
- pushFollow(FOLLOW_rule__GDomainElement__Group_2_2__0_in_rule__GDomainElement__Group_2__2__Impl1743);
+ pushFollow(FOLLOW_12);
rule__GDomainElement__Group_2_2__0();
state._fsp--;
@@ -2591,21 +2591,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group_2_2__0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:883:1: rule__GDomainElement__Group_2_2__0 : rule__GDomainElement__Group_2_2__0__Impl rule__GDomainElement__Group_2_2__1 ;
+ // InternalGModelDSL.g:883:1: rule__GDomainElement__Group_2_2__0 : rule__GDomainElement__Group_2_2__0__Impl rule__GDomainElement__Group_2_2__1 ;
public final void rule__GDomainElement__Group_2_2__0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:887:1: ( rule__GDomainElement__Group_2_2__0__Impl rule__GDomainElement__Group_2_2__1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:888:2: rule__GDomainElement__Group_2_2__0__Impl rule__GDomainElement__Group_2_2__1
+ // InternalGModelDSL.g:887:1: ( rule__GDomainElement__Group_2_2__0__Impl rule__GDomainElement__Group_2_2__1 )
+ // InternalGModelDSL.g:888:2: rule__GDomainElement__Group_2_2__0__Impl rule__GDomainElement__Group_2_2__1
{
- pushFollow(FOLLOW_rule__GDomainElement__Group_2_2__0__Impl_in_rule__GDomainElement__Group_2_2__01780);
+ pushFollow(FOLLOW_4);
rule__GDomainElement__Group_2_2__0__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainElement__Group_2_2__1_in_rule__GDomainElement__Group_2_2__01783);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__Group_2_2__1();
state._fsp--;
@@ -2629,22 +2629,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group_2_2__0__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:895:1: rule__GDomainElement__Group_2_2__0__Impl : ( ', ' ) ;
+ // InternalGModelDSL.g:895:1: rule__GDomainElement__Group_2_2__0__Impl : ( ', ' ) ;
public final void rule__GDomainElement__Group_2_2__0__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:899:1: ( ( ', ' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:900:1: ( ', ' )
+ // InternalGModelDSL.g:899:1: ( ( ', ' ) )
+ // InternalGModelDSL.g:900:1: ( ', ' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:900:1: ( ', ' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:901:1: ', '
+ // InternalGModelDSL.g:900:1: ( ', ' )
+ // InternalGModelDSL.g:901:1: ', '
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getCommaSpaceKeyword_2_2_0());
}
- match(input,20,FOLLOW_20_in_rule__GDomainElement__Group_2_2__0__Impl1811); if (state.failed) return ;
+ match(input,20,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainElementAccess().getCommaSpaceKeyword_2_2_0());
}
@@ -2670,16 +2670,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group_2_2__1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:914:1: rule__GDomainElement__Group_2_2__1 : rule__GDomainElement__Group_2_2__1__Impl ;
+ // InternalGModelDSL.g:914:1: rule__GDomainElement__Group_2_2__1 : rule__GDomainElement__Group_2_2__1__Impl ;
public final void rule__GDomainElement__Group_2_2__1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:918:1: ( rule__GDomainElement__Group_2_2__1__Impl )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:919:2: rule__GDomainElement__Group_2_2__1__Impl
+ // InternalGModelDSL.g:918:1: ( rule__GDomainElement__Group_2_2__1__Impl )
+ // InternalGModelDSL.g:919:2: rule__GDomainElement__Group_2_2__1__Impl
{
- pushFollow(FOLLOW_rule__GDomainElement__Group_2_2__1__Impl_in_rule__GDomainElement__Group_2_2__11842);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__Group_2_2__1__Impl();
state._fsp--;
@@ -2703,25 +2703,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__Group_2_2__1__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:925:1: rule__GDomainElement__Group_2_2__1__Impl : ( ( rule__GDomainElement__SuperTypeListAssignment_2_2_1 ) ) ;
+ // InternalGModelDSL.g:925:1: rule__GDomainElement__Group_2_2__1__Impl : ( ( rule__GDomainElement__SuperTypeListAssignment_2_2_1 ) ) ;
public final void rule__GDomainElement__Group_2_2__1__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:929:1: ( ( ( rule__GDomainElement__SuperTypeListAssignment_2_2_1 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:930:1: ( ( rule__GDomainElement__SuperTypeListAssignment_2_2_1 ) )
+ // InternalGModelDSL.g:929:1: ( ( ( rule__GDomainElement__SuperTypeListAssignment_2_2_1 ) ) )
+ // InternalGModelDSL.g:930:1: ( ( rule__GDomainElement__SuperTypeListAssignment_2_2_1 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:930:1: ( ( rule__GDomainElement__SuperTypeListAssignment_2_2_1 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:931:1: ( rule__GDomainElement__SuperTypeListAssignment_2_2_1 )
+ // InternalGModelDSL.g:930:1: ( ( rule__GDomainElement__SuperTypeListAssignment_2_2_1 ) )
+ // InternalGModelDSL.g:931:1: ( rule__GDomainElement__SuperTypeListAssignment_2_2_1 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getSuperTypeListAssignment_2_2_1());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:932:1: ( rule__GDomainElement__SuperTypeListAssignment_2_2_1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:932:2: rule__GDomainElement__SuperTypeListAssignment_2_2_1
+ // InternalGModelDSL.g:932:1: ( rule__GDomainElement__SuperTypeListAssignment_2_2_1 )
+ // InternalGModelDSL.g:932:2: rule__GDomainElement__SuperTypeListAssignment_2_2_1
{
- pushFollow(FOLLOW_rule__GDomainElement__SuperTypeListAssignment_2_2_1_in_rule__GDomainElement__Group_2_2__1__Impl1869);
+ pushFollow(FOLLOW_2);
rule__GDomainElement__SuperTypeListAssignment_2_2_1();
state._fsp--;
@@ -2754,21 +2754,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainMap__Group__0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:946:1: rule__GDomainMap__Group__0 : rule__GDomainMap__Group__0__Impl rule__GDomainMap__Group__1 ;
+ // InternalGModelDSL.g:946:1: rule__GDomainMap__Group__0 : rule__GDomainMap__Group__0__Impl rule__GDomainMap__Group__1 ;
public final void rule__GDomainMap__Group__0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:950:1: ( rule__GDomainMap__Group__0__Impl rule__GDomainMap__Group__1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:951:2: rule__GDomainMap__Group__0__Impl rule__GDomainMap__Group__1
+ // InternalGModelDSL.g:950:1: ( rule__GDomainMap__Group__0__Impl rule__GDomainMap__Group__1 )
+ // InternalGModelDSL.g:951:2: rule__GDomainMap__Group__0__Impl rule__GDomainMap__Group__1
{
- pushFollow(FOLLOW_rule__GDomainMap__Group__0__Impl_in_rule__GDomainMap__Group__01903);
+ pushFollow(FOLLOW_13);
rule__GDomainMap__Group__0__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainMap__Group__1_in_rule__GDomainMap__Group__01906);
+ pushFollow(FOLLOW_2);
rule__GDomainMap__Group__1();
state._fsp--;
@@ -2792,22 +2792,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainMap__Group__0__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:958:1: rule__GDomainMap__Group__0__Impl : ( 'map' ) ;
+ // InternalGModelDSL.g:958:1: rule__GDomainMap__Group__0__Impl : ( 'map' ) ;
public final void rule__GDomainMap__Group__0__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:962:1: ( ( 'map' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:963:1: ( 'map' )
+ // InternalGModelDSL.g:962:1: ( ( 'map' ) )
+ // InternalGModelDSL.g:963:1: ( 'map' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:963:1: ( 'map' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:964:1: 'map'
+ // InternalGModelDSL.g:963:1: ( 'map' )
+ // InternalGModelDSL.g:964:1: 'map'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainMapAccess().getMapKeyword_0());
}
- match(input,21,FOLLOW_21_in_rule__GDomainMap__Group__0__Impl1934); if (state.failed) return ;
+ match(input,21,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainMapAccess().getMapKeyword_0());
}
@@ -2833,16 +2833,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainMap__Group__1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:977:1: rule__GDomainMap__Group__1 : rule__GDomainMap__Group__1__Impl ;
+ // InternalGModelDSL.g:977:1: rule__GDomainMap__Group__1 : rule__GDomainMap__Group__1__Impl ;
public final void rule__GDomainMap__Group__1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:981:1: ( rule__GDomainMap__Group__1__Impl )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:982:2: rule__GDomainMap__Group__1__Impl
+ // InternalGModelDSL.g:981:1: ( rule__GDomainMap__Group__1__Impl )
+ // InternalGModelDSL.g:982:2: rule__GDomainMap__Group__1__Impl
{
- pushFollow(FOLLOW_rule__GDomainMap__Group__1__Impl_in_rule__GDomainMap__Group__11965);
+ pushFollow(FOLLOW_2);
rule__GDomainMap__Group__1__Impl();
state._fsp--;
@@ -2866,25 +2866,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainMap__Group__1__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:988:1: rule__GDomainMap__Group__1__Impl : ( ( rule__GDomainMap__Alternatives_1 ) ) ;
+ // InternalGModelDSL.g:988:1: rule__GDomainMap__Group__1__Impl : ( ( rule__GDomainMap__Alternatives_1 ) ) ;
public final void rule__GDomainMap__Group__1__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:992:1: ( ( ( rule__GDomainMap__Alternatives_1 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:993:1: ( ( rule__GDomainMap__Alternatives_1 ) )
+ // InternalGModelDSL.g:992:1: ( ( ( rule__GDomainMap__Alternatives_1 ) ) )
+ // InternalGModelDSL.g:993:1: ( ( rule__GDomainMap__Alternatives_1 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:993:1: ( ( rule__GDomainMap__Alternatives_1 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:994:1: ( rule__GDomainMap__Alternatives_1 )
+ // InternalGModelDSL.g:993:1: ( ( rule__GDomainMap__Alternatives_1 ) )
+ // InternalGModelDSL.g:994:1: ( rule__GDomainMap__Alternatives_1 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainMapAccess().getAlternatives_1());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:995:1: ( rule__GDomainMap__Alternatives_1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:995:2: rule__GDomainMap__Alternatives_1
+ // InternalGModelDSL.g:995:1: ( rule__GDomainMap__Alternatives_1 )
+ // InternalGModelDSL.g:995:2: rule__GDomainMap__Alternatives_1
{
- pushFollow(FOLLOW_rule__GDomainMap__Alternatives_1_in_rule__GDomainMap__Group__1__Impl1992);
+ pushFollow(FOLLOW_2);
rule__GDomainMap__Alternatives_1();
state._fsp--;
@@ -2917,21 +2917,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group__0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1009:1: rule__GDomainProperty__Group__0 : rule__GDomainProperty__Group__0__Impl rule__GDomainProperty__Group__1 ;
+ // InternalGModelDSL.g:1009:1: rule__GDomainProperty__Group__0 : rule__GDomainProperty__Group__0__Impl rule__GDomainProperty__Group__1 ;
public final void rule__GDomainProperty__Group__0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1013:1: ( rule__GDomainProperty__Group__0__Impl rule__GDomainProperty__Group__1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1014:2: rule__GDomainProperty__Group__0__Impl rule__GDomainProperty__Group__1
+ // InternalGModelDSL.g:1013:1: ( rule__GDomainProperty__Group__0__Impl rule__GDomainProperty__Group__1 )
+ // InternalGModelDSL.g:1014:2: rule__GDomainProperty__Group__0__Impl rule__GDomainProperty__Group__1
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group__0__Impl_in_rule__GDomainProperty__Group__02026);
+ pushFollow(FOLLOW_14);
rule__GDomainProperty__Group__0__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainProperty__Group__1_in_rule__GDomainProperty__Group__02029);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group__1();
state._fsp--;
@@ -2955,25 +2955,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group__0__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1021:1: rule__GDomainProperty__Group__0__Impl : ( ( rule__GDomainProperty__Alternatives_0 ) ) ;
+ // InternalGModelDSL.g:1021:1: rule__GDomainProperty__Group__0__Impl : ( ( rule__GDomainProperty__Alternatives_0 ) ) ;
public final void rule__GDomainProperty__Group__0__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1025:1: ( ( ( rule__GDomainProperty__Alternatives_0 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1026:1: ( ( rule__GDomainProperty__Alternatives_0 ) )
+ // InternalGModelDSL.g:1025:1: ( ( ( rule__GDomainProperty__Alternatives_0 ) ) )
+ // InternalGModelDSL.g:1026:1: ( ( rule__GDomainProperty__Alternatives_0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1026:1: ( ( rule__GDomainProperty__Alternatives_0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1027:1: ( rule__GDomainProperty__Alternatives_0 )
+ // InternalGModelDSL.g:1026:1: ( ( rule__GDomainProperty__Alternatives_0 ) )
+ // InternalGModelDSL.g:1027:1: ( rule__GDomainProperty__Alternatives_0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getAlternatives_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1028:1: ( rule__GDomainProperty__Alternatives_0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1028:2: rule__GDomainProperty__Alternatives_0
+ // InternalGModelDSL.g:1028:1: ( rule__GDomainProperty__Alternatives_0 )
+ // InternalGModelDSL.g:1028:2: rule__GDomainProperty__Alternatives_0
{
- pushFollow(FOLLOW_rule__GDomainProperty__Alternatives_0_in_rule__GDomainProperty__Group__0__Impl2056);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Alternatives_0();
state._fsp--;
@@ -3006,16 +3006,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group__1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1038:1: rule__GDomainProperty__Group__1 : rule__GDomainProperty__Group__1__Impl ;
+ // InternalGModelDSL.g:1038:1: rule__GDomainProperty__Group__1 : rule__GDomainProperty__Group__1__Impl ;
public final void rule__GDomainProperty__Group__1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1042:1: ( rule__GDomainProperty__Group__1__Impl )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1043:2: rule__GDomainProperty__Group__1__Impl
+ // InternalGModelDSL.g:1042:1: ( rule__GDomainProperty__Group__1__Impl )
+ // InternalGModelDSL.g:1043:2: rule__GDomainProperty__Group__1__Impl
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group__1__Impl_in_rule__GDomainProperty__Group__12086);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group__1__Impl();
state._fsp--;
@@ -3039,22 +3039,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group__1__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1049:1: rule__GDomainProperty__Group__1__Impl : ( ';' ) ;
+ // InternalGModelDSL.g:1049:1: rule__GDomainProperty__Group__1__Impl : ( ';' ) ;
public final void rule__GDomainProperty__Group__1__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1053:1: ( ( ';' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1054:1: ( ';' )
+ // InternalGModelDSL.g:1053:1: ( ( ';' ) )
+ // InternalGModelDSL.g:1054:1: ( ';' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1054:1: ( ';' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1055:1: ';'
+ // InternalGModelDSL.g:1054:1: ( ';' )
+ // InternalGModelDSL.g:1055:1: ';'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getSemicolonKeyword_1());
}
- match(input,22,FOLLOW_22_in_rule__GDomainProperty__Group__1__Impl2114); if (state.failed) return ;
+ match(input,22,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainPropertyAccess().getSemicolonKeyword_1());
}
@@ -3080,21 +3080,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_0__0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1072:1: rule__GDomainProperty__Group_0_0__0 : rule__GDomainProperty__Group_0_0__0__Impl rule__GDomainProperty__Group_0_0__1 ;
+ // InternalGModelDSL.g:1072:1: rule__GDomainProperty__Group_0_0__0 : rule__GDomainProperty__Group_0_0__0__Impl rule__GDomainProperty__Group_0_0__1 ;
public final void rule__GDomainProperty__Group_0_0__0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1076:1: ( rule__GDomainProperty__Group_0_0__0__Impl rule__GDomainProperty__Group_0_0__1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1077:2: rule__GDomainProperty__Group_0_0__0__Impl rule__GDomainProperty__Group_0_0__1
+ // InternalGModelDSL.g:1076:1: ( rule__GDomainProperty__Group_0_0__0__Impl rule__GDomainProperty__Group_0_0__1 )
+ // InternalGModelDSL.g:1077:2: rule__GDomainProperty__Group_0_0__0__Impl rule__GDomainProperty__Group_0_0__1
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_0__0__Impl_in_rule__GDomainProperty__Group_0_0__02149);
+ pushFollow(FOLLOW_15);
rule__GDomainProperty__Group_0_0__0__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_0__1_in_rule__GDomainProperty__Group_0_0__02152);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group_0_0__1();
state._fsp--;
@@ -3118,25 +3118,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_0__0__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1084:1: rule__GDomainProperty__Group_0_0__0__Impl : ( ( rule__GDomainProperty__BuiltInAssignment_0_0_0 ) ) ;
+ // InternalGModelDSL.g:1084:1: rule__GDomainProperty__Group_0_0__0__Impl : ( ( rule__GDomainProperty__BuiltInAssignment_0_0_0 ) ) ;
public final void rule__GDomainProperty__Group_0_0__0__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1088:1: ( ( ( rule__GDomainProperty__BuiltInAssignment_0_0_0 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1089:1: ( ( rule__GDomainProperty__BuiltInAssignment_0_0_0 ) )
+ // InternalGModelDSL.g:1088:1: ( ( ( rule__GDomainProperty__BuiltInAssignment_0_0_0 ) ) )
+ // InternalGModelDSL.g:1089:1: ( ( rule__GDomainProperty__BuiltInAssignment_0_0_0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1089:1: ( ( rule__GDomainProperty__BuiltInAssignment_0_0_0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1090:1: ( rule__GDomainProperty__BuiltInAssignment_0_0_0 )
+ // InternalGModelDSL.g:1089:1: ( ( rule__GDomainProperty__BuiltInAssignment_0_0_0 ) )
+ // InternalGModelDSL.g:1090:1: ( rule__GDomainProperty__BuiltInAssignment_0_0_0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getBuiltInAssignment_0_0_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1091:1: ( rule__GDomainProperty__BuiltInAssignment_0_0_0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1091:2: rule__GDomainProperty__BuiltInAssignment_0_0_0
+ // InternalGModelDSL.g:1091:1: ( rule__GDomainProperty__BuiltInAssignment_0_0_0 )
+ // InternalGModelDSL.g:1091:2: rule__GDomainProperty__BuiltInAssignment_0_0_0
{
- pushFollow(FOLLOW_rule__GDomainProperty__BuiltInAssignment_0_0_0_in_rule__GDomainProperty__Group_0_0__0__Impl2179);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__BuiltInAssignment_0_0_0();
state._fsp--;
@@ -3169,21 +3169,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_0__1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1101:1: rule__GDomainProperty__Group_0_0__1 : rule__GDomainProperty__Group_0_0__1__Impl rule__GDomainProperty__Group_0_0__2 ;
+ // InternalGModelDSL.g:1101:1: rule__GDomainProperty__Group_0_0__1 : rule__GDomainProperty__Group_0_0__1__Impl rule__GDomainProperty__Group_0_0__2 ;
public final void rule__GDomainProperty__Group_0_0__1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1105:1: ( rule__GDomainProperty__Group_0_0__1__Impl rule__GDomainProperty__Group_0_0__2 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1106:2: rule__GDomainProperty__Group_0_0__1__Impl rule__GDomainProperty__Group_0_0__2
+ // InternalGModelDSL.g:1105:1: ( rule__GDomainProperty__Group_0_0__1__Impl rule__GDomainProperty__Group_0_0__2 )
+ // InternalGModelDSL.g:1106:2: rule__GDomainProperty__Group_0_0__1__Impl rule__GDomainProperty__Group_0_0__2
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_0__1__Impl_in_rule__GDomainProperty__Group_0_0__12209);
+ pushFollow(FOLLOW_15);
rule__GDomainProperty__Group_0_0__1__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_0__2_in_rule__GDomainProperty__Group_0_0__12212);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group_0_0__2();
state._fsp--;
@@ -3207,22 +3207,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_0__1__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1113:1: rule__GDomainProperty__Group_0_0__1__Impl : ( ( rule__GDomainProperty__ListAssignment_0_0_1 )? ) ;
+ // InternalGModelDSL.g:1113:1: rule__GDomainProperty__Group_0_0__1__Impl : ( ( rule__GDomainProperty__ListAssignment_0_0_1 )? ) ;
public final void rule__GDomainProperty__Group_0_0__1__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1117:1: ( ( ( rule__GDomainProperty__ListAssignment_0_0_1 )? ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1118:1: ( ( rule__GDomainProperty__ListAssignment_0_0_1 )? )
+ // InternalGModelDSL.g:1117:1: ( ( ( rule__GDomainProperty__ListAssignment_0_0_1 )? ) )
+ // InternalGModelDSL.g:1118:1: ( ( rule__GDomainProperty__ListAssignment_0_0_1 )? )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1118:1: ( ( rule__GDomainProperty__ListAssignment_0_0_1 )? )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1119:1: ( rule__GDomainProperty__ListAssignment_0_0_1 )?
+ // InternalGModelDSL.g:1118:1: ( ( rule__GDomainProperty__ListAssignment_0_0_1 )? )
+ // InternalGModelDSL.g:1119:1: ( rule__GDomainProperty__ListAssignment_0_0_1 )?
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getListAssignment_0_0_1());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1120:1: ( rule__GDomainProperty__ListAssignment_0_0_1 )?
+ // InternalGModelDSL.g:1120:1: ( rule__GDomainProperty__ListAssignment_0_0_1 )?
int alt11=2;
int LA11_0 = input.LA(1);
@@ -3231,9 +3231,9 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
switch (alt11) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1120:2: rule__GDomainProperty__ListAssignment_0_0_1
+ // InternalGModelDSL.g:1120:2: rule__GDomainProperty__ListAssignment_0_0_1
{
- pushFollow(FOLLOW_rule__GDomainProperty__ListAssignment_0_0_1_in_rule__GDomainProperty__Group_0_0__1__Impl2239);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__ListAssignment_0_0_1();
state._fsp--;
@@ -3269,21 +3269,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_0__2"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1130:1: rule__GDomainProperty__Group_0_0__2 : rule__GDomainProperty__Group_0_0__2__Impl rule__GDomainProperty__Group_0_0__3 ;
+ // InternalGModelDSL.g:1130:1: rule__GDomainProperty__Group_0_0__2 : rule__GDomainProperty__Group_0_0__2__Impl rule__GDomainProperty__Group_0_0__3 ;
public final void rule__GDomainProperty__Group_0_0__2() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1134:1: ( rule__GDomainProperty__Group_0_0__2__Impl rule__GDomainProperty__Group_0_0__3 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1135:2: rule__GDomainProperty__Group_0_0__2__Impl rule__GDomainProperty__Group_0_0__3
+ // InternalGModelDSL.g:1134:1: ( rule__GDomainProperty__Group_0_0__2__Impl rule__GDomainProperty__Group_0_0__3 )
+ // InternalGModelDSL.g:1135:2: rule__GDomainProperty__Group_0_0__2__Impl rule__GDomainProperty__Group_0_0__3
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_0__2__Impl_in_rule__GDomainProperty__Group_0_0__22270);
+ pushFollow(FOLLOW_16);
rule__GDomainProperty__Group_0_0__2__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_0__3_in_rule__GDomainProperty__Group_0_0__22273);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group_0_0__3();
state._fsp--;
@@ -3307,25 +3307,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_0__2__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1142:1: rule__GDomainProperty__Group_0_0__2__Impl : ( ( rule__GDomainProperty__NameAssignment_0_0_2 ) ) ;
+ // InternalGModelDSL.g:1142:1: rule__GDomainProperty__Group_0_0__2__Impl : ( ( rule__GDomainProperty__NameAssignment_0_0_2 ) ) ;
public final void rule__GDomainProperty__Group_0_0__2__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1146:1: ( ( ( rule__GDomainProperty__NameAssignment_0_0_2 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1147:1: ( ( rule__GDomainProperty__NameAssignment_0_0_2 ) )
+ // InternalGModelDSL.g:1146:1: ( ( ( rule__GDomainProperty__NameAssignment_0_0_2 ) ) )
+ // InternalGModelDSL.g:1147:1: ( ( rule__GDomainProperty__NameAssignment_0_0_2 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1147:1: ( ( rule__GDomainProperty__NameAssignment_0_0_2 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1148:1: ( rule__GDomainProperty__NameAssignment_0_0_2 )
+ // InternalGModelDSL.g:1147:1: ( ( rule__GDomainProperty__NameAssignment_0_0_2 ) )
+ // InternalGModelDSL.g:1148:1: ( rule__GDomainProperty__NameAssignment_0_0_2 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getNameAssignment_0_0_2());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1149:1: ( rule__GDomainProperty__NameAssignment_0_0_2 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1149:2: rule__GDomainProperty__NameAssignment_0_0_2
+ // InternalGModelDSL.g:1149:1: ( rule__GDomainProperty__NameAssignment_0_0_2 )
+ // InternalGModelDSL.g:1149:2: rule__GDomainProperty__NameAssignment_0_0_2
{
- pushFollow(FOLLOW_rule__GDomainProperty__NameAssignment_0_0_2_in_rule__GDomainProperty__Group_0_0__2__Impl2300);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__NameAssignment_0_0_2();
state._fsp--;
@@ -3358,16 +3358,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_0__3"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1159:1: rule__GDomainProperty__Group_0_0__3 : rule__GDomainProperty__Group_0_0__3__Impl ;
+ // InternalGModelDSL.g:1159:1: rule__GDomainProperty__Group_0_0__3 : rule__GDomainProperty__Group_0_0__3__Impl ;
public final void rule__GDomainProperty__Group_0_0__3() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1163:1: ( rule__GDomainProperty__Group_0_0__3__Impl )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1164:2: rule__GDomainProperty__Group_0_0__3__Impl
+ // InternalGModelDSL.g:1163:1: ( rule__GDomainProperty__Group_0_0__3__Impl )
+ // InternalGModelDSL.g:1164:2: rule__GDomainProperty__Group_0_0__3__Impl
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_0__3__Impl_in_rule__GDomainProperty__Group_0_0__32330);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group_0_0__3__Impl();
state._fsp--;
@@ -3391,22 +3391,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_0__3__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1170:1: rule__GDomainProperty__Group_0_0__3__Impl : ( ( rule__GDomainProperty__Group_0_0_3__0 )? ) ;
+ // InternalGModelDSL.g:1170:1: rule__GDomainProperty__Group_0_0__3__Impl : ( ( rule__GDomainProperty__Group_0_0_3__0 )? ) ;
public final void rule__GDomainProperty__Group_0_0__3__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1174:1: ( ( ( rule__GDomainProperty__Group_0_0_3__0 )? ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1175:1: ( ( rule__GDomainProperty__Group_0_0_3__0 )? )
+ // InternalGModelDSL.g:1174:1: ( ( ( rule__GDomainProperty__Group_0_0_3__0 )? ) )
+ // InternalGModelDSL.g:1175:1: ( ( rule__GDomainProperty__Group_0_0_3__0 )? )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1175:1: ( ( rule__GDomainProperty__Group_0_0_3__0 )? )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1176:1: ( rule__GDomainProperty__Group_0_0_3__0 )?
+ // InternalGModelDSL.g:1175:1: ( ( rule__GDomainProperty__Group_0_0_3__0 )? )
+ // InternalGModelDSL.g:1176:1: ( rule__GDomainProperty__Group_0_0_3__0 )?
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getGroup_0_0_3());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1177:1: ( rule__GDomainProperty__Group_0_0_3__0 )?
+ // InternalGModelDSL.g:1177:1: ( rule__GDomainProperty__Group_0_0_3__0 )?
int alt12=2;
int LA12_0 = input.LA(1);
@@ -3415,9 +3415,9 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
switch (alt12) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1177:2: rule__GDomainProperty__Group_0_0_3__0
+ // InternalGModelDSL.g:1177:2: rule__GDomainProperty__Group_0_0_3__0
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_0_3__0_in_rule__GDomainProperty__Group_0_0__3__Impl2357);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group_0_0_3__0();
state._fsp--;
@@ -3453,21 +3453,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_0_3__0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1195:1: rule__GDomainProperty__Group_0_0_3__0 : rule__GDomainProperty__Group_0_0_3__0__Impl rule__GDomainProperty__Group_0_0_3__1 ;
+ // InternalGModelDSL.g:1195:1: rule__GDomainProperty__Group_0_0_3__0 : rule__GDomainProperty__Group_0_0_3__0__Impl rule__GDomainProperty__Group_0_0_3__1 ;
public final void rule__GDomainProperty__Group_0_0_3__0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1199:1: ( rule__GDomainProperty__Group_0_0_3__0__Impl rule__GDomainProperty__Group_0_0_3__1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1200:2: rule__GDomainProperty__Group_0_0_3__0__Impl rule__GDomainProperty__Group_0_0_3__1
+ // InternalGModelDSL.g:1199:1: ( rule__GDomainProperty__Group_0_0_3__0__Impl rule__GDomainProperty__Group_0_0_3__1 )
+ // InternalGModelDSL.g:1200:2: rule__GDomainProperty__Group_0_0_3__0__Impl rule__GDomainProperty__Group_0_0_3__1
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_0_3__0__Impl_in_rule__GDomainProperty__Group_0_0_3__02396);
+ pushFollow(FOLLOW_17);
rule__GDomainProperty__Group_0_0_3__0__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_0_3__1_in_rule__GDomainProperty__Group_0_0_3__02399);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group_0_0_3__1();
state._fsp--;
@@ -3491,22 +3491,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_0_3__0__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1207:1: rule__GDomainProperty__Group_0_0_3__0__Impl : ( '=' ) ;
+ // InternalGModelDSL.g:1207:1: rule__GDomainProperty__Group_0_0_3__0__Impl : ( '=' ) ;
public final void rule__GDomainProperty__Group_0_0_3__0__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1211:1: ( ( '=' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1212:1: ( '=' )
+ // InternalGModelDSL.g:1211:1: ( ( '=' ) )
+ // InternalGModelDSL.g:1212:1: ( '=' )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1212:1: ( '=' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1213:1: '='
+ // InternalGModelDSL.g:1212:1: ( '=' )
+ // InternalGModelDSL.g:1213:1: '='
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getEqualsSignKeyword_0_0_3_0());
}
- match(input,23,FOLLOW_23_in_rule__GDomainProperty__Group_0_0_3__0__Impl2427); if (state.failed) return ;
+ match(input,23,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainPropertyAccess().getEqualsSignKeyword_0_0_3_0());
}
@@ -3532,16 +3532,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_0_3__1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1226:1: rule__GDomainProperty__Group_0_0_3__1 : rule__GDomainProperty__Group_0_0_3__1__Impl ;
+ // InternalGModelDSL.g:1226:1: rule__GDomainProperty__Group_0_0_3__1 : rule__GDomainProperty__Group_0_0_3__1__Impl ;
public final void rule__GDomainProperty__Group_0_0_3__1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1230:1: ( rule__GDomainProperty__Group_0_0_3__1__Impl )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1231:2: rule__GDomainProperty__Group_0_0_3__1__Impl
+ // InternalGModelDSL.g:1230:1: ( rule__GDomainProperty__Group_0_0_3__1__Impl )
+ // InternalGModelDSL.g:1231:2: rule__GDomainProperty__Group_0_0_3__1__Impl
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_0_3__1__Impl_in_rule__GDomainProperty__Group_0_0_3__12458);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group_0_0_3__1__Impl();
state._fsp--;
@@ -3565,25 +3565,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_0_3__1__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1237:1: rule__GDomainProperty__Group_0_0_3__1__Impl : ( ( rule__GDomainProperty__DefaultValueAssignment_0_0_3_1 ) ) ;
+ // InternalGModelDSL.g:1237:1: rule__GDomainProperty__Group_0_0_3__1__Impl : ( ( rule__GDomainProperty__DefaultValueAssignment_0_0_3_1 ) ) ;
public final void rule__GDomainProperty__Group_0_0_3__1__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1241:1: ( ( ( rule__GDomainProperty__DefaultValueAssignment_0_0_3_1 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1242:1: ( ( rule__GDomainProperty__DefaultValueAssignment_0_0_3_1 ) )
+ // InternalGModelDSL.g:1241:1: ( ( ( rule__GDomainProperty__DefaultValueAssignment_0_0_3_1 ) ) )
+ // InternalGModelDSL.g:1242:1: ( ( rule__GDomainProperty__DefaultValueAssignment_0_0_3_1 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1242:1: ( ( rule__GDomainProperty__DefaultValueAssignment_0_0_3_1 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1243:1: ( rule__GDomainProperty__DefaultValueAssignment_0_0_3_1 )
+ // InternalGModelDSL.g:1242:1: ( ( rule__GDomainProperty__DefaultValueAssignment_0_0_3_1 ) )
+ // InternalGModelDSL.g:1243:1: ( rule__GDomainProperty__DefaultValueAssignment_0_0_3_1 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getDefaultValueAssignment_0_0_3_1());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1244:1: ( rule__GDomainProperty__DefaultValueAssignment_0_0_3_1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1244:2: rule__GDomainProperty__DefaultValueAssignment_0_0_3_1
+ // InternalGModelDSL.g:1244:1: ( rule__GDomainProperty__DefaultValueAssignment_0_0_3_1 )
+ // InternalGModelDSL.g:1244:2: rule__GDomainProperty__DefaultValueAssignment_0_0_3_1
{
- pushFollow(FOLLOW_rule__GDomainProperty__DefaultValueAssignment_0_0_3_1_in_rule__GDomainProperty__Group_0_0_3__1__Impl2485);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__DefaultValueAssignment_0_0_3_1();
state._fsp--;
@@ -3616,21 +3616,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_1__0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1258:1: rule__GDomainProperty__Group_0_1__0 : rule__GDomainProperty__Group_0_1__0__Impl rule__GDomainProperty__Group_0_1__1 ;
+ // InternalGModelDSL.g:1258:1: rule__GDomainProperty__Group_0_1__0 : rule__GDomainProperty__Group_0_1__0__Impl rule__GDomainProperty__Group_0_1__1 ;
public final void rule__GDomainProperty__Group_0_1__0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1262:1: ( rule__GDomainProperty__Group_0_1__0__Impl rule__GDomainProperty__Group_0_1__1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1263:2: rule__GDomainProperty__Group_0_1__0__Impl rule__GDomainProperty__Group_0_1__1
+ // InternalGModelDSL.g:1262:1: ( rule__GDomainProperty__Group_0_1__0__Impl rule__GDomainProperty__Group_0_1__1 )
+ // InternalGModelDSL.g:1263:2: rule__GDomainProperty__Group_0_1__0__Impl rule__GDomainProperty__Group_0_1__1
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_1__0__Impl_in_rule__GDomainProperty__Group_0_1__02519);
+ pushFollow(FOLLOW_15);
rule__GDomainProperty__Group_0_1__0__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_1__1_in_rule__GDomainProperty__Group_0_1__02522);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group_0_1__1();
state._fsp--;
@@ -3654,25 +3654,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_1__0__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1270:1: rule__GDomainProperty__Group_0_1__0__Impl : ( ( rule__GDomainProperty__RefAssignment_0_1_0 ) ) ;
+ // InternalGModelDSL.g:1270:1: rule__GDomainProperty__Group_0_1__0__Impl : ( ( rule__GDomainProperty__RefAssignment_0_1_0 ) ) ;
public final void rule__GDomainProperty__Group_0_1__0__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1274:1: ( ( ( rule__GDomainProperty__RefAssignment_0_1_0 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1275:1: ( ( rule__GDomainProperty__RefAssignment_0_1_0 ) )
+ // InternalGModelDSL.g:1274:1: ( ( ( rule__GDomainProperty__RefAssignment_0_1_0 ) ) )
+ // InternalGModelDSL.g:1275:1: ( ( rule__GDomainProperty__RefAssignment_0_1_0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1275:1: ( ( rule__GDomainProperty__RefAssignment_0_1_0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1276:1: ( rule__GDomainProperty__RefAssignment_0_1_0 )
+ // InternalGModelDSL.g:1275:1: ( ( rule__GDomainProperty__RefAssignment_0_1_0 ) )
+ // InternalGModelDSL.g:1276:1: ( rule__GDomainProperty__RefAssignment_0_1_0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getRefAssignment_0_1_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1277:1: ( rule__GDomainProperty__RefAssignment_0_1_0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1277:2: rule__GDomainProperty__RefAssignment_0_1_0
+ // InternalGModelDSL.g:1277:1: ( rule__GDomainProperty__RefAssignment_0_1_0 )
+ // InternalGModelDSL.g:1277:2: rule__GDomainProperty__RefAssignment_0_1_0
{
- pushFollow(FOLLOW_rule__GDomainProperty__RefAssignment_0_1_0_in_rule__GDomainProperty__Group_0_1__0__Impl2549);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__RefAssignment_0_1_0();
state._fsp--;
@@ -3705,21 +3705,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_1__1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1287:1: rule__GDomainProperty__Group_0_1__1 : rule__GDomainProperty__Group_0_1__1__Impl rule__GDomainProperty__Group_0_1__2 ;
+ // InternalGModelDSL.g:1287:1: rule__GDomainProperty__Group_0_1__1 : rule__GDomainProperty__Group_0_1__1__Impl rule__GDomainProperty__Group_0_1__2 ;
public final void rule__GDomainProperty__Group_0_1__1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1291:1: ( rule__GDomainProperty__Group_0_1__1__Impl rule__GDomainProperty__Group_0_1__2 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1292:2: rule__GDomainProperty__Group_0_1__1__Impl rule__GDomainProperty__Group_0_1__2
+ // InternalGModelDSL.g:1291:1: ( rule__GDomainProperty__Group_0_1__1__Impl rule__GDomainProperty__Group_0_1__2 )
+ // InternalGModelDSL.g:1292:2: rule__GDomainProperty__Group_0_1__1__Impl rule__GDomainProperty__Group_0_1__2
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_1__1__Impl_in_rule__GDomainProperty__Group_0_1__12579);
+ pushFollow(FOLLOW_15);
rule__GDomainProperty__Group_0_1__1__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_1__2_in_rule__GDomainProperty__Group_0_1__12582);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group_0_1__2();
state._fsp--;
@@ -3743,22 +3743,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_1__1__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1299:1: rule__GDomainProperty__Group_0_1__1__Impl : ( ( rule__GDomainProperty__ListAssignment_0_1_1 )? ) ;
+ // InternalGModelDSL.g:1299:1: rule__GDomainProperty__Group_0_1__1__Impl : ( ( rule__GDomainProperty__ListAssignment_0_1_1 )? ) ;
public final void rule__GDomainProperty__Group_0_1__1__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1303:1: ( ( ( rule__GDomainProperty__ListAssignment_0_1_1 )? ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1304:1: ( ( rule__GDomainProperty__ListAssignment_0_1_1 )? )
+ // InternalGModelDSL.g:1303:1: ( ( ( rule__GDomainProperty__ListAssignment_0_1_1 )? ) )
+ // InternalGModelDSL.g:1304:1: ( ( rule__GDomainProperty__ListAssignment_0_1_1 )? )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1304:1: ( ( rule__GDomainProperty__ListAssignment_0_1_1 )? )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1305:1: ( rule__GDomainProperty__ListAssignment_0_1_1 )?
+ // InternalGModelDSL.g:1304:1: ( ( rule__GDomainProperty__ListAssignment_0_1_1 )? )
+ // InternalGModelDSL.g:1305:1: ( rule__GDomainProperty__ListAssignment_0_1_1 )?
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getListAssignment_0_1_1());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1306:1: ( rule__GDomainProperty__ListAssignment_0_1_1 )?
+ // InternalGModelDSL.g:1306:1: ( rule__GDomainProperty__ListAssignment_0_1_1 )?
int alt13=2;
int LA13_0 = input.LA(1);
@@ -3767,9 +3767,9 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
}
switch (alt13) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1306:2: rule__GDomainProperty__ListAssignment_0_1_1
+ // InternalGModelDSL.g:1306:2: rule__GDomainProperty__ListAssignment_0_1_1
{
- pushFollow(FOLLOW_rule__GDomainProperty__ListAssignment_0_1_1_in_rule__GDomainProperty__Group_0_1__1__Impl2609);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__ListAssignment_0_1_1();
state._fsp--;
@@ -3805,16 +3805,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_1__2"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1316:1: rule__GDomainProperty__Group_0_1__2 : rule__GDomainProperty__Group_0_1__2__Impl ;
+ // InternalGModelDSL.g:1316:1: rule__GDomainProperty__Group_0_1__2 : rule__GDomainProperty__Group_0_1__2__Impl ;
public final void rule__GDomainProperty__Group_0_1__2() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1320:1: ( rule__GDomainProperty__Group_0_1__2__Impl )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1321:2: rule__GDomainProperty__Group_0_1__2__Impl
+ // InternalGModelDSL.g:1320:1: ( rule__GDomainProperty__Group_0_1__2__Impl )
+ // InternalGModelDSL.g:1321:2: rule__GDomainProperty__Group_0_1__2__Impl
{
- pushFollow(FOLLOW_rule__GDomainProperty__Group_0_1__2__Impl_in_rule__GDomainProperty__Group_0_1__22640);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__Group_0_1__2__Impl();
state._fsp--;
@@ -3838,25 +3838,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__Group_0_1__2__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1327:1: rule__GDomainProperty__Group_0_1__2__Impl : ( ( rule__GDomainProperty__NameAssignment_0_1_2 ) ) ;
+ // InternalGModelDSL.g:1327:1: rule__GDomainProperty__Group_0_1__2__Impl : ( ( rule__GDomainProperty__NameAssignment_0_1_2 ) ) ;
public final void rule__GDomainProperty__Group_0_1__2__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1331:1: ( ( ( rule__GDomainProperty__NameAssignment_0_1_2 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1332:1: ( ( rule__GDomainProperty__NameAssignment_0_1_2 ) )
+ // InternalGModelDSL.g:1331:1: ( ( ( rule__GDomainProperty__NameAssignment_0_1_2 ) ) )
+ // InternalGModelDSL.g:1332:1: ( ( rule__GDomainProperty__NameAssignment_0_1_2 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1332:1: ( ( rule__GDomainProperty__NameAssignment_0_1_2 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1333:1: ( rule__GDomainProperty__NameAssignment_0_1_2 )
+ // InternalGModelDSL.g:1332:1: ( ( rule__GDomainProperty__NameAssignment_0_1_2 ) )
+ // InternalGModelDSL.g:1333:1: ( rule__GDomainProperty__NameAssignment_0_1_2 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getNameAssignment_0_1_2());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1334:1: ( rule__GDomainProperty__NameAssignment_0_1_2 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1334:2: rule__GDomainProperty__NameAssignment_0_1_2
+ // InternalGModelDSL.g:1334:1: ( rule__GDomainProperty__NameAssignment_0_1_2 )
+ // InternalGModelDSL.g:1334:2: rule__GDomainProperty__NameAssignment_0_1_2
{
- pushFollow(FOLLOW_rule__GDomainProperty__NameAssignment_0_1_2_in_rule__GDomainProperty__Group_0_1__2__Impl2667);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__NameAssignment_0_1_2();
state._fsp--;
@@ -3889,21 +3889,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__QualifiedName__Group__0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1350:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
+ // InternalGModelDSL.g:1350:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
public final void rule__QualifiedName__Group__0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1354:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1355:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
+ // InternalGModelDSL.g:1354:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
+ // InternalGModelDSL.g:1355:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
{
- pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__02703);
+ pushFollow(FOLLOW_18);
rule__QualifiedName__Group__0__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__02706);
+ pushFollow(FOLLOW_2);
rule__QualifiedName__Group__1();
state._fsp--;
@@ -3927,22 +3927,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__QualifiedName__Group__0__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1362:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
+ // InternalGModelDSL.g:1362:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1366:1: ( ( ruleValidID ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1367:1: ( ruleValidID )
+ // InternalGModelDSL.g:1366:1: ( ( ruleValidID ) )
+ // InternalGModelDSL.g:1367:1: ( ruleValidID )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1367:1: ( ruleValidID )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1368:1: ruleValidID
+ // InternalGModelDSL.g:1367:1: ( ruleValidID )
+ // InternalGModelDSL.g:1368:1: ruleValidID
{
if ( state.backtracking==0 ) {
before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0());
}
- pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl2733);
+ pushFollow(FOLLOW_2);
ruleValidID();
state._fsp--;
@@ -3972,16 +3972,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__QualifiedName__Group__1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1379:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
+ // InternalGModelDSL.g:1379:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
public final void rule__QualifiedName__Group__1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1383:1: ( rule__QualifiedName__Group__1__Impl )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1384:2: rule__QualifiedName__Group__1__Impl
+ // InternalGModelDSL.g:1383:1: ( rule__QualifiedName__Group__1__Impl )
+ // InternalGModelDSL.g:1384:2: rule__QualifiedName__Group__1__Impl
{
- pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__12762);
+ pushFollow(FOLLOW_2);
rule__QualifiedName__Group__1__Impl();
state._fsp--;
@@ -4005,22 +4005,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__QualifiedName__Group__1__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1390:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
+ // InternalGModelDSL.g:1390:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1394:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1395:1: ( ( rule__QualifiedName__Group_1__0 )* )
+ // InternalGModelDSL.g:1394:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
+ // InternalGModelDSL.g:1395:1: ( ( rule__QualifiedName__Group_1__0 )* )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1395:1: ( ( rule__QualifiedName__Group_1__0 )* )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1396:1: ( rule__QualifiedName__Group_1__0 )*
+ // InternalGModelDSL.g:1395:1: ( ( rule__QualifiedName__Group_1__0 )* )
+ // InternalGModelDSL.g:1396:1: ( rule__QualifiedName__Group_1__0 )*
{
if ( state.backtracking==0 ) {
before(grammarAccess.getQualifiedNameAccess().getGroup_1());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1397:1: ( rule__QualifiedName__Group_1__0 )*
+ // InternalGModelDSL.g:1397:1: ( rule__QualifiedName__Group_1__0 )*
loop14:
do {
int alt14=2;
@@ -4033,9 +4033,9 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
switch (alt14) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1397:2: rule__QualifiedName__Group_1__0
+ // InternalGModelDSL.g:1397:2: rule__QualifiedName__Group_1__0
{
- pushFollow(FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl2789);
+ pushFollow(FOLLOW_19);
rule__QualifiedName__Group_1__0();
state._fsp--;
@@ -4074,21 +4074,21 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__QualifiedName__Group_1__0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1411:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
+ // InternalGModelDSL.g:1411:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
public final void rule__QualifiedName__Group_1__0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1415:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1416:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
+ // InternalGModelDSL.g:1415:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
+ // InternalGModelDSL.g:1416:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
{
- pushFollow(FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__02824);
+ pushFollow(FOLLOW_4);
rule__QualifiedName__Group_1__0__Impl();
state._fsp--;
if (state.failed) return ;
- pushFollow(FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__02827);
+ pushFollow(FOLLOW_2);
rule__QualifiedName__Group_1__1();
state._fsp--;
@@ -4112,25 +4112,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__QualifiedName__Group_1__0__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1423:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
+ // InternalGModelDSL.g:1423:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1427:1: ( ( ( '.' ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1428:1: ( ( '.' ) )
+ // InternalGModelDSL.g:1427:1: ( ( ( '.' ) ) )
+ // InternalGModelDSL.g:1428:1: ( ( '.' ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1428:1: ( ( '.' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1429:1: ( '.' )
+ // InternalGModelDSL.g:1428:1: ( ( '.' ) )
+ // InternalGModelDSL.g:1429:1: ( '.' )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1430:1: ( '.' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1431:2: '.'
+ // InternalGModelDSL.g:1430:1: ( '.' )
+ // InternalGModelDSL.g:1431:2: '.'
{
- match(input,24,FOLLOW_24_in_rule__QualifiedName__Group_1__0__Impl2856); if (state.failed) return ;
+ match(input,24,FOLLOW_2); if (state.failed) return ;
}
@@ -4159,16 +4159,16 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__QualifiedName__Group_1__1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1442:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
+ // InternalGModelDSL.g:1442:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
public final void rule__QualifiedName__Group_1__1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1446:1: ( rule__QualifiedName__Group_1__1__Impl )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1447:2: rule__QualifiedName__Group_1__1__Impl
+ // InternalGModelDSL.g:1446:1: ( rule__QualifiedName__Group_1__1__Impl )
+ // InternalGModelDSL.g:1447:2: rule__QualifiedName__Group_1__1__Impl
{
- pushFollow(FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__12888);
+ pushFollow(FOLLOW_2);
rule__QualifiedName__Group_1__1__Impl();
state._fsp--;
@@ -4192,22 +4192,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__QualifiedName__Group_1__1__Impl"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1453:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
+ // InternalGModelDSL.g:1453:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1457:1: ( ( ruleValidID ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1458:1: ( ruleValidID )
+ // InternalGModelDSL.g:1457:1: ( ( ruleValidID ) )
+ // InternalGModelDSL.g:1458:1: ( ruleValidID )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1458:1: ( ruleValidID )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1459:1: ruleValidID
+ // InternalGModelDSL.g:1458:1: ( ruleValidID )
+ // InternalGModelDSL.g:1459:1: ruleValidID
{
if ( state.backtracking==0 ) {
before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1());
}
- pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl2915);
+ pushFollow(FOLLOW_2);
ruleValidID();
state._fsp--;
@@ -4237,22 +4237,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GModel__NameAssignment_1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1475:1: rule__GModel__NameAssignment_1 : ( ruleQualifiedName ) ;
+ // InternalGModelDSL.g:1475:1: rule__GModel__NameAssignment_1 : ( ruleQualifiedName ) ;
public final void rule__GModel__NameAssignment_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1479:1: ( ( ruleQualifiedName ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1480:1: ( ruleQualifiedName )
+ // InternalGModelDSL.g:1479:1: ( ( ruleQualifiedName ) )
+ // InternalGModelDSL.g:1480:1: ( ruleQualifiedName )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1480:1: ( ruleQualifiedName )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1481:1: ruleQualifiedName
+ // InternalGModelDSL.g:1480:1: ( ruleQualifiedName )
+ // InternalGModelDSL.g:1481:1: ruleQualifiedName
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGModelAccess().getNameQualifiedNameParserRuleCall_1_0());
}
- pushFollow(FOLLOW_ruleQualifiedName_in_rule__GModel__NameAssignment_12953);
+ pushFollow(FOLLOW_2);
ruleQualifiedName();
state._fsp--;
@@ -4282,22 +4282,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GModel__TypeListAssignment_3"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1490:1: rule__GModel__TypeListAssignment_3 : ( ruleGDomainElement ) ;
+ // InternalGModelDSL.g:1490:1: rule__GModel__TypeListAssignment_3 : ( ruleGDomainElement ) ;
public final void rule__GModel__TypeListAssignment_3() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1494:1: ( ( ruleGDomainElement ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1495:1: ( ruleGDomainElement )
+ // InternalGModelDSL.g:1494:1: ( ( ruleGDomainElement ) )
+ // InternalGModelDSL.g:1495:1: ( ruleGDomainElement )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1495:1: ( ruleGDomainElement )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1496:1: ruleGDomainElement
+ // InternalGModelDSL.g:1495:1: ( ruleGDomainElement )
+ // InternalGModelDSL.g:1496:1: ruleGDomainElement
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGModelAccess().getTypeListGDomainElementParserRuleCall_3_0());
}
- pushFollow(FOLLOW_ruleGDomainElement_in_rule__GModel__TypeListAssignment_32984);
+ pushFollow(FOLLOW_2);
ruleGDomainElement();
state._fsp--;
@@ -4327,22 +4327,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__NameAssignment_1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1505:1: rule__GDomainElement__NameAssignment_1 : ( RULE_ID ) ;
+ // InternalGModelDSL.g:1505:1: rule__GDomainElement__NameAssignment_1 : ( RULE_ID ) ;
public final void rule__GDomainElement__NameAssignment_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1509:1: ( ( RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1510:1: ( RULE_ID )
+ // InternalGModelDSL.g:1509:1: ( ( RULE_ID ) )
+ // InternalGModelDSL.g:1510:1: ( RULE_ID )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1510:1: ( RULE_ID )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1511:1: RULE_ID
+ // InternalGModelDSL.g:1510:1: ( RULE_ID )
+ // InternalGModelDSL.g:1511:1: RULE_ID
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getNameIDTerminalRuleCall_1_0());
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__GDomainElement__NameAssignment_13015); if (state.failed) return ;
+ match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainElementAccess().getNameIDTerminalRuleCall_1_0());
}
@@ -4368,28 +4368,28 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__SuperTypeListAssignment_2_1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1520:1: rule__GDomainElement__SuperTypeListAssignment_2_1 : ( ( RULE_ID ) ) ;
+ // InternalGModelDSL.g:1520:1: rule__GDomainElement__SuperTypeListAssignment_2_1 : ( ( RULE_ID ) ) ;
public final void rule__GDomainElement__SuperTypeListAssignment_2_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1524:1: ( ( ( RULE_ID ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1525:1: ( ( RULE_ID ) )
+ // InternalGModelDSL.g:1524:1: ( ( ( RULE_ID ) ) )
+ // InternalGModelDSL.g:1525:1: ( ( RULE_ID ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1525:1: ( ( RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1526:1: ( RULE_ID )
+ // InternalGModelDSL.g:1525:1: ( ( RULE_ID ) )
+ // InternalGModelDSL.g:1526:1: ( RULE_ID )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getSuperTypeListGDomainElementCrossReference_2_1_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1527:1: ( RULE_ID )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1528:1: RULE_ID
+ // InternalGModelDSL.g:1527:1: ( RULE_ID )
+ // InternalGModelDSL.g:1528:1: RULE_ID
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getSuperTypeListGDomainElementIDTerminalRuleCall_2_1_0_1());
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__GDomainElement__SuperTypeListAssignment_2_13050); if (state.failed) return ;
+ match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainElementAccess().getSuperTypeListGDomainElementIDTerminalRuleCall_2_1_0_1());
}
@@ -4421,28 +4421,28 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__SuperTypeListAssignment_2_2_1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1539:1: rule__GDomainElement__SuperTypeListAssignment_2_2_1 : ( ( RULE_ID ) ) ;
+ // InternalGModelDSL.g:1539:1: rule__GDomainElement__SuperTypeListAssignment_2_2_1 : ( ( RULE_ID ) ) ;
public final void rule__GDomainElement__SuperTypeListAssignment_2_2_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1543:1: ( ( ( RULE_ID ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1544:1: ( ( RULE_ID ) )
+ // InternalGModelDSL.g:1543:1: ( ( ( RULE_ID ) ) )
+ // InternalGModelDSL.g:1544:1: ( ( RULE_ID ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1544:1: ( ( RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1545:1: ( RULE_ID )
+ // InternalGModelDSL.g:1544:1: ( ( RULE_ID ) )
+ // InternalGModelDSL.g:1545:1: ( RULE_ID )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getSuperTypeListGDomainElementCrossReference_2_2_1_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1546:1: ( RULE_ID )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1547:1: RULE_ID
+ // InternalGModelDSL.g:1546:1: ( RULE_ID )
+ // InternalGModelDSL.g:1547:1: RULE_ID
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getSuperTypeListGDomainElementIDTerminalRuleCall_2_2_1_0_1());
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__GDomainElement__SuperTypeListAssignment_2_2_13089); if (state.failed) return ;
+ match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainElementAccess().getSuperTypeListGDomainElementIDTerminalRuleCall_2_2_1_0_1());
}
@@ -4474,22 +4474,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__MapAssignment_4_0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1558:1: rule__GDomainElement__MapAssignment_4_0 : ( ruleGDomainMap ) ;
+ // InternalGModelDSL.g:1558:1: rule__GDomainElement__MapAssignment_4_0 : ( ruleGDomainMap ) ;
public final void rule__GDomainElement__MapAssignment_4_0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1562:1: ( ( ruleGDomainMap ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1563:1: ( ruleGDomainMap )
+ // InternalGModelDSL.g:1562:1: ( ( ruleGDomainMap ) )
+ // InternalGModelDSL.g:1563:1: ( ruleGDomainMap )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1563:1: ( ruleGDomainMap )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1564:1: ruleGDomainMap
+ // InternalGModelDSL.g:1563:1: ( ruleGDomainMap )
+ // InternalGModelDSL.g:1564:1: ruleGDomainMap
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getMapGDomainMapParserRuleCall_4_0_0());
}
- pushFollow(FOLLOW_ruleGDomainMap_in_rule__GDomainElement__MapAssignment_4_03124);
+ pushFollow(FOLLOW_2);
ruleGDomainMap();
state._fsp--;
@@ -4519,22 +4519,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainElement__PropertyListAssignment_4_1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1573:1: rule__GDomainElement__PropertyListAssignment_4_1 : ( ruleGDomainProperty ) ;
+ // InternalGModelDSL.g:1573:1: rule__GDomainElement__PropertyListAssignment_4_1 : ( ruleGDomainProperty ) ;
public final void rule__GDomainElement__PropertyListAssignment_4_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1577:1: ( ( ruleGDomainProperty ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1578:1: ( ruleGDomainProperty )
+ // InternalGModelDSL.g:1577:1: ( ( ruleGDomainProperty ) )
+ // InternalGModelDSL.g:1578:1: ( ruleGDomainProperty )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1578:1: ( ruleGDomainProperty )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1579:1: ruleGDomainProperty
+ // InternalGModelDSL.g:1578:1: ( ruleGDomainProperty )
+ // InternalGModelDSL.g:1579:1: ruleGDomainProperty
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainElementAccess().getPropertyListGDomainPropertyParserRuleCall_4_1_0());
}
- pushFollow(FOLLOW_ruleGDomainProperty_in_rule__GDomainElement__PropertyListAssignment_4_13155);
+ pushFollow(FOLLOW_2);
ruleGDomainProperty();
state._fsp--;
@@ -4564,25 +4564,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainMap__BuiltInAssignment_1_0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1588:1: rule__GDomainMap__BuiltInAssignment_1_0 : ( ( rule__GDomainMap__BuiltInAlternatives_1_0_0 ) ) ;
+ // InternalGModelDSL.g:1588:1: rule__GDomainMap__BuiltInAssignment_1_0 : ( ( rule__GDomainMap__BuiltInAlternatives_1_0_0 ) ) ;
public final void rule__GDomainMap__BuiltInAssignment_1_0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1592:1: ( ( ( rule__GDomainMap__BuiltInAlternatives_1_0_0 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1593:1: ( ( rule__GDomainMap__BuiltInAlternatives_1_0_0 ) )
+ // InternalGModelDSL.g:1592:1: ( ( ( rule__GDomainMap__BuiltInAlternatives_1_0_0 ) ) )
+ // InternalGModelDSL.g:1593:1: ( ( rule__GDomainMap__BuiltInAlternatives_1_0_0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1593:1: ( ( rule__GDomainMap__BuiltInAlternatives_1_0_0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1594:1: ( rule__GDomainMap__BuiltInAlternatives_1_0_0 )
+ // InternalGModelDSL.g:1593:1: ( ( rule__GDomainMap__BuiltInAlternatives_1_0_0 ) )
+ // InternalGModelDSL.g:1594:1: ( rule__GDomainMap__BuiltInAlternatives_1_0_0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainMapAccess().getBuiltInAlternatives_1_0_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1595:1: ( rule__GDomainMap__BuiltInAlternatives_1_0_0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1595:2: rule__GDomainMap__BuiltInAlternatives_1_0_0
+ // InternalGModelDSL.g:1595:1: ( rule__GDomainMap__BuiltInAlternatives_1_0_0 )
+ // InternalGModelDSL.g:1595:2: rule__GDomainMap__BuiltInAlternatives_1_0_0
{
- pushFollow(FOLLOW_rule__GDomainMap__BuiltInAlternatives_1_0_0_in_rule__GDomainMap__BuiltInAssignment_1_03186);
+ pushFollow(FOLLOW_2);
rule__GDomainMap__BuiltInAlternatives_1_0_0();
state._fsp--;
@@ -4615,28 +4615,28 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainMap__RefAssignment_1_1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1604:1: rule__GDomainMap__RefAssignment_1_1 : ( ( RULE_ID ) ) ;
+ // InternalGModelDSL.g:1604:1: rule__GDomainMap__RefAssignment_1_1 : ( ( RULE_ID ) ) ;
public final void rule__GDomainMap__RefAssignment_1_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1608:1: ( ( ( RULE_ID ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1609:1: ( ( RULE_ID ) )
+ // InternalGModelDSL.g:1608:1: ( ( ( RULE_ID ) ) )
+ // InternalGModelDSL.g:1609:1: ( ( RULE_ID ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1609:1: ( ( RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1610:1: ( RULE_ID )
+ // InternalGModelDSL.g:1609:1: ( ( RULE_ID ) )
+ // InternalGModelDSL.g:1610:1: ( RULE_ID )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainMapAccess().getRefGDomainElementCrossReference_1_1_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1611:1: ( RULE_ID )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1612:1: RULE_ID
+ // InternalGModelDSL.g:1611:1: ( RULE_ID )
+ // InternalGModelDSL.g:1612:1: RULE_ID
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainMapAccess().getRefGDomainElementIDTerminalRuleCall_1_1_0_1());
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__GDomainMap__RefAssignment_1_13223); if (state.failed) return ;
+ match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainMapAccess().getRefGDomainElementIDTerminalRuleCall_1_1_0_1());
}
@@ -4668,25 +4668,25 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__BuiltInAssignment_0_0_0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1623:1: rule__GDomainProperty__BuiltInAssignment_0_0_0 : ( ( rule__GDomainProperty__BuiltInAlternatives_0_0_0_0 ) ) ;
+ // InternalGModelDSL.g:1623:1: rule__GDomainProperty__BuiltInAssignment_0_0_0 : ( ( rule__GDomainProperty__BuiltInAlternatives_0_0_0_0 ) ) ;
public final void rule__GDomainProperty__BuiltInAssignment_0_0_0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1627:1: ( ( ( rule__GDomainProperty__BuiltInAlternatives_0_0_0_0 ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1628:1: ( ( rule__GDomainProperty__BuiltInAlternatives_0_0_0_0 ) )
+ // InternalGModelDSL.g:1627:1: ( ( ( rule__GDomainProperty__BuiltInAlternatives_0_0_0_0 ) ) )
+ // InternalGModelDSL.g:1628:1: ( ( rule__GDomainProperty__BuiltInAlternatives_0_0_0_0 ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1628:1: ( ( rule__GDomainProperty__BuiltInAlternatives_0_0_0_0 ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1629:1: ( rule__GDomainProperty__BuiltInAlternatives_0_0_0_0 )
+ // InternalGModelDSL.g:1628:1: ( ( rule__GDomainProperty__BuiltInAlternatives_0_0_0_0 ) )
+ // InternalGModelDSL.g:1629:1: ( rule__GDomainProperty__BuiltInAlternatives_0_0_0_0 )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getBuiltInAlternatives_0_0_0_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1630:1: ( rule__GDomainProperty__BuiltInAlternatives_0_0_0_0 )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1630:2: rule__GDomainProperty__BuiltInAlternatives_0_0_0_0
+ // InternalGModelDSL.g:1630:1: ( rule__GDomainProperty__BuiltInAlternatives_0_0_0_0 )
+ // InternalGModelDSL.g:1630:2: rule__GDomainProperty__BuiltInAlternatives_0_0_0_0
{
- pushFollow(FOLLOW_rule__GDomainProperty__BuiltInAlternatives_0_0_0_0_in_rule__GDomainProperty__BuiltInAssignment_0_0_03258);
+ pushFollow(FOLLOW_2);
rule__GDomainProperty__BuiltInAlternatives_0_0_0_0();
state._fsp--;
@@ -4719,28 +4719,28 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__ListAssignment_0_0_1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1639:1: rule__GDomainProperty__ListAssignment_0_0_1 : ( ( '[]' ) ) ;
+ // InternalGModelDSL.g:1639:1: rule__GDomainProperty__ListAssignment_0_0_1 : ( ( '[]' ) ) ;
public final void rule__GDomainProperty__ListAssignment_0_0_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1643:1: ( ( ( '[]' ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1644:1: ( ( '[]' ) )
+ // InternalGModelDSL.g:1643:1: ( ( ( '[]' ) ) )
+ // InternalGModelDSL.g:1644:1: ( ( '[]' ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1644:1: ( ( '[]' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1645:1: ( '[]' )
+ // InternalGModelDSL.g:1644:1: ( ( '[]' ) )
+ // InternalGModelDSL.g:1645:1: ( '[]' )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getListLeftSquareBracketRightSquareBracketKeyword_0_0_1_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1646:1: ( '[]' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1647:1: '[]'
+ // InternalGModelDSL.g:1646:1: ( '[]' )
+ // InternalGModelDSL.g:1647:1: '[]'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getListLeftSquareBracketRightSquareBracketKeyword_0_0_1_0());
}
- match(input,25,FOLLOW_25_in_rule__GDomainProperty__ListAssignment_0_0_13296); if (state.failed) return ;
+ match(input,25,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainPropertyAccess().getListLeftSquareBracketRightSquareBracketKeyword_0_0_1_0());
}
@@ -4772,22 +4772,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__NameAssignment_0_0_2"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1662:1: rule__GDomainProperty__NameAssignment_0_0_2 : ( RULE_ID ) ;
+ // InternalGModelDSL.g:1662:1: rule__GDomainProperty__NameAssignment_0_0_2 : ( RULE_ID ) ;
public final void rule__GDomainProperty__NameAssignment_0_0_2() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1666:1: ( ( RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1667:1: ( RULE_ID )
+ // InternalGModelDSL.g:1666:1: ( ( RULE_ID ) )
+ // InternalGModelDSL.g:1667:1: ( RULE_ID )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1667:1: ( RULE_ID )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1668:1: RULE_ID
+ // InternalGModelDSL.g:1667:1: ( RULE_ID )
+ // InternalGModelDSL.g:1668:1: RULE_ID
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getNameIDTerminalRuleCall_0_0_2_0());
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__GDomainProperty__NameAssignment_0_0_23335); if (state.failed) return ;
+ match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainPropertyAccess().getNameIDTerminalRuleCall_0_0_2_0());
}
@@ -4813,22 +4813,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__DefaultValueAssignment_0_0_3_1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1677:1: rule__GDomainProperty__DefaultValueAssignment_0_0_3_1 : ( ruleGDefault ) ;
+ // InternalGModelDSL.g:1677:1: rule__GDomainProperty__DefaultValueAssignment_0_0_3_1 : ( ruleGDefault ) ;
public final void rule__GDomainProperty__DefaultValueAssignment_0_0_3_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1681:1: ( ( ruleGDefault ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1682:1: ( ruleGDefault )
+ // InternalGModelDSL.g:1681:1: ( ( ruleGDefault ) )
+ // InternalGModelDSL.g:1682:1: ( ruleGDefault )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1682:1: ( ruleGDefault )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1683:1: ruleGDefault
+ // InternalGModelDSL.g:1682:1: ( ruleGDefault )
+ // InternalGModelDSL.g:1683:1: ruleGDefault
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getDefaultValueGDefaultParserRuleCall_0_0_3_1_0());
}
- pushFollow(FOLLOW_ruleGDefault_in_rule__GDomainProperty__DefaultValueAssignment_0_0_3_13366);
+ pushFollow(FOLLOW_2);
ruleGDefault();
state._fsp--;
@@ -4858,28 +4858,28 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__RefAssignment_0_1_0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1692:1: rule__GDomainProperty__RefAssignment_0_1_0 : ( ( RULE_ID ) ) ;
+ // InternalGModelDSL.g:1692:1: rule__GDomainProperty__RefAssignment_0_1_0 : ( ( RULE_ID ) ) ;
public final void rule__GDomainProperty__RefAssignment_0_1_0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1696:1: ( ( ( RULE_ID ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1697:1: ( ( RULE_ID ) )
+ // InternalGModelDSL.g:1696:1: ( ( ( RULE_ID ) ) )
+ // InternalGModelDSL.g:1697:1: ( ( RULE_ID ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1697:1: ( ( RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1698:1: ( RULE_ID )
+ // InternalGModelDSL.g:1697:1: ( ( RULE_ID ) )
+ // InternalGModelDSL.g:1698:1: ( RULE_ID )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getRefGDomainElementCrossReference_0_1_0_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1699:1: ( RULE_ID )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1700:1: RULE_ID
+ // InternalGModelDSL.g:1699:1: ( RULE_ID )
+ // InternalGModelDSL.g:1700:1: RULE_ID
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getRefGDomainElementIDTerminalRuleCall_0_1_0_0_1());
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__GDomainProperty__RefAssignment_0_1_03401); if (state.failed) return ;
+ match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainPropertyAccess().getRefGDomainElementIDTerminalRuleCall_0_1_0_0_1());
}
@@ -4911,28 +4911,28 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__ListAssignment_0_1_1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1711:1: rule__GDomainProperty__ListAssignment_0_1_1 : ( ( '[]' ) ) ;
+ // InternalGModelDSL.g:1711:1: rule__GDomainProperty__ListAssignment_0_1_1 : ( ( '[]' ) ) ;
public final void rule__GDomainProperty__ListAssignment_0_1_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1715:1: ( ( ( '[]' ) ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1716:1: ( ( '[]' ) )
+ // InternalGModelDSL.g:1715:1: ( ( ( '[]' ) ) )
+ // InternalGModelDSL.g:1716:1: ( ( '[]' ) )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1716:1: ( ( '[]' ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1717:1: ( '[]' )
+ // InternalGModelDSL.g:1716:1: ( ( '[]' ) )
+ // InternalGModelDSL.g:1717:1: ( '[]' )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getListLeftSquareBracketRightSquareBracketKeyword_0_1_1_0());
}
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1718:1: ( '[]' )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1719:1: '[]'
+ // InternalGModelDSL.g:1718:1: ( '[]' )
+ // InternalGModelDSL.g:1719:1: '[]'
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getListLeftSquareBracketRightSquareBracketKeyword_0_1_1_0());
}
- match(input,25,FOLLOW_25_in_rule__GDomainProperty__ListAssignment_0_1_13441); if (state.failed) return ;
+ match(input,25,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainPropertyAccess().getListLeftSquareBracketRightSquareBracketKeyword_0_1_1_0());
}
@@ -4964,22 +4964,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDomainProperty__NameAssignment_0_1_2"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1734:1: rule__GDomainProperty__NameAssignment_0_1_2 : ( RULE_ID ) ;
+ // InternalGModelDSL.g:1734:1: rule__GDomainProperty__NameAssignment_0_1_2 : ( RULE_ID ) ;
public final void rule__GDomainProperty__NameAssignment_0_1_2() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1738:1: ( ( RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1739:1: ( RULE_ID )
+ // InternalGModelDSL.g:1738:1: ( ( RULE_ID ) )
+ // InternalGModelDSL.g:1739:1: ( RULE_ID )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1739:1: ( RULE_ID )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1740:1: RULE_ID
+ // InternalGModelDSL.g:1739:1: ( RULE_ID )
+ // InternalGModelDSL.g:1740:1: RULE_ID
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDomainPropertyAccess().getNameIDTerminalRuleCall_0_1_2_0());
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__GDomainProperty__NameAssignment_0_1_23480); if (state.failed) return ;
+ match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDomainPropertyAccess().getNameIDTerminalRuleCall_0_1_2_0());
}
@@ -5005,22 +5005,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDefault__StringValAssignment_0"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1749:1: rule__GDefault__StringValAssignment_0 : ( RULE_STRING ) ;
+ // InternalGModelDSL.g:1749:1: rule__GDefault__StringValAssignment_0 : ( RULE_STRING ) ;
public final void rule__GDefault__StringValAssignment_0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1753:1: ( ( RULE_STRING ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1754:1: ( RULE_STRING )
+ // InternalGModelDSL.g:1753:1: ( ( RULE_STRING ) )
+ // InternalGModelDSL.g:1754:1: ( RULE_STRING )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1754:1: ( RULE_STRING )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1755:1: RULE_STRING
+ // InternalGModelDSL.g:1754:1: ( RULE_STRING )
+ // InternalGModelDSL.g:1755:1: RULE_STRING
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDefaultAccess().getStringValSTRINGTerminalRuleCall_0_0());
}
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__GDefault__StringValAssignment_03511); if (state.failed) return ;
+ match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDefaultAccess().getStringValSTRINGTerminalRuleCall_0_0());
}
@@ -5046,22 +5046,22 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__GDefault__IntValAssignment_1"
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1764:1: rule__GDefault__IntValAssignment_1 : ( RULE_INT ) ;
+ // InternalGModelDSL.g:1764:1: rule__GDefault__IntValAssignment_1 : ( RULE_INT ) ;
public final void rule__GDefault__IntValAssignment_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1768:1: ( ( RULE_INT ) )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1769:1: ( RULE_INT )
+ // InternalGModelDSL.g:1768:1: ( ( RULE_INT ) )
+ // InternalGModelDSL.g:1769:1: ( RULE_INT )
{
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1769:1: ( RULE_INT )
- // ../org.eclipse.fx.ide.gmodel.ui/src-gen/org/eclipse/fx/ide/gmodel/ui/contentassist/antlr/internal/InternalGModelDSL.g:1770:1: RULE_INT
+ // InternalGModelDSL.g:1769:1: ( RULE_INT )
+ // InternalGModelDSL.g:1770:1: RULE_INT
{
if ( state.backtracking==0 ) {
before(grammarAccess.getGDefaultAccess().getIntValINTTerminalRuleCall_1_0());
}
- match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__GDefault__IntValAssignment_13542); if (state.failed) return ;
+ match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
if ( state.backtracking==0 ) {
after(grammarAccess.getGDefaultAccess().getIntValINTTerminalRuleCall_1_0());
}
@@ -5090,149 +5090,24 @@ public class InternalGModelDSLParser extends AbstractInternalContentAssistParser
- public static final BitSet FOLLOW_ruleGModel_in_entryRuleGModel67 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleGModel74 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GModel__Group__0_in_ruleGModel100 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGDomainElement_in_entryRuleGDomainElement127 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleGDomainElement134 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group__0_in_ruleGDomainElement160 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGDomainMap_in_entryRuleGDomainMap187 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleGDomainMap194 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainMap__Group__0_in_ruleGDomainMap220 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGDomainProperty_in_entryRuleGDomainProperty247 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleGDomainProperty254 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group__0_in_ruleGDomainProperty280 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGDefault_in_entryRuleGDefault307 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleGDefault314 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDefault__Alternatives_in_ruleGDefault340 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleValidID_in_entryRuleValidID367 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleValidID374 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleValidID400 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName426 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName433 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName459 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__MapAssignment_4_0_in_rule__GDomainElement__Alternatives_4495 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__PropertyListAssignment_4_1_in_rule__GDomainElement__Alternatives_4513 = new BitSet(new long[]{0x0000000000007812L});
- public static final BitSet FOLLOW_rule__GDomainMap__BuiltInAssignment_1_0_in_rule__GDomainMap__Alternatives_1547 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainMap__RefAssignment_1_1_in_rule__GDomainMap__Alternatives_1565 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_11_in_rule__GDomainMap__BuiltInAlternatives_1_0_0599 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_12_in_rule__GDomainMap__BuiltInAlternatives_1_0_0619 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_13_in_rule__GDomainMap__BuiltInAlternatives_1_0_0639 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_14_in_rule__GDomainMap__BuiltInAlternatives_1_0_0659 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_0__0_in_rule__GDomainProperty__Alternatives_0693 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_1__0_in_rule__GDomainProperty__Alternatives_0711 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_11_in_rule__GDomainProperty__BuiltInAlternatives_0_0_0_0745 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_12_in_rule__GDomainProperty__BuiltInAlternatives_0_0_0_0765 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_13_in_rule__GDomainProperty__BuiltInAlternatives_0_0_0_0785 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_14_in_rule__GDomainProperty__BuiltInAlternatives_0_0_0_0805 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDefault__StringValAssignment_0_in_rule__GDefault__Alternatives839 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDefault__IntValAssignment_1_in_rule__GDefault__Alternatives857 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GModel__Group__0__Impl_in_rule__GModel__Group__0888 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_rule__GModel__Group__1_in_rule__GModel__Group__0891 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_15_in_rule__GModel__Group__0__Impl919 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GModel__Group__1__Impl_in_rule__GModel__Group__1950 = new BitSet(new long[]{0x0000000000010000L});
- public static final BitSet FOLLOW_rule__GModel__Group__2_in_rule__GModel__Group__1953 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GModel__NameAssignment_1_in_rule__GModel__Group__1__Impl980 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GModel__Group__2__Impl_in_rule__GModel__Group__21010 = new BitSet(new long[]{0x0000000000040000L});
- public static final BitSet FOLLOW_rule__GModel__Group__3_in_rule__GModel__Group__21013 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_16_in_rule__GModel__Group__2__Impl1041 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GModel__Group__3__Impl_in_rule__GModel__Group__31072 = new BitSet(new long[]{0x0000000000020000L});
- public static final BitSet FOLLOW_rule__GModel__Group__4_in_rule__GModel__Group__31075 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GModel__TypeListAssignment_3_in_rule__GModel__Group__3__Impl1104 = new BitSet(new long[]{0x0000000000040002L});
- public static final BitSet FOLLOW_rule__GModel__TypeListAssignment_3_in_rule__GModel__Group__3__Impl1116 = new BitSet(new long[]{0x0000000000040002L});
- public static final BitSet FOLLOW_rule__GModel__Group__4__Impl_in_rule__GModel__Group__41149 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_17_in_rule__GModel__Group__4__Impl1177 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group__0__Impl_in_rule__GDomainElement__Group__01218 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group__1_in_rule__GDomainElement__Group__01221 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_18_in_rule__GDomainElement__Group__0__Impl1249 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group__1__Impl_in_rule__GDomainElement__Group__11280 = new BitSet(new long[]{0x0000000000090000L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group__2_in_rule__GDomainElement__Group__11283 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__NameAssignment_1_in_rule__GDomainElement__Group__1__Impl1310 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group__2__Impl_in_rule__GDomainElement__Group__21340 = new BitSet(new long[]{0x0000000000090000L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group__3_in_rule__GDomainElement__Group__21343 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group_2__0_in_rule__GDomainElement__Group__2__Impl1370 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group__3__Impl_in_rule__GDomainElement__Group__31401 = new BitSet(new long[]{0x0000000000207810L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group__4_in_rule__GDomainElement__Group__31404 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_16_in_rule__GDomainElement__Group__3__Impl1432 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group__4__Impl_in_rule__GDomainElement__Group__41463 = new BitSet(new long[]{0x0000000000020000L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group__5_in_rule__GDomainElement__Group__41466 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Alternatives_4_in_rule__GDomainElement__Group__4__Impl1493 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group__5__Impl_in_rule__GDomainElement__Group__51523 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_17_in_rule__GDomainElement__Group__5__Impl1551 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group_2__0__Impl_in_rule__GDomainElement__Group_2__01594 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group_2__1_in_rule__GDomainElement__Group_2__01597 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_19_in_rule__GDomainElement__Group_2__0__Impl1625 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group_2__1__Impl_in_rule__GDomainElement__Group_2__11656 = new BitSet(new long[]{0x0000000000100000L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group_2__2_in_rule__GDomainElement__Group_2__11659 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__SuperTypeListAssignment_2_1_in_rule__GDomainElement__Group_2__1__Impl1686 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group_2__2__Impl_in_rule__GDomainElement__Group_2__21716 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group_2_2__0_in_rule__GDomainElement__Group_2__2__Impl1743 = new BitSet(new long[]{0x0000000000100002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group_2_2__0__Impl_in_rule__GDomainElement__Group_2_2__01780 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group_2_2__1_in_rule__GDomainElement__Group_2_2__01783 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_20_in_rule__GDomainElement__Group_2_2__0__Impl1811 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__Group_2_2__1__Impl_in_rule__GDomainElement__Group_2_2__11842 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainElement__SuperTypeListAssignment_2_2_1_in_rule__GDomainElement__Group_2_2__1__Impl1869 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainMap__Group__0__Impl_in_rule__GDomainMap__Group__01903 = new BitSet(new long[]{0x0000000000007810L});
- public static final BitSet FOLLOW_rule__GDomainMap__Group__1_in_rule__GDomainMap__Group__01906 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_21_in_rule__GDomainMap__Group__0__Impl1934 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainMap__Group__1__Impl_in_rule__GDomainMap__Group__11965 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainMap__Alternatives_1_in_rule__GDomainMap__Group__1__Impl1992 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group__0__Impl_in_rule__GDomainProperty__Group__02026 = new BitSet(new long[]{0x0000000000400000L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group__1_in_rule__GDomainProperty__Group__02029 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Alternatives_0_in_rule__GDomainProperty__Group__0__Impl2056 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group__1__Impl_in_rule__GDomainProperty__Group__12086 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_22_in_rule__GDomainProperty__Group__1__Impl2114 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_0__0__Impl_in_rule__GDomainProperty__Group_0_0__02149 = new BitSet(new long[]{0x0000000002000010L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_0__1_in_rule__GDomainProperty__Group_0_0__02152 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__BuiltInAssignment_0_0_0_in_rule__GDomainProperty__Group_0_0__0__Impl2179 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_0__1__Impl_in_rule__GDomainProperty__Group_0_0__12209 = new BitSet(new long[]{0x0000000002000010L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_0__2_in_rule__GDomainProperty__Group_0_0__12212 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__ListAssignment_0_0_1_in_rule__GDomainProperty__Group_0_0__1__Impl2239 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_0__2__Impl_in_rule__GDomainProperty__Group_0_0__22270 = new BitSet(new long[]{0x0000000000800000L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_0__3_in_rule__GDomainProperty__Group_0_0__22273 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__NameAssignment_0_0_2_in_rule__GDomainProperty__Group_0_0__2__Impl2300 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_0__3__Impl_in_rule__GDomainProperty__Group_0_0__32330 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_0_3__0_in_rule__GDomainProperty__Group_0_0__3__Impl2357 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_0_3__0__Impl_in_rule__GDomainProperty__Group_0_0_3__02396 = new BitSet(new long[]{0x0000000000000060L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_0_3__1_in_rule__GDomainProperty__Group_0_0_3__02399 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_23_in_rule__GDomainProperty__Group_0_0_3__0__Impl2427 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_0_3__1__Impl_in_rule__GDomainProperty__Group_0_0_3__12458 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__DefaultValueAssignment_0_0_3_1_in_rule__GDomainProperty__Group_0_0_3__1__Impl2485 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_1__0__Impl_in_rule__GDomainProperty__Group_0_1__02519 = new BitSet(new long[]{0x0000000002000010L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_1__1_in_rule__GDomainProperty__Group_0_1__02522 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__RefAssignment_0_1_0_in_rule__GDomainProperty__Group_0_1__0__Impl2549 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_1__1__Impl_in_rule__GDomainProperty__Group_0_1__12579 = new BitSet(new long[]{0x0000000002000010L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_1__2_in_rule__GDomainProperty__Group_0_1__12582 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__ListAssignment_0_1_1_in_rule__GDomainProperty__Group_0_1__1__Impl2609 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__Group_0_1__2__Impl_in_rule__GDomainProperty__Group_0_1__22640 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__NameAssignment_0_1_2_in_rule__GDomainProperty__Group_0_1__2__Impl2667 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__02703 = new BitSet(new long[]{0x0000000001000000L});
- public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__02706 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl2733 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__12762 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl2789 = new BitSet(new long[]{0x0000000001000002L});
- public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__02824 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__02827 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_24_in_rule__QualifiedName__Group_1__0__Impl2856 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__12888 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl2915 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQualifiedName_in_rule__GModel__NameAssignment_12953 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGDomainElement_in_rule__GModel__TypeListAssignment_32984 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_rule__GDomainElement__NameAssignment_13015 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_rule__GDomainElement__SuperTypeListAssignment_2_13050 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_rule__GDomainElement__SuperTypeListAssignment_2_2_13089 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGDomainMap_in_rule__GDomainElement__MapAssignment_4_03124 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGDomainProperty_in_rule__GDomainElement__PropertyListAssignment_4_13155 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainMap__BuiltInAlternatives_1_0_0_in_rule__GDomainMap__BuiltInAssignment_1_03186 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_rule__GDomainMap__RefAssignment_1_13223 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__GDomainProperty__BuiltInAlternatives_0_0_0_0_in_rule__GDomainProperty__BuiltInAssignment_0_0_03258 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_25_in_rule__GDomainProperty__ListAssignment_0_0_13296 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_rule__GDomainProperty__NameAssignment_0_0_23335 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGDefault_in_rule__GDomainProperty__DefaultValueAssignment_0_0_3_13366 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_rule__GDomainProperty__RefAssignment_0_1_03401 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_25_in_rule__GDomainProperty__ListAssignment_0_1_13441 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_rule__GDomainProperty__NameAssignment_0_1_23480 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_rule__GDefault__StringValAssignment_03511 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_INT_in_rule__GDefault__IntValAssignment_13542 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000007812L});
+ public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000010000L});
+ public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000040000L});
+ public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000020000L});
+ public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000040002L});
+ public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000090000L});
+ public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000207810L});
+ public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000100000L});
+ public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000100002L});
+ public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000007810L});
+ public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000400000L});
+ public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000002000010L});
+ public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000800000L});
+ public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000000060L});
+ public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000001000000L});
+ public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000001000002L});
} \ No newline at end of file
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/GModelDSLStandaloneSetupGenerated.java b/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/GModelDSLStandaloneSetupGenerated.java
index fc272cec2..7a560e78d 100644
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/GModelDSLStandaloneSetupGenerated.java
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/GModelDSLStandaloneSetupGenerated.java
@@ -4,8 +4,8 @@
package org.eclipse.fx.ide.gmodel;
import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.ISetup;
import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ISetup;
import com.google.inject.Guice;
import com.google.inject.Injector;
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g b/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g
index 2885c3e5f..29037c70e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g
@@ -94,7 +94,7 @@ ruleGModel returns [EObject current=null]
$current,
"name",
lv_name_1_0,
- "QualifiedName");
+ "org.eclipse.fx.ide.gmodel.GModelDSL.QualifiedName");
afterParserOrEnumRuleCall();
}
@@ -116,7 +116,7 @@ ruleGModel returns [EObject current=null]
$current,
"typeList",
lv_typeList_3_0,
- "GDomainElement");
+ "org.eclipse.fx.ide.gmodel.GModelDSL.GDomainElement");
afterParserOrEnumRuleCall();
}
@@ -164,7 +164,7 @@ ruleGDomainElement returns [EObject current=null]
$current,
"name",
lv_name_1_0,
- "ID");
+ "org.eclipse.xtext.common.Terminals.ID");
}
)
@@ -219,7 +219,7 @@ ruleGDomainElement returns [EObject current=null]
$current,
"map",
lv_map_7_0,
- "GDomainMap");
+ "org.eclipse.fx.ide.gmodel.GModelDSL.GDomainMap");
afterParserOrEnumRuleCall();
}
@@ -238,7 +238,7 @@ ruleGDomainElement returns [EObject current=null]
$current,
"propertyList",
lv_propertyList_8_0,
- "GDomainProperty");
+ "org.eclipse.fx.ide.gmodel.GModelDSL.GDomainProperty");
afterParserOrEnumRuleCall();
}
@@ -444,7 +444,7 @@ ruleGDomainProperty returns [EObject current=null]
$current,
"name",
lv_name_2_0,
- "ID");
+ "org.eclipse.xtext.common.Terminals.ID");
}
)
@@ -465,7 +465,7 @@ ruleGDomainProperty returns [EObject current=null]
$current,
"defaultValue",
lv_defaultValue_4_0,
- "GDefault");
+ "org.eclipse.fx.ide.gmodel.GModelDSL.GDefault");
afterParserOrEnumRuleCall();
}
@@ -513,7 +513,7 @@ ruleGDomainProperty returns [EObject current=null]
$current,
"name",
lv_name_7_0,
- "ID");
+ "org.eclipse.xtext.common.Terminals.ID");
}
)
@@ -556,7 +556,7 @@ ruleGDefault returns [EObject current=null]
$current,
"stringVal",
lv_stringVal_0_0,
- "STRING");
+ "org.eclipse.xtext.common.Terminals.STRING");
}
)
@@ -575,7 +575,7 @@ ruleGDefault returns [EObject current=null]
$current,
"intVal",
lv_intVal_1_0,
- "INT");
+ "org.eclipse.xtext.common.Terminals.INT");
}
)
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSLLexer.java b/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSLLexer.java
index c3e1871b0..3086b27e2 100644
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSLLexer.java
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSLLexer.java
@@ -47,15 +47,15 @@ public class InternalGModelDSLLexer extends Lexer {
super(input,state);
}
- public String getGrammarFileName() { return "../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g"; }
+ public String getGrammarFileName() { return "InternalGModelDSL.g"; }
// $ANTLR start "T__11"
public final void mT__11() throws RecognitionException {
try {
int _type = T__11;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:11:7: ( 'package' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:11:9: 'package'
+ // InternalGModelDSL.g:11:7: ( 'package' )
+ // InternalGModelDSL.g:11:9: 'package'
{
match("package");
@@ -75,8 +75,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__12;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:12:7: ( '{' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:12:9: '{'
+ // InternalGModelDSL.g:12:7: ( '{' )
+ // InternalGModelDSL.g:12:9: '{'
{
match('{');
@@ -95,8 +95,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__13;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:13:7: ( '}' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:13:9: '}'
+ // InternalGModelDSL.g:13:7: ( '}' )
+ // InternalGModelDSL.g:13:9: '}'
{
match('}');
@@ -115,8 +115,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__14;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:14:7: ( 'type' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:14:9: 'type'
+ // InternalGModelDSL.g:14:7: ( 'type' )
+ // InternalGModelDSL.g:14:9: 'type'
{
match("type");
@@ -136,8 +136,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__15;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:15:7: ( 'extends' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:15:9: 'extends'
+ // InternalGModelDSL.g:15:7: ( 'extends' )
+ // InternalGModelDSL.g:15:9: 'extends'
{
match("extends");
@@ -157,8 +157,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__16;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:16:7: ( ', ' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:16:9: ', '
+ // InternalGModelDSL.g:16:7: ( ', ' )
+ // InternalGModelDSL.g:16:9: ', '
{
match(", ");
@@ -178,8 +178,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__17;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:17:7: ( 'map' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:17:9: 'map'
+ // InternalGModelDSL.g:17:7: ( 'map' )
+ // InternalGModelDSL.g:17:9: 'map'
{
match("map");
@@ -199,8 +199,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__18;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:18:7: ( 'Int' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:18:9: 'Int'
+ // InternalGModelDSL.g:18:7: ( 'Int' )
+ // InternalGModelDSL.g:18:9: 'Int'
{
match("Int");
@@ -220,8 +220,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__19;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:19:7: ( 'Double' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:19:9: 'Double'
+ // InternalGModelDSL.g:19:7: ( 'Double' )
+ // InternalGModelDSL.g:19:9: 'Double'
{
match("Double");
@@ -241,8 +241,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__20;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:20:7: ( 'String' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:20:9: 'String'
+ // InternalGModelDSL.g:20:7: ( 'String' )
+ // InternalGModelDSL.g:20:9: 'String'
{
match("String");
@@ -262,8 +262,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__21;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:21:7: ( 'Boolean' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:21:9: 'Boolean'
+ // InternalGModelDSL.g:21:7: ( 'Boolean' )
+ // InternalGModelDSL.g:21:9: 'Boolean'
{
match("Boolean");
@@ -283,8 +283,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__22;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:22:7: ( '[]' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:22:9: '[]'
+ // InternalGModelDSL.g:22:7: ( '[]' )
+ // InternalGModelDSL.g:22:9: '[]'
{
match("[]");
@@ -304,8 +304,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__23;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:23:7: ( '=' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:23:9: '='
+ // InternalGModelDSL.g:23:7: ( '=' )
+ // InternalGModelDSL.g:23:9: '='
{
match('=');
@@ -324,8 +324,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__24;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:24:7: ( ';' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:24:9: ';'
+ // InternalGModelDSL.g:24:7: ( ';' )
+ // InternalGModelDSL.g:24:9: ';'
{
match(';');
@@ -344,8 +344,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = T__25;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:25:7: ( '.' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:25:9: '.'
+ // InternalGModelDSL.g:25:7: ( '.' )
+ // InternalGModelDSL.g:25:9: '.'
{
match('.');
@@ -364,10 +364,10 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = RULE_ID;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:668:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:668:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // InternalGModelDSL.g:668:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // InternalGModelDSL.g:668:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:668:11: ( '^' )?
+ // InternalGModelDSL.g:668:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -376,7 +376,7 @@ public class InternalGModelDSLLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:668:11: '^'
+ // InternalGModelDSL.g:668:11: '^'
{
match('^');
@@ -394,7 +394,7 @@ public class InternalGModelDSLLexer extends Lexer {
recover(mse);
throw mse;}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:668:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // InternalGModelDSL.g:668:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -407,7 +407,7 @@ public class InternalGModelDSLLexer extends Lexer {
switch (alt2) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:
+ // InternalGModelDSL.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') ) {
input.consume();
@@ -443,10 +443,10 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = RULE_INT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:670:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:670:12: ( '0' .. '9' )+
+ // InternalGModelDSL.g:670:10: ( ( '0' .. '9' )+ )
+ // InternalGModelDSL.g:670:12: ( '0' .. '9' )+
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:670:12: ( '0' .. '9' )+
+ // InternalGModelDSL.g:670:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -460,7 +460,7 @@ public class InternalGModelDSLLexer extends Lexer {
switch (alt3) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:670:13: '0' .. '9'
+ // InternalGModelDSL.g:670:13: '0' .. '9'
{
matchRange('0','9');
@@ -492,10 +492,10 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = RULE_STRING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:672:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:672:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // InternalGModelDSL.g:672:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // InternalGModelDSL.g:672:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:672:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // InternalGModelDSL.g:672:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -513,10 +513,10 @@ public class InternalGModelDSLLexer extends Lexer {
}
switch (alt6) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:672:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // InternalGModelDSL.g:672:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:672:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+ // InternalGModelDSL.g:672:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -532,7 +532,7 @@ public class InternalGModelDSLLexer extends Lexer {
switch (alt4) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:672:21: '\\\\' .
+ // InternalGModelDSL.g:672:21: '\\\\' .
{
match('\\');
matchAny();
@@ -540,7 +540,7 @@ public class InternalGModelDSLLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:672:28: ~ ( ( '\\\\' | '\"' ) )
+ // InternalGModelDSL.g:672:28: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -565,10 +565,10 @@ public class InternalGModelDSLLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:672:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // InternalGModelDSL.g:672:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:672:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // InternalGModelDSL.g:672:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -584,7 +584,7 @@ public class InternalGModelDSLLexer extends Lexer {
switch (alt5) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:672:54: '\\\\' .
+ // InternalGModelDSL.g:672:54: '\\\\' .
{
match('\\');
matchAny();
@@ -592,7 +592,7 @@ public class InternalGModelDSLLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:672:61: ~ ( ( '\\\\' | '\\'' ) )
+ // InternalGModelDSL.g:672:61: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -635,12 +635,12 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = RULE_ML_COMMENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:674:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:674:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // InternalGModelDSL.g:674:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // InternalGModelDSL.g:674:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:674:24: ( options {greedy=false; } : . )*
+ // InternalGModelDSL.g:674:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -665,7 +665,7 @@ public class InternalGModelDSLLexer extends Lexer {
switch (alt7) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:674:52: .
+ // InternalGModelDSL.g:674:52: .
{
matchAny();
@@ -695,12 +695,12 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = RULE_SL_COMMENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:676:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:676:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // InternalGModelDSL.g:676:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // InternalGModelDSL.g:676:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:676:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // InternalGModelDSL.g:676:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
@@ -713,7 +713,7 @@ public class InternalGModelDSLLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:676:24: ~ ( ( '\\n' | '\\r' ) )
+ // InternalGModelDSL.g:676:24: ~ ( ( '\\n' | '\\r' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -733,7 +733,7 @@ public class InternalGModelDSLLexer extends Lexer {
}
} while (true);
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:676:40: ( ( '\\r' )? '\\n' )?
+ // InternalGModelDSL.g:676:40: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -742,9 +742,9 @@ public class InternalGModelDSLLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:676:41: ( '\\r' )? '\\n'
+ // InternalGModelDSL.g:676:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:676:41: ( '\\r' )?
+ // InternalGModelDSL.g:676:41: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -753,7 +753,7 @@ public class InternalGModelDSLLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:676:41: '\\r'
+ // InternalGModelDSL.g:676:41: '\\r'
{
match('\r');
@@ -785,10 +785,10 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = RULE_WS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:678:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:678:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // InternalGModelDSL.g:678:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // InternalGModelDSL.g:678:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:678:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // InternalGModelDSL.g:678:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -802,7 +802,7 @@ public class InternalGModelDSLLexer extends Lexer {
switch (alt11) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:
+ // InternalGModelDSL.g:
{
if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
input.consume();
@@ -842,8 +842,8 @@ public class InternalGModelDSLLexer extends Lexer {
try {
int _type = RULE_ANY_OTHER;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:680:16: ( . )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:680:18: .
+ // InternalGModelDSL.g:680:16: ( . )
+ // InternalGModelDSL.g:680:18: .
{
matchAny();
@@ -858,159 +858,159 @@ public class InternalGModelDSLLexer extends Lexer {
// $ANTLR end "RULE_ANY_OTHER"
public void mTokens() throws RecognitionException {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+ // InternalGModelDSL.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
int alt12=22;
alt12 = dfa12.predict(input);
switch (alt12) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:10: T__11
+ // InternalGModelDSL.g:1:10: T__11
{
mT__11();
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:16: T__12
+ // InternalGModelDSL.g:1:16: T__12
{
mT__12();
}
break;
case 3 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:22: T__13
+ // InternalGModelDSL.g:1:22: T__13
{
mT__13();
}
break;
case 4 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:28: T__14
+ // InternalGModelDSL.g:1:28: T__14
{
mT__14();
}
break;
case 5 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:34: T__15
+ // InternalGModelDSL.g:1:34: T__15
{
mT__15();
}
break;
case 6 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:40: T__16
+ // InternalGModelDSL.g:1:40: T__16
{
mT__16();
}
break;
case 7 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:46: T__17
+ // InternalGModelDSL.g:1:46: T__17
{
mT__17();
}
break;
case 8 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:52: T__18
+ // InternalGModelDSL.g:1:52: T__18
{
mT__18();
}
break;
case 9 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:58: T__19
+ // InternalGModelDSL.g:1:58: T__19
{
mT__19();
}
break;
case 10 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:64: T__20
+ // InternalGModelDSL.g:1:64: T__20
{
mT__20();
}
break;
case 11 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:70: T__21
+ // InternalGModelDSL.g:1:70: T__21
{
mT__21();
}
break;
case 12 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:76: T__22
+ // InternalGModelDSL.g:1:76: T__22
{
mT__22();
}
break;
case 13 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:82: T__23
+ // InternalGModelDSL.g:1:82: T__23
{
mT__23();
}
break;
case 14 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:88: T__24
+ // InternalGModelDSL.g:1:88: T__24
{
mT__24();
}
break;
case 15 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:94: T__25
+ // InternalGModelDSL.g:1:94: T__25
{
mT__25();
}
break;
case 16 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:100: RULE_ID
+ // InternalGModelDSL.g:1:100: RULE_ID
{
mRULE_ID();
}
break;
case 17 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:108: RULE_INT
+ // InternalGModelDSL.g:1:108: RULE_INT
{
mRULE_INT();
}
break;
case 18 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:117: RULE_STRING
+ // InternalGModelDSL.g:1:117: RULE_STRING
{
mRULE_STRING();
}
break;
case 19 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:129: RULE_ML_COMMENT
+ // InternalGModelDSL.g:1:129: RULE_ML_COMMENT
{
mRULE_ML_COMMENT();
}
break;
case 20 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:145: RULE_SL_COMMENT
+ // InternalGModelDSL.g:1:145: RULE_SL_COMMENT
{
mRULE_SL_COMMENT();
}
break;
case 21 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:161: RULE_WS
+ // InternalGModelDSL.g:1:161: RULE_WS
{
mRULE_WS();
}
break;
case 22 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:1:169: RULE_ANY_OTHER
+ // InternalGModelDSL.g:1:169: RULE_ANY_OTHER
{
mRULE_ANY_OTHER();
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSLParser.java b/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSLParser.java
index 27f9644e3..a5bebd11c 100644
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSLParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSLParser.java
@@ -62,7 +62,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
public String[] getTokenNames() { return InternalGModelDSLParser.tokenNames; }
- public String getGrammarFileName() { return "../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g"; }
+ public String getGrammarFileName() { return "InternalGModelDSL.g"; }
@@ -87,7 +87,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleGModel"
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:67:1: entryRuleGModel returns [EObject current=null] : iv_ruleGModel= ruleGModel EOF ;
+ // InternalGModelDSL.g:67:1: entryRuleGModel returns [EObject current=null] : iv_ruleGModel= ruleGModel EOF ;
public final EObject entryRuleGModel() throws RecognitionException {
EObject current = null;
@@ -95,13 +95,13 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:68:2: (iv_ruleGModel= ruleGModel EOF )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:69:2: iv_ruleGModel= ruleGModel EOF
+ // InternalGModelDSL.g:68:2: (iv_ruleGModel= ruleGModel EOF )
+ // InternalGModelDSL.g:69:2: iv_ruleGModel= ruleGModel EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getGModelRule());
}
- pushFollow(FOLLOW_ruleGModel_in_entryRuleGModel75);
+ pushFollow(FOLLOW_1);
iv_ruleGModel=ruleGModel();
state._fsp--;
@@ -109,7 +109,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleGModel;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleGModel85); if (state.failed) return current;
+ match(input,EOF,FOLLOW_2); if (state.failed) return current;
}
@@ -127,7 +127,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleGModel"
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:76:1: ruleGModel returns [EObject current=null] : (otherlv_0= 'package' ( (lv_name_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_typeList_3_0= ruleGDomainElement ) )+ otherlv_4= '}' ) ;
+ // InternalGModelDSL.g:76:1: ruleGModel returns [EObject current=null] : (otherlv_0= 'package' ( (lv_name_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_typeList_3_0= ruleGDomainElement ) )+ otherlv_4= '}' ) ;
public final EObject ruleGModel() throws RecognitionException {
EObject current = null;
@@ -142,30 +142,30 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:79:28: ( (otherlv_0= 'package' ( (lv_name_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_typeList_3_0= ruleGDomainElement ) )+ otherlv_4= '}' ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:80:1: (otherlv_0= 'package' ( (lv_name_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_typeList_3_0= ruleGDomainElement ) )+ otherlv_4= '}' )
+ // InternalGModelDSL.g:79:28: ( (otherlv_0= 'package' ( (lv_name_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_typeList_3_0= ruleGDomainElement ) )+ otherlv_4= '}' ) )
+ // InternalGModelDSL.g:80:1: (otherlv_0= 'package' ( (lv_name_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_typeList_3_0= ruleGDomainElement ) )+ otherlv_4= '}' )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:80:1: (otherlv_0= 'package' ( (lv_name_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_typeList_3_0= ruleGDomainElement ) )+ otherlv_4= '}' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:80:3: otherlv_0= 'package' ( (lv_name_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_typeList_3_0= ruleGDomainElement ) )+ otherlv_4= '}'
+ // InternalGModelDSL.g:80:1: (otherlv_0= 'package' ( (lv_name_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_typeList_3_0= ruleGDomainElement ) )+ otherlv_4= '}' )
+ // InternalGModelDSL.g:80:3: otherlv_0= 'package' ( (lv_name_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_typeList_3_0= ruleGDomainElement ) )+ otherlv_4= '}'
{
- otherlv_0=(Token)match(input,11,FOLLOW_11_in_ruleGModel122); if (state.failed) return current;
+ otherlv_0=(Token)match(input,11,FOLLOW_3); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_0, grammarAccess.getGModelAccess().getPackageKeyword_0());
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:84:1: ( (lv_name_1_0= ruleQualifiedName ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:85:1: (lv_name_1_0= ruleQualifiedName )
+ // InternalGModelDSL.g:84:1: ( (lv_name_1_0= ruleQualifiedName ) )
+ // InternalGModelDSL.g:85:1: (lv_name_1_0= ruleQualifiedName )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:85:1: (lv_name_1_0= ruleQualifiedName )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:86:3: lv_name_1_0= ruleQualifiedName
+ // InternalGModelDSL.g:85:1: (lv_name_1_0= ruleQualifiedName )
+ // InternalGModelDSL.g:86:3: lv_name_1_0= ruleQualifiedName
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getGModelAccess().getNameQualifiedNameParserRuleCall_1_0());
}
- pushFollow(FOLLOW_ruleQualifiedName_in_ruleGModel143);
+ pushFollow(FOLLOW_4);
lv_name_1_0=ruleQualifiedName();
state._fsp--;
@@ -179,7 +179,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
current,
"name",
lv_name_1_0,
- "QualifiedName");
+ "org.eclipse.fx.ide.gmodel.GModelDSL.QualifiedName");
afterParserOrEnumRuleCall();
}
@@ -189,13 +189,13 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
- otherlv_2=(Token)match(input,12,FOLLOW_12_in_ruleGModel155); if (state.failed) return current;
+ otherlv_2=(Token)match(input,12,FOLLOW_5); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_2, grammarAccess.getGModelAccess().getLeftCurlyBracketKeyword_2());
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:106:1: ( (lv_typeList_3_0= ruleGDomainElement ) )+
+ // InternalGModelDSL.g:106:1: ( (lv_typeList_3_0= ruleGDomainElement ) )+
int cnt1=0;
loop1:
do {
@@ -209,17 +209,17 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
switch (alt1) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:107:1: (lv_typeList_3_0= ruleGDomainElement )
+ // InternalGModelDSL.g:107:1: (lv_typeList_3_0= ruleGDomainElement )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:107:1: (lv_typeList_3_0= ruleGDomainElement )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:108:3: lv_typeList_3_0= ruleGDomainElement
+ // InternalGModelDSL.g:107:1: (lv_typeList_3_0= ruleGDomainElement )
+ // InternalGModelDSL.g:108:3: lv_typeList_3_0= ruleGDomainElement
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getGModelAccess().getTypeListGDomainElementParserRuleCall_3_0());
}
- pushFollow(FOLLOW_ruleGDomainElement_in_ruleGModel176);
+ pushFollow(FOLLOW_6);
lv_typeList_3_0=ruleGDomainElement();
state._fsp--;
@@ -233,7 +233,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
current,
"typeList",
lv_typeList_3_0,
- "GDomainElement");
+ "org.eclipse.fx.ide.gmodel.GModelDSL.GDomainElement");
afterParserOrEnumRuleCall();
}
@@ -254,7 +254,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
cnt1++;
} while (true);
- otherlv_4=(Token)match(input,13,FOLLOW_13_in_ruleGModel189); if (state.failed) return current;
+ otherlv_4=(Token)match(input,13,FOLLOW_2); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_4, grammarAccess.getGModelAccess().getRightCurlyBracketKeyword_4());
@@ -283,7 +283,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleGDomainElement"
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:136:1: entryRuleGDomainElement returns [EObject current=null] : iv_ruleGDomainElement= ruleGDomainElement EOF ;
+ // InternalGModelDSL.g:136:1: entryRuleGDomainElement returns [EObject current=null] : iv_ruleGDomainElement= ruleGDomainElement EOF ;
public final EObject entryRuleGDomainElement() throws RecognitionException {
EObject current = null;
@@ -291,13 +291,13 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:137:2: (iv_ruleGDomainElement= ruleGDomainElement EOF )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:138:2: iv_ruleGDomainElement= ruleGDomainElement EOF
+ // InternalGModelDSL.g:137:2: (iv_ruleGDomainElement= ruleGDomainElement EOF )
+ // InternalGModelDSL.g:138:2: iv_ruleGDomainElement= ruleGDomainElement EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getGDomainElementRule());
}
- pushFollow(FOLLOW_ruleGDomainElement_in_entryRuleGDomainElement225);
+ pushFollow(FOLLOW_1);
iv_ruleGDomainElement=ruleGDomainElement();
state._fsp--;
@@ -305,7 +305,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleGDomainElement;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleGDomainElement235); if (state.failed) return current;
+ match(input,EOF,FOLLOW_2); if (state.failed) return current;
}
@@ -323,7 +323,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleGDomainElement"
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:145:1: ruleGDomainElement returns [EObject current=null] : (otherlv_0= 'type' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= 'extends' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= '{' ( ( (lv_map_7_0= ruleGDomainMap ) ) | ( (lv_propertyList_8_0= ruleGDomainProperty ) )* ) otherlv_9= '}' ) ;
+ // InternalGModelDSL.g:145:1: ruleGDomainElement returns [EObject current=null] : (otherlv_0= 'type' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= 'extends' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= '{' ( ( (lv_map_7_0= ruleGDomainMap ) ) | ( (lv_propertyList_8_0= ruleGDomainProperty ) )* ) otherlv_9= '}' ) ;
public final EObject ruleGDomainElement() throws RecognitionException {
EObject current = null;
@@ -343,25 +343,25 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:148:28: ( (otherlv_0= 'type' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= 'extends' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= '{' ( ( (lv_map_7_0= ruleGDomainMap ) ) | ( (lv_propertyList_8_0= ruleGDomainProperty ) )* ) otherlv_9= '}' ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:149:1: (otherlv_0= 'type' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= 'extends' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= '{' ( ( (lv_map_7_0= ruleGDomainMap ) ) | ( (lv_propertyList_8_0= ruleGDomainProperty ) )* ) otherlv_9= '}' )
+ // InternalGModelDSL.g:148:28: ( (otherlv_0= 'type' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= 'extends' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= '{' ( ( (lv_map_7_0= ruleGDomainMap ) ) | ( (lv_propertyList_8_0= ruleGDomainProperty ) )* ) otherlv_9= '}' ) )
+ // InternalGModelDSL.g:149:1: (otherlv_0= 'type' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= 'extends' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= '{' ( ( (lv_map_7_0= ruleGDomainMap ) ) | ( (lv_propertyList_8_0= ruleGDomainProperty ) )* ) otherlv_9= '}' )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:149:1: (otherlv_0= 'type' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= 'extends' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= '{' ( ( (lv_map_7_0= ruleGDomainMap ) ) | ( (lv_propertyList_8_0= ruleGDomainProperty ) )* ) otherlv_9= '}' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:149:3: otherlv_0= 'type' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= 'extends' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= '{' ( ( (lv_map_7_0= ruleGDomainMap ) ) | ( (lv_propertyList_8_0= ruleGDomainProperty ) )* ) otherlv_9= '}'
+ // InternalGModelDSL.g:149:1: (otherlv_0= 'type' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= 'extends' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= '{' ( ( (lv_map_7_0= ruleGDomainMap ) ) | ( (lv_propertyList_8_0= ruleGDomainProperty ) )* ) otherlv_9= '}' )
+ // InternalGModelDSL.g:149:3: otherlv_0= 'type' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= 'extends' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= '{' ( ( (lv_map_7_0= ruleGDomainMap ) ) | ( (lv_propertyList_8_0= ruleGDomainProperty ) )* ) otherlv_9= '}'
{
- otherlv_0=(Token)match(input,14,FOLLOW_14_in_ruleGDomainElement272); if (state.failed) return current;
+ otherlv_0=(Token)match(input,14,FOLLOW_3); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_0, grammarAccess.getGDomainElementAccess().getTypeKeyword_0());
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:153:1: ( (lv_name_1_0= RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:154:1: (lv_name_1_0= RULE_ID )
+ // InternalGModelDSL.g:153:1: ( (lv_name_1_0= RULE_ID ) )
+ // InternalGModelDSL.g:154:1: (lv_name_1_0= RULE_ID )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:154:1: (lv_name_1_0= RULE_ID )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:155:3: lv_name_1_0= RULE_ID
+ // InternalGModelDSL.g:154:1: (lv_name_1_0= RULE_ID )
+ // InternalGModelDSL.g:155:3: lv_name_1_0= RULE_ID
{
- lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGDomainElement289); if (state.failed) return current;
+ lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_7); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_name_1_0, grammarAccess.getGDomainElementAccess().getNameIDTerminalRuleCall_1_0());
@@ -376,7 +376,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
current,
"name",
lv_name_1_0,
- "ID");
+ "org.eclipse.xtext.common.Terminals.ID");
}
@@ -385,7 +385,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:171:2: (otherlv_2= 'extends' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )* )?
+ // InternalGModelDSL.g:171:2: (otherlv_2= 'extends' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )* )?
int alt3=2;
int LA3_0 = input.LA(1);
@@ -394,19 +394,19 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
switch (alt3) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:171:4: otherlv_2= 'extends' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )*
+ // InternalGModelDSL.g:171:4: otherlv_2= 'extends' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )*
{
- otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleGDomainElement307); if (state.failed) return current;
+ otherlv_2=(Token)match(input,15,FOLLOW_3); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_2, grammarAccess.getGDomainElementAccess().getExtendsKeyword_2_0());
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:175:1: ( (otherlv_3= RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:176:1: (otherlv_3= RULE_ID )
+ // InternalGModelDSL.g:175:1: ( (otherlv_3= RULE_ID ) )
+ // InternalGModelDSL.g:176:1: (otherlv_3= RULE_ID )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:176:1: (otherlv_3= RULE_ID )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:177:3: otherlv_3= RULE_ID
+ // InternalGModelDSL.g:176:1: (otherlv_3= RULE_ID )
+ // InternalGModelDSL.g:177:3: otherlv_3= RULE_ID
{
if ( state.backtracking==0 ) {
@@ -415,7 +415,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
}
- otherlv_3=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGDomainElement327); if (state.failed) return current;
+ otherlv_3=(Token)match(input,RULE_ID,FOLLOW_8); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_3, grammarAccess.getGDomainElementAccess().getSuperTypeListGDomainElementCrossReference_2_1_0());
@@ -427,7 +427,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:188:2: (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )*
+ // InternalGModelDSL.g:188:2: (otherlv_4= ', ' ( (otherlv_5= RULE_ID ) ) )*
loop2:
do {
int alt2=2;
@@ -440,19 +440,19 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
switch (alt2) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:188:4: otherlv_4= ', ' ( (otherlv_5= RULE_ID ) )
+ // InternalGModelDSL.g:188:4: otherlv_4= ', ' ( (otherlv_5= RULE_ID ) )
{
- otherlv_4=(Token)match(input,16,FOLLOW_16_in_ruleGDomainElement340); if (state.failed) return current;
+ otherlv_4=(Token)match(input,16,FOLLOW_3); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_4, grammarAccess.getGDomainElementAccess().getCommaSpaceKeyword_2_2_0());
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:192:1: ( (otherlv_5= RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:193:1: (otherlv_5= RULE_ID )
+ // InternalGModelDSL.g:192:1: ( (otherlv_5= RULE_ID ) )
+ // InternalGModelDSL.g:193:1: (otherlv_5= RULE_ID )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:193:1: (otherlv_5= RULE_ID )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:194:3: otherlv_5= RULE_ID
+ // InternalGModelDSL.g:193:1: (otherlv_5= RULE_ID )
+ // InternalGModelDSL.g:194:3: otherlv_5= RULE_ID
{
if ( state.backtracking==0 ) {
@@ -461,7 +461,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
}
- otherlv_5=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGDomainElement360); if (state.failed) return current;
+ otherlv_5=(Token)match(input,RULE_ID,FOLLOW_8); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_5, grammarAccess.getGDomainElementAccess().getSuperTypeListGDomainElementCrossReference_2_2_1_0());
@@ -488,13 +488,13 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
- otherlv_6=(Token)match(input,12,FOLLOW_12_in_ruleGDomainElement376); if (state.failed) return current;
+ otherlv_6=(Token)match(input,12,FOLLOW_9); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_6, grammarAccess.getGDomainElementAccess().getLeftCurlyBracketKeyword_3());
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:209:1: ( ( (lv_map_7_0= ruleGDomainMap ) ) | ( (lv_propertyList_8_0= ruleGDomainProperty ) )* )
+ // InternalGModelDSL.g:209:1: ( ( (lv_map_7_0= ruleGDomainMap ) ) | ( (lv_propertyList_8_0= ruleGDomainProperty ) )* )
int alt5=2;
int LA5_0 = input.LA(1);
@@ -513,20 +513,20 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
switch (alt5) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:209:2: ( (lv_map_7_0= ruleGDomainMap ) )
+ // InternalGModelDSL.g:209:2: ( (lv_map_7_0= ruleGDomainMap ) )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:209:2: ( (lv_map_7_0= ruleGDomainMap ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:210:1: (lv_map_7_0= ruleGDomainMap )
+ // InternalGModelDSL.g:209:2: ( (lv_map_7_0= ruleGDomainMap ) )
+ // InternalGModelDSL.g:210:1: (lv_map_7_0= ruleGDomainMap )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:210:1: (lv_map_7_0= ruleGDomainMap )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:211:3: lv_map_7_0= ruleGDomainMap
+ // InternalGModelDSL.g:210:1: (lv_map_7_0= ruleGDomainMap )
+ // InternalGModelDSL.g:211:3: lv_map_7_0= ruleGDomainMap
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getGDomainElementAccess().getMapGDomainMapParserRuleCall_4_0_0());
}
- pushFollow(FOLLOW_ruleGDomainMap_in_ruleGDomainElement398);
+ pushFollow(FOLLOW_10);
lv_map_7_0=ruleGDomainMap();
state._fsp--;
@@ -540,7 +540,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
current,
"map",
lv_map_7_0,
- "GDomainMap");
+ "org.eclipse.fx.ide.gmodel.GModelDSL.GDomainMap");
afterParserOrEnumRuleCall();
}
@@ -554,9 +554,9 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:228:6: ( (lv_propertyList_8_0= ruleGDomainProperty ) )*
+ // InternalGModelDSL.g:228:6: ( (lv_propertyList_8_0= ruleGDomainProperty ) )*
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:228:6: ( (lv_propertyList_8_0= ruleGDomainProperty ) )*
+ // InternalGModelDSL.g:228:6: ( (lv_propertyList_8_0= ruleGDomainProperty ) )*
loop4:
do {
int alt4=2;
@@ -569,17 +569,17 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
switch (alt4) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:229:1: (lv_propertyList_8_0= ruleGDomainProperty )
+ // InternalGModelDSL.g:229:1: (lv_propertyList_8_0= ruleGDomainProperty )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:229:1: (lv_propertyList_8_0= ruleGDomainProperty )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:230:3: lv_propertyList_8_0= ruleGDomainProperty
+ // InternalGModelDSL.g:229:1: (lv_propertyList_8_0= ruleGDomainProperty )
+ // InternalGModelDSL.g:230:3: lv_propertyList_8_0= ruleGDomainProperty
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getGDomainElementAccess().getPropertyListGDomainPropertyParserRuleCall_4_1_0());
}
- pushFollow(FOLLOW_ruleGDomainProperty_in_ruleGDomainElement425);
+ pushFollow(FOLLOW_11);
lv_propertyList_8_0=ruleGDomainProperty();
state._fsp--;
@@ -593,7 +593,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
current,
"propertyList",
lv_propertyList_8_0,
- "GDomainProperty");
+ "org.eclipse.fx.ide.gmodel.GModelDSL.GDomainProperty");
afterParserOrEnumRuleCall();
}
@@ -615,7 +615,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
- otherlv_9=(Token)match(input,13,FOLLOW_13_in_ruleGDomainElement439); if (state.failed) return current;
+ otherlv_9=(Token)match(input,13,FOLLOW_2); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_9, grammarAccess.getGDomainElementAccess().getRightCurlyBracketKeyword_5());
@@ -644,7 +644,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleGDomainMap"
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:258:1: entryRuleGDomainMap returns [EObject current=null] : iv_ruleGDomainMap= ruleGDomainMap EOF ;
+ // InternalGModelDSL.g:258:1: entryRuleGDomainMap returns [EObject current=null] : iv_ruleGDomainMap= ruleGDomainMap EOF ;
public final EObject entryRuleGDomainMap() throws RecognitionException {
EObject current = null;
@@ -652,13 +652,13 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:259:2: (iv_ruleGDomainMap= ruleGDomainMap EOF )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:260:2: iv_ruleGDomainMap= ruleGDomainMap EOF
+ // InternalGModelDSL.g:259:2: (iv_ruleGDomainMap= ruleGDomainMap EOF )
+ // InternalGModelDSL.g:260:2: iv_ruleGDomainMap= ruleGDomainMap EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getGDomainMapRule());
}
- pushFollow(FOLLOW_ruleGDomainMap_in_entryRuleGDomainMap475);
+ pushFollow(FOLLOW_1);
iv_ruleGDomainMap=ruleGDomainMap();
state._fsp--;
@@ -666,7 +666,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleGDomainMap;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleGDomainMap485); if (state.failed) return current;
+ match(input,EOF,FOLLOW_2); if (state.failed) return current;
}
@@ -684,7 +684,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleGDomainMap"
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:267:1: ruleGDomainMap returns [EObject current=null] : (otherlv_0= 'map' ( ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) ) | ( (otherlv_2= RULE_ID ) ) ) ) ;
+ // InternalGModelDSL.g:267:1: ruleGDomainMap returns [EObject current=null] : (otherlv_0= 'map' ( ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) ) | ( (otherlv_2= RULE_ID ) ) ) ) ;
public final EObject ruleGDomainMap() throws RecognitionException {
EObject current = null;
@@ -698,19 +698,19 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:270:28: ( (otherlv_0= 'map' ( ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) ) | ( (otherlv_2= RULE_ID ) ) ) ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:271:1: (otherlv_0= 'map' ( ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) ) | ( (otherlv_2= RULE_ID ) ) ) )
+ // InternalGModelDSL.g:270:28: ( (otherlv_0= 'map' ( ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) ) | ( (otherlv_2= RULE_ID ) ) ) ) )
+ // InternalGModelDSL.g:271:1: (otherlv_0= 'map' ( ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) ) | ( (otherlv_2= RULE_ID ) ) ) )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:271:1: (otherlv_0= 'map' ( ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) ) | ( (otherlv_2= RULE_ID ) ) ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:271:3: otherlv_0= 'map' ( ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) ) | ( (otherlv_2= RULE_ID ) ) )
+ // InternalGModelDSL.g:271:1: (otherlv_0= 'map' ( ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) ) | ( (otherlv_2= RULE_ID ) ) ) )
+ // InternalGModelDSL.g:271:3: otherlv_0= 'map' ( ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) ) | ( (otherlv_2= RULE_ID ) ) )
{
- otherlv_0=(Token)match(input,17,FOLLOW_17_in_ruleGDomainMap522); if (state.failed) return current;
+ otherlv_0=(Token)match(input,17,FOLLOW_12); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_0, grammarAccess.getGDomainMapAccess().getMapKeyword_0());
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:275:1: ( ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) ) | ( (otherlv_2= RULE_ID ) ) )
+ // InternalGModelDSL.g:275:1: ( ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) ) | ( (otherlv_2= RULE_ID ) ) )
int alt7=2;
int LA7_0 = input.LA(1);
@@ -729,15 +729,15 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
switch (alt7) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:275:2: ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) )
+ // InternalGModelDSL.g:275:2: ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:275:2: ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:276:1: ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) )
+ // InternalGModelDSL.g:275:2: ( ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) ) )
+ // InternalGModelDSL.g:276:1: ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:276:1: ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:277:1: (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' )
+ // InternalGModelDSL.g:276:1: ( (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' ) )
+ // InternalGModelDSL.g:277:1: (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:277:1: (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' )
+ // InternalGModelDSL.g:277:1: (lv_builtIn_1_1= 'Int' | lv_builtIn_1_2= 'Double' | lv_builtIn_1_3= 'String' | lv_builtIn_1_4= 'Boolean' )
int alt6=4;
switch ( input.LA(1) ) {
case 18:
@@ -770,9 +770,9 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
switch (alt6) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:278:3: lv_builtIn_1_1= 'Int'
+ // InternalGModelDSL.g:278:3: lv_builtIn_1_1= 'Int'
{
- lv_builtIn_1_1=(Token)match(input,18,FOLLOW_18_in_ruleGDomainMap543); if (state.failed) return current;
+ lv_builtIn_1_1=(Token)match(input,18,FOLLOW_2); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_builtIn_1_1, grammarAccess.getGDomainMapAccess().getBuiltInIntKeyword_1_0_0_0());
@@ -790,9 +790,9 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:290:8: lv_builtIn_1_2= 'Double'
+ // InternalGModelDSL.g:290:8: lv_builtIn_1_2= 'Double'
{
- lv_builtIn_1_2=(Token)match(input,19,FOLLOW_19_in_ruleGDomainMap572); if (state.failed) return current;
+ lv_builtIn_1_2=(Token)match(input,19,FOLLOW_2); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_builtIn_1_2, grammarAccess.getGDomainMapAccess().getBuiltInDoubleKeyword_1_0_0_1());
@@ -810,9 +810,9 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
break;
case 3 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:302:8: lv_builtIn_1_3= 'String'
+ // InternalGModelDSL.g:302:8: lv_builtIn_1_3= 'String'
{
- lv_builtIn_1_3=(Token)match(input,20,FOLLOW_20_in_ruleGDomainMap601); if (state.failed) return current;
+ lv_builtIn_1_3=(Token)match(input,20,FOLLOW_2); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_builtIn_1_3, grammarAccess.getGDomainMapAccess().getBuiltInStringKeyword_1_0_0_2());
@@ -830,9 +830,9 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
break;
case 4 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:314:8: lv_builtIn_1_4= 'Boolean'
+ // InternalGModelDSL.g:314:8: lv_builtIn_1_4= 'Boolean'
{
- lv_builtIn_1_4=(Token)match(input,21,FOLLOW_21_in_ruleGDomainMap630); if (state.failed) return current;
+ lv_builtIn_1_4=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_builtIn_1_4, grammarAccess.getGDomainMapAccess().getBuiltInBooleanKeyword_1_0_0_3());
@@ -862,13 +862,13 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:330:6: ( (otherlv_2= RULE_ID ) )
+ // InternalGModelDSL.g:330:6: ( (otherlv_2= RULE_ID ) )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:330:6: ( (otherlv_2= RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:331:1: (otherlv_2= RULE_ID )
+ // InternalGModelDSL.g:330:6: ( (otherlv_2= RULE_ID ) )
+ // InternalGModelDSL.g:331:1: (otherlv_2= RULE_ID )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:331:1: (otherlv_2= RULE_ID )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:332:3: otherlv_2= RULE_ID
+ // InternalGModelDSL.g:331:1: (otherlv_2= RULE_ID )
+ // InternalGModelDSL.g:332:3: otherlv_2= RULE_ID
{
if ( state.backtracking==0 ) {
@@ -877,7 +877,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
}
- otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGDomainMap672); if (state.failed) return current;
+ otherlv_2=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_2, grammarAccess.getGDomainMapAccess().getRefGDomainElementCrossReference_1_1_0());
@@ -918,7 +918,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleGDomainProperty"
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:351:1: entryRuleGDomainProperty returns [EObject current=null] : iv_ruleGDomainProperty= ruleGDomainProperty EOF ;
+ // InternalGModelDSL.g:351:1: entryRuleGDomainProperty returns [EObject current=null] : iv_ruleGDomainProperty= ruleGDomainProperty EOF ;
public final EObject entryRuleGDomainProperty() throws RecognitionException {
EObject current = null;
@@ -926,13 +926,13 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:352:2: (iv_ruleGDomainProperty= ruleGDomainProperty EOF )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:353:2: iv_ruleGDomainProperty= ruleGDomainProperty EOF
+ // InternalGModelDSL.g:352:2: (iv_ruleGDomainProperty= ruleGDomainProperty EOF )
+ // InternalGModelDSL.g:353:2: iv_ruleGDomainProperty= ruleGDomainProperty EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getGDomainPropertyRule());
}
- pushFollow(FOLLOW_ruleGDomainProperty_in_entryRuleGDomainProperty709);
+ pushFollow(FOLLOW_1);
iv_ruleGDomainProperty=ruleGDomainProperty();
state._fsp--;
@@ -940,7 +940,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleGDomainProperty;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleGDomainProperty719); if (state.failed) return current;
+ match(input,EOF,FOLLOW_2); if (state.failed) return current;
}
@@ -958,7 +958,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleGDomainProperty"
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:360:1: ruleGDomainProperty returns [EObject current=null] : ( ( ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? ) | ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) ) ) otherlv_8= ';' ) ;
+ // InternalGModelDSL.g:360:1: ruleGDomainProperty returns [EObject current=null] : ( ( ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? ) | ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) ) ) otherlv_8= ';' ) ;
public final EObject ruleGDomainProperty() throws RecognitionException {
EObject current = null;
@@ -979,13 +979,13 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:363:28: ( ( ( ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? ) | ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) ) ) otherlv_8= ';' ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:364:1: ( ( ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? ) | ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) ) ) otherlv_8= ';' )
+ // InternalGModelDSL.g:363:28: ( ( ( ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? ) | ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) ) ) otherlv_8= ';' ) )
+ // InternalGModelDSL.g:364:1: ( ( ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? ) | ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) ) ) otherlv_8= ';' )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:364:1: ( ( ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? ) | ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) ) ) otherlv_8= ';' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:364:2: ( ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? ) | ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) ) ) otherlv_8= ';'
+ // InternalGModelDSL.g:364:1: ( ( ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? ) | ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) ) ) otherlv_8= ';' )
+ // InternalGModelDSL.g:364:2: ( ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? ) | ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) ) ) otherlv_8= ';'
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:364:2: ( ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? ) | ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) ) )
+ // InternalGModelDSL.g:364:2: ( ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? ) | ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) ) )
int alt12=2;
int LA12_0 = input.LA(1);
@@ -1004,18 +1004,18 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
switch (alt12) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:364:3: ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? )
+ // InternalGModelDSL.g:364:3: ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:364:3: ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:364:4: ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )?
+ // InternalGModelDSL.g:364:3: ( ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )? )
+ // InternalGModelDSL.g:364:4: ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) ) ( (lv_list_1_0= '[]' ) )? ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )?
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:364:4: ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:365:1: ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) )
+ // InternalGModelDSL.g:364:4: ( ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) ) )
+ // InternalGModelDSL.g:365:1: ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:365:1: ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:366:1: (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' )
+ // InternalGModelDSL.g:365:1: ( (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' ) )
+ // InternalGModelDSL.g:366:1: (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:366:1: (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' )
+ // InternalGModelDSL.g:366:1: (lv_builtIn_0_1= 'Int' | lv_builtIn_0_2= 'Double' | lv_builtIn_0_3= 'String' | lv_builtIn_0_4= 'Boolean' )
int alt8=4;
switch ( input.LA(1) ) {
case 18:
@@ -1048,9 +1048,9 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
switch (alt8) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:367:3: lv_builtIn_0_1= 'Int'
+ // InternalGModelDSL.g:367:3: lv_builtIn_0_1= 'Int'
{
- lv_builtIn_0_1=(Token)match(input,18,FOLLOW_18_in_ruleGDomainProperty766); if (state.failed) return current;
+ lv_builtIn_0_1=(Token)match(input,18,FOLLOW_13); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_builtIn_0_1, grammarAccess.getGDomainPropertyAccess().getBuiltInIntKeyword_0_0_0_0_0());
@@ -1068,9 +1068,9 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:379:8: lv_builtIn_0_2= 'Double'
+ // InternalGModelDSL.g:379:8: lv_builtIn_0_2= 'Double'
{
- lv_builtIn_0_2=(Token)match(input,19,FOLLOW_19_in_ruleGDomainProperty795); if (state.failed) return current;
+ lv_builtIn_0_2=(Token)match(input,19,FOLLOW_13); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_builtIn_0_2, grammarAccess.getGDomainPropertyAccess().getBuiltInDoubleKeyword_0_0_0_0_1());
@@ -1088,9 +1088,9 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
break;
case 3 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:391:8: lv_builtIn_0_3= 'String'
+ // InternalGModelDSL.g:391:8: lv_builtIn_0_3= 'String'
{
- lv_builtIn_0_3=(Token)match(input,20,FOLLOW_20_in_ruleGDomainProperty824); if (state.failed) return current;
+ lv_builtIn_0_3=(Token)match(input,20,FOLLOW_13); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_builtIn_0_3, grammarAccess.getGDomainPropertyAccess().getBuiltInStringKeyword_0_0_0_0_2());
@@ -1108,9 +1108,9 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
break;
case 4 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:403:8: lv_builtIn_0_4= 'Boolean'
+ // InternalGModelDSL.g:403:8: lv_builtIn_0_4= 'Boolean'
{
- lv_builtIn_0_4=(Token)match(input,21,FOLLOW_21_in_ruleGDomainProperty853); if (state.failed) return current;
+ lv_builtIn_0_4=(Token)match(input,21,FOLLOW_13); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_builtIn_0_4, grammarAccess.getGDomainPropertyAccess().getBuiltInBooleanKeyword_0_0_0_0_3());
@@ -1136,7 +1136,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:418:2: ( (lv_list_1_0= '[]' ) )?
+ // InternalGModelDSL.g:418:2: ( (lv_list_1_0= '[]' ) )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -1145,12 +1145,12 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
switch (alt9) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:419:1: (lv_list_1_0= '[]' )
+ // InternalGModelDSL.g:419:1: (lv_list_1_0= '[]' )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:419:1: (lv_list_1_0= '[]' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:420:3: lv_list_1_0= '[]'
+ // InternalGModelDSL.g:419:1: (lv_list_1_0= '[]' )
+ // InternalGModelDSL.g:420:3: lv_list_1_0= '[]'
{
- lv_list_1_0=(Token)match(input,22,FOLLOW_22_in_ruleGDomainProperty887); if (state.failed) return current;
+ lv_list_1_0=(Token)match(input,22,FOLLOW_3); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_list_1_0, grammarAccess.getGDomainPropertyAccess().getListLeftSquareBracketRightSquareBracketKeyword_0_0_1_0());
@@ -1173,13 +1173,13 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:433:3: ( (lv_name_2_0= RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:434:1: (lv_name_2_0= RULE_ID )
+ // InternalGModelDSL.g:433:3: ( (lv_name_2_0= RULE_ID ) )
+ // InternalGModelDSL.g:434:1: (lv_name_2_0= RULE_ID )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:434:1: (lv_name_2_0= RULE_ID )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:435:3: lv_name_2_0= RULE_ID
+ // InternalGModelDSL.g:434:1: (lv_name_2_0= RULE_ID )
+ // InternalGModelDSL.g:435:3: lv_name_2_0= RULE_ID
{
- lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGDomainProperty918); if (state.failed) return current;
+ lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_14); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_name_2_0, grammarAccess.getGDomainPropertyAccess().getNameIDTerminalRuleCall_0_0_2_0());
@@ -1194,7 +1194,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
current,
"name",
lv_name_2_0,
- "ID");
+ "org.eclipse.xtext.common.Terminals.ID");
}
@@ -1203,7 +1203,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:451:2: (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )?
+ // InternalGModelDSL.g:451:2: (otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) ) )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -1212,26 +1212,26 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:451:4: otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) )
+ // InternalGModelDSL.g:451:4: otherlv_3= '=' ( (lv_defaultValue_4_0= ruleGDefault ) )
{
- otherlv_3=(Token)match(input,23,FOLLOW_23_in_ruleGDomainProperty936); if (state.failed) return current;
+ otherlv_3=(Token)match(input,23,FOLLOW_15); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_3, grammarAccess.getGDomainPropertyAccess().getEqualsSignKeyword_0_0_3_0());
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:455:1: ( (lv_defaultValue_4_0= ruleGDefault ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:456:1: (lv_defaultValue_4_0= ruleGDefault )
+ // InternalGModelDSL.g:455:1: ( (lv_defaultValue_4_0= ruleGDefault ) )
+ // InternalGModelDSL.g:456:1: (lv_defaultValue_4_0= ruleGDefault )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:456:1: (lv_defaultValue_4_0= ruleGDefault )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:457:3: lv_defaultValue_4_0= ruleGDefault
+ // InternalGModelDSL.g:456:1: (lv_defaultValue_4_0= ruleGDefault )
+ // InternalGModelDSL.g:457:3: lv_defaultValue_4_0= ruleGDefault
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getGDomainPropertyAccess().getDefaultValueGDefaultParserRuleCall_0_0_3_1_0());
}
- pushFollow(FOLLOW_ruleGDefault_in_ruleGDomainProperty957);
+ pushFollow(FOLLOW_16);
lv_defaultValue_4_0=ruleGDefault();
state._fsp--;
@@ -1245,7 +1245,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
current,
"defaultValue",
lv_defaultValue_4_0,
- "GDefault");
+ "org.eclipse.fx.ide.gmodel.GModelDSL.GDefault");
afterParserOrEnumRuleCall();
}
@@ -1268,16 +1268,16 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:474:6: ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) )
+ // InternalGModelDSL.g:474:6: ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:474:6: ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:474:7: ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) )
+ // InternalGModelDSL.g:474:6: ( ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) ) )
+ // InternalGModelDSL.g:474:7: ( (otherlv_5= RULE_ID ) ) ( (lv_list_6_0= '[]' ) )? ( (lv_name_7_0= RULE_ID ) )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:474:7: ( (otherlv_5= RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:475:1: (otherlv_5= RULE_ID )
+ // InternalGModelDSL.g:474:7: ( (otherlv_5= RULE_ID ) )
+ // InternalGModelDSL.g:475:1: (otherlv_5= RULE_ID )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:475:1: (otherlv_5= RULE_ID )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:476:3: otherlv_5= RULE_ID
+ // InternalGModelDSL.g:475:1: (otherlv_5= RULE_ID )
+ // InternalGModelDSL.g:476:3: otherlv_5= RULE_ID
{
if ( state.backtracking==0 ) {
@@ -1286,7 +1286,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
}
- otherlv_5=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGDomainProperty987); if (state.failed) return current;
+ otherlv_5=(Token)match(input,RULE_ID,FOLLOW_13); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_5, grammarAccess.getGDomainPropertyAccess().getRefGDomainElementCrossReference_0_1_0_0());
@@ -1298,7 +1298,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:487:2: ( (lv_list_6_0= '[]' ) )?
+ // InternalGModelDSL.g:487:2: ( (lv_list_6_0= '[]' ) )?
int alt11=2;
int LA11_0 = input.LA(1);
@@ -1307,12 +1307,12 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
switch (alt11) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:488:1: (lv_list_6_0= '[]' )
+ // InternalGModelDSL.g:488:1: (lv_list_6_0= '[]' )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:488:1: (lv_list_6_0= '[]' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:489:3: lv_list_6_0= '[]'
+ // InternalGModelDSL.g:488:1: (lv_list_6_0= '[]' )
+ // InternalGModelDSL.g:489:3: lv_list_6_0= '[]'
{
- lv_list_6_0=(Token)match(input,22,FOLLOW_22_in_ruleGDomainProperty1005); if (state.failed) return current;
+ lv_list_6_0=(Token)match(input,22,FOLLOW_3); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_list_6_0, grammarAccess.getGDomainPropertyAccess().getListLeftSquareBracketRightSquareBracketKeyword_0_1_1_0());
@@ -1335,13 +1335,13 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:502:3: ( (lv_name_7_0= RULE_ID ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:503:1: (lv_name_7_0= RULE_ID )
+ // InternalGModelDSL.g:502:3: ( (lv_name_7_0= RULE_ID ) )
+ // InternalGModelDSL.g:503:1: (lv_name_7_0= RULE_ID )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:503:1: (lv_name_7_0= RULE_ID )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:504:3: lv_name_7_0= RULE_ID
+ // InternalGModelDSL.g:503:1: (lv_name_7_0= RULE_ID )
+ // InternalGModelDSL.g:504:3: lv_name_7_0= RULE_ID
{
- lv_name_7_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGDomainProperty1036); if (state.failed) return current;
+ lv_name_7_0=(Token)match(input,RULE_ID,FOLLOW_16); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_name_7_0, grammarAccess.getGDomainPropertyAccess().getNameIDTerminalRuleCall_0_1_2_0());
@@ -1356,7 +1356,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
current,
"name",
lv_name_7_0,
- "ID");
+ "org.eclipse.xtext.common.Terminals.ID");
}
@@ -1374,7 +1374,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
- otherlv_8=(Token)match(input,24,FOLLOW_24_in_ruleGDomainProperty1055); if (state.failed) return current;
+ otherlv_8=(Token)match(input,24,FOLLOW_2); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_8, grammarAccess.getGDomainPropertyAccess().getSemicolonKeyword_1());
@@ -1403,7 +1403,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleGDefault"
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:532:1: entryRuleGDefault returns [EObject current=null] : iv_ruleGDefault= ruleGDefault EOF ;
+ // InternalGModelDSL.g:532:1: entryRuleGDefault returns [EObject current=null] : iv_ruleGDefault= ruleGDefault EOF ;
public final EObject entryRuleGDefault() throws RecognitionException {
EObject current = null;
@@ -1411,13 +1411,13 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:533:2: (iv_ruleGDefault= ruleGDefault EOF )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:534:2: iv_ruleGDefault= ruleGDefault EOF
+ // InternalGModelDSL.g:533:2: (iv_ruleGDefault= ruleGDefault EOF )
+ // InternalGModelDSL.g:534:2: iv_ruleGDefault= ruleGDefault EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getGDefaultRule());
}
- pushFollow(FOLLOW_ruleGDefault_in_entryRuleGDefault1091);
+ pushFollow(FOLLOW_1);
iv_ruleGDefault=ruleGDefault();
state._fsp--;
@@ -1425,7 +1425,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleGDefault;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleGDefault1101); if (state.failed) return current;
+ match(input,EOF,FOLLOW_2); if (state.failed) return current;
}
@@ -1443,7 +1443,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleGDefault"
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:541:1: ruleGDefault returns [EObject current=null] : ( ( (lv_stringVal_0_0= RULE_STRING ) ) | ( (lv_intVal_1_0= RULE_INT ) ) ) ;
+ // InternalGModelDSL.g:541:1: ruleGDefault returns [EObject current=null] : ( ( (lv_stringVal_0_0= RULE_STRING ) ) | ( (lv_intVal_1_0= RULE_INT ) ) ) ;
public final EObject ruleGDefault() throws RecognitionException {
EObject current = null;
@@ -1453,10 +1453,10 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:544:28: ( ( ( (lv_stringVal_0_0= RULE_STRING ) ) | ( (lv_intVal_1_0= RULE_INT ) ) ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:545:1: ( ( (lv_stringVal_0_0= RULE_STRING ) ) | ( (lv_intVal_1_0= RULE_INT ) ) )
+ // InternalGModelDSL.g:544:28: ( ( ( (lv_stringVal_0_0= RULE_STRING ) ) | ( (lv_intVal_1_0= RULE_INT ) ) ) )
+ // InternalGModelDSL.g:545:1: ( ( (lv_stringVal_0_0= RULE_STRING ) ) | ( (lv_intVal_1_0= RULE_INT ) ) )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:545:1: ( ( (lv_stringVal_0_0= RULE_STRING ) ) | ( (lv_intVal_1_0= RULE_INT ) ) )
+ // InternalGModelDSL.g:545:1: ( ( (lv_stringVal_0_0= RULE_STRING ) ) | ( (lv_intVal_1_0= RULE_INT ) ) )
int alt13=2;
int LA13_0 = input.LA(1);
@@ -1475,15 +1475,15 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
switch (alt13) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:545:2: ( (lv_stringVal_0_0= RULE_STRING ) )
+ // InternalGModelDSL.g:545:2: ( (lv_stringVal_0_0= RULE_STRING ) )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:545:2: ( (lv_stringVal_0_0= RULE_STRING ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:546:1: (lv_stringVal_0_0= RULE_STRING )
+ // InternalGModelDSL.g:545:2: ( (lv_stringVal_0_0= RULE_STRING ) )
+ // InternalGModelDSL.g:546:1: (lv_stringVal_0_0= RULE_STRING )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:546:1: (lv_stringVal_0_0= RULE_STRING )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:547:3: lv_stringVal_0_0= RULE_STRING
+ // InternalGModelDSL.g:546:1: (lv_stringVal_0_0= RULE_STRING )
+ // InternalGModelDSL.g:547:3: lv_stringVal_0_0= RULE_STRING
{
- lv_stringVal_0_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleGDefault1143); if (state.failed) return current;
+ lv_stringVal_0_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_stringVal_0_0, grammarAccess.getGDefaultAccess().getStringValSTRINGTerminalRuleCall_0_0());
@@ -1498,7 +1498,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
current,
"stringVal",
lv_stringVal_0_0,
- "STRING");
+ "org.eclipse.xtext.common.Terminals.STRING");
}
@@ -1511,15 +1511,15 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:564:6: ( (lv_intVal_1_0= RULE_INT ) )
+ // InternalGModelDSL.g:564:6: ( (lv_intVal_1_0= RULE_INT ) )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:564:6: ( (lv_intVal_1_0= RULE_INT ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:565:1: (lv_intVal_1_0= RULE_INT )
+ // InternalGModelDSL.g:564:6: ( (lv_intVal_1_0= RULE_INT ) )
+ // InternalGModelDSL.g:565:1: (lv_intVal_1_0= RULE_INT )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:565:1: (lv_intVal_1_0= RULE_INT )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:566:3: lv_intVal_1_0= RULE_INT
+ // InternalGModelDSL.g:565:1: (lv_intVal_1_0= RULE_INT )
+ // InternalGModelDSL.g:566:3: lv_intVal_1_0= RULE_INT
{
- lv_intVal_1_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleGDefault1171); if (state.failed) return current;
+ lv_intVal_1_0=(Token)match(input,RULE_INT,FOLLOW_2); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_intVal_1_0, grammarAccess.getGDefaultAccess().getIntValINTTerminalRuleCall_1_0());
@@ -1534,7 +1534,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
current,
"intVal",
lv_intVal_1_0,
- "INT");
+ "org.eclipse.xtext.common.Terminals.INT");
}
@@ -1569,7 +1569,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleValidID"
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:590:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
+ // InternalGModelDSL.g:590:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
public final String entryRuleValidID() throws RecognitionException {
String current = null;
@@ -1577,13 +1577,13 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:591:2: (iv_ruleValidID= ruleValidID EOF )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:592:2: iv_ruleValidID= ruleValidID EOF
+ // InternalGModelDSL.g:591:2: (iv_ruleValidID= ruleValidID EOF )
+ // InternalGModelDSL.g:592:2: iv_ruleValidID= ruleValidID EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getValidIDRule());
}
- pushFollow(FOLLOW_ruleValidID_in_entryRuleValidID1213);
+ pushFollow(FOLLOW_1);
iv_ruleValidID=ruleValidID();
state._fsp--;
@@ -1591,7 +1591,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleValidID.getText();
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleValidID1224); if (state.failed) return current;
+ match(input,EOF,FOLLOW_2); if (state.failed) return current;
}
@@ -1609,7 +1609,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleValidID"
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:599:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+ // InternalGModelDSL.g:599:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -1618,10 +1618,10 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:602:28: (this_ID_0= RULE_ID )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:603:5: this_ID_0= RULE_ID
+ // InternalGModelDSL.g:602:28: (this_ID_0= RULE_ID )
+ // InternalGModelDSL.g:603:5: this_ID_0= RULE_ID
{
- this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleValidID1263); if (state.failed) return current;
+ this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(this_ID_0);
@@ -1652,7 +1652,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleQualifiedName"
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:618:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+ // InternalGModelDSL.g:618:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
public final String entryRuleQualifiedName() throws RecognitionException {
String current = null;
@@ -1660,13 +1660,13 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:619:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:620:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+ // InternalGModelDSL.g:619:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+ // InternalGModelDSL.g:620:2: iv_ruleQualifiedName= ruleQualifiedName EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getQualifiedNameRule());
}
- pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName1308);
+ pushFollow(FOLLOW_1);
iv_ruleQualifiedName=ruleQualifiedName();
state._fsp--;
@@ -1674,7 +1674,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleQualifiedName.getText();
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName1319); if (state.failed) return current;
+ match(input,EOF,FOLLOW_2); if (state.failed) return current;
}
@@ -1692,7 +1692,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleQualifiedName"
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:627:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
+ // InternalGModelDSL.g:627:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -1705,18 +1705,18 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:630:28: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:631:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+ // InternalGModelDSL.g:630:28: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
+ // InternalGModelDSL.g:631:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:631:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:632:5: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+ // InternalGModelDSL.g:631:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+ // InternalGModelDSL.g:632:5: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0());
}
- pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName1366);
+ pushFollow(FOLLOW_17);
this_ValidID_0=ruleValidID();
state._fsp--;
@@ -1731,7 +1731,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
afterParserOrEnumRuleCall();
}
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:642:1: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+ // InternalGModelDSL.g:642:1: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
loop14:
do {
int alt14=2;
@@ -1744,12 +1744,12 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
switch (alt14) {
case 1 :
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:642:2: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
+ // InternalGModelDSL.g:642:2: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
{
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:642:2: ( ( '.' )=>kw= '.' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:642:3: ( '.' )=>kw= '.'
+ // InternalGModelDSL.g:642:2: ( ( '.' )=>kw= '.' )
+ // InternalGModelDSL.g:642:3: ( '.' )=>kw= '.'
{
- kw=(Token)match(input,25,FOLLOW_25_in_ruleQualifiedName1394); if (state.failed) return current;
+ kw=(Token)match(input,25,FOLLOW_3); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(kw);
@@ -1764,7 +1764,7 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1());
}
- pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName1417);
+ pushFollow(FOLLOW_17);
this_ValidID_2=ruleValidID();
state._fsp--;
@@ -1811,10 +1811,10 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
// $ANTLR start synpred1_InternalGModelDSL
public final void synpred1_InternalGModelDSL_fragment() throws RecognitionException {
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:642:3: ( '.' )
- // ../org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g:643:2: '.'
+ // InternalGModelDSL.g:642:3: ( '.' )
+ // InternalGModelDSL.g:643:2: '.'
{
- match(input,25,FOLLOW_25_in_synpred1_InternalGModelDSL1385); if (state.failed) return ;
+ match(input,25,FOLLOW_2); if (state.failed) return ;
}
}
@@ -1840,59 +1840,22 @@ public class InternalGModelDSLParser extends AbstractInternalAntlrParser {
- public static final BitSet FOLLOW_ruleGModel_in_entryRuleGModel75 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleGModel85 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_11_in_ruleGModel122 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleQualifiedName_in_ruleGModel143 = new BitSet(new long[]{0x0000000000001000L});
- public static final BitSet FOLLOW_12_in_ruleGModel155 = new BitSet(new long[]{0x0000000000004000L});
- public static final BitSet FOLLOW_ruleGDomainElement_in_ruleGModel176 = new BitSet(new long[]{0x0000000000006000L});
- public static final BitSet FOLLOW_13_in_ruleGModel189 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGDomainElement_in_entryRuleGDomainElement225 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleGDomainElement235 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_14_in_ruleGDomainElement272 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleGDomainElement289 = new BitSet(new long[]{0x0000000000009000L});
- public static final BitSet FOLLOW_15_in_ruleGDomainElement307 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleGDomainElement327 = new BitSet(new long[]{0x0000000000011000L});
- public static final BitSet FOLLOW_16_in_ruleGDomainElement340 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleGDomainElement360 = new BitSet(new long[]{0x0000000000011000L});
- public static final BitSet FOLLOW_12_in_ruleGDomainElement376 = new BitSet(new long[]{0x00000000003E2010L});
- public static final BitSet FOLLOW_ruleGDomainMap_in_ruleGDomainElement398 = new BitSet(new long[]{0x0000000000002000L});
- public static final BitSet FOLLOW_ruleGDomainProperty_in_ruleGDomainElement425 = new BitSet(new long[]{0x00000000003C2010L});
- public static final BitSet FOLLOW_13_in_ruleGDomainElement439 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGDomainMap_in_entryRuleGDomainMap475 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleGDomainMap485 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_17_in_ruleGDomainMap522 = new BitSet(new long[]{0x00000000003C0010L});
- public static final BitSet FOLLOW_18_in_ruleGDomainMap543 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_19_in_ruleGDomainMap572 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_20_in_ruleGDomainMap601 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_21_in_ruleGDomainMap630 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleGDomainMap672 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGDomainProperty_in_entryRuleGDomainProperty709 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleGDomainProperty719 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_18_in_ruleGDomainProperty766 = new BitSet(new long[]{0x0000000000400010L});
- public static final BitSet FOLLOW_19_in_ruleGDomainProperty795 = new BitSet(new long[]{0x0000000000400010L});
- public static final BitSet FOLLOW_20_in_ruleGDomainProperty824 = new BitSet(new long[]{0x0000000000400010L});
- public static final BitSet FOLLOW_21_in_ruleGDomainProperty853 = new BitSet(new long[]{0x0000000000400010L});
- public static final BitSet FOLLOW_22_in_ruleGDomainProperty887 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleGDomainProperty918 = new BitSet(new long[]{0x0000000001800000L});
- public static final BitSet FOLLOW_23_in_ruleGDomainProperty936 = new BitSet(new long[]{0x0000000000000060L});
- public static final BitSet FOLLOW_ruleGDefault_in_ruleGDomainProperty957 = new BitSet(new long[]{0x0000000001000000L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleGDomainProperty987 = new BitSet(new long[]{0x0000000000400010L});
- public static final BitSet FOLLOW_22_in_ruleGDomainProperty1005 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleGDomainProperty1036 = new BitSet(new long[]{0x0000000001000000L});
- public static final BitSet FOLLOW_24_in_ruleGDomainProperty1055 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleGDefault_in_entryRuleGDefault1091 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleGDefault1101 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleGDefault1143 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_INT_in_ruleGDefault1171 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleValidID_in_entryRuleValidID1213 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleValidID1224 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleValidID1263 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName1308 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName1319 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName1366 = new BitSet(new long[]{0x0000000002000002L});
- public static final BitSet FOLLOW_25_in_ruleQualifiedName1394 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName1417 = new BitSet(new long[]{0x0000000002000002L});
- public static final BitSet FOLLOW_25_in_synpred1_InternalGModelDSL1385 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000001000L});
+ public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000004000L});
+ public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000006000L});
+ public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000009000L});
+ public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000011000L});
+ public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x00000000003E2010L});
+ public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000002000L});
+ public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x00000000003C2010L});
+ public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x00000000003C0010L});
+ public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000400010L});
+ public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000001800000L});
+ public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000000060L});
+ public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000001000000L});
+ public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000002000002L});
} \ No newline at end of file
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/serializer/GModelDSLSemanticSequencer.java b/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/serializer/GModelDSLSemanticSequencer.java
index 1b9491d6b..2b33f219f 100644
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/serializer/GModelDSLSemanticSequencer.java
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/serializer/GModelDSLSemanticSequencer.java
@@ -4,8 +4,9 @@
package org.eclipse.fx.ide.gmodel.serializer;
import com.google.inject.Inject;
-import com.google.inject.Provider;
+import java.util.Set;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
import org.eclipse.fx.ide.gmodel.gModelDSL.GDefault;
import org.eclipse.fx.ide.gmodel.gModelDSL.GDomainElement;
import org.eclipse.fx.ide.gmodel.gModelDSL.GDomainMap;
@@ -13,13 +14,11 @@ import org.eclipse.fx.ide.gmodel.gModelDSL.GDomainProperty;
import org.eclipse.fx.ide.gmodel.gModelDSL.GModel;
import org.eclipse.fx.ide.gmodel.gModelDSL.GModelDSLPackage;
import org.eclipse.fx.ide.gmodel.services.GModelDSLGrammarAccess;
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
-import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider;
-import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
+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;
-import org.eclipse.xtext.serializer.sequencer.GenericSequencer;
-import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
@SuppressWarnings("all")
public class GModelDSLSemanticSequencer extends AbstractDelegatingSemanticSequencer {
@@ -28,8 +27,13 @@ public class GModelDSLSemanticSequencer extends AbstractDelegatingSemanticSequen
private GModelDSLGrammarAccess grammarAccess;
@Override
- public void createSequence(EObject context, EObject semanticObject) {
- if(semanticObject.eClass().getEPackage() == GModelDSLPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+ 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 (epackage == GModelDSLPackage.eINSTANCE)
+ switch (semanticObject.eClass().getClassifierID()) {
case GModelDSLPackage.GDEFAULT:
sequence_GDefault(context, (GDefault) semanticObject);
return;
@@ -46,53 +50,71 @@ public class GModelDSLSemanticSequencer extends AbstractDelegatingSemanticSequen
sequence_GModel(context, (GModel) semanticObject);
return;
}
- if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+ if (errorAcceptor != null)
+ errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
}
/**
+ * Contexts:
+ * GDefault returns GDefault
+ *
* Constraint:
* (stringVal=STRING | intVal=INT)
*/
- protected void sequence_GDefault(EObject context, GDefault semanticObject) {
+ protected void sequence_GDefault(ISerializationContext context, GDefault semanticObject) {
genericSequencer.createSequence(context, semanticObject);
}
/**
+ * Contexts:
+ * GDomainElement returns GDomainElement
+ *
* Constraint:
- * (name=ID (superTypeList+=[GDomainElement|ID] superTypeList+=[GDomainElement|ID]*)? (map=GDomainMap | propertyList+=GDomainProperty*))
+ * (name=ID (superTypeList+=[GDomainElement|ID] superTypeList+=[GDomainElement|ID]*)? (map=GDomainMap | propertyList+=GDomainProperty+)?)
*/
- protected void sequence_GDomainElement(EObject context, GDomainElement semanticObject) {
+ protected void sequence_GDomainElement(ISerializationContext context, GDomainElement semanticObject) {
genericSequencer.createSequence(context, semanticObject);
}
/**
+ * Contexts:
+ * GDomainMap returns GDomainMap
+ *
* Constraint:
* (builtIn='Int' | builtIn='Double' | builtIn='String' | builtIn='Boolean' | ref=[GDomainElement|ID])
*/
- protected void sequence_GDomainMap(EObject context, GDomainMap semanticObject) {
+ protected void sequence_GDomainMap(ISerializationContext context, GDomainMap semanticObject) {
genericSequencer.createSequence(context, semanticObject);
}
/**
+ * Contexts:
+ * GDomainProperty returns GDomainProperty
+ *
* Constraint:
* (
* ((builtIn='Int' | builtIn='Double' | builtIn='String' | builtIn='Boolean') list?='[]'? name=ID defaultValue=GDefault?) |
* (ref=[GDomainElement|ID] list?='[]'? name=ID)
* )
*/
- protected void sequence_GDomainProperty(EObject context, GDomainProperty semanticObject) {
+ protected void sequence_GDomainProperty(ISerializationContext context, GDomainProperty semanticObject) {
genericSequencer.createSequence(context, semanticObject);
}
/**
+ * Contexts:
+ * GModel returns GModel
+ *
* Constraint:
* (name=QualifiedName typeList+=GDomainElement+)
*/
- protected void sequence_GModel(EObject context, GModel semanticObject) {
+ protected void sequence_GModel(ISerializationContext context, GModel semanticObject) {
genericSequencer.createSequence(context, semanticObject);
}
+
+
}
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/services/GModelDSLGrammarAccess.java b/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/services/GModelDSLGrammarAccess.java
index f341a5e9d..e65684287 100644
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/services/GModelDSLGrammarAccess.java
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/services/GModelDSLGrammarAccess.java
@@ -19,7 +19,7 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
public class GModelElements extends AbstractParserRuleElementFinder {
- private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "GModel");
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.fx.ide.gmodel.GModelDSL.GModel");
private final Group cGroup = (Group)rule.eContents().get(1);
private final Keyword cPackageKeyword_0 = (Keyword)cGroup.eContents().get(0);
private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -30,13 +30,15 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
//GModel:
- // "package" name=QualifiedName "{" typeList+=GDomainElement+ "}";
+ // 'package' name=QualifiedName '{'
+ // typeList+=GDomainElement+
+ // '}';
@Override public ParserRule getRule() { return rule; }
- //"package" name=QualifiedName "{" typeList+=GDomainElement+ "}"
+ //'package' name=QualifiedName '{' typeList+=GDomainElement+ '}'
public Group getGroup() { return cGroup; }
- //"package"
+ //'package'
public Keyword getPackageKeyword_0() { return cPackageKeyword_0; }
//name=QualifiedName
@@ -45,7 +47,7 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
//QualifiedName
public RuleCall getNameQualifiedNameParserRuleCall_1_0() { return cNameQualifiedNameParserRuleCall_1_0; }
- //"{"
+ //'{'
public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
//typeList+=GDomainElement+
@@ -54,12 +56,12 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
//GDomainElement
public RuleCall getTypeListGDomainElementParserRuleCall_3_0() { return cTypeListGDomainElementParserRuleCall_3_0; }
- //"}"
+ //'}'
public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
}
public class GDomainElementElements extends AbstractParserRuleElementFinder {
- private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "GDomainElement");
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.fx.ide.gmodel.GModelDSL.GDomainElement");
private final Group cGroup = (Group)rule.eContents().get(1);
private final Keyword cTypeKeyword_0 = (Keyword)cGroup.eContents().get(0);
private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -83,15 +85,16 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
//GDomainElement:
- // "type" name=ID ("extends" superTypeList+=[GDomainElement] (", " superTypeList+=[GDomainElement])*)? "{"
- // (map=GDomainMap | propertyList+=GDomainProperty*) "}";
+ // 'type' name=ID ('extends' superTypeList+=[GDomainElement] (', ' superTypeList+=[GDomainElement])*)? '{'
+ // (map=GDomainMap | propertyList+=GDomainProperty*)
+ // '}';
@Override public ParserRule getRule() { return rule; }
- //"type" name=ID ("extends" superTypeList+=[GDomainElement] (", " superTypeList+=[GDomainElement])*)? "{" (map=GDomainMap
- //| propertyList+=GDomainProperty*) "}"
+ //'type' name=ID ('extends' superTypeList+=[GDomainElement] (', ' superTypeList+=[GDomainElement])*)? '{' (map=GDomainMap
+ //| propertyList+=GDomainProperty*) '}'
public Group getGroup() { return cGroup; }
- //"type"
+ //'type'
public Keyword getTypeKeyword_0() { return cTypeKeyword_0; }
//name=ID
@@ -100,10 +103,10 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
//ID
public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
- //("extends" superTypeList+=[GDomainElement] (", " superTypeList+=[GDomainElement])*)?
+ //('extends' superTypeList+=[GDomainElement] (', ' superTypeList+=[GDomainElement])*)?
public Group getGroup_2() { return cGroup_2; }
- //"extends"
+ //'extends'
public Keyword getExtendsKeyword_2_0() { return cExtendsKeyword_2_0; }
//superTypeList+=[GDomainElement]
@@ -115,10 +118,10 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
//ID
public RuleCall getSuperTypeListGDomainElementIDTerminalRuleCall_2_1_0_1() { return cSuperTypeListGDomainElementIDTerminalRuleCall_2_1_0_1; }
- //(", " superTypeList+=[GDomainElement])*
+ //(', ' superTypeList+=[GDomainElement])*
public Group getGroup_2_2() { return cGroup_2_2; }
- //", "
+ //', '
public Keyword getCommaSpaceKeyword_2_2_0() { return cCommaSpaceKeyword_2_2_0; }
//superTypeList+=[GDomainElement]
@@ -130,10 +133,10 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
//ID
public RuleCall getSuperTypeListGDomainElementIDTerminalRuleCall_2_2_1_0_1() { return cSuperTypeListGDomainElementIDTerminalRuleCall_2_2_1_0_1; }
- //"{"
+ //'{'
public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
- //map=GDomainMap | propertyList+=GDomainProperty*
+ //(map=GDomainMap | propertyList+=GDomainProperty*)
public Alternatives getAlternatives_4() { return cAlternatives_4; }
//map=GDomainMap
@@ -148,12 +151,12 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
//GDomainProperty
public RuleCall getPropertyListGDomainPropertyParserRuleCall_4_1_0() { return cPropertyListGDomainPropertyParserRuleCall_4_1_0; }
- //"}"
+ //'}'
public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
}
public class GDomainMapElements extends AbstractParserRuleElementFinder {
- private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "GDomainMap");
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.fx.ide.gmodel.GModelDSL.GDomainMap");
private final Group cGroup = (Group)rule.eContents().get(1);
private final Keyword cMapKeyword_0 = (Keyword)cGroup.eContents().get(0);
private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
@@ -168,34 +171,34 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cRefGDomainElementIDTerminalRuleCall_1_1_0_1 = (RuleCall)cRefGDomainElementCrossReference_1_1_0.eContents().get(1);
//GDomainMap:
- // "map" (builtIn=("Int" | "Double" | "String" | "Boolean") | ref=[GDomainElement]);
+ // 'map' (builtIn=('Int' | 'Double' | 'String' | 'Boolean') | ref=[GDomainElement]);
@Override public ParserRule getRule() { return rule; }
- //"map" (builtIn=("Int" | "Double" | "String" | "Boolean") | ref=[GDomainElement])
+ //'map' (builtIn=('Int' | 'Double' | 'String' | 'Boolean') | ref=[GDomainElement])
public Group getGroup() { return cGroup; }
- //"map"
+ //'map'
public Keyword getMapKeyword_0() { return cMapKeyword_0; }
- //builtIn=("Int" | "Double" | "String" | "Boolean") | ref=[GDomainElement]
+ //(builtIn=('Int' | 'Double' | 'String' | 'Boolean') | ref=[GDomainElement])
public Alternatives getAlternatives_1() { return cAlternatives_1; }
- //builtIn=("Int" | "Double" | "String" | "Boolean")
+ //builtIn=('Int' | 'Double' | 'String' | 'Boolean')
public Assignment getBuiltInAssignment_1_0() { return cBuiltInAssignment_1_0; }
- //"Int" | "Double" | "String" | "Boolean"
+ //('Int' | 'Double' | 'String' | 'Boolean')
public Alternatives getBuiltInAlternatives_1_0_0() { return cBuiltInAlternatives_1_0_0; }
- //"Int"
+ //'Int'
public Keyword getBuiltInIntKeyword_1_0_0_0() { return cBuiltInIntKeyword_1_0_0_0; }
- //"Double"
+ //'Double'
public Keyword getBuiltInDoubleKeyword_1_0_0_1() { return cBuiltInDoubleKeyword_1_0_0_1; }
- //"String"
+ //'String'
public Keyword getBuiltInStringKeyword_1_0_0_2() { return cBuiltInStringKeyword_1_0_0_2; }
- //"Boolean"
+ //'Boolean'
public Keyword getBuiltInBooleanKeyword_1_0_0_3() { return cBuiltInBooleanKeyword_1_0_0_3; }
//ref=[GDomainElement]
@@ -209,7 +212,7 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
}
public class GDomainPropertyElements extends AbstractParserRuleElementFinder {
- private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "GDomainProperty");
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.fx.ide.gmodel.GModelDSL.GDomainProperty");
private final Group cGroup = (Group)rule.eContents().get(1);
private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
private final Group cGroup_0_0 = (Group)cAlternatives_0.eContents().get(0);
@@ -238,43 +241,43 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cSemicolonKeyword_1 = (Keyword)cGroup.eContents().get(1);
//GDomainProperty:
- // (builtIn=("Int" | "Double" | "String" | "Boolean") list?="[]"? name=ID ("=" defaultValue=GDefault)? |
- // ref=[GDomainElement] list?="[]"? name=ID) ";";
+ // (builtIn=('Int' | 'Double' | 'String' | 'Boolean') list?='[]'? name=ID ('=' defaultValue=GDefault)? |
+ // ref=[GDomainElement] list?='[]'? name=ID) ';';
@Override public ParserRule getRule() { return rule; }
- //(builtIn=("Int" | "Double" | "String" | "Boolean") list?="[]"? name=ID ("=" defaultValue=GDefault)? |
- //ref=[GDomainElement] list?="[]"? name=ID) ";"
+ //(builtIn=('Int' | 'Double' | 'String' | 'Boolean') list?='[]'? name=ID ('=' defaultValue=GDefault)? |
+ //ref=[GDomainElement] list?='[]'? name=ID) ';'
public Group getGroup() { return cGroup; }
- //builtIn=("Int" | "Double" | "String" | "Boolean") list?="[]"? name=ID ("=" defaultValue=GDefault)? |
- //ref=[GDomainElement] list?="[]"? name=ID
+ //(builtIn=('Int' | 'Double' | 'String' | 'Boolean') list?='[]'? name=ID ('=' defaultValue=GDefault)? |
+ //ref=[GDomainElement] list?='[]'? name=ID)
public Alternatives getAlternatives_0() { return cAlternatives_0; }
- //builtIn=("Int" | "Double" | "String" | "Boolean") list?="[]"? name=ID ("=" defaultValue=GDefault)?
+ //builtIn=('Int' | 'Double' | 'String' | 'Boolean') list?='[]'? name=ID ('=' defaultValue=GDefault)?
public Group getGroup_0_0() { return cGroup_0_0; }
- //builtIn=("Int" | "Double" | "String" | "Boolean")
+ //builtIn=('Int' | 'Double' | 'String' | 'Boolean')
public Assignment getBuiltInAssignment_0_0_0() { return cBuiltInAssignment_0_0_0; }
- //"Int" | "Double" | "String" | "Boolean"
+ //('Int' | 'Double' | 'String' | 'Boolean')
public Alternatives getBuiltInAlternatives_0_0_0_0() { return cBuiltInAlternatives_0_0_0_0; }
- //"Int"
+ //'Int'
public Keyword getBuiltInIntKeyword_0_0_0_0_0() { return cBuiltInIntKeyword_0_0_0_0_0; }
- //"Double"
+ //'Double'
public Keyword getBuiltInDoubleKeyword_0_0_0_0_1() { return cBuiltInDoubleKeyword_0_0_0_0_1; }
- //"String"
+ //'String'
public Keyword getBuiltInStringKeyword_0_0_0_0_2() { return cBuiltInStringKeyword_0_0_0_0_2; }
- //"Boolean"
+ //'Boolean'
public Keyword getBuiltInBooleanKeyword_0_0_0_0_3() { return cBuiltInBooleanKeyword_0_0_0_0_3; }
- //list?="[]"?
+ //list?='[]'?
public Assignment getListAssignment_0_0_1() { return cListAssignment_0_0_1; }
- //"[]"
+ //'[]'
public Keyword getListLeftSquareBracketRightSquareBracketKeyword_0_0_1_0() { return cListLeftSquareBracketRightSquareBracketKeyword_0_0_1_0; }
//name=ID
@@ -283,10 +286,10 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
//ID
public RuleCall getNameIDTerminalRuleCall_0_0_2_0() { return cNameIDTerminalRuleCall_0_0_2_0; }
- //("=" defaultValue=GDefault)?
+ //('=' defaultValue=GDefault)?
public Group getGroup_0_0_3() { return cGroup_0_0_3; }
- //"="
+ //'='
public Keyword getEqualsSignKeyword_0_0_3_0() { return cEqualsSignKeyword_0_0_3_0; }
//defaultValue=GDefault
@@ -295,7 +298,7 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
//GDefault
public RuleCall getDefaultValueGDefaultParserRuleCall_0_0_3_1_0() { return cDefaultValueGDefaultParserRuleCall_0_0_3_1_0; }
- //ref=[GDomainElement] list?="[]"? name=ID
+ //ref=[GDomainElement] list?='[]'? name=ID
public Group getGroup_0_1() { return cGroup_0_1; }
//ref=[GDomainElement]
@@ -307,10 +310,10 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
//ID
public RuleCall getRefGDomainElementIDTerminalRuleCall_0_1_0_0_1() { return cRefGDomainElementIDTerminalRuleCall_0_1_0_0_1; }
- //list?="[]"?
+ //list?='[]'?
public Assignment getListAssignment_0_1_1() { return cListAssignment_0_1_1; }
- //"[]"
+ //'[]'
public Keyword getListLeftSquareBracketRightSquareBracketKeyword_0_1_1_0() { return cListLeftSquareBracketRightSquareBracketKeyword_0_1_1_0; }
//name=ID
@@ -319,12 +322,12 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
//ID
public RuleCall getNameIDTerminalRuleCall_0_1_2_0() { return cNameIDTerminalRuleCall_0_1_2_0; }
- //";"
+ //';'
public Keyword getSemicolonKeyword_1() { return cSemicolonKeyword_1; }
}
public class GDefaultElements extends AbstractParserRuleElementFinder {
- private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "GDefault");
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.fx.ide.gmodel.GModelDSL.GDefault");
private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
private final Assignment cStringValAssignment_0 = (Assignment)cAlternatives.eContents().get(0);
private final RuleCall cStringValSTRINGTerminalRuleCall_0_0 = (RuleCall)cStringValAssignment_0.eContents().get(0);
@@ -352,7 +355,7 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
}
public class ValidIDElements extends AbstractParserRuleElementFinder {
- private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ValidID");
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.fx.ide.gmodel.GModelDSL.ValidID");
private final RuleCall cIDTerminalRuleCall = (RuleCall)rule.eContents().get(1);
//ValidID:
@@ -364,7 +367,7 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
}
public class QualifiedNameElements extends AbstractParserRuleElementFinder {
- private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "QualifiedName");
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.fx.ide.gmodel.GModelDSL.QualifiedName");
private final Group cGroup = (Group)rule.eContents().get(1);
private final RuleCall cValidIDParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -372,19 +375,19 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cValidIDParserRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
//QualifiedName:
- // ValidID ("." ValidID)*;
+ // ValidID (=> '.' ValidID)*;
@Override public ParserRule getRule() { return rule; }
- //ValidID ("." ValidID)*
+ //ValidID (=> '.' ValidID)*
public Group getGroup() { return cGroup; }
//ValidID
public RuleCall getValidIDParserRuleCall_0() { return cValidIDParserRuleCall_0; }
- //(=> "." ValidID)*
+ //(=> '.' ValidID)*
public Group getGroup_1() { return cGroup_1; }
- //=> "."
+ //=> '.'
public Keyword getFullStopKeyword_1_0() { return cFullStopKeyword_1_0; }
//ValidID
@@ -446,7 +449,9 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
//GModel:
- // "package" name=QualifiedName "{" typeList+=GDomainElement+ "}";
+ // 'package' name=QualifiedName '{'
+ // typeList+=GDomainElement+
+ // '}';
public GModelElements getGModelAccess() {
return pGModel;
}
@@ -456,8 +461,9 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
}
//GDomainElement:
- // "type" name=ID ("extends" superTypeList+=[GDomainElement] (", " superTypeList+=[GDomainElement])*)? "{"
- // (map=GDomainMap | propertyList+=GDomainProperty*) "}";
+ // 'type' name=ID ('extends' superTypeList+=[GDomainElement] (', ' superTypeList+=[GDomainElement])*)? '{'
+ // (map=GDomainMap | propertyList+=GDomainProperty*)
+ // '}';
public GDomainElementElements getGDomainElementAccess() {
return pGDomainElement;
}
@@ -467,7 +473,7 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
}
//GDomainMap:
- // "map" (builtIn=("Int" | "Double" | "String" | "Boolean") | ref=[GDomainElement]);
+ // 'map' (builtIn=('Int' | 'Double' | 'String' | 'Boolean') | ref=[GDomainElement]);
public GDomainMapElements getGDomainMapAccess() {
return pGDomainMap;
}
@@ -477,8 +483,8 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
}
//GDomainProperty:
- // (builtIn=("Int" | "Double" | "String" | "Boolean") list?="[]"? name=ID ("=" defaultValue=GDefault)? |
- // ref=[GDomainElement] list?="[]"? name=ID) ";";
+ // (builtIn=('Int' | 'Double' | 'String' | 'Boolean') list?='[]'? name=ID ('=' defaultValue=GDefault)? |
+ // ref=[GDomainElement] list?='[]'? name=ID) ';';
public GDomainPropertyElements getGDomainPropertyAccess() {
return pGDomainProperty;
}
@@ -508,7 +514,7 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
}
//QualifiedName:
- // ValidID ("." ValidID)*;
+ // ValidID (=> '.' ValidID)*;
public QualifiedNameElements getQualifiedNameAccess() {
return pQualifiedName;
}
@@ -518,38 +524,38 @@ public class GModelDSLGrammarAccess extends AbstractGrammarElementFinder {
}
//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 gaTerminals.getIDRule();
}
//terminal INT returns ecore::EInt:
- // "0".."9"+;
+ // '0'..'9'+;
public TerminalRule getINTRule() {
return gaTerminals.getINTRule();
}
//terminal STRING:
- // "\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
- // / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
+ // '"' ('\\' . | !('\\' | '"'))* '"' |
+ // "'" ('\\' . | !('\\' | "'"))* "'";
public TerminalRule getSTRINGRule() {
return gaTerminals.getSTRINGRule();
}
//terminal ML_COMMENT:
- // "/ *"->"* /";
+ // '/ *'->'* /';
public TerminalRule getML_COMMENTRule() {
return gaTerminals.getML_COMMENTRule();
}
//terminal SL_COMMENT:
- // "//" !("\n" | "\r")* ("\r"? "\n")?;
+ // '//' !('\n' | '\r')* ('\r'? '\n')?;
public TerminalRule getSL_COMMENTRule() {
return gaTerminals.getSL_COMMENTRule();
}
//terminal WS:
- // (" " | "\t" | "\r" | "\n")+;
+ // ' ' | '\t' | '\r' | '\n'+;
public TerminalRule getWSRule() {
return gaTerminals.getWSRule();
}
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.NLSDslProposalProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.NLSDslProposalProvider.xtendbin
index 8962922f1..474e3d256 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.NLSDslProposalProvider.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.NLSDslProposalProvider.xtendbin
Binary files differ
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.StringReplacementHandler.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.StringReplacementHandler.xtendbin
index 025f73754..224236b99 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.StringReplacementHandler.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.StringReplacementHandler.xtendbin
Binary files differ
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingCalculator.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingCalculator.xtendbin
index 9e16b6dcc..5483ec6c8 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingCalculator.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingCalculator.xtendbin
Binary files differ
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingConfiguration.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingConfiguration.xtendbin
index f928a1232..3dbf3e49d 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingConfiguration.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingConfiguration.xtendbin
Binary files differ
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.TokenToAttributeIdMapper.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.TokenToAttributeIdMapper.xtendbin
index 8b25cafad..9d4b21798 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.TokenToAttributeIdMapper.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.TokenToAttributeIdMapper.xtendbin
Binary files differ
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslDescriptionLabelProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslDescriptionLabelProvider.xtendbin
index 766451787..74a01b234 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslDescriptionLabelProvider.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslDescriptionLabelProvider.xtendbin
Binary files differ
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslLabelProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslLabelProvider.xtendbin
index 0ab177b6d..bd3674d1c 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslLabelProvider.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslLabelProvider.xtendbin
Binary files differ
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.NLSDslOutlineTreeProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.NLSDslOutlineTreeProvider.xtendbin
index a45b0e37d..93e41eb69 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.NLSDslOutlineTreeProvider.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.NLSDslOutlineTreeProvider.xtendbin
Binary files differ
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.NLSDslQuickfixProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.NLSDslQuickfixProvider.xtendbin
index 28cbd4365..0da2d1fa0 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.NLSDslQuickfixProvider.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.NLSDslQuickfixProvider.xtendbin
Binary files differ
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.NLSDslFormatter.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.NLSDslFormatter.xtendbin
index 62b12fe8e..14e8d931e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.NLSDslFormatter.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.NLSDslFormatter.xtendbin
Binary files differ
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.NLSDslGenerator.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.NLSDslGenerator.xtendbin
index d094d8171..3194eeb07 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.NLSDslGenerator.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.NLSDslGenerator.xtendbin
Binary files differ
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.NLSDslScopeProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.NLSDslScopeProvider.xtendbin
index 343e351df..3ac87865e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.NLSDslScopeProvider.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.NLSDslScopeProvider.xtendbin
Binary files differ
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.NLSDslValidator.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.NLSDslValidator.xtendbin
index 8af4d5721..0389a4753 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.NLSDslValidator.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.NLSDslValidator.xtendbin
Binary files differ
diff --git a/demos/org.eclipse.fx.simplycode.app.feature/feature.xml b/demos/org.eclipse.fx.simplycode.app.feature/feature.xml
index cf7f8a062..f7e138493 100644
--- a/demos/org.eclipse.fx.simplycode.app.feature/feature.xml
+++ b/demos/org.eclipse.fx.simplycode.app.feature/feature.xml
@@ -185,75 +185,95 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
unpack="false"/>
<plugin
- id="org.eclipse.fx.code.editor.ldef"
+ id="at.bestsolution.asciidocj"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.fx.code.editor.ldef.langs"
+ id="at.bestsolution.code.editor.asciidoc"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.fx.code.editor.ldef.text"
+ id="org.eclipse.fx.code.editor.asciidoc"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
<plugin
- id="org.eclipse.fx.code.editor.ldef.text.fx"
+ id="org.eclipse.fx.code.editor.asciidoc.fx"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
<plugin
- id="org.eclipse.fx.code.editor.ldef.langs.themes"
+ id="org.eclipse.fx.code.editor.asciidoc.fx.e4"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.fx.code.editor.ldef.langs.text"
+ id="at.bestsolution.code.fx.addons"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="at.bestsolution.code.fx.addons.e4"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.fx.code.editor.langs"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="at.bestsolution.asciidocj"
+ id="org.eclipse.fx.code.editor.configuration"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="at.bestsolution.code.editor.asciidoc"
+ id="org.eclipse.fx.code.editor.configuration.text"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.fx.code.editor.asciidoc"
+ id="org.eclipse.fx.code.editor.configuration.text.fx"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.fx.code.editor.asciidoc.fx"
+ id="org.eclipse.fx.code.editor.langs.themes"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.fx.code.editor.langs.contrib"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.fx.code.editor.asciidoc.fx.e4"
+ id="org.eclipse.fx.code.editor.configuration.text.e4"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/demos/org.eclipse.fx.simplycode.app.product/org.eclipse.fx.simplycode.app.product.product.launch b/demos/org.eclipse.fx.simplycode.app.product/org.eclipse.fx.simplycode.app.product.product.launch
index 8acac93d6..c4007b022 100644
--- a/demos/org.eclipse.fx.simplycode.app.product/org.eclipse.fx.simplycode.app.product.product.launch
+++ b/demos/org.eclipse.fx.simplycode.app.product/org.eclipse.fx.simplycode.app.product.product.launch
@@ -20,7 +20,7 @@
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nl ${target.nl} -consoleLog -nosplash -console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.osgi.framework.bundle.parent=ext"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.osgi.framework.bundle.parent=ext -Djavafx.debug=true -Djavafx.verbose=true -Djavafx.pulseLogger=true"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.fx.simplycode.app.product"/>
<stringAttribute key="productFile" value="/org.eclipse.fx.simplycode.app.product/org.eclipse.fx.simplycode.app.product.product"/>
diff --git a/demos/org.eclipse.fx.simplycode.app.releng/pom.xml b/demos/org.eclipse.fx.simplycode.app.releng/pom.xml
index a1439602a..da0ce56a9 100644
--- a/demos/org.eclipse.fx.simplycode.app.releng/pom.xml
+++ b/demos/org.eclipse.fx.simplycode.app.releng/pom.xml
@@ -14,7 +14,7 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
- <tycho-version>0.21.0</tycho-version>
+ <tycho-version>0.23.1</tycho-version>
<junit-version>4.11</junit-version>
<mockito-version>1.8.4</mockito-version>
<platform-version>4.2</platform-version>
@@ -26,7 +26,6 @@
<module>../org.eclipse.fx.simplycode.app</module>
<module>../org.eclipse.fx.simplycode.app.feature</module>
<module>../org.eclipse.fx.simplycode.app.product</module>
- <module>../org.eclipse.fx.simplycode.app.jemmy</module>
</modules>
<repositories>
@@ -36,9 +35,9 @@
<url>http://download.eclipse.org/efxclipse/runtime-nightly/site</url>
</repository>
<repository>
- <id>efxclipse-addons</id>
+ <id>codeedit-addons</id>
<layout>p2</layout>
- <url>http://downloads.efxclipse.org/efxclipse.bestsolution.at/p2-repos/addons/nightly/site/</url>
+ <url>file:/Users/tomschindl/git/codeaddons/releng/at.bestsolution.code.updatesite/target/site</url>
</repository>
</repositories>
@@ -91,8 +90,8 @@
<version>${tycho-version}</version>
<configuration>
<encoding>UTF-8</encoding>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<extraClasspathElements>
<extraClasspathElement>
<groupId>javafx</groupId>
diff --git a/demos/org.eclipse.fx.simplycode.app/Application.e4xmi b/demos/org.eclipse.fx.simplycode.app/Application.e4xmi
index 62e09ee57..10c8eed0e 100644
--- a/demos/org.eclipse.fx.simplycode.app/Application.e4xmi
+++ b/demos/org.eclipse.fx.simplycode.app/Application.e4xmi
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmi:id="_5jLXkTuxEeW_pv6K11JvGw" elementId="org.eclipse.e4.application" bindingContexts="_5jLXkDuxEeW_pv6K11JvGw">
<children xsi:type="basic:TrimmedWindow" xmi:id="_xnrEIDuyEeW_pv6K11JvGw" elementId="org.eclipse.fx.simplycode.app.trimmedwindow.simplycode" label="Simply Code">
+ <tags>efx-lightweight-dialogs</tags>
<children xsi:type="basic:PartSashContainer" xmi:id="_PK21MDuzEeW_pv6K11JvGw" elementId="org.eclipse.fx.simplycode.app.partsashcontainer.0" horizontal="true">
<children xsi:type="basic:Part" xmi:id="_0KUAADuyEeW_pv6K11JvGw" elementId="org.eclipse.fx.simplycode.app.part.0" containerData="30" contributionURI="bundleclass://org.eclipse.fx.simplycode.app/org.eclipse.fx.simplycode.app.parts.ProjectExplorer"/>
<children xsi:type="basic:PartStack" xmi:id="_zlEk8DuyEeW_pv6K11JvGw" elementId="org.eclipse.fx.simplycode.app.partstack.0" containerData="70">
@@ -21,4 +22,5 @@
<addons xmi:id="_5jLXmTuxEeW_pv6K11JvGw" elementId="org.eclipse.fx.ui.keybindings.e4.model" contributionURI="bundleclass://org.eclipse.fx.ui.keybindings.e4/org.eclipse.fx.ui.keybindings.e4.BindingProcessingAddon"/>
<addons xmi:id="_5jLXmjuxEeW_pv6K11JvGw" elementId="org.eclipse.e4.ui.workbench.addons.HandlerProcessingAddon" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/>
<addons xmi:id="_GGjbYEBOEeWOGdqHuxjO6w" elementId="org.eclipse.fx.simplycode.app.addon.0" contributionURI="bundleclass://org.eclipse.fx.code.editor.e4/org.eclipse.fx.code.editor.e4.addons.DirtyStateTrackingAddon"/>
+ <addons xmi:id="_jyPh8JQxEeW0a-xuwVYiTA" elementId="org.eclipse.fx.simplycode.app.addon.1" contributionURI="bundleclass://org.eclipse.fx.ui.workbench.renderers.base/org.eclipse.fx.ui.workbench.renderers.base.addons.MinMaxAddon"/>
</application:Application>
diff --git a/demos/org.eclipse.fx.simplycode.app/META-INF/MANIFEST.MF b/demos/org.eclipse.fx.simplycode.app/META-INF/MANIFEST.MF
index c816759c2..e4245f489 100644
--- a/demos/org.eclipse.fx.simplycode.app/META-INF/MANIFEST.MF
+++ b/demos/org.eclipse.fx.simplycode.app/META-INF/MANIFEST.MF
@@ -27,7 +27,10 @@ Require-Bundle: org.eclipse.fx.ui.workbench.fx,
org.eclipse.fx.ui.controls;bundle-version="2.1.0",
org.eclipse.jdt.annotation;bundle-version="2.0.100";resolution:=optional,
org.eclipse.osgi.services,
- org.eclipse.fx.code.editor.e4;bundle-version="2.1.0"
+ org.eclipse.fx.code.editor.e4;bundle-version="2.1.0",
+ org.eclipse.fx.ui.workbench.renderers.fx,
+ org.eclipse.fx.ui.workbench.renderers.base;bundle-version="2.2.0"
Import-Package: javax.inject;version="1.0.0"
-Service-Component: OSGI-INF/services/org.eclipse.fx.simplycode.app.themes.DefaultTheme.xml
+Service-Component: OSGI-INF/services/org.eclipse.fx.simplycode.app.themes.DefaultTheme.xml,
+ OSGI-INF/services/org.eclipse.fx.simplycode.app.animation.MinMaxAnimation.xml
Bundle-Vendor: Eclipse.org
diff --git a/demos/org.eclipse.fx.testcases.dnd.app.jemmy/bin/.gitignore b/demos/org.eclipse.fx.testcases.dnd.app.jemmy/bin/.gitignore
deleted file mode 100644
index 571ee510a..000000000
--- a/demos/org.eclipse.fx.testcases.dnd.app.jemmy/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/org
diff --git a/demos/org.eclipse.fx.testcases.dnd.app/.project b/demos/org.eclipse.fx.testcases.dnd.app/.project
index 3bd461dc3..d8de24b27 100644
--- a/demos/org.eclipse.fx.testcases.dnd.app/.project
+++ b/demos/org.eclipse.fx.testcases.dnd.app/.project
@@ -25,6 +25,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/demos/org.eclipse.fx.testcases.dnd.app/META-INF/MANIFEST.MF b/demos/org.eclipse.fx.testcases.dnd.app/META-INF/MANIFEST.MF
index aebc4ac3b..910d26212 100644
--- a/demos/org.eclipse.fx.testcases.dnd.app/META-INF/MANIFEST.MF
+++ b/demos/org.eclipse.fx.testcases.dnd.app/META-INF/MANIFEST.MF
@@ -51,3 +51,4 @@ Import-Package: javafx.animation;version="2.0.0",
javafx.util;version="2.0.0",
javax.annotation;version="1.0.0",
javax.inject;version="1.0.0"
+Service-Component: OSGI-INF/org.eclipse.fx.testcases.dnd.app.DefaultTheme.xml
diff --git a/demos/org.eclipse.fx.testcases.dnd.app/build.properties b/demos/org.eclipse.fx.testcases.dnd.app/build.properties
index db411bb01..197abee96 100644
--- a/demos/org.eclipse.fx.testcases.dnd.app/build.properties
+++ b/demos/org.eclipse.fx.testcases.dnd.app/build.properties
@@ -1,7 +1,8 @@
bin.includes = .,\
- META-INF/,\
- plugin.xml,\
-css/,\
- Application.e4xmi
+ META-INF/,\
+ plugin.xml,\
+ css/,\
+ Application.e4xmi,\
+ OSGI-INF/org.eclipse.fx.testcases.dnd.app.DefaultTheme.xml
source.. = src/
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.app/OSGI-INF/services/org.eclipse.fx.code.compensator.app.DarkTheme.xml b/experimental/compensator/org.eclipse.fx.code.compensator.app/OSGI-INF/services/org.eclipse.fx.code.compensator.app.DarkTheme.xml
index 075dfb7a4..2cc036308 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.app/OSGI-INF/services/org.eclipse.fx.code.compensator.app.DarkTheme.xml
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.app/OSGI-INF/services/org.eclipse.fx.code.compensator.app.DarkTheme.xml
@@ -4,6 +4,6 @@
<service>
<provide interface="org.eclipse.fx.ui.services.theme.Theme"/>
</service>
- <reference bind="registerMultiURLStylesheet" cardinality="0..n" interface="org.eclipse.fx.ui.services.theme.MultiURLStylesheet" name="registerMultiURLStylesheet" policy="dynamic" unbind="unregisterMultiURLStylesheet"/>
- <reference bind="registerStylesheet" cardinality="0..n" interface="org.eclipse.fx.ui.services.theme.Stylesheet" name="registerStylesheet" policy="dynamic" unbind="unregisterStylesheet"/>
+ <reference bind="registerMultiURLStylesheet" cardinality="0..n" interface="org.eclipse.fx.ui.services.theme.MultiURLStylesheet" name="registerMultiURLStylesheet" policy="dynamic"/>
+ <reference bind="registerStylesheet" cardinality="0..n" interface="org.eclipse.fx.ui.services.theme.Stylesheet" name="registerStylesheet" policy="dynamic"/>
</scr:component> \ No newline at end of file
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.app/OSGI-INF/services/org.eclipse.fx.code.compensator.app.DefaultTheme.xml b/experimental/compensator/org.eclipse.fx.code.compensator.app/OSGI-INF/services/org.eclipse.fx.code.compensator.app.DefaultTheme.xml
index 48db54a93..b092468a9 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.app/OSGI-INF/services/org.eclipse.fx.code.compensator.app.DefaultTheme.xml
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.app/OSGI-INF/services/org.eclipse.fx.code.compensator.app.DefaultTheme.xml
@@ -4,6 +4,6 @@
<service>
<provide interface="org.eclipse.fx.ui.services.theme.Theme"/>
</service>
- <reference bind="registerMultiURLStylesheet" cardinality="0..n" interface="org.eclipse.fx.ui.services.theme.MultiURLStylesheet" name="registerMultiURLStylesheet" policy="dynamic" unbind="unregisterMultiURLStylesheet"/>
- <reference bind="registerStylesheet" cardinality="0..n" interface="org.eclipse.fx.ui.services.theme.Stylesheet" name="registerStylesheet" policy="dynamic" unbind="unregisterStylesheet"/>
+ <reference bind="registerMultiURLStylesheet" cardinality="0..n" interface="org.eclipse.fx.ui.services.theme.MultiURLStylesheet" name="registerMultiURLStylesheet" policy="dynamic"/>
+ <reference bind="registerStylesheet" cardinality="0..n" interface="org.eclipse.fx.ui.services.theme.Stylesheet" name="registerStylesheet" policy="dynamic"/>
</scr:component> \ No newline at end of file
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/ApplicationLifecycle.class b/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/ApplicationLifecycle.class
index 88099e290..a86386874 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/ApplicationLifecycle.class
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/ApplicationLifecycle.class
Binary files differ
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/DirtyStateTrackerAddon.class b/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/DirtyStateTrackerAddon.class
index f1d12d9e2..4ed480c37 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/DirtyStateTrackerAddon.class
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/DirtyStateTrackerAddon.class
Binary files differ
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/LoadFile.class b/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/LoadFile.class
index 4b5480750..c95034bb5 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/LoadFile.class
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/LoadFile.class
Binary files differ
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/LoadFolder.class b/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/LoadFolder.class
index b050d2a24..7e5276289 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/LoadFolder.class
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/LoadFolder.class
Binary files differ
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/OpenFile.class b/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/OpenFile.class
index 7e433236e..13e3d60e8 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/OpenFile.class
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.app/bin/org/eclipse/fx/code/compensator/app/OpenFile.class
Binary files differ
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/BugTrackerImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/BugTrackerImpl.java
index 14e6e8cbf..1ea72da39 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/BugTrackerImpl.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/BugTrackerImpl.java
@@ -17,7 +17,6 @@ import org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage;
* An implementation of the model object '<em><b>Bug Tracker</b></em>'.
* <!-- end-user-doc -->
* <p>
- * <p>
* The following features are implemented:
* </p>
* <ul>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/CISystemImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/CISystemImpl.java
index 67efa9ac6..da6788d64 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/CISystemImpl.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/CISystemImpl.java
@@ -17,7 +17,6 @@ import org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage;
* An implementation of the model object '<em><b>CI System</b></em>'.
* <!-- end-user-doc -->
* <p>
- * <p>
* The following features are implemented:
* </p>
* <ul>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/LocalProjectImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/LocalProjectImpl.java
index 073d9f011..14190aee3 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/LocalProjectImpl.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/LocalProjectImpl.java
@@ -23,7 +23,6 @@ import org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage;
* An implementation of the model object '<em><b>Local Project</b></em>'.
* <!-- end-user-doc -->
* <p>
- * <p>
* The following features are implemented:
* </p>
* <ul>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ModuleContainerImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ModuleContainerImpl.java
index 976fa498d..05289c6f5 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ModuleContainerImpl.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ModuleContainerImpl.java
@@ -25,7 +25,6 @@ import org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage;
* An implementation of the model object '<em><b>Module Container</b></em>'.
* <!-- end-user-doc -->
* <p>
- * <p>
* The following features are implemented:
* </p>
* <ul>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ModuleImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ModuleImpl.java
index 1d5167113..4d75494b3 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ModuleImpl.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ModuleImpl.java
@@ -16,7 +16,6 @@ import org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage;
* An implementation of the model object '<em><b>Module</b></em>'.
* <!-- end-user-doc -->
* <p>
- * <p>
* The following features are implemented:
* </p>
* <ul>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ProjectImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ProjectImpl.java
index 32a852258..a390a76a2 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ProjectImpl.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ProjectImpl.java
@@ -27,7 +27,6 @@ import org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage;
* An implementation of the model object '<em><b>Project</b></em>'.
* <!-- end-user-doc -->
* <p>
- * <p>
* The following features are implemented:
* </p>
* <ul>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/RemoteProjectImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/RemoteProjectImpl.java
index f2911e828..5519b33e8 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/RemoteProjectImpl.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/RemoteProjectImpl.java
@@ -16,7 +16,6 @@ import org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage;
* An implementation of the model object '<em><b>Remote Project</b></em>'.
* <!-- end-user-doc -->
* <p>
- * <p>
* The following features are implemented:
* </p>
* <ul>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/VCSRepositoryImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/VCSRepositoryImpl.java
index 872dea846..fdda794df 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/VCSRepositoryImpl.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/VCSRepositoryImpl.java
@@ -17,7 +17,6 @@ import org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage;
* An implementation of the model object '<em><b>VCS Repository</b></em>'.
* <!-- end-user-doc -->
* <p>
- * <p>
* The following features are implemented:
* </p>
* <ul>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/xtend-gen/org/eclipse/fx/code/compensator/project/jdt/handler/.NewClassTemplate.xtendbin b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/xtend-gen/org/eclipse/fx/code/compensator/project/jdt/handler/.NewClassTemplate.xtendbin
index 4db1eebea..8d9704eec 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/xtend-gen/org/eclipse/fx/code/compensator/project/jdt/handler/.NewClassTemplate.xtendbin
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/xtend-gen/org/eclipse/fx/code/compensator/project/jdt/handler/.NewClassTemplate.xtendbin
Binary files differ
diff --git a/experimental/swt/org.eclipse.fx.runtime.examples.swt/.classpath b/experimental/swt/org.eclipse.fx.runtime.examples.swt/.classpath
index 154022be0..4047486e8 100644
--- a/experimental/swt/org.eclipse.fx.runtime.examples.swt/.classpath
+++ b/experimental/swt/org.eclipse.fx.runtime.examples.swt/.classpath
@@ -5,5 +5,7 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-mini"/>
<classpathentry kind="src" path="src-snippets"/>
+ <classpathentry kind="src" path="src-forms"/>
+ <classpathentry kind="src" path="src-jface"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/experimental/swt/org.eclipse.fx.runtime.examples.swt/META-INF/MANIFEST.MF b/experimental/swt/org.eclipse.fx.runtime.examples.swt/META-INF/MANIFEST.MF
index 824105135..e9912db3e 100644
--- a/experimental/swt/org.eclipse.fx.runtime.examples.swt/META-INF/MANIFEST.MF
+++ b/experimental/swt/org.eclipse.fx.runtime.examples.swt/META-INF/MANIFEST.MF
@@ -7,7 +7,9 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.fx.runtime.swt;bundle-version="1.0.0",
org.eclipse.fx.osgi.util;bundle-version="0.8.1",
org.eclipse.equinox.event;bundle-version="1.3.0",
- org.eclipse.fx.runtime.swtutil;bundle-version="1.0.0"
+ org.eclipse.fx.runtime.swtutil;bundle-version="1.0.0",
+ org.eclipse.ui.forms;bundle-version="3.6.200",
+ org.eclipse.jface;bundle-version="3.11.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javafx.animation;version="2.0.0",
javafx.application;version="2.0.0",
diff --git a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Control.java b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Control.java
index 59f99821b..2764f93a3 100644
--- a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Control.java
+++ b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Control.java
@@ -222,7 +222,7 @@ public abstract class Control extends Widget implements Drawable {
javafx.scene.control.Control.USE_COMPUTED_SIZE);
int height = (int) internal_getNativeObject().prefHeight(
javafx.scene.control.Control.USE_COMPUTED_SIZE);
-
+
if (width <= 0) {
width = DEFAULT_WIDTH;
}
@@ -272,11 +272,11 @@ public abstract class Control extends Widget implements Drawable {
addListener(SWT.Move, typedListener);
}
-
+
public void addDragDetectListener (DragDetectListener listener) {
Util.logNotImplemented();
}
-
+
public void addFocusListener(FocusListener listener) {
TypedListener typedListener = new TypedListener(listener);
addListener(SWT.FocusIn, typedListener);
@@ -300,11 +300,11 @@ public abstract class Control extends Widget implements Drawable {
addListener(SWT.KeyDown, typedListener);
}
-
+
public void addMenuDetectListener (MenuDetectListener listener) {
Util.logNotImplemented();
}
-
+
public void addMouseListener(MouseListener listener) {
TypedListener typedListener = new TypedListener(listener);
addListener(SWT.MouseDown, typedListener);
@@ -317,9 +317,14 @@ public abstract class Control extends Widget implements Drawable {
addListener(SWT.MouseMove, typedListener);
}
-
+
public void addMouseTrackListener (MouseTrackListener listener) {
- Util.logNotImplemented();
+ checkWidget();
+ if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+ TypedListener typedListener = new TypedListener (listener);
+ addListener (SWT.MouseEnter,typedListener);
+ addListener (SWT.MouseExit,typedListener);
+ addListener (SWT.MouseHover,typedListener);
}
//
// public void addMouseWheelListener (MouseWheelListener listener) {
@@ -375,10 +380,10 @@ public abstract class Control extends Widget implements Drawable {
Util.logNotImplemented();
return false;
}
-
+
public boolean dragDetect (Event event) {
Util.logNotImplemented();
- return false;
+ return false;
}
//
// public boolean forceFocus () {
@@ -398,7 +403,7 @@ public abstract class Control extends Widget implements Drawable {
Util.logNotImplemented();
return null;
}
-
+
public Rectangle getBounds() {
Point location = getLocation();
Point size = getSize();
@@ -448,7 +453,7 @@ public abstract class Control extends Widget implements Drawable {
if (!(this instanceof Shell)) {
bounds = getDisplay().map(getParent(), null, bounds);
}
-
+
int index = -1, value = -1;
for (int i = 0; i < monitors.length; i++) {
Rectangle rect = bounds.intersection(monitors[i].getBounds());
@@ -527,7 +532,7 @@ public abstract class Control extends Widget implements Drawable {
public boolean isEnabled () {
return getEnabled () && parent.isEnabled ();
}
-
+
public boolean isFocusControl() {
return internal_getEventTarget().isFocused();
}
@@ -545,12 +550,12 @@ public abstract class Control extends Widget implements Drawable {
parent.internal_controlMoveAbove(this, control);
}
-
+
public void moveBelow (Control control) {
System.out.println("MOVE BELOW: " + parent);
parent.internal_controlMoveBelow(this, control);
}
-
+
public void pack() {
forceSizeProcessing();
// TODO is it min size??
@@ -558,12 +563,12 @@ public abstract class Control extends Widget implements Drawable {
(int) internal_getNativeControl().prefHeight(-1));
}
-
+
public void pack (boolean changed) {
forceSizeProcessing();
// TODO is it min size??
setSize((int) internal_getNativeControl().prefWidth(-1),
- (int) internal_getNativeControl().prefHeight(-1));
+ (int) internal_getNativeControl().prefHeight(-1));
}
//
// public boolean print (GC gc) {
@@ -580,13 +585,13 @@ public abstract class Control extends Widget implements Drawable {
public void removeControlListener (ControlListener listener) {
removeListener(SWT.Resize, listener);
- removeListener(SWT.Move, listener);
+ removeListener(SWT.Move, listener);
}
-
+
public void removeDragDetectListener(DragDetectListener listener) {
Util.logNotImplemented();
}
-
+
public void removeFocusListener(FocusListener listener) {
removeListener(SWT.FocusIn, listener);
removeListener(SWT.FocusOut, listener);
@@ -618,11 +623,11 @@ public abstract class Control extends Widget implements Drawable {
removeListener(SWT.MouseDoubleClick, listener);
}
-
+
public void removeMouseMoveListener(MouseMoveListener listener) {
removeListener(SWT.MouseMove, listener);
}
-
+
public void removeMouseTrackListener(MouseTrackListener listener) {
Util.logNotImplemented();
}
@@ -667,7 +672,7 @@ public abstract class Control extends Widget implements Drawable {
public void setCapture (boolean capture) {
Util.logNotImplemented();
}
-
+
public void setCursor(Cursor cursor) {
this.cursor = cursor;
internal_getNativeObject().setCursor(
@@ -708,20 +713,20 @@ public abstract class Control extends Widget implements Drawable {
if (font != null) {
b.append(font.internal_getAsCSSString());
}
-
+
if (foreground != null) {
String rgb = "rgb(" + foreground.getRed() + ","
+ foreground.getGreen() + "," + foreground.getBlue() + ")";
b.append("-fx-text-inner-color: " + rgb
+ "; -fx-text-background-color: " + rgb + ";");
}
-
+
if( background != null ) {
String rgb = "rgb(" + background.getRed() + ","
+ background.getGreen() + "," + background.getBlue() + ")";
b.append("-fx-background-color: " + rgb);
}
-
+
return b.toString();
}
@@ -761,14 +766,14 @@ public abstract class Control extends Widget implements Drawable {
Util.logNotImplemented();
}
-
+
public boolean setParent (Composite parent) {
this.parent.internal_detachControl(this);
parent.internal_attachControl(this);
this.parent = parent;
return true;
}
-
+
public void setRedraw(boolean redraw) {
// Not needed in FX
}
@@ -829,26 +834,26 @@ public abstract class Control extends Widget implements Drawable {
return toDisplay(point.x, point.y);
}
-
+
public boolean traverse (int traversal) {
Util.logNotImplemented();
return false;
}
-
+
public boolean traverse (int traversal, KeyEvent event) {
Util.logNotImplemented();
return false;
}
-
+
public boolean traverse (int traversal, Event event) {
Util.logNotImplemented();
return false;
}
-
+
public void update() {
Util.logNotImplemented();
}
-
+
public void setTextDirection(int dir) {
Util.logNotImplemented();
}
@@ -1095,12 +1100,12 @@ public abstract class Control extends Widget implements Drawable {
}
}
}
-
+
@Override
public DrawableGC internal_new_GC() {
return new MeasureGC(this);
}
-
+
void markLayout (boolean changed, boolean all) {
// nothing todo
}
@@ -1202,7 +1207,7 @@ public abstract class Control extends Widget implements Drawable {
Control c = Widget.getWidget(event.getTarget());
if (c != null) {
c.sendKeyEvent(event);
-//if we consume the event e.g. navigation in table/tree get broken!
+//if we consume the event e.g. navigation in table/tree get broken!
// event.consume();
}
}
diff --git a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Shell.java b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Shell.java
index 2b3492e76..567e02d1f 100644
--- a/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Shell.java
+++ b/experimental/swt/org.eclipse.fx.runtime.swt/src/org/eclipse/swt/widgets/Shell.java
@@ -13,33 +13,35 @@ package org.eclipse.swt.widgets;
import java.util.ArrayList;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ShellListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.internal.Util;
+
+import com.sun.javafx.geom.PathIterator;
+
import javafx.beans.InvalidationListener;
import javafx.beans.Observable;
import javafx.event.EventHandler;
import javafx.scene.Node;
import javafx.scene.Scene;
+import javafx.scene.control.PopupControl;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.Region;
import javafx.scene.shape.LineTo;
import javafx.scene.shape.MoveTo;
import javafx.scene.shape.Path;
import javafx.stage.Modality;
+import javafx.stage.Popup;
import javafx.stage.Stage;
import javafx.stage.StageStyle;
import javafx.stage.Window;
import javafx.stage.WindowEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ShellListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.internal.Util;
-
-import com.sun.javafx.geom.PathIterator;
-
public class Shell extends Decorations {
- private Stage stage;
+ private Window stage;
private static final double MIN_WIDTH = 500;
private static final double MIN_HEIGHT = 200;
private BorderPane nativeObject;
@@ -49,7 +51,7 @@ public class Shell extends Decorations {
public Shell() {
super(Display.getCurrent(), SWT.DIALOG_TRIM);
}
-
+
public Shell(Display d) {
super(d, SWT.DIALOG_TRIM);
}
@@ -57,13 +59,24 @@ public class Shell extends Decorations {
public Shell(Display d, int style) {
super(d, style);
}
-
+
public Shell(Shell s) {
this(s == null ? null : s.getDisplay());
- stage.initOwner(s.stage);
+ if( isStage() ) {
+ ((Stage)stage).initOwner(s.stage);
+ }
+
this.parentShell = s;
}
+ private boolean isStage() {
+ return stage instanceof Stage;
+ }
+
+ private Stage asStage() {
+ return (Stage) stage;
+ }
+
public Shell(int style) {
this(Display.getDefault(),style);
}
@@ -71,7 +84,9 @@ public class Shell extends Decorations {
public Shell(Shell shell, int style) {
this(shell == null ? null : shell.getDisplay(), style);
if (shell != null) {
- stage.initOwner(shell.stage);
+ if( isStage() ) {
+ ((Stage)stage).initOwner(shell.stage);
+ }
}
this.parentShell = shell;
}
@@ -80,104 +95,115 @@ public class Shell extends Decorations {
super(Display.getDefault(),SWT.NONE);
this.stage = stage;
}
-
+
@Override
protected Region createWidget() {
if( stage != null ) {
return nativeObject = new BorderPane();
}
-
+
Region r = super.createWidget();
nativeObject = new BorderPane();
+ nativeObject.setStyle("-fx-background-color: black");
nativeObject.setCenter(r);
-
- stage = new Stage();
- final Scene s = new Scene(internal_getNativeObject());
- s.getStylesheets().add(getClass().getClassLoader().getResource("org/eclipse/swt/internal/swt.css").toExternalForm());
- stage.setScene(s);
- //TODO what to do with SWT.TOOL???
- if( /* (getStyle() & SWT.TOOL) == SWT.TOOL ||*/ (getStyle() & SWT.NO_TRIM) == SWT.NO_TRIM ) {
- stage.initStyle(StageStyle.UNDECORATED);
- }
- if( (style & SWT.APPLICATION_MODAL) == SWT.APPLICATION_MODAL ) {
- stage.initModality(Modality.APPLICATION_MODAL);
- } else if( (style & SWT.PRIMARY_MODAL) == SWT.PRIMARY_MODAL ) {
- Util.logNotImplemented();
- }
-
-
+
if( (getStyle() & SWT.NO_FOCUS) == SWT.NO_FOCUS ) {
- System.err.println("NO FOCUS NOT IMPLEMENTED");
- }
- stage.setOnShowing(new EventHandler<WindowEvent>() {
-
- @Override
- public void handle(WindowEvent event) {
- if( stage.widthProperty().getValue().equals(Double.NaN) && stage.heightProperty().getValue().equals(Double.NaN) ) {
- stage.setWidth(MIN_WIDTH);
- stage.setHeight(MIN_HEIGHT);
+ stage = new Popup() {
+ public void hide() {
+ Thread.dumpStack();
+ System.err.println("HIDING!!!!");
+ super.hide();
}
+ };
+ ((Popup)stage).getContent().add(nativeObject);
+ ((Popup)stage).setAutoHide(false);
+ getDisplay().registerShell(this);
+ } else {
+ Stage stage = new Stage();
+ this.stage = stage;
+ final Scene s = new Scene(internal_getNativeObject());
+ s.getStylesheets().add(getClass().getClassLoader().getResource("org/eclipse/swt/internal/swt.css").toExternalForm());
+ stage.setScene(s);
+ //TODO what to do with SWT.TOOL???
+ if( /* (getStyle() & SWT.TOOL) == SWT.TOOL ||*/ (getStyle() & SWT.NO_TRIM) == SWT.NO_TRIM ) {
+ stage.initStyle(StageStyle.UNDECORATED);
+ }
+ if( (style & SWT.APPLICATION_MODAL) == SWT.APPLICATION_MODAL ) {
+ stage.initModality(Modality.APPLICATION_MODAL);
+ } else if( (style & SWT.PRIMARY_MODAL) == SWT.PRIMARY_MODAL ) {
+ Util.logNotImplemented();
}
- });
- stage.addEventHandler(WindowEvent.WINDOW_CLOSE_REQUEST, new EventHandler<WindowEvent>() {
- @Override
- public void handle(WindowEvent event) {
- if( isListening(SWT.Close) ) {
- Event evt = new Event();
- internal_sendEvent(SWT.Close, evt, true);
- if( ! evt.doit ) {
- event.consume();
+ stage.setOnShowing(new EventHandler<WindowEvent>() {
+
+ @Override
+ public void handle(WindowEvent event) {
+ if( stage.widthProperty().getValue().equals(Double.NaN) && stage.heightProperty().getValue().equals(Double.NaN) ) {
+ stage.setWidth(MIN_WIDTH);
+ stage.setHeight(MIN_HEIGHT);
}
}
- }
- });
- stage.focusedProperty().addListener(new InvalidationListener() {
-
- @Override
- public void invalidated(Observable observable) {
- if( s.getFocusOwner() != null ) {
- Object o = Widget.getWidget(s.getFocusOwner());
- if( o instanceof Control ) {
- getDisplay().setFocusControl((Control) o);
+ });
+ stage.addEventHandler(WindowEvent.WINDOW_CLOSE_REQUEST, new EventHandler<WindowEvent>() {
+
+ @Override
+ public void handle(WindowEvent event) {
+ if( isListening(SWT.Close) ) {
+ Event evt = new Event();
+ internal_sendEvent(SWT.Close, evt, true);
+ if( ! evt.doit ) {
+ event.consume();
+ }
}
- } else {
- getDisplay().setFocusControl(null);
}
- }
- });
- s.focusOwnerProperty().addListener(new InvalidationListener() {
-
- @Override
- public void invalidated(Observable observable) {
- if( stage.isFocused() ) {
+ });
+ stage.focusedProperty().addListener(new InvalidationListener() {
+
+ @Override
+ public void invalidated(Observable observable) {
if( s.getFocusOwner() != null ) {
Object o = Widget.getWidget(s.getFocusOwner());
if( o instanceof Control ) {
- getDisplay().setFocusControl((Control) o);
+ getDisplay().setFocusControl((Control) o);
}
} else {
getDisplay().setFocusControl(null);
}
}
- }
- });
-
- getDisplay().registerShell(this);
-
+ });
+ s.focusOwnerProperty().addListener(new InvalidationListener() {
+
+ @Override
+ public void invalidated(Observable observable) {
+ if( stage.isFocused() ) {
+ if( s.getFocusOwner() != null ) {
+ Object o = Widget.getWidget(s.getFocusOwner());
+ if( o instanceof Control ) {
+ getDisplay().setFocusControl((Control) o);
+ }
+ } else {
+ getDisplay().setFocusControl(null);
+ }
+ }
+ }
+ });
+
+ getDisplay().registerShell(this);
+ }
+
return nativeObject;
}
-
+
@Override
public Region internal_getNativeObject() {
return nativeObject;
}
-
+
@Override
protected void initListeners() {
super.initListeners();
stage.setOnHidden(new EventHandler<WindowEvent>() {
-
+
@Override
public void handle(WindowEvent event) {
dispose();
@@ -186,7 +212,11 @@ public class Shell extends Decorations {
}
public void open() {
- stage.show();
+ if( isStage() ) {
+ ((Stage)stage).show();
+ } else {
+ ((Popup)stage).show(parentShell.internal_getWindow());
+ }
}
@Override
@@ -202,137 +232,174 @@ public class Shell extends Decorations {
public void setLocation(int x, int y) {
stage.setX(x);
stage.setY(y);
+ System.err.println(x+"/"+y);
}
-
+
@Override
public void setText(String string) {
- stage.setTitle(string);
+ if( isStage() ) {
+ ((Stage)stage).setTitle(string);
+ } else {
+ Util.logNotImplemented();
+ }
}
@Override
public String getText() {
- return stage.getTitle();
+ if( isStage() ) {
+ return ((Stage)stage).getTitle();
+ } else {
+ Util.logNotImplemented();
+ return null;
+ }
}
-
+
@Override
public void setImage(Image image) {
Image oldImage = getImage();
super.setImage(image);
-
- if( oldImage != null ) {
- stage.getIcons().remove(oldImage.internal_getImage());
- }
-
- if( image != null ) {
- stage.getIcons().add(image.internal_getImage());
+
+ if( isStage() ) {
+ if( oldImage != null ) {
+ ((Stage)stage).getIcons().remove(oldImage.internal_getImage());
+ }
+
+ if( image != null ) {
+ ((Stage)stage).getIcons().add(image.internal_getImage());
+ }
+ } else {
+ Util.logNotImplemented();
}
}
-
+
@Override
protected double internal_getWidth() {
return stage.getWidth();
}
-
+
@Override
protected double internal_getHeight() {
return stage.getHeight();
}
-
+
@Override
public Point getLocation() {
return new Point((int)stage.getX(), (int)stage.getY());
}
-
+
@Override
public void setSize(int width, int height) {
stage.setWidth(width);
stage.setHeight(height);
}
-
+
@Override
public Point getSize() {
return new Point((int)stage.getWidth(), (int)stage.getHeight());
}
-
+
@Override
public Rectangle getBounds() {
return new Rectangle((int)stage.getX(), (int)stage.getY(), (int)stage.getWidth(), (int)stage.getHeight());
}
public void setFullScreen(boolean selection) {
- stage.setFullScreen(selection);
+ if( isStage() ) {
+ ((Stage)stage).setFullScreen(selection);
+ } else {
+ Util.logNotImplemented();
+ }
}
-
+
@Override
public Composite getParent() {
// TODO Does it need another implementation???
return super.getParent();
}
-
+
@Override
public Shell getShell() {
return this;
}
-
+
@Override
public void pack() {
stage.sizeToScene();
}
-
+
public Window internal_getWindow() {
return stage;
}
-
+
@Override
public void setDefaultButton(Button defaultButton) {
Button b = getDefaultButton();
if( b != null ) {
b.internal_setDefault(false);
}
-
+
super.setDefaultButton(defaultButton);
-
+
if( defaultButton != null ) {
defaultButton.internal_setDefault(true);
}
}
-
+
public void addShellListener(ShellListener listener) {
Util.logNotImplemented();
}
-
+
public void close () {
- stage.close();
+ if( isStage() ) {
+ ((Stage)stage).close();
+ } else {
+ Util.logNotImplemented();
+ }
}
-
+
public int getAlpha () {
return 255 - (int)(stage.getOpacity() * 255);
}
-
+
// public int getImeInputMode () {
-//
+//
// }
-
+
public boolean getMaximized () {
- return stage.isMaximized();
+ if( isStage() ) {
+ return ((Stage)stage).isMaximized();
+ } else {
+ Util.logNotImplemented();
+ return false;
+ }
}
-
+
// public boolean getModified () {
// return false;
// }
-
+
public boolean getMinimized () {
- return stage.isIconified();
+ if( isStage() ) {
+ return ((Stage)stage).isIconified();
+ } else {
+ return false;
+ }
+
}
-
+
public Point getMinimumSize () {
- return new Point((int)stage.getMinWidth(), (int)stage.getMinHeight());
+ if( isStage() ) {
+ return new Point((int)((Stage)stage).getMinWidth(), (int)((Stage)stage).getMinHeight());
+ } else {
+ Util.logNotImplemented();
+ return new Point(100,100);
+ }
}
-
+
public org.eclipse.swt.graphics.Region getRegion () {
return region;
}
-
+
public Shell [] getShells () {
java.util.List<Shell> shells = new ArrayList<>();
for( Shell s : getDisplay().getShells() ) {
@@ -342,91 +409,105 @@ public class Shell extends Decorations {
}
return shells.toArray(new Shell[shells.size()]);
}
-
+
// public ToolBar getToolBar() {
-//
+//
// }
-
+
// public boolean isEnabled () {
// return true;
// }
public boolean isVisible () {
- return getVisible();
+ return stage.isShowing();
}
-
+
@Override
public boolean isEnabled() {
return getEnabled();
}
-
-//
+
+//
// public boolean print (GC gc) {
-//
+//
// }
-//
+//
public void removeShellListener(ShellListener listener) {
Util.logNotImplemented();
}
-
+
public void setActive () {
- stage.toFront();
+ if( isStage() ) {
+ ((Stage)stage).toFront();
+ }
stage.setFocused(true);
}
-
+
public void setAlpha (int alpha) {
stage.setOpacity(alpha/255.0);
}
-//
+//
// public void setFullScreen (boolean fullScreen) {
-//
+//
// }
-//
+//
public void setMenuBar (Menu menu) {
if( (menu.style & SWT.BAR) == SWT.BAR ) {
nativeObject.setTop((Node)menu.internal_getNativeObject());
}
super.setMenuBar(menu);
}
-//
+//
// public void setImeInputMode (int mode) {
-//
+//
// }
-//
+//
public void setMaximized (boolean maximized) {
- stage.setMaximized(true);
- super.setMaximized(maximized);
+ if( isStage() ) {
+ asStage().setMaximized(true);
+ super.setMaximized(maximized);
+ } else {
+ Util.logNotImplemented();
+ }
}
-
+
public void setMinimized (boolean minimized) {
- stage.setIconified(true);
- super.setMinimized(minimized);
+ if( isStage() ) {
+ asStage().setIconified(true);
+ super.setMinimized(minimized);
+ } else {
+ Util.logNotImplemented();
+ }
}
-
+
public void setMinimumSize (int width, int height) {
- stage.setMinWidth(width);
- stage.setMinHeight(height);
+ if( isStage() ) {
+ asStage().setMinWidth(width);
+ asStage().setMinHeight(height);
+ } else {
+ Util.logNotImplemented();
+ }
}
-
+
public void setMinimumSize (Point size) {
setMinimumSize(size.x, size.y);
}
-
+
public void setModified (boolean modified) {
Util.logNotImplemented();
}
-
+
public void setRegion (org.eclipse.swt.graphics.Region region) {
float coords[] = new float[6];
-
+
float x = 0;
float y = 0;
-
+
PathIterator pathIterator = region.internal_getNativeObject().getPathIterator(null);
-
+
Path p = new Path();
-
+
p.getElements().add(new MoveTo(0, 0));
-
+
while( ! pathIterator.isDone() ) {
switch (pathIterator.currentSegment(coords)) {
case PathIterator.SEG_CLOSE:
@@ -451,50 +532,69 @@ public class Shell extends Decorations {
}
pathIterator.next();
}
-
+
stage.getScene().getRoot().setClip(p);
this.region = region;
}
-
+
public void setVisible (boolean visible) {
+ System.err.println("VISIBILITY: " + visible);
+ if( visible == isVisible() ) {
+ return;
+ }
+
if( visible ) {
- stage.show();
- } else {
- if( stage.isShowing() ) {
- stage.hide();
+ if( isStage() ) {
+ asStage().show();
+ } else {
+ ((Popup)stage).show(parentShell.internal_getWindow());
+ System.err.println(isVisible());
}
+ } else {
+// if( stage.isShowing() ) {
+// stage.hide();
+// } else {
+// Thread.dumpStack();
+// ((Popup)stage).hide();
+// }
}
-
+
}
-
+
@Override
public void dispose() {
getDisplay().unregisterShell(this);
super.dispose();
- stage.close();
+ if( isStage() ) {
+ asStage().close();
+ } else {
+ Util.logNotImplemented();
+ }
}
-
+
@Override
public void setImages(Image[] images) {
super.setImages(images);
javafx.scene.image.Image[] imgs = new javafx.scene.image.Image[images.length];
-
+
for(int i = 0; i < imgs.length; i++) {
imgs[i] = images[i].internal_getImage();
}
-
- stage.getIcons().setAll(imgs);
+
+ if( isStage() ) {
+ asStage().getIcons().setAll(imgs);
+ }
}
public void forceActive () {
Util.logNotImplemented();
}
-
+
@Override
public void moveAbove(Control control) {
// super.moveAbove(control);
}
-
+
@Override
public void moveBelow(Control control) {
// super.moveBelow(control);
diff --git a/experimental/swt/org.eclipse.fx.sample.singlesource.app/bin/.gitignore b/experimental/swt/org.eclipse.fx.sample.singlesource.app/bin/.gitignore
deleted file mode 100644
index 283762609..000000000
--- a/experimental/swt/org.eclipse.fx.sample.singlesource.app/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/donotdelete
diff --git a/releng/cmdtools/org.eclipse.fx.code.editor.ldef.app/bnd.bnd b/releng/cmdtools/org.eclipse.fx.code.editor.ldef.app/bnd.bnd
index 6e8bcef54..6e5e22675 100644
--- a/releng/cmdtools/org.eclipse.fx.code.editor.ldef.app/bnd.bnd
+++ b/releng/cmdtools/org.eclipse.fx.code.editor.ldef.app/bnd.bnd
@@ -8,7 +8,9 @@ Service-Component: \
org.eclipse.emf.ecore,\
org.eclipse.emf.ecore.xmi,\
org.eclipse.emf.common,\
- org.eclipse.xtext
+ org.eclipse.xtext,\
+ javax.inject
Private-Package: \
org.eclipse.fx.code.editor.ldef.app
-runee: JavaSE-1.8
+-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]' \ No newline at end of file
diff --git a/releng/maven-deploy/efxclipse/animation.xml b/releng/maven-deploy/efxclipse/animation.xml
deleted file mode 100644
index 706e49991..000000000
--- a/releng/maven-deploy/efxclipse/animation.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.ui.animation</artifactId>
- <version>2.1.0</version>
- <name>Basic JavaFX animations</name>
- <description>Basic animations for the JavaFX 2.0</description>
- <url>http://efxclipse.org</url>
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <url>http://git.eclipse.org/c/efxclipse/org.eclipse.efxclipse.git/tree/bundles/runtime/org.eclipse.fx.ui.animation</url>
- </scm>
- <developers>
- <developer>
- <name>Tom Schindl</name>
- <organization>Eclipse.org</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.jdt.annotation</artifactId>
- <version>2.0.100</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project> \ No newline at end of file
diff --git a/releng/maven-deploy/efxclipse/code_editor.xml b/releng/maven-deploy/efxclipse/code_editor.xml
deleted file mode 100644
index a9f34372e..000000000
--- a/releng/maven-deploy/efxclipse/code_editor.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.code.editor</artifactId>
- <version>2.1.0</version>
- <name>Base services required to implement an editor</name>
- <description>Widget toolkit independent APIs to implement an editor</description>
- <url>http://efxclipse.org</url>
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <url>http://git.eclipse.org/c/efxclipse/org.eclipse.efxclipse.git/tree/bundles/code/org.eclipse.fx.code.editor</url>
- </scm>
- <developers>
- <developer>
- <name>Tom Schindl</name>
- <organization>Eclipse.org</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.text</artifactId>
- <version>3.5.400</version>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.core</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- </dependency>
- </dependencies>
-</project> \ No newline at end of file
diff --git a/releng/maven-deploy/efxclipse/code_editor_fx.xml b/releng/maven-deploy/efxclipse/code_editor_fx.xml
deleted file mode 100644
index 4ecb7d022..000000000
--- a/releng/maven-deploy/efxclipse/code_editor_fx.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.code.editor.fx</artifactId>
- <version>2.1.0</version>
- <name>JavaFX editor components and services</name>
- <description>JavaFX code editor components</description>
- <url>http://efxclipse.org</url>
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <url>http://git.eclipse.org/c/efxclipse/org.eclipse.efxclipse.git/tree/bundles/code/org.eclipse.fx.code.editor.fx</url>
- </scm>
- <developers>
- <developer>
- <name>Tom Schindl</name>
- <organization>Eclipse.org</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.e4.core.di.annotations</artifactId>
- <version>1.4.0</version>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.code.editor</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.core.di</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.text</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.text.ui</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.ui.controls</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.core</artifactId>
- <version>2.1.0</version>
- </dependency>
- </dependencies>
-</project> \ No newline at end of file
diff --git a/releng/maven-deploy/efxclipse/controls.xml b/releng/maven-deploy/efxclipse/controls.xml
deleted file mode 100644
index 4d3dfb480..000000000
--- a/releng/maven-deploy/efxclipse/controls.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.ui.controls</artifactId>
- <version>2.1.0</version>
- <name>Custom JavaFX controls</name>
- <description>Custom JavaFX controls like a styled text component, ...</description>
- <url>http://efxclipse.org</url>
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <url>http://git.eclipse.org/c/efxclipse/org.eclipse.efxclipse.git/tree/bundles/runtime/org.eclipse.fx.ui.controls</url>
- </scm>
- <developers>
- <developer>
- <name>Tom Schindl</name>
- <organization>Eclipse.org</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.jdt.annotation</artifactId>
- <version>2.0.100</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.core</artifactId>
- <version>2.0.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.ui.panes</artifactId>
- <version>2.0.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.ui.animation</artifactId>
- <version>2.0.0</version>
- <scope>compile</scope>
- </dependency>
- <!--
- org.eclipse.osgi_3.10.100.v20150529-1857.jar
- -->
- </dependencies>
-</project> \ No newline at end of file
diff --git a/releng/maven-deploy/efxclipse/core.xml b/releng/maven-deploy/efxclipse/core.xml
deleted file mode 100644
index b35d65994..000000000
--- a/releng/maven-deploy/efxclipse/core.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.core</artifactId>
- <version>2.1.0</version>
- <name>Core utilities</name>
- <description>Collection of core utilities like a log abstraction, adapter system, ...</description>
- <url>http://efxclipse.org</url>
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <url>http://git.eclipse.org/c/efxclipse/org.eclipse.efxclipse.git/tree/bundles/runtime/org.eclipse.fx.core</url>
- </scm>
- <developers>
- <developer>
- <name>Tom Schindl</name>
- <organization>Eclipse.org</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.jdt.annotation</artifactId>
- <version>2.0.100</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>19.0-rc1</version>
- </dependency>
- <!--
- org.eclipse.osgi.services_3.5.0.v20150519-2006.jar
- org.eclipse.osgi_3.10.100.v20150529-1857.jar
- -->
- </dependencies>
-</project> \ No newline at end of file
diff --git a/releng/maven-deploy/efxclipse/core_di.xml b/releng/maven-deploy/efxclipse/core_di.xml
deleted file mode 100644
index 98db73aa8..000000000
--- a/releng/maven-deploy/efxclipse/core_di.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.core.di</artifactId>
- <version>2.1.0</version>
- <name>Core DI APIs</name>
- <description>DI APIs to be used without getting a dependency on a concrete DI container</description>
- <url>http://efxclipse.org</url>
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <url>http://git.eclipse.org/c/efxclipse/org.eclipse.efxclipse.git/tree/bundles/runtime/org.eclipse.fx.core.di</url>
- </scm>
- <developers>
- <developer>
- <name>Tom Schindl</name>
- <organization>Eclipse.org</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.jdt.annotation</artifactId>
- <version>2.0.100</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.core</artifactId>
- <version>2.1.0</version>
- </dependency>
- <!--
- org.eclipse.osgi.services_3.5.0.v20150519-2006.jar
- org.eclipse.osgi_3.10.100.v20150529-1857.jar
- -->
- </dependencies>
-</project> \ No newline at end of file
diff --git a/releng/maven-deploy/efxclipse/panes.xml b/releng/maven-deploy/efxclipse/panes.xml
deleted file mode 100644
index 8f8ddddef..000000000
--- a/releng/maven-deploy/efxclipse/panes.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.ui.panes</artifactId>
- <version>2.1.0</version>
- <name>JavaFX layout panes</name>
- <description>A port of SWT-Layouts like GridLayout to JavaFX</description>
- <url>http://efxclipse.org</url>
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <url>http://git.eclipse.org/c/efxclipse/org.eclipse.efxclipse.git/tree/bundles/runtime/org.eclipse.fx.ui.panes</url>
- </scm>
- <developers>
- <developer>
- <name>Tom Schindl</name>
- <organization>Eclipse.org</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.jdt.annotation</artifactId>
- <version>2.0.100</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project> \ No newline at end of file
diff --git a/releng/maven-deploy/efxclipse/text.xml b/releng/maven-deploy/efxclipse/text.xml
deleted file mode 100644
index c48229b40..000000000
--- a/releng/maven-deploy/efxclipse/text.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.text</artifactId>
- <version>2.1.0</version>
- <name>Additional core Text components</name>
- <description>UI Toolkit neutral components extraxted from Eclipse JFace Text</description>
- <url>http://efxclipse.org</url>
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <url>http://git.eclipse.org/c/efxclipse/org.eclipse.efxclipse.git/tree/bundles/code/org.eclipse.fx.text</url>
- </scm>
- <developers>
- <developer>
- <name>Tom Schindl</name>
- <organization>Eclipse.org</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.text</artifactId>
- <version>3.5.400</version>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.equinox.common</artifactId>
- <version>3.7.0</version>
- </dependency>
- </dependencies>
-</project> \ No newline at end of file
diff --git a/releng/maven-deploy/efxclipse/text_ui.xml b/releng/maven-deploy/efxclipse/text_ui.xml
deleted file mode 100644
index e3b5b5a99..000000000
--- a/releng/maven-deploy/efxclipse/text_ui.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.text.ui</artifactId>
- <version>2.1.0</version>
- <name>JavaFX text components</name>
- <description>Text components built on top the core infrastructure</description>
- <url>http://efxclipse.org</url>
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <url>http://git.eclipse.org/c/efxclipse/org.eclipse.efxclipse.git/tree/bundles/code/org.eclipse.fx.text.ui</url>
- </scm>
- <developers>
- <developer>
- <name>Tom Schindl</name>
- <organization>Eclipse.org</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.ui.controls</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.text</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.fx.core</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.text</artifactId>
- <version>3.5.400</version>
- </dependency>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.jdt.annotation</artifactId>
- <version>2.0.100</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- </dependency>
- </dependencies>
-</project> \ No newline at end of file
diff --git a/releng/maven-deploy/platform/di_annotation.xml b/releng/maven-deploy/platform/di_annotation.xml
deleted file mode 100644
index 68ff1c89e..000000000
--- a/releng/maven-deploy/platform/di_annotation.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.e4.core.di.annotations</artifactId>
- <version>1.4.0</version>
- <name>Some basic Equinox components</name>
- <description>Some basic Equinox components useable outside of OSGi</description>
- <url>https://www.eclipse.org/equinox/</url>
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <url>http://git.eclipse.org/c/equinox/rt.equinox.bundles.git/tree/bundles/org.eclipse.equinox.common</url>
- </scm>
- <developers>
- <developer>
- <name>Tom Schindl</name>
- <organization>Eclipse.org</organization>
- <roles>
- <role>contributor</role>
- </roles>
- </developer>
- </developers>
-
-</project> \ No newline at end of file
diff --git a/releng/maven-deploy/platform/eclipse_text.xml b/releng/maven-deploy/platform/eclipse_text.xml
deleted file mode 100644
index 0d41fd25e..000000000
--- a/releng/maven-deploy/platform/eclipse_text.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.text</artifactId>
- <version>3.5.400</version>
- <name>Basic Eclipse Text Infrastructure</name>
- <description>Basic Text Infrastructure for Partitioning, Tokenizing, ...</description>
- <url>http://www.eclipse.org/platform</url>
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <url>http://git.eclipse.org/c/platform/eclipse.platform.text.git/tree/org.eclipse.text</url>
- </scm>
- <developers>
- <developer>
- <name>Tom Schindl</name>
- <organization>Eclipse.org</organization>
- <roles>
- <role>contributor</role>
- </roles>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>com.ibm.icu.base</artifactId>
- <version>54.1.1</version>
- </dependency>
- </dependencies>
-</project> \ No newline at end of file
diff --git a/releng/maven-deploy/platform/equinox_common.xml b/releng/maven-deploy/platform/equinox_common.xml
deleted file mode 100644
index 4f2e0c01d..000000000
--- a/releng/maven-deploy/platform/equinox_common.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.equinox.common</artifactId>
- <version>3.7.0</version>
- <name>Some basic Equinox components</name>
- <description>Some basic Equinox components useable outside of OSGi</description>
- <url>https://www.eclipse.org/equinox/</url>
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <url>http://git.eclipse.org/c/equinox/rt.equinox.bundles.git/tree/bundles/org.eclipse.equinox.common</url>
- </scm>
- <developers>
- <developer>
- <name>Tom Schindl</name>
- <organization>Eclipse.org</organization>
- <roles>
- <role>contributor</role>
- </roles>
- </developer>
- </developers>
-
-</project> \ No newline at end of file
diff --git a/releng/maven-deploy/platform/icu_base.xml b/releng/maven-deploy/platform/icu_base.xml
deleted file mode 100644
index a929a2782..000000000
--- a/releng/maven-deploy/platform/icu_base.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>com.ibm.icu.base</artifactId>
- <version>54.1.1</version>
- <name>ICU Base implementation</name>
- <description>ICU Base implementation</description>
- <url>https://www.eclipse.org/orbit/</url>
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <url>http://git.eclipse.org/c/platform/eclipse.platform.text.git/tree/org.eclipse.text</url>
- </scm>
- <developers>
- <developer>
- <name>Tom Schindl</name>
- <organization>Eclipse.org</organization>
- <roles>
- <role>contributor</role>
- </roles>
- </developer>
- </developers>
-</project> \ No newline at end of file
diff --git a/releng/maven-deploy/platform/jdt_annotation.xml b/releng/maven-deploy/platform/jdt_annotation.xml
deleted file mode 100644
index 26846d013..000000000
--- a/releng/maven-deploy/platform/jdt_annotation.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.bestsolution.eclipse</groupId>
- <artifactId>org.eclipse.jdt.annotation</artifactId>
- <version>2.0.100</version>
- <name>JDT Annotations for Enhanced Null Analysis</name>
- <description>Eclipse JDT Annotations for Enhanced Null Analysis for Java 8</description>
- <url>https://repo.eclipse.org/content/repositories/eclipse-releases/org/eclipse/jdt/org.eclipse.jdt.annotation</url>
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <url>http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/tree/org.eclipse.jdt.annotation</url>
- </scm>
- <developers>
- <developer>
- <name>Tom Schindl</name>
- <organization>Eclipse.org</organization>
- <roles>
- <role>contributor</role>
- </roles>
- </developer>
- </developers>
-</project> \ No newline at end of file
diff --git a/releng/maven-deploy/publish.sh b/releng/maven-deploy/publish.sh
deleted file mode 100644
index 8ca7efad7..000000000
--- a/releng/maven-deploy/publish.sh
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/bin/sh
-
-MAVEN=/Users/tomschindl/Applications/apache-maven-3.2.5/bin/mvn
-ASSEMBLY_ZIP=/tmp/site_assembly.zip
-ASSEMBLY_ROOT=/tmp/site_assembly/plugins
-REPO_ID=sonatype
-REPO_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
-
-## ----------------------------------------------------------------
-## org.eclipse.jdt.annotation
-## ----------------------------------------------------------------
-
-POM=/Users/tomschindl/git/efxclipse/releng/maven-deploy/platform/jdt_annotation.xml
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=$POM \
- -Dfile=$ASSEMBLY_ROOT/org.eclipse.jdt.annotation_2.0.100.v20150311-1658.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL
-
-## FIXME Needs to be in target
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=$POM \
- -Dfile=/Users/tomschindl/Applications/Eclipse/Eclipse.app/Contents/Eclipse/plugins/org.eclipse.jdt.annotation.source_2.0.100.v20150311-1658.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL \
- -Dclassifier=sources
-
-rm -rf /tmp/javadoc
-mkdir /tmp/javadoc
-javadoc -d /tmp/javadoc -sourcepath /Users/tomschindl/Applications/Eclipse/Eclipse.app/Contents/Eclipse/plugins/org.eclipse.jdt.annotation.source_2.0.100.v20150311-1658.jar -subpackages org.eclipse.jdt.annotation
-cd /tmp/javadoc
-zip -r javadoc.jar *
-
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=/Users/tomschindl/git/efxclipse/releng/maven-deploy/platform/jdt_annotation.xml \
- -Dfile=/tmp/javadoc/javadoc.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL \
- -Dclassifier=javadoc
-
-cd -
-
-
-## ----------------------------------------------------------------
-## org.eclipse.fx.core
-## ----------------------------------------------------------------
-
-POM=/Users/tomschindl/git/efxclipse/releng/maven-deploy/efxclipse/core.xml
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=$POM \
- -Dfile=$ASSEMBLY_ROOT/org.eclipse.fx.core_2.0.0.201506240602.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL
-
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=/Users/tomschindl/git/efxclipse/releng/maven-deploy/efxclipse/core.xml \
- -Dfile=$ASSEMBLY_ROOT/org.eclipse.fx.core.source_2.0.0.201506240602.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL \
- -Dclassifier=sources
-
-rm -rf /tmp/javadoc
-mkdir /tmp/javadoc
-javadoc -d /tmp/javadoc -sourcepath $ASSEMBLY_ROOT/org.eclipse.fx.core.source_2.0.0.201506240602.jar -subpackages org.eclipse.fx.core
-cd /tmp/javadoc
-zip -r javadoc.jar *
-
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=/Users/tomschindl/git/efxclipse/releng/maven-deploy/efxclipse/core.xml \
- -Dfile=/tmp/javadoc/javadoc.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL \
- -Dclassifier=javadoc
-
-cd -
-
-
-## ----------------------------------------------------------------
-## org.eclipse.fx.ui.panes
-## ----------------------------------------------------------------
-
-POM=/Users/tomschindl/git/efxclipse/releng/maven-deploy/efxclipse/panes.xml
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=$POM \
- -Dfile=$ASSEMBLY_ROOT/org.eclipse.fx.ui.panes_2.0.0.201506240602.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL
-
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=$POM \
- -Dfile=$ASSEMBLY_ROOT/org.eclipse.fx.ui.panes.source_2.0.0.201506240602.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL \
- -Dclassifier=sources
-
-rm -rf /tmp/javadoc
-mkdir /tmp/javadoc
-javadoc -d /tmp/javadoc -sourcepath $ASSEMBLY_ROOT/org.eclipse.fx.ui.panes.source_2.0.0.201506240602.jar -subpackages org.eclipse.fx.ui.panes
-cd /tmp/javadoc
-zip -r javadoc.jar *
-
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=$POM \
- -Dfile=/tmp/javadoc/javadoc.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL \
- -Dclassifier=javadoc
-
-cd -
-
-## ----------------------------------------------------------------
-## org.eclipse.fx.ui.animation
-## ----------------------------------------------------------------
-
-POM=/Users/tomschindl/git/efxclipse/releng/maven-deploy/efxclipse/animation.xml
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=$POM \
- -Dfile=$ASSEMBLY_ROOT/org.eclipse.fx.ui.animation_2.0.0.201506240602.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL
-
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=$POM \
- -Dfile=$ASSEMBLY_ROOT/org.eclipse.fx.ui.animation.source_2.0.0.201506240602.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL \
- -Dclassifier=sources
-
-rm -rf /tmp/javadoc
-mkdir /tmp/javadoc
-javadoc -d /tmp/javadoc -sourcepath $ASSEMBLY_ROOT/org.eclipse.fx.ui.animation.source_2.0.0.201506240602.jar -subpackages org.eclipse.fx.ui.animation
-cd /tmp/javadoc
-zip -r javadoc.jar *
-
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=$POM \
- -Dfile=/tmp/javadoc/javadoc.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL \
- -Dclassifier=javadoc
-
-cd -
-
-
-## ----------------------------------------------------------------
-## org.eclipse.fx.ui.controls
-## ----------------------------------------------------------------
-
-POM=/Users/tomschindl/git/efxclipse/releng/maven-deploy/efxclipse/controls.xml
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=$POM \
- -Dfile=$ASSEMBLY_ROOT/org.eclipse.fx.ui.controls_2.0.0.201506240602.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL
-
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=$POM \
- -Dfile=$ASSEMBLY_ROOT/org.eclipse.fx.ui.controls.source_2.0.0.201506240602.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL \
- -Dclassifier=sources
-
-rm -rf /tmp/javadoc
-mkdir /tmp/javadoc
-javadoc -d /tmp/javadoc -sourcepath $ASSEMBLY_ROOT/org.eclipse.fx.ui.controls.source_2.0.0.201506240602.jar -subpackages org.eclipse.fx.ui.controls
-cd /tmp/javadoc
-zip -r javadoc.jar *
-
-$MAVEN gpg:sign-and-deploy-file \
- -DpomFile=$POM \
- -Dfile=/tmp/javadoc/javadoc.jar \
- -DrepositoryId=$REPO_ID \
- -Durl=$REPO_URL \
- -Dclassifier=javadoc
-
-cd -
diff --git a/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi b/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi
index a9ddd2163..ac30a18f7 100755
--- a/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi
+++ b/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi
@@ -39,7 +39,12 @@
<children xsi:type="basic:Part" xmi:id="_cjVs4OL-EeGP-5z69KadAQ" elementId="org.eclipse.fx.testcases.e4.part.1" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.parts.ContentPanel" label="C1">
<tags>Part-ToolBarMenu-Floating</tags>
<toolbar xmi:id="_QPi6AIHxEeKxavJ0U4_mHQ" elementId="org.eclipse.fx.testcases.e4.toolbar.4">
- <children xsi:type="menu:DirectToolItem" xmi:id="_QxE5wIHxEeKxavJ0U4_mHQ" elementId="org.eclipse.fx.testcases.e4.directtoolitem.8" label="DI" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.DiHandler2"/>
+ <children xsi:type="menu:DirectToolItem" xmi:id="_zFeR4E1YEeWIZtt-ld8_6A" elementId="org.eclipse.fx.testcases.e4.directtoolitem.testradio" label="Test Radio" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.DiHandler2">
+ <menu xmi:id="_1o4p0E1YEeWIZtt-ld8_6A" elementId="org.eclipse.fx.testcases.e4.menu.11">
+ <children xsi:type="menu:DirectMenuItem" xmi:id="_2u0XIE1YEeWIZtt-ld8_6A" elementId="org.eclipse.fx.testcases.e4.directmenuitem.r1" label="R1" type="Radio" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.DiHandler2"/>
+ <children xsi:type="menu:DirectMenuItem" xmi:id="_4VJbwE1YEeWIZtt-ld8_6A" elementId="org.eclipse.fx.testcases.e4.directmenuitem.r2" label="R2" type="Radio" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.DiHandler2"/>
+ </menu>
+ </children>
</toolbar>
</children>
<children xsi:type="basic:Part" xmi:id="_f5-RgOL-EeGP-5z69KadAQ" elementId="org.eclipse.fx.testcases.e4.part.2" toBeRendered="false" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.parts.ContentPanel" label="C2" closeable="true"/>

Back to the top