diff options
| author | Tom Schindl | 2016-03-16 14:21:42 +0000 |
|---|---|---|
| committer | Tom Schindl | 2016-03-16 14:21:42 +0000 |
| commit | c012411794c3f0ae66df270d4f9b7affb895a3ad (patch) | |
| tree | 56386c8134312736edfb6ac5769f0f89fc2acffc /bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g | |
| parent | 63f338ab515119116616568c317c80a15dd72b48 (diff) | |
| parent | aa71c74f50697dada863b88cdbb5debd9f3334b1 (diff) | |
| download | org.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
Diffstat (limited to 'bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g')
| -rw-r--r-- | bundles/tooling/org.eclipse.fx.ide.gmodel/src-gen/org/eclipse/fx/ide/gmodel/parser/antlr/internal/InternalGModelDSL.g | 20 |
1 files changed, 10 insertions, 10 deletions
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"); } ) |