diff --git a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/AbstractRDLIdeModule.java b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/AbstractRDLIdeModule.java index 5d00628..4e8f83a 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/AbstractRDLIdeModule.java +++ b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/AbstractRDLIdeModule.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.ide; @@ -15,6 +15,9 @@ import org.eclipse.xtext.ide.editor.contentassist.IProposalConflictHelper; import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper; import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; +import org.eclipse.xtext.ide.refactoring.IRenameStrategy2; +import org.eclipse.xtext.ide.server.rename.IRenameService; +import org.eclipse.xtext.ide.server.rename.RenameService; /** * Manual modifications go to {@link RDLIdeModule}. @@ -44,4 +47,14 @@ public abstract class AbstractRDLIdeModule extends DefaultIdeModule { return FQNPrefixMatcher.class; } + // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 + public Class bindIRenameService() { + return RenameService.class; + } + + // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 + public Class bindIRenameStrategy2() { + return IRenameStrategy2.DefaultImpl.class; + } + } diff --git a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/PartialRDLContentAssistParser.java b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/PartialRDLContentAssistParser.java index e33a07f..ee8119a 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/PartialRDLContentAssistParser.java +++ b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/PartialRDLContentAssistParser.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.ide.contentassist.antlr; diff --git a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/RDLParser.java b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/RDLParser.java index dd7cf28..4aa30e8 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/RDLParser.java +++ b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/RDLParser.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.ide.contentassist.antlr; diff --git a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.g b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.g index db3853c..021699e 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.g +++ b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.g @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ grammar InternalRDL; diff --git a/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml b/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml index 5b73f16..f3f7a2e 100644 --- a/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml +++ b/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml @@ -25,393 +25,6 @@ id="org.eclipse.rcp" version="0.0.0"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/com.minres.rdl.parent/com.minres.rdl.standalone/.classpath b/com.minres.rdl.parent/com.minres.rdl.standalone/.classpath index 7ef76c3..6c43b38 100644 --- a/com.minres.rdl.parent/com.minres.rdl.standalone/.classpath +++ b/com.minres.rdl.parent/com.minres.rdl.standalone/.classpath @@ -12,11 +12,7 @@ - - - - - + diff --git a/com.minres.rdl.parent/com.minres.rdl.standalone/.settings/org.eclipse.jdt.core.prefs b/com.minres.rdl.parent/com.minres.rdl.standalone/.settings/org.eclipse.jdt.core.prefs index abec6ca..6e80039 100644 --- a/com.minres.rdl.parent/com.minres.rdl.standalone/.settings/org.eclipse.jdt.core.prefs +++ b/com.minres.rdl.parent/com.minres.rdl.standalone/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,8 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +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.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target b/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target index 1d2613f..39c58db 100644 --- a/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target +++ b/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target @@ -1,25 +1,28 @@ - + - + - + - - - - + - - - - + + + + + + + + + + - + \ No newline at end of file diff --git a/com.minres.rdl.parent/com.minres.rdl.tests/META-INF/MANIFEST.MF b/com.minres.rdl.parent/com.minres.rdl.tests/META-INF/MANIFEST.MF index f5a2cd3..6bea19e 100644 --- a/com.minres.rdl.parent/com.minres.rdl.tests/META-INF/MANIFEST.MF +++ b/com.minres.rdl.parent/com.minres.rdl.tests/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: com.minres.rdl, org.junit;bundle-version="4.12.0", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing, - org.eclipse.xtext.xbase.lib + org.eclipse.xtext.xbase.lib;bundle-version="2.13.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: com.minres.rdl.tests;x-internal=true Import-Package: org.hamcrest.core, diff --git a/com.minres.rdl.parent/com.minres.rdl.tests/src-gen/com/minres/rdl/tests/RDLInjectorProvider.java b/com.minres.rdl.parent/com.minres.rdl.tests/src-gen/com/minres/rdl/tests/RDLInjectorProvider.java index 007050e..9ca35dc 100644 --- a/com.minres.rdl.parent/com.minres.rdl.tests/src-gen/com/minres/rdl/tests/RDLInjectorProvider.java +++ b/com.minres.rdl.parent/com.minres.rdl.tests/src-gen/com/minres/rdl/tests/RDLInjectorProvider.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.tests; diff --git a/com.minres.rdl.parent/com.minres.rdl.ui.tests/src-gen/com/minres/rdl/ui/tests/RDLUiInjectorProvider.java b/com.minres.rdl.parent/com.minres.rdl.ui.tests/src-gen/com/minres/rdl/ui/tests/RDLUiInjectorProvider.java index c0b6312..4987f0c 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui.tests/src-gen/com/minres/rdl/ui/tests/RDLUiInjectorProvider.java +++ b/com.minres.rdl.parent/com.minres.rdl.ui.tests/src-gen/com/minres/rdl/ui/tests/RDLUiInjectorProvider.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.ui.tests; diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF b/com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF index 06c5a1c..f98314b 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF +++ b/com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: com.minres.rdl, org.eclipse.compare, org.eclipse.xtext.builder, org.eclipse.xtend.lib;resolution:=optional, - org.eclipse.xtext.xbase.lib + org.eclipse.xtext.xbase.lib;bundle-version="2.13.0" Import-Package: org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: com.minres.rdl.ui.internal, diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/AbstractRDLUiModule.java b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/AbstractRDLUiModule.java index 0404f00..30ff6a4 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/AbstractRDLUiModule.java +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/AbstractRDLUiModule.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.ui; @@ -210,6 +210,13 @@ public abstract class AbstractRDLUiModule extends DefaultUiModule { return RDLProposalProvider.class; } + // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 + public void configureIPreferenceStoreInitializer(Binder binder) { + binder.bind(IPreferenceStoreInitializer.class) + .annotatedWith(Names.named("RefactoringPreferences")) + .to(RefactoringPreferences.Initializer.class); + } + // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 public Class bindIRenameStrategy() { return DefaultRenameStrategy.class; @@ -220,13 +227,6 @@ public abstract class AbstractRDLUiModule extends DefaultUiModule { return DefaultReferenceUpdater.class; } - // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 - public void configureIPreferenceStoreInitializer(Binder binder) { - binder.bind(IPreferenceStoreInitializer.class) - .annotatedWith(Names.named("RefactoringPreferences")) - .to(RefactoringPreferences.Initializer.class); - } - // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 public Class bindIRenameRefactoringProvider() { return DefaultRenameRefactoringProvider.class; diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/RDLExecutableExtensionFactory.java b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/RDLExecutableExtensionFactory.java index 039406d..b3551ab 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/RDLExecutableExtensionFactory.java +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/RDLExecutableExtensionFactory.java @@ -1,10 +1,11 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.ui; import com.google.inject.Injector; import com.minres.rdl.ui.internal.RdlActivator; +import org.eclipse.core.runtime.Platform; import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory; import org.osgi.framework.Bundle; @@ -16,12 +17,13 @@ public class RDLExecutableExtensionFactory extends AbstractGuiceAwareExecutableE @Override protected Bundle getBundle() { - return RdlActivator.getInstance().getBundle(); + return Platform.getBundle(RdlActivator.PLUGIN_ID); } @Override protected Injector getInjector() { - return RdlActivator.getInstance().getInjector(RdlActivator.COM_MINRES_RDL_RDL); + RdlActivator activator = RdlActivator.getInstance(); + return activator != null ? activator.getInjector(RdlActivator.COM_MINRES_RDL_RDL) : null; } - + } diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/contentassist/AbstractRDLProposalProvider.java b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/contentassist/AbstractRDLProposalProvider.java index 6df15ab..379ee8f 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/contentassist/AbstractRDLProposalProvider.java +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/contentassist/AbstractRDLProposalProvider.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.ui.contentassist; diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/internal/RdlActivator.java b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/internal/RdlActivator.java index be4c5ca..7f24c0b 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/internal/RdlActivator.java +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/internal/RdlActivator.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.ui.internal; @@ -23,6 +23,7 @@ import org.osgi.framework.BundleContext; */ public class RdlActivator extends AbstractUIPlugin { + public static final String PLUGIN_ID = "com.minres.rdl.ui"; public static final String COM_MINRES_RDL_RDL = "com.minres.rdl.RDL"; private static final Logger logger = Logger.getLogger(RdlActivator.class); @@ -90,4 +91,5 @@ public class RdlActivator extends AbstractUIPlugin { return new SharedStateModule(); } + } diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/RDLUiModule.java b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/RDLUiModule.java index f4a8c89..38135bf 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/RDLUiModule.java +++ b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/RDLUiModule.java @@ -25,7 +25,7 @@ public class RDLUiModule extends AbstractRDLUiModule { return RDLEObjectDocumentationProvider.class; } - public RDLUiModule(final AbstractUIPlugin arg0) { - super(arg0); + public RDLUiModule(final AbstractUIPlugin plugin) { + super(plugin); } } diff --git a/com.minres.rdl.parent/com.minres.rdl/META-INF/MANIFEST.MF b/com.minres.rdl.parent/com.minres.rdl/META-INF/MANIFEST.MF index 12071ea..4ed447a 100644 --- a/com.minres.rdl.parent/com.minres.rdl/META-INF/MANIFEST.MF +++ b/com.minres.rdl.parent/com.minres.rdl/META-INF/MANIFEST.MF @@ -9,10 +9,10 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.5.0", org.eclipse.emf.ecore, - org.eclipse.xtext.xbase.lib, + org.eclipse.xtext.xbase.lib;bundle-version="2.13.0", org.antlr.runtime, org.eclipse.xtext.util, - org.eclipse.xtend.lib, + org.eclipse.xtend.lib;bundle-version="2.13.0", org.eclipse.emf.common, org.eclipse.equinox.preferences Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/com.minres.rdl.parent/com.minres.rdl/model/generated/RDL.genmodel b/com.minres.rdl.parent/com.minres.rdl/model/generated/RDL.genmodel index c6cabcc..ad0b2bd 100644 --- a/com.minres.rdl.parent/com.minres.rdl/model/generated/RDL.genmodel +++ b/com.minres.rdl.parent/com.minres.rdl/model/generated/RDL.genmodel @@ -1,6 +1,6 @@ diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/AbstractRDLRuntimeModule.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/AbstractRDLRuntimeModule.java index 78b1008..641f7b2 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/AbstractRDLRuntimeModule.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/AbstractRDLRuntimeModule.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/RDLStandaloneSetupGenerated.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/RDLStandaloneSetupGenerated.java index a0e99ec..91e6fe2 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/RDLStandaloneSetupGenerated.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/RDLStandaloneSetupGenerated.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/RDLAntlrTokenFileProvider.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/RDLAntlrTokenFileProvider.java index 8381355..f817cfe 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/RDLAntlrTokenFileProvider.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/RDLAntlrTokenFileProvider.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.parser.antlr; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/RDLParser.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/RDLParser.java index b15ee91..8779abc 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/RDLParser.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/RDLParser.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.parser.antlr; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDL.g b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDL.g index b7b55c5..22be1f4 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDL.g +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDL.g @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ grammar InternalRDL; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ComponentDefinition.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ComponentDefinition.java index eed8502..7ed2f42 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ComponentDefinition.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ComponentDefinition.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ComponentDefinitionType.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ComponentDefinitionType.java index 31141da..b6f26d6 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ComponentDefinitionType.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ComponentDefinitionType.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ComponentInstance.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ComponentInstance.java index ed2e6fb..8a16106 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ComponentInstance.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ComponentInstance.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Concat.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Concat.java index 50d3d46..bf3446d 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Concat.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Concat.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ConcatElem.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ConcatElem.java index d509f16..1eb2165 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ConcatElem.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ConcatElem.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/DefaultProperyAssignment.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/DefaultProperyAssignment.java index 31b2985..ee88330 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/DefaultProperyAssignment.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/DefaultProperyAssignment.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Entity.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Entity.java index 4290198..9cff1dd 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Entity.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Entity.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumBody.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumBody.java index 676139a..014cb21 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumBody.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumBody.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumDefinition.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumDefinition.java index 4cb38e0..0069d30 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumDefinition.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumDefinition.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumEntry.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumEntry.java index d988ff6..3c35a85 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumEntry.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumEntry.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumInstanceType.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumInstanceType.java index cb05e7e..5795567 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumInstanceType.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumInstanceType.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumProperty.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumProperty.java index 881d27c..312328c 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumProperty.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/EnumProperty.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ExplicitPropertyAssignment.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ExplicitPropertyAssignment.java index 98e6ed8..cc99552 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ExplicitPropertyAssignment.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/ExplicitPropertyAssignment.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Include.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Include.java index 79dca21..a0700be 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Include.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Include.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/InstancePropertyRef.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/InstancePropertyRef.java index 90dc246..e4f65ce 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/InstancePropertyRef.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/InstancePropertyRef.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/InstanceRef.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/InstanceRef.java index ca64679..61594cd 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/InstanceRef.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/InstanceRef.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Instantiation.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Instantiation.java index 564736d..b95d67a 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Instantiation.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Instantiation.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PostPropertyAssignment.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PostPropertyAssignment.java index 6fe7b48..4ccc103 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PostPropertyAssignment.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PostPropertyAssignment.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyAssignment.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyAssignment.java index 5fa9bc2..453a7de 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyAssignment.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyAssignment.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyAssignmentRhs.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyAssignmentRhs.java index e1886f2..10212a7 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyAssignmentRhs.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyAssignmentRhs.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyComponent.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyComponent.java index 9616d30..66fa172 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyComponent.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyComponent.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyDefault.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyDefault.java index b9d3729..2f95c24 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyDefault.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyDefault.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyDefinition.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyDefinition.java index b4415e9..1ce7b6e 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyDefinition.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyDefinition.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyEnum.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyEnum.java index 3cc35ef..33f006d 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyEnum.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyEnum.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyModifier.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyModifier.java index e911557..22e8f83 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyModifier.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyModifier.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyTypeName.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyTypeName.java index 34cd303..f427481 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyTypeName.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyTypeName.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyUsage.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyUsage.java index ce6da71..40abda3 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyUsage.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/PropertyUsage.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RValue.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RValue.java index f5c262f..4b26037 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RValue.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RValue.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RValueConstant.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RValueConstant.java index db05d42..072b393 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RValueConstant.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RValueConstant.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Range.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Range.java index 37f307a..6345810 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Range.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Range.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RdlFactory.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RdlFactory.java index da2e893..ce34a90 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RdlFactory.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RdlFactory.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RdlPackage.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RdlPackage.java index 015b0a6..c43b310 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RdlPackage.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/RdlPackage.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Root.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Root.java index a68fe25..9d8ef96 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Root.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/Root.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentDefinitionImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentDefinitionImpl.java index e8ec30c..5b6c974 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentDefinitionImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentDefinitionImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentInstanceImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentInstanceImpl.java index ae038c6..3b9fad5 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentInstanceImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentInstanceImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ConcatElemImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ConcatElemImpl.java index 03f92ab..647ff32 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ConcatElemImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ConcatElemImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ConcatImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ConcatImpl.java index 5f0e58e..ddc06c3 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ConcatImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ConcatImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/DefaultProperyAssignmentImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/DefaultProperyAssignmentImpl.java index c3eb89b..b25f602 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/DefaultProperyAssignmentImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/DefaultProperyAssignmentImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EntityImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EntityImpl.java index c071b6e..26f6e1d 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EntityImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EntityImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumBodyImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumBodyImpl.java index 70dc047..8f33673 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumBodyImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumBodyImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumDefinitionImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumDefinitionImpl.java index da4fc13..5f0262d 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumDefinitionImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumDefinitionImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumEntryImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumEntryImpl.java index 9169c46..b90ecbd 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumEntryImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumEntryImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumInstanceTypeImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumInstanceTypeImpl.java index e5935ee..bff7f3e 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumInstanceTypeImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumInstanceTypeImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumPropertyImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumPropertyImpl.java index 8b564e8..76685b7 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumPropertyImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumPropertyImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ExplicitPropertyAssignmentImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ExplicitPropertyAssignmentImpl.java index b631f6f..eb6cb71 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ExplicitPropertyAssignmentImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ExplicitPropertyAssignmentImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/IncludeImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/IncludeImpl.java index 2f1e281..053e8bf 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/IncludeImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/IncludeImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstancePropertyRefImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstancePropertyRefImpl.java index 710b457..8edd37a 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstancePropertyRefImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstancePropertyRefImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstanceRefImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstanceRefImpl.java index dbc57b0..df78bf3 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstanceRefImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstanceRefImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstantiationImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstantiationImpl.java index 1dcd600..bf839c2 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstantiationImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstantiationImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PostPropertyAssignmentImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PostPropertyAssignmentImpl.java index ecef2d4..4f313cb 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PostPropertyAssignmentImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PostPropertyAssignmentImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyAssignmentImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyAssignmentImpl.java index c77cea9..6dd429d 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyAssignmentImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyAssignmentImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyAssignmentRhsImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyAssignmentRhsImpl.java index 0f331c4..19bffca 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyAssignmentRhsImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyAssignmentRhsImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefaultImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefaultImpl.java index 1a76f4c..4eea5c6 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefaultImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefaultImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefinitionImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefinitionImpl.java index 98b6551..9bfbcf2 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefinitionImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefinitionImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyUsageImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyUsageImpl.java index 1360213..336ce4a 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyUsageImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyUsageImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RValueImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RValueImpl.java index 5a5d8c8..a8e2ba1 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RValueImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RValueImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RangeImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RangeImpl.java index 94f0bb1..d93274b 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RangeImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RangeImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RdlFactoryImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RdlFactoryImpl.java index 00aa45f..97a993f 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RdlFactoryImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RdlFactoryImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RdlPackageImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RdlPackageImpl.java index 7cfc1b6..8e3a08b 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RdlPackageImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RdlPackageImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RootImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RootImpl.java index 7710d5e..89ef3cd 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RootImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RootImpl.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.impl; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/util/RdlAdapterFactory.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/util/RdlAdapterFactory.java index d20165e..c21c296 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/util/RdlAdapterFactory.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/util/RdlAdapterFactory.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.util; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/util/RdlSwitch.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/util/RdlSwitch.java index e8c2047..4800aa0 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/util/RdlSwitch.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/util/RdlSwitch.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.rdl.util; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/scoping/AbstractRDLScopeProvider.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/scoping/AbstractRDLScopeProvider.java index 148e43a..81465f6 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/scoping/AbstractRDLScopeProvider.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/scoping/AbstractRDLScopeProvider.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.scoping; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/serializer/RDLSemanticSequencer.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/serializer/RDLSemanticSequencer.java index f2ca164..e10db5d 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/serializer/RDLSemanticSequencer.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/serializer/RDLSemanticSequencer.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.serializer; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/serializer/RDLSyntacticSequencer.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/serializer/RDLSyntacticSequencer.java index c48de30..e3b22f5 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/serializer/RDLSyntacticSequencer.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/serializer/RDLSyntacticSequencer.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.serializer; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/services/RDLGrammarAccess.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/services/RDLGrammarAccess.java index 8e05c9c..fcee2c0 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/services/RDLGrammarAccess.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/services/RDLGrammarAccess.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.services; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/validation/AbstractRDLValidator.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/validation/AbstractRDLValidator.java index 5a07d9b..524e767 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/validation/AbstractRDLValidator.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/validation/AbstractRDLValidator.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.13.0 */ package com.minres.rdl.validation; diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RDL.xtext b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RDL.xtext index be9194a..b12a655 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RDL.xtext +++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RDL.xtext @@ -61,7 +61,8 @@ enum ComponentDefinitionType: Instantiation: ( - instanceType=EnumInstanceType? ("alias" alias=ID)? componentRef=[ComponentDefinition]| component=ComponentDefinition instanceType=EnumInstanceType? + instanceType=EnumInstanceType? ("alias" alias=ID)? + componentRef=[ComponentDefinition] | component=ComponentDefinition instanceType=EnumInstanceType? ) componentInstances+=ComponentInstance (',' componentInstances+=ComponentInstance)* ; diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/preferences/PreferenceInitializer.java b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/preferences/PreferenceInitializer.java index 5e0460f..8bf8d83 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/preferences/PreferenceInitializer.java +++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/preferences/PreferenceInitializer.java @@ -1,7 +1,6 @@ package com.minres.rdl.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; -import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; /** @@ -16,7 +15,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { * initializeDefaultPreferences() */ public void initializeDefaultPreferences() { - IEclipsePreferences store = getPreferenceStore(); + IEclipsePreferences store = RdlPreferences.getPreferenceStore(); store.putBoolean(PreferenceConstants.P_GENERATE_CSV, true); String value = System.getProperty(PreferenceConstants.ADDRESSUNIT_PROP); if(value!=null){ @@ -34,8 +33,4 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { store.put(PreferenceConstants.P_ADDRESSUNIT, "byte"); } - public static IEclipsePreferences getPreferenceStore() { - return DefaultScope.INSTANCE.getNode(PreferenceConstants.SCOPE_NAME); - } - } diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/scoping/RDLScopeProvider.xtend b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/scoping/RDLScopeProvider.xtend index d304d51..f7639d5 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/scoping/RDLScopeProvider.xtend +++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/scoping/RDLScopeProvider.xtend @@ -5,7 +5,6 @@ package com.minres.rdl.scoping import com.minres.rdl.rdl.ComponentDefinition import com.minres.rdl.rdl.Root -import org.eclipse.emf.ecore.EObject import org.eclipse.xtext.EcoreUtil2 import org.eclipse.xtext.scoping.IScope import org.eclipse.xtext.scoping.Scopes diff --git a/com.minres.rdl.parent/pom.xml b/com.minres.rdl.parent/pom.xml index d108234..18d3afc 100644 --- a/com.minres.rdl.parent/pom.xml +++ b/com.minres.rdl.parent/pom.xml @@ -92,7 +92,8 @@ com.minres.rdl com.minres.rdl.target - ${project.version} + + 1.0.0-SNAPSHOT