diff --git a/com.minres.rdl.parent/com.minres.rdl.feature/feature.xml b/com.minres.rdl.parent/com.minres.rdl.feature/feature.xml index 25da556..cb5ccc5 100644 --- a/com.minres.rdl.parent/com.minres.rdl.feature/feature.xml +++ b/com.minres.rdl.parent/com.minres.rdl.feature/feature.xml @@ -1,52 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.ide/META-INF/MANIFEST.MF b/com.minres.rdl.parent/com.minres.rdl.ide/META-INF/MANIFEST.MF index e537fb9..b5feab9 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ide/META-INF/MANIFEST.MF +++ b/com.minres.rdl.parent/com.minres.rdl.ide/META-INF/MANIFEST.MF @@ -1,4 +1,5 @@ Manifest-Version: 1.0 +Automatic-Module-Name: com.minres.rdl.ide Bundle-ManifestVersion: 2 Bundle-Name: com.minres.rdl.ide Bundle-Vendor: My Company diff --git a/com.minres.rdl.parent/com.minres.rdl.ide/pom.xml b/com.minres.rdl.parent/com.minres.rdl.ide/pom.xml index ba6e67e..e0f40fc 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ide/pom.xml +++ b/com.minres.rdl.parent/com.minres.rdl.ide/pom.xml @@ -9,12 +9,182 @@ com.minres.rdl.ide eclipse-plugin + + + log4j + log4j + 1.2.16 + + + org.eclipse.lsp4j + org.eclipse.lsp4j + 0.4.0 + + + org.ow2.asm + asm + 6.1.1 + + + org.ow2.asm + asm-commons + 6.1.1 + + + org.ow2.asm + asm-tree + 6.1.1 + + org.eclipse.xtend xtend-maven-plugin + + org.eclipse.tycho + target-platform-configuration + + consider + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.1 + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/libs + false + false + true + true + + com.ibm.icu, + org.apache.ant, + org.apache.commons.lang, + org.apache.commons.logging, + org.eclipse.core.commands, + org.eclipse.core.contenttype, + org.eclipse.core.expressions, + org.eclipse.core.filesystem, + org.eclipse.core.jobs, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.core.variables, + org.eclipse.debug.core, + org.eclipse.emf.codegen.ecore, + org.eclipse.emf.codegen, + org.eclipse.emf.mwe.core, + org.eclipse.emf.mwe.utils, + org.eclipse.emf.mwe2.lib, + org.eclipse.emf.mwe2.runtime, + org.eclipse.equinox.app, + org.eclipse.equinox.preferences, + org.eclipse.equinox.registry, + org.eclipse.jdt.core, + org.eclipse.jdt.debug, + org.eclipse.jdt.launching, + org.eclipse.text, + org.eclipse.xtend.typesystem.emf, + org.eclipse.xtend, + + + + + + + com.googlecode.addjars-maven-plugin + addjars-maven-plugin + 1.0.5 + + + package + + add-jars + + + + + ${project.build.directory}/libs + + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.0.0 + + + + org.eclipse.xtext.ide.server.ServerLauncher + + + plugin.properties + + + + + *:com.minres.rdl.ide-org.eclipse.lsp4j* + *:com.minres.rdl.ide-org.eclipse.xtext.xbase.lib* + *:com.minres.rdl.ide-org.eclipse.xtend.lib* + *:com.minres.rdl.ide-com.google.guava* + *:com.minres.rdl.ide-asm* + *:com.minres.rdl.ide-log4j* + *:com.minres.rdl.ide-org.objectweb.asm* + *:com.minres.rdl.ide-org.apache.log4j* + + + + + *:* + + META-INF/INDEX.LIST + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + .options + .api_description + *.profile + *.html + about.* + about_files/* + plugin.xml + modeling32.png + systembundle.properties + profile.list + **/*._trace + **/*.g + **/*.mwe2 + **/*.xtext + + + + true + ls + false + + + + package + + shade + + + + 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 4e8f83a..04e644e 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.13.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ide; 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 ee8119a..3b4dd45 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.13.0 + * generated by Xtext 2.14.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 4aa30e8..8d96d2e 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,23 +1,222 @@ /* - * generated by Xtext 2.13.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ide.contentassist.antlr; +import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; +import com.google.inject.Singleton; import com.minres.rdl.ide.contentassist.antlr.internal.InternalRDLParser; import com.minres.rdl.services.RDLGrammarAccess; -import java.util.HashMap; import java.util.Map; import org.eclipse.xtext.AbstractElement; import org.eclipse.xtext.ide.editor.contentassist.antlr.AbstractContentAssistParser; public class RDLParser extends AbstractContentAssistParser { + @Singleton + public static final class NameMappings { + + private final Map mappings; + + @Inject + public NameMappings(RDLGrammarAccess grammarAccess) { + ImmutableMap.Builder builder = ImmutableMap.builder(); + init(builder, grammarAccess); + this.mappings = builder.build(); + } + + public String getRuleName(AbstractElement element) { + return mappings.get(element); + } + + private static void init(ImmutableMap.Builder builder, RDLGrammarAccess grammarAccess) { + builder.put(grammarAccess.getRootAccess().getAlternatives(), "rule__Root__Alternatives"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getAlternatives_3(), "rule__PropertyDefinition__Alternatives_3"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getAlternatives_3_0_4(), "rule__PropertyDefinition__Alternatives_3_0_4"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getAlternatives_3_1_1(), "rule__PropertyDefinition__Alternatives_3_1_1"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getAlternatives_3_2_1(), "rule__PropertyDefinition__Alternatives_3_2_1"); + builder.put(grammarAccess.getPropertyDefaultAccess().getAlternatives_2(), "rule__PropertyDefault__Alternatives_2"); + builder.put(grammarAccess.getComponentDefinitionAccess().getAlternatives_3(), "rule__ComponentDefinition__Alternatives_3"); + builder.put(grammarAccess.getInstantiationAccess().getAlternatives_0(), "rule__Instantiation__Alternatives_0"); + builder.put(grammarAccess.getRangeAccess().getAlternatives_1(), "rule__Range__Alternatives_1"); + builder.put(grammarAccess.getPropertyAssignmentAccess().getAlternatives(), "rule__PropertyAssignment__Alternatives"); + builder.put(grammarAccess.getExplicitPropertyAssignmentAccess().getAlternatives(), "rule__ExplicitPropertyAssignment__Alternatives"); + builder.put(grammarAccess.getPostPropertyAssignmentAccess().getAlternatives_0(), "rule__PostPropertyAssignment__Alternatives_0"); + builder.put(grammarAccess.getPostPropertyAssignmentAccess().getAlternatives_0_0_2(), "rule__PostPropertyAssignment__Alternatives_0_0_2"); + builder.put(grammarAccess.getInstancePropertyRefAccess().getAlternatives_1_1(), "rule__InstancePropertyRef__Alternatives_1_1"); + builder.put(grammarAccess.getEntityAccess().getAlternatives(), "rule__Entity__Alternatives"); + builder.put(grammarAccess.getPropertyAssignmentRhsAccess().getAlternatives(), "rule__PropertyAssignmentRhs__Alternatives"); + builder.put(grammarAccess.getConcatElemAccess().getAlternatives(), "rule__ConcatElem__Alternatives"); + builder.put(grammarAccess.getPropertyRvalueConstantAccess().getAlternatives(), "rule__PropertyRvalueConstant__Alternatives"); + builder.put(grammarAccess.getEnumPropertyAccess().getAlternatives_0(), "rule__EnumProperty__Alternatives_0"); + builder.put(grammarAccess.getEnumInstanceTypeAccess().getAlternatives(), "rule__EnumInstanceType__Alternatives"); + builder.put(grammarAccess.getPropertyTypeNameAccess().getAlternatives(), "rule__PropertyTypeName__Alternatives"); + builder.put(grammarAccess.getPropertyComponentAccess().getAlternatives(), "rule__PropertyComponent__Alternatives"); + builder.put(grammarAccess.getComponentDefinitionTypeAccess().getAlternatives(), "rule__ComponentDefinitionType__Alternatives"); + builder.put(grammarAccess.getPropertyEnumAccess().getAlternatives(), "rule__PropertyEnum__Alternatives"); + builder.put(grammarAccess.getPropertyAccess().getAlternatives(), "rule__Property__Alternatives"); + builder.put(grammarAccess.getRValueConstantAccess().getAlternatives(), "rule__RValueConstant__Alternatives"); + builder.put(grammarAccess.getPropertyModifierAccess().getAlternatives(), "rule__PropertyModifier__Alternatives"); + builder.put(grammarAccess.getRootAccess().getGroup_1(), "rule__Root__Group_1__0"); + builder.put(grammarAccess.getRootAccess().getGroup_2(), "rule__Root__Group_2__0"); + builder.put(grammarAccess.getRootAccess().getGroup_3(), "rule__Root__Group_3__0"); + builder.put(grammarAccess.getRootAccess().getGroup_4(), "rule__Root__Group_4__0"); + builder.put(grammarAccess.getRootAccess().getGroup_5(), "rule__Root__Group_5__0"); + builder.put(grammarAccess.getIncludeAccess().getGroup(), "rule__Include__Group__0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getGroup(), "rule__PropertyDefinition__Group__0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_0(), "rule__PropertyDefinition__Group_3_0__0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_0_4_0(), "rule__PropertyDefinition__Group_3_0_4_0__0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_0_4_1(), "rule__PropertyDefinition__Group_3_0_4_1__0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_1(), "rule__PropertyDefinition__Group_3_1__0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_1_1_0(), "rule__PropertyDefinition__Group_3_1_1_0__0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_1_1_1(), "rule__PropertyDefinition__Group_3_1_1_1__0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_2(), "rule__PropertyDefinition__Group_3_2__0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_2_1_0(), "rule__PropertyDefinition__Group_3_2_1_0__0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_2_1_1(), "rule__PropertyDefinition__Group_3_2_1_1__0"); + builder.put(grammarAccess.getPropertyDefaultAccess().getGroup(), "rule__PropertyDefault__Group__0"); + builder.put(grammarAccess.getPropertyUsageAccess().getGroup(), "rule__PropertyUsage__Group__0"); + builder.put(grammarAccess.getPropertyUsageAccess().getGroup_3(), "rule__PropertyUsage__Group_3__0"); + builder.put(grammarAccess.getComponentDefinitionAccess().getGroup(), "rule__ComponentDefinition__Group__0"); + builder.put(grammarAccess.getComponentDefinitionAccess().getGroup_3_0(), "rule__ComponentDefinition__Group_3_0__0"); + builder.put(grammarAccess.getComponentDefinitionAccess().getGroup_3_1(), "rule__ComponentDefinition__Group_3_1__0"); + builder.put(grammarAccess.getComponentDefinitionAccess().getGroup_3_2(), "rule__ComponentDefinition__Group_3_2__0"); + builder.put(grammarAccess.getComponentDefinitionAccess().getGroup_3_3(), "rule__ComponentDefinition__Group_3_3__0"); + builder.put(grammarAccess.getInstantiationAccess().getGroup(), "rule__Instantiation__Group__0"); + builder.put(grammarAccess.getInstantiationAccess().getGroup_0_0(), "rule__Instantiation__Group_0_0__0"); + builder.put(grammarAccess.getInstantiationAccess().getGroup_0_0_1(), "rule__Instantiation__Group_0_0_1__0"); + builder.put(grammarAccess.getInstantiationAccess().getGroup_0_1(), "rule__Instantiation__Group_0_1__0"); + builder.put(grammarAccess.getInstantiationAccess().getGroup_2(), "rule__Instantiation__Group_2__0"); + builder.put(grammarAccess.getComponentInstanceAccess().getGroup(), "rule__ComponentInstance__Group__0"); + builder.put(grammarAccess.getComponentInstanceAccess().getGroup_2(), "rule__ComponentInstance__Group_2__0"); + builder.put(grammarAccess.getComponentInstanceAccess().getGroup_3(), "rule__ComponentInstance__Group_3__0"); + builder.put(grammarAccess.getComponentInstanceAccess().getGroup_4(), "rule__ComponentInstance__Group_4__0"); + builder.put(grammarAccess.getComponentInstanceAccess().getGroup_5(), "rule__ComponentInstance__Group_5__0"); + builder.put(grammarAccess.getRangeAccess().getGroup(), "rule__Range__Group__0"); + builder.put(grammarAccess.getRangeAccess().getGroup_1_0(), "rule__Range__Group_1_0__0"); + builder.put(grammarAccess.getDefaultProperyAssignmentAccess().getGroup(), "rule__DefaultProperyAssignment__Group__0"); + builder.put(grammarAccess.getExplicitPropertyAssignmentAccess().getGroup_0(), "rule__ExplicitPropertyAssignment__Group_0__0"); + builder.put(grammarAccess.getExplicitPropertyAssignmentAccess().getGroup_1(), "rule__ExplicitPropertyAssignment__Group_1__0"); + builder.put(grammarAccess.getExplicitPropertyAssignmentAccess().getGroup_1_1(), "rule__ExplicitPropertyAssignment__Group_1_1__0"); + builder.put(grammarAccess.getPostPropertyAssignmentAccess().getGroup(), "rule__PostPropertyAssignment__Group__0"); + builder.put(grammarAccess.getPostPropertyAssignmentAccess().getGroup_0_0(), "rule__PostPropertyAssignment__Group_0_0__0"); + builder.put(grammarAccess.getPostPropertyAssignmentAccess().getGroup_1(), "rule__PostPropertyAssignment__Group_1__0"); + builder.put(grammarAccess.getInstancePropertyRefAccess().getGroup(), "rule__InstancePropertyRef__Group__0"); + builder.put(grammarAccess.getInstancePropertyRefAccess().getGroup_1(), "rule__InstancePropertyRef__Group_1__0"); + builder.put(grammarAccess.getInstanceRefAccess().getGroup(), "rule__InstanceRef__Group__0"); + builder.put(grammarAccess.getInstanceRefAccess().getGroup_1(), "rule__InstanceRef__Group_1__0"); + builder.put(grammarAccess.getHierInstanceRefAccess().getGroup(), "rule__HierInstanceRef__Group__0"); + builder.put(grammarAccess.getHierInstanceRefAccess().getGroup_1(), "rule__HierInstanceRef__Group_1__0"); + builder.put(grammarAccess.getPropertyAssignmentRhsAccess().getGroup_2(), "rule__PropertyAssignmentRhs__Group_2__0"); + builder.put(grammarAccess.getConcatAccess().getGroup(), "rule__Concat__Group__0"); + builder.put(grammarAccess.getConcatAccess().getGroup_2(), "rule__Concat__Group_2__0"); + builder.put(grammarAccess.getEnumDefinitionAccess().getGroup(), "rule__EnumDefinition__Group__0"); + builder.put(grammarAccess.getEnumBodyAccess().getGroup(), "rule__EnumBody__Group__0"); + builder.put(grammarAccess.getEnumEntryAccess().getGroup(), "rule__EnumEntry__Group__0"); + builder.put(grammarAccess.getEnumEntryAccess().getGroup_3(), "rule__EnumEntry__Group_3__0"); + builder.put(grammarAccess.getEnumPropertyAccess().getGroup(), "rule__EnumProperty__Group__0"); + builder.put(grammarAccess.getEnumPropertyAccess().getGroup_0_0(), "rule__EnumProperty__Group_0_0__0"); + builder.put(grammarAccess.getEnumPropertyAccess().getGroup_0_1(), "rule__EnumProperty__Group_0_1__0"); + builder.put(grammarAccess.getRootAccess().getIncludesAssignment_0(), "rule__Root__IncludesAssignment_0"); + builder.put(grammarAccess.getRootAccess().getComponentDefinitionsAssignment_1_0(), "rule__Root__ComponentDefinitionsAssignment_1_0"); + builder.put(grammarAccess.getRootAccess().getEnumDefinitionsAssignment_2_0(), "rule__Root__EnumDefinitionsAssignment_2_0"); + builder.put(grammarAccess.getRootAccess().getInstantiationsAssignment_3_0(), "rule__Root__InstantiationsAssignment_3_0"); + builder.put(grammarAccess.getRootAccess().getPropertyAssignmentsAssignment_4_0(), "rule__Root__PropertyAssignmentsAssignment_4_0"); + builder.put(grammarAccess.getRootAccess().getPropertyDefinitionsAssignment_5_0(), "rule__Root__PropertyDefinitionsAssignment_5_0"); + builder.put(grammarAccess.getIncludeAccess().getImportURIAssignment_1(), "rule__Include__ImportURIAssignment_1"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getNameAssignment_1(), "rule__PropertyDefinition__NameAssignment_1"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getTypeAssignment_3_0_2(), "rule__PropertyDefinition__TypeAssignment_3_0_2"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getUsageAssignment_3_0_4_0_0(), "rule__PropertyDefinition__UsageAssignment_3_0_4_0_0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getDefaultAssignment_3_0_4_0_1(), "rule__PropertyDefinition__DefaultAssignment_3_0_4_0_1"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getDefaultAssignment_3_0_4_1_0(), "rule__PropertyDefinition__DefaultAssignment_3_0_4_1_0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getUsageAssignment_3_0_4_1_1(), "rule__PropertyDefinition__UsageAssignment_3_0_4_1_1"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getUsageAssignment_3_1_0(), "rule__PropertyDefinition__UsageAssignment_3_1_0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getTypeAssignment_3_1_1_0_2(), "rule__PropertyDefinition__TypeAssignment_3_1_1_0_2"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getDefaultAssignment_3_1_1_0_4(), "rule__PropertyDefinition__DefaultAssignment_3_1_1_0_4"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getDefaultAssignment_3_1_1_1_0(), "rule__PropertyDefinition__DefaultAssignment_3_1_1_1_0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getTypeAssignment_3_1_1_1_3(), "rule__PropertyDefinition__TypeAssignment_3_1_1_1_3"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getDefaultAssignment_3_2_0(), "rule__PropertyDefinition__DefaultAssignment_3_2_0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getTypeAssignment_3_2_1_0_2(), "rule__PropertyDefinition__TypeAssignment_3_2_1_0_2"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getUsageAssignment_3_2_1_0_4(), "rule__PropertyDefinition__UsageAssignment_3_2_1_0_4"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getUsageAssignment_3_2_1_1_0(), "rule__PropertyDefinition__UsageAssignment_3_2_1_1_0"); + builder.put(grammarAccess.getPropertyDefinitionAccess().getTypeAssignment_3_2_1_1_3(), "rule__PropertyDefinition__TypeAssignment_3_2_1_1_3"); + builder.put(grammarAccess.getPropertyDefaultAccess().getStringAssignment_2_0(), "rule__PropertyDefault__StringAssignment_2_0"); + builder.put(grammarAccess.getPropertyDefaultAccess().getValueAssignment_2_1(), "rule__PropertyDefault__ValueAssignment_2_1"); + builder.put(grammarAccess.getPropertyDefaultAccess().getStringAssignment_2_2(), "rule__PropertyDefault__StringAssignment_2_2"); + builder.put(grammarAccess.getPropertyDefaultAccess().getStringAssignment_2_3(), "rule__PropertyDefault__StringAssignment_2_3"); + builder.put(grammarAccess.getPropertyUsageAccess().getComponentsAssignment_2(), "rule__PropertyUsage__ComponentsAssignment_2"); + builder.put(grammarAccess.getPropertyUsageAccess().getComponentsAssignment_3_1(), "rule__PropertyUsage__ComponentsAssignment_3_1"); + builder.put(grammarAccess.getComponentDefinitionAccess().getTypeAssignment_0(), "rule__ComponentDefinition__TypeAssignment_0"); + builder.put(grammarAccess.getComponentDefinitionAccess().getNameAssignment_1(), "rule__ComponentDefinition__NameAssignment_1"); + builder.put(grammarAccess.getComponentDefinitionAccess().getComponentDefinitionsAssignment_3_0_0(), "rule__ComponentDefinition__ComponentDefinitionsAssignment_3_0_0"); + builder.put(grammarAccess.getComponentDefinitionAccess().getInstantiationsAssignment_3_1_0(), "rule__ComponentDefinition__InstantiationsAssignment_3_1_0"); + builder.put(grammarAccess.getComponentDefinitionAccess().getPropertyAssignmentsAssignment_3_2_0(), "rule__ComponentDefinition__PropertyAssignmentsAssignment_3_2_0"); + builder.put(grammarAccess.getComponentDefinitionAccess().getEnumDefinitionsAssignment_3_3_0(), "rule__ComponentDefinition__EnumDefinitionsAssignment_3_3_0"); + builder.put(grammarAccess.getInstantiationAccess().getInstanceTypeAssignment_0_0_0(), "rule__Instantiation__InstanceTypeAssignment_0_0_0"); + builder.put(grammarAccess.getInstantiationAccess().getAliasAssignment_0_0_1_1(), "rule__Instantiation__AliasAssignment_0_0_1_1"); + builder.put(grammarAccess.getInstantiationAccess().getComponentRefAssignment_0_0_2(), "rule__Instantiation__ComponentRefAssignment_0_0_2"); + builder.put(grammarAccess.getInstantiationAccess().getComponentAssignment_0_1_0(), "rule__Instantiation__ComponentAssignment_0_1_0"); + builder.put(grammarAccess.getInstantiationAccess().getInstanceTypeAssignment_0_1_1(), "rule__Instantiation__InstanceTypeAssignment_0_1_1"); + builder.put(grammarAccess.getInstantiationAccess().getComponentInstancesAssignment_1(), "rule__Instantiation__ComponentInstancesAssignment_1"); + builder.put(grammarAccess.getInstantiationAccess().getComponentInstancesAssignment_2_1(), "rule__Instantiation__ComponentInstancesAssignment_2_1"); + builder.put(grammarAccess.getComponentInstanceAccess().getNameAssignment_0(), "rule__ComponentInstance__NameAssignment_0"); + builder.put(grammarAccess.getComponentInstanceAccess().getRangeAssignment_1(), "rule__ComponentInstance__RangeAssignment_1"); + builder.put(grammarAccess.getComponentInstanceAccess().getResetAssignment_2_1(), "rule__ComponentInstance__ResetAssignment_2_1"); + builder.put(grammarAccess.getComponentInstanceAccess().getAddressAssignment_3_1(), "rule__ComponentInstance__AddressAssignment_3_1"); + builder.put(grammarAccess.getComponentInstanceAccess().getAddrIncAssignment_4_1(), "rule__ComponentInstance__AddrIncAssignment_4_1"); + builder.put(grammarAccess.getComponentInstanceAccess().getAddrModAssignment_5_1(), "rule__ComponentInstance__AddrModAssignment_5_1"); + builder.put(grammarAccess.getRangeAccess().getLeftAssignment_1_0_0(), "rule__Range__LeftAssignment_1_0_0"); + builder.put(grammarAccess.getRangeAccess().getRightAssignment_1_0_2(), "rule__Range__RightAssignment_1_0_2"); + builder.put(grammarAccess.getRangeAccess().getSizeAssignment_1_1(), "rule__Range__SizeAssignment_1_1"); + builder.put(grammarAccess.getExplicitPropertyAssignmentAccess().getModifierAssignment_0_0(), "rule__ExplicitPropertyAssignment__ModifierAssignment_0_0"); + builder.put(grammarAccess.getExplicitPropertyAssignmentAccess().getNameAssignment_0_1(), "rule__ExplicitPropertyAssignment__NameAssignment_0_1"); + builder.put(grammarAccess.getExplicitPropertyAssignmentAccess().getNameAssignment_1_0(), "rule__ExplicitPropertyAssignment__NameAssignment_1_0"); + builder.put(grammarAccess.getExplicitPropertyAssignmentAccess().getRhsAssignment_1_1_1(), "rule__ExplicitPropertyAssignment__RhsAssignment_1_1_1"); + builder.put(grammarAccess.getPostPropertyAssignmentAccess().getInstanceAssignment_0_0_0(), "rule__PostPropertyAssignment__InstanceAssignment_0_0_0"); + builder.put(grammarAccess.getPostPropertyAssignmentAccess().getPropertyEnumAssignment_0_0_2_0(), "rule__PostPropertyAssignment__PropertyEnumAssignment_0_0_2_0"); + builder.put(grammarAccess.getPostPropertyAssignmentAccess().getPropertyAssignment_0_0_2_1(), "rule__PostPropertyAssignment__PropertyAssignment_0_0_2_1"); + builder.put(grammarAccess.getPostPropertyAssignmentAccess().getPropertyAssignment_0_1(), "rule__PostPropertyAssignment__PropertyAssignment_0_1"); + builder.put(grammarAccess.getPostPropertyAssignmentAccess().getRhsAssignment_1_1(), "rule__PostPropertyAssignment__RhsAssignment_1_1"); + builder.put(grammarAccess.getInstancePropertyRefAccess().getInstanceAssignment_0(), "rule__InstancePropertyRef__InstanceAssignment_0"); + builder.put(grammarAccess.getInstancePropertyRefAccess().getPropertyEnumAssignment_1_1_0(), "rule__InstancePropertyRef__PropertyEnumAssignment_1_1_0"); + builder.put(grammarAccess.getInstancePropertyRefAccess().getPropertyAssignment_1_1_1(), "rule__InstancePropertyRef__PropertyAssignment_1_1_1"); + builder.put(grammarAccess.getInstanceRefAccess().getInstanceAssignment_0(), "rule__InstanceRef__InstanceAssignment_0"); + builder.put(grammarAccess.getInstanceRefAccess().getTailAssignment_1_1(), "rule__InstanceRef__TailAssignment_1_1"); + builder.put(grammarAccess.getHierInstanceRefAccess().getInstanceAssignment_0(), "rule__HierInstanceRef__InstanceAssignment_0"); + builder.put(grammarAccess.getHierInstanceRefAccess().getTailAssignment_1_1(), "rule__HierInstanceRef__TailAssignment_1_1"); + builder.put(grammarAccess.getPropertyAssignmentRhsAccess().getValueAssignment_0(), "rule__PropertyAssignmentRhs__ValueAssignment_0"); + builder.put(grammarAccess.getPropertyAssignmentRhsAccess().getInstPropRefAssignment_1(), "rule__PropertyAssignmentRhs__InstPropRefAssignment_1"); + builder.put(grammarAccess.getPropertyAssignmentRhsAccess().getEnumRefAssignment_2_0(), "rule__PropertyAssignmentRhs__EnumRefAssignment_2_0"); + builder.put(grammarAccess.getPropertyAssignmentRhsAccess().getEnumsAssignment_2_2(), "rule__PropertyAssignmentRhs__EnumsAssignment_2_2"); + builder.put(grammarAccess.getPropertyAssignmentRhsAccess().getElementsAssignment_3(), "rule__PropertyAssignmentRhs__ElementsAssignment_3"); + builder.put(grammarAccess.getConcatAccess().getElementsAssignment_1(), "rule__Concat__ElementsAssignment_1"); + builder.put(grammarAccess.getConcatAccess().getElementsAssignment_2_1(), "rule__Concat__ElementsAssignment_2_1"); + builder.put(grammarAccess.getConcatElemAccess().getInstPropRefAssignment_0(), "rule__ConcatElem__InstPropRefAssignment_0"); + builder.put(grammarAccess.getConcatElemAccess().getValueAssignment_1(), "rule__ConcatElem__ValueAssignment_1"); + builder.put(grammarAccess.getPropertyRvalueConstantAccess().getValAssignment_0(), "rule__PropertyRvalueConstant__ValAssignment_0"); + builder.put(grammarAccess.getPropertyRvalueConstantAccess().getNumAssignment_1(), "rule__PropertyRvalueConstant__NumAssignment_1"); + builder.put(grammarAccess.getPropertyRvalueConstantAccess().getStrAssignment_2(), "rule__PropertyRvalueConstant__StrAssignment_2"); + builder.put(grammarAccess.getEnumDefinitionAccess().getNameAssignment_1(), "rule__EnumDefinition__NameAssignment_1"); + builder.put(grammarAccess.getEnumDefinitionAccess().getBodyAssignment_2(), "rule__EnumDefinition__BodyAssignment_2"); + builder.put(grammarAccess.getEnumBodyAccess().getEntriesAssignment_2(), "rule__EnumBody__EntriesAssignment_2"); + builder.put(grammarAccess.getEnumEntryAccess().getNameAssignment_0(), "rule__EnumEntry__NameAssignment_0"); + builder.put(grammarAccess.getEnumEntryAccess().getIndexAssignment_2(), "rule__EnumEntry__IndexAssignment_2"); + builder.put(grammarAccess.getEnumEntryAccess().getPropertiesAssignment_3_1(), "rule__EnumEntry__PropertiesAssignment_3_1"); + builder.put(grammarAccess.getEnumPropertyAccess().getNameAssignment_0_0_0(), "rule__EnumProperty__NameAssignment_0_0_0"); + builder.put(grammarAccess.getEnumPropertyAccess().getValueAssignment_0_0_2(), "rule__EnumProperty__ValueAssignment_0_0_2"); + builder.put(grammarAccess.getEnumPropertyAccess().getNameAssignment_0_1_0(), "rule__EnumProperty__NameAssignment_0_1_0"); + builder.put(grammarAccess.getEnumPropertyAccess().getValueAssignment_0_1_2(), "rule__EnumProperty__ValueAssignment_0_1_2"); + builder.put(grammarAccess.getEnumInstanceTypeAccess().getEXTERNALAssignment_0(), "rule__EnumInstanceType__EXTERNALAssignment_0"); + builder.put(grammarAccess.getEnumInstanceTypeAccess().getINTERNALAssignment_1(), "rule__EnumInstanceType__INTERNALAssignment_1"); + } + } + + @Inject + private NameMappings nameMappings; + @Inject private RDLGrammarAccess grammarAccess; - private Map nameMappings; - @Override protected InternalRDLParser createParser() { InternalRDLParser result = new InternalRDLParser(null); @@ -27,193 +226,9 @@ public class RDLParser extends AbstractContentAssistParser { @Override protected String getRuleName(AbstractElement element) { - if (nameMappings == null) { - nameMappings = new HashMap() { - private static final long serialVersionUID = 1L; - { - put(grammarAccess.getRootAccess().getAlternatives(), "rule__Root__Alternatives"); - put(grammarAccess.getPropertyDefinitionAccess().getAlternatives_3(), "rule__PropertyDefinition__Alternatives_3"); - put(grammarAccess.getPropertyDefinitionAccess().getAlternatives_3_0_4(), "rule__PropertyDefinition__Alternatives_3_0_4"); - put(grammarAccess.getPropertyDefinitionAccess().getAlternatives_3_1_1(), "rule__PropertyDefinition__Alternatives_3_1_1"); - put(grammarAccess.getPropertyDefinitionAccess().getAlternatives_3_2_1(), "rule__PropertyDefinition__Alternatives_3_2_1"); - put(grammarAccess.getPropertyDefaultAccess().getAlternatives_2(), "rule__PropertyDefault__Alternatives_2"); - put(grammarAccess.getComponentDefinitionAccess().getAlternatives_3(), "rule__ComponentDefinition__Alternatives_3"); - put(grammarAccess.getInstantiationAccess().getAlternatives_0(), "rule__Instantiation__Alternatives_0"); - put(grammarAccess.getRangeAccess().getAlternatives_1(), "rule__Range__Alternatives_1"); - put(grammarAccess.getPropertyAssignmentAccess().getAlternatives(), "rule__PropertyAssignment__Alternatives"); - put(grammarAccess.getExplicitPropertyAssignmentAccess().getAlternatives(), "rule__ExplicitPropertyAssignment__Alternatives"); - put(grammarAccess.getPostPropertyAssignmentAccess().getAlternatives_0(), "rule__PostPropertyAssignment__Alternatives_0"); - put(grammarAccess.getPostPropertyAssignmentAccess().getAlternatives_0_0_2(), "rule__PostPropertyAssignment__Alternatives_0_0_2"); - put(grammarAccess.getInstancePropertyRefAccess().getAlternatives_1_1(), "rule__InstancePropertyRef__Alternatives_1_1"); - put(grammarAccess.getEntityAccess().getAlternatives(), "rule__Entity__Alternatives"); - put(grammarAccess.getPropertyAssignmentRhsAccess().getAlternatives(), "rule__PropertyAssignmentRhs__Alternatives"); - put(grammarAccess.getConcatElemAccess().getAlternatives(), "rule__ConcatElem__Alternatives"); - put(grammarAccess.getPropertyRvalueConstantAccess().getAlternatives(), "rule__PropertyRvalueConstant__Alternatives"); - put(grammarAccess.getEnumPropertyAccess().getAlternatives_0(), "rule__EnumProperty__Alternatives_0"); - put(grammarAccess.getEnumInstanceTypeAccess().getAlternatives(), "rule__EnumInstanceType__Alternatives"); - put(grammarAccess.getPropertyTypeNameAccess().getAlternatives(), "rule__PropertyTypeName__Alternatives"); - put(grammarAccess.getPropertyComponentAccess().getAlternatives(), "rule__PropertyComponent__Alternatives"); - put(grammarAccess.getComponentDefinitionTypeAccess().getAlternatives(), "rule__ComponentDefinitionType__Alternatives"); - put(grammarAccess.getPropertyEnumAccess().getAlternatives(), "rule__PropertyEnum__Alternatives"); - put(grammarAccess.getPropertyAccess().getAlternatives(), "rule__Property__Alternatives"); - put(grammarAccess.getRValueConstantAccess().getAlternatives(), "rule__RValueConstant__Alternatives"); - put(grammarAccess.getPropertyModifierAccess().getAlternatives(), "rule__PropertyModifier__Alternatives"); - put(grammarAccess.getRootAccess().getGroup_1(), "rule__Root__Group_1__0"); - put(grammarAccess.getRootAccess().getGroup_2(), "rule__Root__Group_2__0"); - put(grammarAccess.getRootAccess().getGroup_3(), "rule__Root__Group_3__0"); - put(grammarAccess.getRootAccess().getGroup_4(), "rule__Root__Group_4__0"); - put(grammarAccess.getRootAccess().getGroup_5(), "rule__Root__Group_5__0"); - put(grammarAccess.getIncludeAccess().getGroup(), "rule__Include__Group__0"); - put(grammarAccess.getPropertyDefinitionAccess().getGroup(), "rule__PropertyDefinition__Group__0"); - put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_0(), "rule__PropertyDefinition__Group_3_0__0"); - put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_0_4_0(), "rule__PropertyDefinition__Group_3_0_4_0__0"); - put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_0_4_1(), "rule__PropertyDefinition__Group_3_0_4_1__0"); - put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_1(), "rule__PropertyDefinition__Group_3_1__0"); - put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_1_1_0(), "rule__PropertyDefinition__Group_3_1_1_0__0"); - put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_1_1_1(), "rule__PropertyDefinition__Group_3_1_1_1__0"); - put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_2(), "rule__PropertyDefinition__Group_3_2__0"); - put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_2_1_0(), "rule__PropertyDefinition__Group_3_2_1_0__0"); - put(grammarAccess.getPropertyDefinitionAccess().getGroup_3_2_1_1(), "rule__PropertyDefinition__Group_3_2_1_1__0"); - put(grammarAccess.getPropertyDefaultAccess().getGroup(), "rule__PropertyDefault__Group__0"); - put(grammarAccess.getPropertyUsageAccess().getGroup(), "rule__PropertyUsage__Group__0"); - put(grammarAccess.getPropertyUsageAccess().getGroup_3(), "rule__PropertyUsage__Group_3__0"); - put(grammarAccess.getComponentDefinitionAccess().getGroup(), "rule__ComponentDefinition__Group__0"); - put(grammarAccess.getComponentDefinitionAccess().getGroup_3_0(), "rule__ComponentDefinition__Group_3_0__0"); - put(grammarAccess.getComponentDefinitionAccess().getGroup_3_1(), "rule__ComponentDefinition__Group_3_1__0"); - put(grammarAccess.getComponentDefinitionAccess().getGroup_3_2(), "rule__ComponentDefinition__Group_3_2__0"); - put(grammarAccess.getComponentDefinitionAccess().getGroup_3_3(), "rule__ComponentDefinition__Group_3_3__0"); - put(grammarAccess.getInstantiationAccess().getGroup(), "rule__Instantiation__Group__0"); - put(grammarAccess.getInstantiationAccess().getGroup_0_0(), "rule__Instantiation__Group_0_0__0"); - put(grammarAccess.getInstantiationAccess().getGroup_0_0_1(), "rule__Instantiation__Group_0_0_1__0"); - put(grammarAccess.getInstantiationAccess().getGroup_0_1(), "rule__Instantiation__Group_0_1__0"); - put(grammarAccess.getInstantiationAccess().getGroup_2(), "rule__Instantiation__Group_2__0"); - put(grammarAccess.getComponentInstanceAccess().getGroup(), "rule__ComponentInstance__Group__0"); - put(grammarAccess.getComponentInstanceAccess().getGroup_2(), "rule__ComponentInstance__Group_2__0"); - put(grammarAccess.getComponentInstanceAccess().getGroup_3(), "rule__ComponentInstance__Group_3__0"); - put(grammarAccess.getComponentInstanceAccess().getGroup_4(), "rule__ComponentInstance__Group_4__0"); - put(grammarAccess.getComponentInstanceAccess().getGroup_5(), "rule__ComponentInstance__Group_5__0"); - put(grammarAccess.getRangeAccess().getGroup(), "rule__Range__Group__0"); - put(grammarAccess.getRangeAccess().getGroup_1_0(), "rule__Range__Group_1_0__0"); - put(grammarAccess.getDefaultProperyAssignmentAccess().getGroup(), "rule__DefaultProperyAssignment__Group__0"); - put(grammarAccess.getExplicitPropertyAssignmentAccess().getGroup_0(), "rule__ExplicitPropertyAssignment__Group_0__0"); - put(grammarAccess.getExplicitPropertyAssignmentAccess().getGroup_1(), "rule__ExplicitPropertyAssignment__Group_1__0"); - put(grammarAccess.getExplicitPropertyAssignmentAccess().getGroup_1_1(), "rule__ExplicitPropertyAssignment__Group_1_1__0"); - put(grammarAccess.getPostPropertyAssignmentAccess().getGroup(), "rule__PostPropertyAssignment__Group__0"); - put(grammarAccess.getPostPropertyAssignmentAccess().getGroup_0_0(), "rule__PostPropertyAssignment__Group_0_0__0"); - put(grammarAccess.getPostPropertyAssignmentAccess().getGroup_1(), "rule__PostPropertyAssignment__Group_1__0"); - put(grammarAccess.getInstancePropertyRefAccess().getGroup(), "rule__InstancePropertyRef__Group__0"); - put(grammarAccess.getInstancePropertyRefAccess().getGroup_1(), "rule__InstancePropertyRef__Group_1__0"); - put(grammarAccess.getInstanceRefAccess().getGroup(), "rule__InstanceRef__Group__0"); - put(grammarAccess.getInstanceRefAccess().getGroup_1(), "rule__InstanceRef__Group_1__0"); - put(grammarAccess.getHierInstanceRefAccess().getGroup(), "rule__HierInstanceRef__Group__0"); - put(grammarAccess.getHierInstanceRefAccess().getGroup_1(), "rule__HierInstanceRef__Group_1__0"); - put(grammarAccess.getPropertyAssignmentRhsAccess().getGroup_2(), "rule__PropertyAssignmentRhs__Group_2__0"); - put(grammarAccess.getConcatAccess().getGroup(), "rule__Concat__Group__0"); - put(grammarAccess.getConcatAccess().getGroup_2(), "rule__Concat__Group_2__0"); - put(grammarAccess.getEnumDefinitionAccess().getGroup(), "rule__EnumDefinition__Group__0"); - put(grammarAccess.getEnumBodyAccess().getGroup(), "rule__EnumBody__Group__0"); - put(grammarAccess.getEnumEntryAccess().getGroup(), "rule__EnumEntry__Group__0"); - put(grammarAccess.getEnumEntryAccess().getGroup_3(), "rule__EnumEntry__Group_3__0"); - put(grammarAccess.getEnumPropertyAccess().getGroup(), "rule__EnumProperty__Group__0"); - put(grammarAccess.getEnumPropertyAccess().getGroup_0_0(), "rule__EnumProperty__Group_0_0__0"); - put(grammarAccess.getEnumPropertyAccess().getGroup_0_1(), "rule__EnumProperty__Group_0_1__0"); - put(grammarAccess.getRootAccess().getIncludesAssignment_0(), "rule__Root__IncludesAssignment_0"); - put(grammarAccess.getRootAccess().getComponentDefinitionsAssignment_1_0(), "rule__Root__ComponentDefinitionsAssignment_1_0"); - put(grammarAccess.getRootAccess().getEnumDefinitionsAssignment_2_0(), "rule__Root__EnumDefinitionsAssignment_2_0"); - put(grammarAccess.getRootAccess().getInstantiationsAssignment_3_0(), "rule__Root__InstantiationsAssignment_3_0"); - put(grammarAccess.getRootAccess().getPropertyAssignmentsAssignment_4_0(), "rule__Root__PropertyAssignmentsAssignment_4_0"); - put(grammarAccess.getRootAccess().getPropertyDefinitionsAssignment_5_0(), "rule__Root__PropertyDefinitionsAssignment_5_0"); - put(grammarAccess.getIncludeAccess().getImportURIAssignment_1(), "rule__Include__ImportURIAssignment_1"); - put(grammarAccess.getPropertyDefinitionAccess().getNameAssignment_1(), "rule__PropertyDefinition__NameAssignment_1"); - put(grammarAccess.getPropertyDefinitionAccess().getTypeAssignment_3_0_2(), "rule__PropertyDefinition__TypeAssignment_3_0_2"); - put(grammarAccess.getPropertyDefinitionAccess().getUsageAssignment_3_0_4_0_0(), "rule__PropertyDefinition__UsageAssignment_3_0_4_0_0"); - put(grammarAccess.getPropertyDefinitionAccess().getDefaultAssignment_3_0_4_0_1(), "rule__PropertyDefinition__DefaultAssignment_3_0_4_0_1"); - put(grammarAccess.getPropertyDefinitionAccess().getDefaultAssignment_3_0_4_1_0(), "rule__PropertyDefinition__DefaultAssignment_3_0_4_1_0"); - put(grammarAccess.getPropertyDefinitionAccess().getUsageAssignment_3_0_4_1_1(), "rule__PropertyDefinition__UsageAssignment_3_0_4_1_1"); - put(grammarAccess.getPropertyDefinitionAccess().getUsageAssignment_3_1_0(), "rule__PropertyDefinition__UsageAssignment_3_1_0"); - put(grammarAccess.getPropertyDefinitionAccess().getTypeAssignment_3_1_1_0_2(), "rule__PropertyDefinition__TypeAssignment_3_1_1_0_2"); - put(grammarAccess.getPropertyDefinitionAccess().getDefaultAssignment_3_1_1_0_4(), "rule__PropertyDefinition__DefaultAssignment_3_1_1_0_4"); - put(grammarAccess.getPropertyDefinitionAccess().getDefaultAssignment_3_1_1_1_0(), "rule__PropertyDefinition__DefaultAssignment_3_1_1_1_0"); - put(grammarAccess.getPropertyDefinitionAccess().getTypeAssignment_3_1_1_1_3(), "rule__PropertyDefinition__TypeAssignment_3_1_1_1_3"); - put(grammarAccess.getPropertyDefinitionAccess().getDefaultAssignment_3_2_0(), "rule__PropertyDefinition__DefaultAssignment_3_2_0"); - put(grammarAccess.getPropertyDefinitionAccess().getTypeAssignment_3_2_1_0_2(), "rule__PropertyDefinition__TypeAssignment_3_2_1_0_2"); - put(grammarAccess.getPropertyDefinitionAccess().getUsageAssignment_3_2_1_0_4(), "rule__PropertyDefinition__UsageAssignment_3_2_1_0_4"); - put(grammarAccess.getPropertyDefinitionAccess().getUsageAssignment_3_2_1_1_0(), "rule__PropertyDefinition__UsageAssignment_3_2_1_1_0"); - put(grammarAccess.getPropertyDefinitionAccess().getTypeAssignment_3_2_1_1_3(), "rule__PropertyDefinition__TypeAssignment_3_2_1_1_3"); - put(grammarAccess.getPropertyDefaultAccess().getStringAssignment_2_0(), "rule__PropertyDefault__StringAssignment_2_0"); - put(grammarAccess.getPropertyDefaultAccess().getValueAssignment_2_1(), "rule__PropertyDefault__ValueAssignment_2_1"); - put(grammarAccess.getPropertyDefaultAccess().getStringAssignment_2_2(), "rule__PropertyDefault__StringAssignment_2_2"); - put(grammarAccess.getPropertyDefaultAccess().getStringAssignment_2_3(), "rule__PropertyDefault__StringAssignment_2_3"); - put(grammarAccess.getPropertyUsageAccess().getComponentsAssignment_2(), "rule__PropertyUsage__ComponentsAssignment_2"); - put(grammarAccess.getPropertyUsageAccess().getComponentsAssignment_3_1(), "rule__PropertyUsage__ComponentsAssignment_3_1"); - put(grammarAccess.getComponentDefinitionAccess().getTypeAssignment_0(), "rule__ComponentDefinition__TypeAssignment_0"); - put(grammarAccess.getComponentDefinitionAccess().getNameAssignment_1(), "rule__ComponentDefinition__NameAssignment_1"); - put(grammarAccess.getComponentDefinitionAccess().getComponentDefinitionsAssignment_3_0_0(), "rule__ComponentDefinition__ComponentDefinitionsAssignment_3_0_0"); - put(grammarAccess.getComponentDefinitionAccess().getInstantiationsAssignment_3_1_0(), "rule__ComponentDefinition__InstantiationsAssignment_3_1_0"); - put(grammarAccess.getComponentDefinitionAccess().getPropertyAssignmentsAssignment_3_2_0(), "rule__ComponentDefinition__PropertyAssignmentsAssignment_3_2_0"); - put(grammarAccess.getComponentDefinitionAccess().getEnumDefinitionsAssignment_3_3_0(), "rule__ComponentDefinition__EnumDefinitionsAssignment_3_3_0"); - put(grammarAccess.getInstantiationAccess().getInstanceTypeAssignment_0_0_0(), "rule__Instantiation__InstanceTypeAssignment_0_0_0"); - put(grammarAccess.getInstantiationAccess().getAliasAssignment_0_0_1_1(), "rule__Instantiation__AliasAssignment_0_0_1_1"); - put(grammarAccess.getInstantiationAccess().getComponentRefAssignment_0_0_2(), "rule__Instantiation__ComponentRefAssignment_0_0_2"); - put(grammarAccess.getInstantiationAccess().getComponentAssignment_0_1_0(), "rule__Instantiation__ComponentAssignment_0_1_0"); - put(grammarAccess.getInstantiationAccess().getInstanceTypeAssignment_0_1_1(), "rule__Instantiation__InstanceTypeAssignment_0_1_1"); - put(grammarAccess.getInstantiationAccess().getComponentInstancesAssignment_1(), "rule__Instantiation__ComponentInstancesAssignment_1"); - put(grammarAccess.getInstantiationAccess().getComponentInstancesAssignment_2_1(), "rule__Instantiation__ComponentInstancesAssignment_2_1"); - put(grammarAccess.getComponentInstanceAccess().getNameAssignment_0(), "rule__ComponentInstance__NameAssignment_0"); - put(grammarAccess.getComponentInstanceAccess().getRangeAssignment_1(), "rule__ComponentInstance__RangeAssignment_1"); - put(grammarAccess.getComponentInstanceAccess().getResetAssignment_2_1(), "rule__ComponentInstance__ResetAssignment_2_1"); - put(grammarAccess.getComponentInstanceAccess().getAddressAssignment_3_1(), "rule__ComponentInstance__AddressAssignment_3_1"); - put(grammarAccess.getComponentInstanceAccess().getAddrIncAssignment_4_1(), "rule__ComponentInstance__AddrIncAssignment_4_1"); - put(grammarAccess.getComponentInstanceAccess().getAddrModAssignment_5_1(), "rule__ComponentInstance__AddrModAssignment_5_1"); - put(grammarAccess.getRangeAccess().getLeftAssignment_1_0_0(), "rule__Range__LeftAssignment_1_0_0"); - put(grammarAccess.getRangeAccess().getRightAssignment_1_0_2(), "rule__Range__RightAssignment_1_0_2"); - put(grammarAccess.getRangeAccess().getSizeAssignment_1_1(), "rule__Range__SizeAssignment_1_1"); - put(grammarAccess.getExplicitPropertyAssignmentAccess().getModifierAssignment_0_0(), "rule__ExplicitPropertyAssignment__ModifierAssignment_0_0"); - put(grammarAccess.getExplicitPropertyAssignmentAccess().getNameAssignment_0_1(), "rule__ExplicitPropertyAssignment__NameAssignment_0_1"); - put(grammarAccess.getExplicitPropertyAssignmentAccess().getNameAssignment_1_0(), "rule__ExplicitPropertyAssignment__NameAssignment_1_0"); - put(grammarAccess.getExplicitPropertyAssignmentAccess().getRhsAssignment_1_1_1(), "rule__ExplicitPropertyAssignment__RhsAssignment_1_1_1"); - put(grammarAccess.getPostPropertyAssignmentAccess().getInstanceAssignment_0_0_0(), "rule__PostPropertyAssignment__InstanceAssignment_0_0_0"); - put(grammarAccess.getPostPropertyAssignmentAccess().getPropertyEnumAssignment_0_0_2_0(), "rule__PostPropertyAssignment__PropertyEnumAssignment_0_0_2_0"); - put(grammarAccess.getPostPropertyAssignmentAccess().getPropertyAssignment_0_0_2_1(), "rule__PostPropertyAssignment__PropertyAssignment_0_0_2_1"); - put(grammarAccess.getPostPropertyAssignmentAccess().getPropertyAssignment_0_1(), "rule__PostPropertyAssignment__PropertyAssignment_0_1"); - put(grammarAccess.getPostPropertyAssignmentAccess().getRhsAssignment_1_1(), "rule__PostPropertyAssignment__RhsAssignment_1_1"); - put(grammarAccess.getInstancePropertyRefAccess().getInstanceAssignment_0(), "rule__InstancePropertyRef__InstanceAssignment_0"); - put(grammarAccess.getInstancePropertyRefAccess().getPropertyEnumAssignment_1_1_0(), "rule__InstancePropertyRef__PropertyEnumAssignment_1_1_0"); - put(grammarAccess.getInstancePropertyRefAccess().getPropertyAssignment_1_1_1(), "rule__InstancePropertyRef__PropertyAssignment_1_1_1"); - put(grammarAccess.getInstanceRefAccess().getInstanceAssignment_0(), "rule__InstanceRef__InstanceAssignment_0"); - put(grammarAccess.getInstanceRefAccess().getTailAssignment_1_1(), "rule__InstanceRef__TailAssignment_1_1"); - put(grammarAccess.getHierInstanceRefAccess().getInstanceAssignment_0(), "rule__HierInstanceRef__InstanceAssignment_0"); - put(grammarAccess.getHierInstanceRefAccess().getTailAssignment_1_1(), "rule__HierInstanceRef__TailAssignment_1_1"); - put(grammarAccess.getPropertyAssignmentRhsAccess().getValueAssignment_0(), "rule__PropertyAssignmentRhs__ValueAssignment_0"); - put(grammarAccess.getPropertyAssignmentRhsAccess().getInstPropRefAssignment_1(), "rule__PropertyAssignmentRhs__InstPropRefAssignment_1"); - put(grammarAccess.getPropertyAssignmentRhsAccess().getEnumRefAssignment_2_0(), "rule__PropertyAssignmentRhs__EnumRefAssignment_2_0"); - put(grammarAccess.getPropertyAssignmentRhsAccess().getEnumsAssignment_2_2(), "rule__PropertyAssignmentRhs__EnumsAssignment_2_2"); - put(grammarAccess.getPropertyAssignmentRhsAccess().getElementsAssignment_3(), "rule__PropertyAssignmentRhs__ElementsAssignment_3"); - put(grammarAccess.getConcatAccess().getElementsAssignment_1(), "rule__Concat__ElementsAssignment_1"); - put(grammarAccess.getConcatAccess().getElementsAssignment_2_1(), "rule__Concat__ElementsAssignment_2_1"); - put(grammarAccess.getConcatElemAccess().getInstPropRefAssignment_0(), "rule__ConcatElem__InstPropRefAssignment_0"); - put(grammarAccess.getConcatElemAccess().getValueAssignment_1(), "rule__ConcatElem__ValueAssignment_1"); - put(grammarAccess.getPropertyRvalueConstantAccess().getValAssignment_0(), "rule__PropertyRvalueConstant__ValAssignment_0"); - put(grammarAccess.getPropertyRvalueConstantAccess().getNumAssignment_1(), "rule__PropertyRvalueConstant__NumAssignment_1"); - put(grammarAccess.getPropertyRvalueConstantAccess().getStrAssignment_2(), "rule__PropertyRvalueConstant__StrAssignment_2"); - put(grammarAccess.getEnumDefinitionAccess().getNameAssignment_1(), "rule__EnumDefinition__NameAssignment_1"); - put(grammarAccess.getEnumDefinitionAccess().getBodyAssignment_2(), "rule__EnumDefinition__BodyAssignment_2"); - put(grammarAccess.getEnumBodyAccess().getEntriesAssignment_2(), "rule__EnumBody__EntriesAssignment_2"); - put(grammarAccess.getEnumEntryAccess().getNameAssignment_0(), "rule__EnumEntry__NameAssignment_0"); - put(grammarAccess.getEnumEntryAccess().getIndexAssignment_2(), "rule__EnumEntry__IndexAssignment_2"); - put(grammarAccess.getEnumEntryAccess().getPropertiesAssignment_3_1(), "rule__EnumEntry__PropertiesAssignment_3_1"); - put(grammarAccess.getEnumPropertyAccess().getNameAssignment_0_0_0(), "rule__EnumProperty__NameAssignment_0_0_0"); - put(grammarAccess.getEnumPropertyAccess().getValueAssignment_0_0_2(), "rule__EnumProperty__ValueAssignment_0_0_2"); - put(grammarAccess.getEnumPropertyAccess().getNameAssignment_0_1_0(), "rule__EnumProperty__NameAssignment_0_1_0"); - put(grammarAccess.getEnumPropertyAccess().getValueAssignment_0_1_2(), "rule__EnumProperty__ValueAssignment_0_1_2"); - put(grammarAccess.getEnumInstanceTypeAccess().getEXTERNALAssignment_0(), "rule__EnumInstanceType__EXTERNALAssignment_0"); - put(grammarAccess.getEnumInstanceTypeAccess().getINTERNALAssignment_1(), "rule__EnumInstanceType__INTERNALAssignment_1"); - } - }; - } - return nameMappings.get(element); + return nameMappings.getRuleName(element); } - + @Override protected String[] getInitialHiddenTokens() { return new String[] { "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_ESCAPE_JSP", "RULE_ESCAPE_ORDL" }; @@ -226,4 +241,12 @@ public class RDLParser extends AbstractContentAssistParser { public void setGrammarAccess(RDLGrammarAccess grammarAccess) { this.grammarAccess = grammarAccess; } + + public NameMappings getNameMappings() { + return nameMappings; + } + + public void setNameMappings(NameMappings nameMappings) { + this.nameMappings = nameMappings; + } } 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 021699e..919065f 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.13.0 + * generated by Xtext 2.14.0 */ grammar InternalRDL; diff --git a/com.minres.rdl.parent/com.minres.rdl.ide/src/com/minres/rdl/ide/RDLIdeModule.xtend b/com.minres.rdl.parent/com.minres.rdl.ide/src/com/minres/rdl/ide/RDLIdeModule.xtend index d8d27ef..cfd8678 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ide/src/com/minres/rdl/ide/RDLIdeModule.xtend +++ b/com.minres.rdl.parent/com.minres.rdl.ide/src/com/minres/rdl/ide/RDLIdeModule.xtend @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ide diff --git a/com.minres.rdl.parent/com.minres.rdl.ide/src/com/minres/rdl/ide/RDLIdeSetup.xtend b/com.minres.rdl.parent/com.minres.rdl.ide/src/com/minres/rdl/ide/RDLIdeSetup.xtend index ee0ac0d..bf84a13 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ide/src/com/minres/rdl/ide/RDLIdeSetup.xtend +++ b/com.minres.rdl.parent/com.minres.rdl.ide/src/com/minres/rdl/ide/RDLIdeSetup.xtend @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ide diff --git a/com.minres.rdl.parent/com.minres.rdl.ide/xtend-gen/com/minres/rdl/ide/RDLIdeModule.java b/com.minres.rdl.parent/com.minres.rdl.ide/xtend-gen/com/minres/rdl/ide/RDLIdeModule.java index 085d7f1..d5f95b6 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ide/xtend-gen/com/minres/rdl/ide/RDLIdeModule.java +++ b/com.minres.rdl.parent/com.minres.rdl.ide/xtend-gen/com/minres/rdl/ide/RDLIdeModule.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ide; diff --git a/com.minres.rdl.parent/com.minres.rdl.ide/xtend-gen/com/minres/rdl/ide/RDLIdeSetup.java b/com.minres.rdl.parent/com.minres.rdl.ide/xtend-gen/com/minres/rdl/ide/RDLIdeSetup.java index f118390..8cbc604 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ide/xtend-gen/com/minres/rdl/ide/RDLIdeSetup.java +++ b/com.minres.rdl.parent/com.minres.rdl.ide/xtend-gen/com/minres/rdl/ide/RDLIdeSetup.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ide; 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 f3f7a2e..7bd0cbf 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 @@ -18,11 +18,19 @@ + + + + - - - - - - - - - - + + diff --git a/com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml b/com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml index 04355a6..69a3b11 100644 --- a/com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml +++ b/com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml @@ -9,6 +9,24 @@ com.minres.rdl.platform.feature eclipse-feature + + + + org.eclipse.tycho.extras + tycho-source-feature-plugin + ${tycho-version} + + + source-feature + none + + + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.product.releng/.project b/com.minres.rdl.parent/com.minres.rdl.product.releng/.project new file mode 100644 index 0000000..5db7f1c --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product.releng/.project @@ -0,0 +1,17 @@ + + + com.minres.rdl.product.releng + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/com.minres.rdl.parent/com.minres.rdl.product.releng/.settings/org.eclipse.m2e.core.prefs b/com.minres.rdl.parent/com.minres.rdl.product.releng/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product.releng/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.minres.rdl.parent/com.minres.rdl.product/com.minres.rdl.product.product b/com.minres.rdl.parent/com.minres.rdl.product.releng/com.minres.rdl.product.product similarity index 87% rename from com.minres.rdl.parent/com.minres.rdl.product/com.minres.rdl.product.product rename to com.minres.rdl.parent/com.minres.rdl.product.releng/com.minres.rdl.product.product index d5bf213..251f2d7 100644 --- a/com.minres.rdl.parent/com.minres.rdl.product/com.minres.rdl.product.product +++ b/com.minres.rdl.parent/com.minres.rdl.product.releng/com.minres.rdl.product.product @@ -1,7 +1,7 @@ - + @@ -14,7 +14,6 @@ - @@ -104,6 +103,16 @@ + + + + + + + + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.product.releng/pom.xml b/com.minres.rdl.parent/com.minres.rdl.product.releng/pom.xml new file mode 100644 index 0000000..43049b9 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product.releng/pom.xml @@ -0,0 +1,45 @@ + + 4.0.0 + + com.minres.rdl.product.releng + eclipse-repository + RDL EEditor + + + 1.0.0-SNAPSHOT + com.minres.rdl + com.minres.rdl.parent + + + + + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho-version} + + + zip + tar.gz + tar.gz + + + + + materialize-products + + materialize-products + + + + archive-products + + archive-products + + + + + + + \ No newline at end of file diff --git a/com.minres.rdl.parent/com.minres.rdl.product/.classpath b/com.minres.rdl.parent/com.minres.rdl.product/.classpath index eca7bdb..43b9862 100644 --- a/com.minres.rdl.parent/com.minres.rdl.product/.classpath +++ b/com.minres.rdl.parent/com.minres.rdl.product/.classpath @@ -3,5 +3,5 @@ - + diff --git a/com.minres.rdl.parent/com.minres.rdl.product/plugin.xml b/com.minres.rdl.parent/com.minres.rdl.product/plugin.xml index 9cbd490..423f253 100644 --- a/com.minres.rdl.parent/com.minres.rdl.product/plugin.xml +++ b/com.minres.rdl.parent/com.minres.rdl.product/plugin.xml @@ -6,10 +6,10 @@ point="org.eclipse.core.runtime.products"> + name="RDL Editor"> + value="RDL Editor"> diff --git a/com.minres.rdl.parent/com.minres.rdl.product/pom.xml b/com.minres.rdl.parent/com.minres.rdl.product/pom.xml index 097a8bb..ee8aa59 100644 --- a/com.minres.rdl.parent/com.minres.rdl.product/pom.xml +++ b/com.minres.rdl.parent/com.minres.rdl.product/pom.xml @@ -7,16 +7,6 @@ 1.0.0-SNAPSHOT com.minres.rdl.product - eclipse-application - - - - - org.eclipse.xtend - xtend-maven-plugin - - - - + eclipse-plugin 1.1.1-SNAPSHOT diff --git a/com.minres.rdl.parent/com.minres.rdl.repository/category.xml b/com.minres.rdl.parent/com.minres.rdl.repository/category.xml index 66d9e31..857ad4a 100644 --- a/com.minres.rdl.parent/com.minres.rdl.repository/category.xml +++ b/com.minres.rdl.parent/com.minres.rdl.repository/category.xml @@ -1,7 +1,11 @@ - - - - + + + + + + + + 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 39c58db..0874d48 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,28 +1,33 @@ - + + + + + + + + + + + + + - + - - - - - - - - - - - - - + + + + + + - \ No newline at end of file + diff --git a/com.minres.rdl.parent/com.minres.rdl.tests/.classpath b/com.minres.rdl.parent/com.minres.rdl.tests/.classpath index 8d26fa5..94641c6 100644 --- a/com.minres.rdl.parent/com.minres.rdl.tests/.classpath +++ b/com.minres.rdl.parent/com.minres.rdl.tests/.classpath @@ -3,6 +3,7 @@ + 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 6bea19e..0c25f3e 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 @@ -1,4 +1,5 @@ Manifest-Version: 1.0 +Automatic-Module-Name: com.minres.rdl.tests Bundle-ManifestVersion: 2 Bundle-Name: com.minres.rdl.tests Bundle-Vendor: My Company @@ -9,13 +10,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;bundle-version="2.13.0" + org.eclipse.xtext.xbase.lib;bundle-version="2.14.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: com.minres.rdl.tests;x-internal=true -Import-Package: org.hamcrest.core, - org.junit;version="4.5.0", - org.junit.runners.model;version="4.5.0", - org.junit.runner;version="4.5.0", - org.junit.runners;version="4.5.0", - org.junit.runner.manipulation;version="4.5.0", - org.junit.runner.notification;version="4.5.0" + 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 9ca35dc..7cda00f 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.13.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.tests; diff --git a/com.minres.rdl.parent/com.minres.rdl.tests/src/com/minres/rdl/tests/RDLParsingTest.xtend b/com.minres.rdl.parent/com.minres.rdl.tests/src/com/minres/rdl/tests/RDLParsingTest.xtend index 1b8aa55..d421063 100644 --- a/com.minres.rdl.parent/com.minres.rdl.tests/src/com/minres/rdl/tests/RDLParsingTest.xtend +++ b/com.minres.rdl.parent/com.minres.rdl.tests/src/com/minres/rdl/tests/RDLParsingTest.xtend @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.tests @@ -21,9 +21,53 @@ class RDLParsingTest { @Test def void loadModel() { val result = parseHelper.parse(''' - Hello Xtext! + regfile uart_regs { + reg { + name="txdata"; + desc="Transmit data register"; + field {} data[7:0]; + field {} full[31:31]; + } txdata @0x00; + reg { + name="rxdata"; + desc="Receive data register"; + field {} data[7:0]; + field {} empty[31:31]; + }rxdata @0x04; + reg { + name="txctrl"; + desc="Transmit control register"; + field {} txen[1]; + field {} nstop[1]; + field {} txcnt[18:16]; + }txctrl @0x08; + reg { + name="rxctrl"; + desc="Receive control register"; + field {} rxen[1]; + field {} rxcnt[18:16]; + }rxctrl @0x0C; + reg { + name="ie"; + desc="UART interrupt enable"; + field{} txwm[1]; + field{} rxwm[1]; + }ie @0x10; + reg { + name="ip"; + desc="UART Interrupt pending"; + field{} txwm[1]; + field{} rxwm[1]; + } ip @0x14; + reg { + name="div"; + desc="Baud rate divisor"; + field{} div[16]; + } div @0x18; + }; ''') Assert.assertNotNull(result) - Assert.assertTrue(result.eResource.errors.isEmpty) + val errors = result.eResource.errors + Assert.assertTrue('''Unexpected errors: «errors.join(", ")»''', errors.isEmpty) } } diff --git a/com.minres.rdl.parent/com.minres.rdl.tests/xtend-gen/com/minres/rdl/tests/RDLParsingTest.java b/com.minres.rdl.parent/com.minres.rdl.tests/xtend-gen/com/minres/rdl/tests/RDLParsingTest.java index 31c1296..052fc47 100644 --- a/com.minres.rdl.parent/com.minres.rdl.tests/xtend-gen/com/minres/rdl/tests/RDLParsingTest.java +++ b/com.minres.rdl.parent/com.minres.rdl.tests/xtend-gen/com/minres/rdl/tests/RDLParsingTest.java @@ -1,16 +1,19 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.tests; import com.google.inject.Inject; import com.minres.rdl.rdl.Root; import com.minres.rdl.tests.RDLInjectorProvider; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtend2.lib.StringConcatenation; import org.eclipse.xtext.testing.InjectWith; import org.eclipse.xtext.testing.XtextRunner; import org.eclipse.xtext.testing.util.ParseHelper; import org.eclipse.xtext.xbase.lib.Exceptions; +import org.eclipse.xtext.xbase.lib.IterableExtensions; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,11 +29,144 @@ public class RDLParsingTest { public void loadModel() { try { StringConcatenation _builder = new StringConcatenation(); - _builder.append("Hello Xtext!"); + _builder.append("regfile uart_regs {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("reg {"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("name=\"txdata\";"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("desc=\"Transmit data register\";"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("field {} data[7:0];"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("field {} full[31:31];"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("} txdata @0x00;"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("reg {"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("name=\"rxdata\";"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("desc=\"Receive data register\";"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("field {} data[7:0];"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("field {} empty[31:31];"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("}rxdata @0x04;"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("reg {"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("name=\"txctrl\";"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("desc=\"Transmit control register\";"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("field {} txen[1];"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("field {} nstop[1];"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("field {} txcnt[18:16];"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("}txctrl @0x08;"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("reg {"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("name=\"rxctrl\";"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("desc=\"Receive control register\";"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("field {} rxen[1];"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("field {} rxcnt[18:16];"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("}rxctrl @0x0C;"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("reg {"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("name=\"ie\";"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("desc=\"UART interrupt enable\";"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("field{} txwm[1];"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("field{} rxwm[1];"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("}ie @0x10;"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("reg {"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("name=\"ip\";"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("desc=\"UART Interrupt pending\";"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("field{} txwm[1];"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("field{} rxwm[1];"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("} ip @0x14;"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("reg {"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("name=\"div\";"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("desc=\"Baud rate divisor\";"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("field{} div[16];"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("} div @0x18;"); + _builder.newLine(); + _builder.append("};"); _builder.newLine(); final Root result = this.parseHelper.parse(_builder); Assert.assertNotNull(result); - Assert.assertTrue(result.eResource().getErrors().isEmpty()); + final EList errors = result.eResource().getErrors(); + StringConcatenation _builder_1 = new StringConcatenation(); + _builder_1.append("Unexpected errors: "); + String _join = IterableExtensions.join(errors, ", "); + _builder_1.append(_join); + Assert.assertTrue(_builder_1.toString(), errors.isEmpty()); } catch (Throwable _e) { throw Exceptions.sneakyThrow(_e); } diff --git a/com.minres.rdl.parent/com.minres.rdl.ui.tests/.classpath b/com.minres.rdl.parent/com.minres.rdl.ui.tests/.classpath index 8d26fa5..94641c6 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui.tests/.classpath +++ b/com.minres.rdl.parent/com.minres.rdl.ui.tests/.classpath @@ -3,6 +3,7 @@ + diff --git a/com.minres.rdl.parent/com.minres.rdl.ui.tests/META-INF/MANIFEST.MF b/com.minres.rdl.parent/com.minres.rdl.ui.tests/META-INF/MANIFEST.MF index 57c1052..d741c5e 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui.tests/META-INF/MANIFEST.MF +++ b/com.minres.rdl.parent/com.minres.rdl.ui.tests/META-INF/MANIFEST.MF @@ -1,4 +1,5 @@ Manifest-Version: 1.0 +Automatic-Module-Name: com.minres.rdl.ui.tests Bundle-ManifestVersion: 2 Bundle-Name: com.minres.rdl.ui.tests Bundle-Vendor: My Company @@ -15,10 +16,4 @@ Require-Bundle: com.minres.rdl.ui, org.eclipse.ui.workbench;resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: com.minres.rdl.ui.tests;x-internal=true -Import-Package: org.hamcrest.core, - org.junit;version="4.5.0", - org.junit.runners.model;version="4.5.0", - org.junit.runner;version="4.5.0", - org.junit.runners;version="4.5.0", - org.junit.runner.manipulation;version="4.5.0", - org.junit.runner.notification;version="4.5.0" + diff --git a/com.minres.rdl.parent/com.minres.rdl.ui.tests/pom.xml b/com.minres.rdl.parent/com.minres.rdl.ui.tests/pom.xml index d4002f4..369be2f 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui.tests/pom.xml +++ b/com.minres.rdl.parent/com.minres.rdl.ui.tests/pom.xml @@ -18,7 +18,6 @@ org.eclipse.tycho tycho-surefire-plugin - ${tycho-version} false true @@ -45,18 +44,4 @@ - - - - testing-on-mac - - - mac - - - - -XstartOnFirstThread - - - 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 4987f0c..82af3a3 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.13.0 + * generated by Xtext 2.14.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 f98314b..79a275c 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 @@ -1,4 +1,5 @@ Manifest-Version: 1.0 +Automatic-Module-Name: com.minres.rdl.ui Bundle-ManifestVersion: 2 Bundle-Name: com.minres.rdl.ui Bundle-Vendor: My Company @@ -15,11 +16,13 @@ Require-Bundle: com.minres.rdl, org.eclipse.ui, org.eclipse.compare, org.eclipse.xtext.builder, + org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtend.lib;resolution:=optional, - org.eclipse.xtext.xbase.lib;bundle-version="2.13.0" + org.eclipse.core.runtime, + org.eclipse.core.resources Import-Package: org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: com.minres.rdl.ui.internal, - com.minres.rdl.ui.quickfix, - com.minres.rdl.ui.contentassist + com.minres.rdl.ui.contentassist, + com.minres.rdl.ui.quickfix Bundle-Activator: com.minres.rdl.ui.internal.RdlActivator diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/plugin.xml b/com.minres.rdl.parent/com.minres.rdl.ui/plugin.xml index c19ed96..b58ba9e 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/plugin.xml +++ b/com.minres.rdl.parent/com.minres.rdl.ui/plugin.xml @@ -98,16 +98,12 @@ - - - - + + + + @@ -250,6 +255,15 @@ + + + + + + + + + + + + + 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 30ff6a4..4d8d3e8 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.13.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui; @@ -14,6 +14,8 @@ import com.minres.rdl.ui.labeling.RDLDescriptionLabelProvider; import com.minres.rdl.ui.labeling.RDLLabelProvider; import com.minres.rdl.ui.outline.RDLOutlineTreeProvider; import com.minres.rdl.ui.quickfix.RDLQuickfixProvider; +import com.minres.rdl.ui.wizard.RDLProjectCreator; +import com.minres.rdl.validation.RDLValidatorConfigurationBlock; import org.eclipse.compare.IViewerCreator; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; @@ -76,6 +78,8 @@ import org.eclipse.xtext.ui.refactoring.ui.IRenameSupport; import org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferences; import org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider; import org.eclipse.xtext.ui.shared.Access; +import org.eclipse.xtext.ui.validation.AbstractValidatorConfigurationBlock; +import org.eclipse.xtext.ui.wizard.IProjectCreator; /** * Manual modifications go to {@link RDLUiModule}. @@ -133,6 +137,11 @@ public abstract class AbstractRDLUiModule extends DefaultUiModule { binder.bind(InternalRDLLexer.class).toProvider(LexerProvider.create(InternalRDLLexer.class)); } + // contributed by org.eclipse.xtext.xtext.generator.validation.ValidatorFragment2 + public Class bindAbstractValidatorConfigurationBlock() { + return RDLValidatorConfigurationBlock.class; + } + // contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2 public Class bindPrefixMatcher() { return FQNPrefixMatcher.class; @@ -278,6 +287,11 @@ public abstract class AbstractRDLUiModule extends DefaultUiModule { binder.bind(String.class).annotatedWith(Names.named(UIBindings.COMPARE_VIEWER_TITLE)).toInstance("RDL Compare"); } + // contributed by org.eclipse.xtext.xtext.generator.ui.projectWizard.SimpleProjectWizardFragment2 + public Class bindIProjectCreator() { + return RDLProjectCreator.class; + } + // contributed by org.eclipse.xtext.xtext.generator.exporting.SimpleNamesFragment2 public Class bindIDependentElementsCalculator() { return DefaultDependentElementsCalculator.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 b3551ab..fbc8f54 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,5 +1,5 @@ /* - * generated by Xtext 2.13.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui; 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 379ee8f..caf76f7 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.13.0 + * generated by Xtext 2.14.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 7f24c0b..66ba03b 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,12 +1,11 @@ /* - * generated by Xtext 2.13.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui.internal; import com.google.common.collect.Maps; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.Module; import com.minres.rdl.RDLRuntimeModule; import com.minres.rdl.ui.RDLUiModule; import java.util.Collections; @@ -61,10 +60,10 @@ public class RdlActivator extends AbstractUIPlugin { protected Injector createInjector(String language) { try { - Module runtimeModule = getRuntimeModule(language); - Module sharedStateModule = getSharedStateModule(); - Module uiModule = getUiModule(language); - Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule); + com.google.inject.Module runtimeModule = getRuntimeModule(language); + com.google.inject.Module sharedStateModule = getSharedStateModule(); + com.google.inject.Module uiModule = getUiModule(language); + com.google.inject.Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule); return Guice.createInjector(mergedModule); } catch (Exception e) { logger.error("Failed to create injector for " + language); @@ -73,21 +72,21 @@ public class RdlActivator extends AbstractUIPlugin { } } - protected Module getRuntimeModule(String grammar) { + protected com.google.inject.Module getRuntimeModule(String grammar) { if (COM_MINRES_RDL_RDL.equals(grammar)) { return new RDLRuntimeModule(); } throw new IllegalArgumentException(grammar); } - protected Module getUiModule(String grammar) { + protected com.google.inject.Module getUiModule(String grammar) { if (COM_MINRES_RDL_RDL.equals(grammar)) { return new RDLUiModule(this); } throw new IllegalArgumentException(grammar); } - protected Module getSharedStateModule() { + protected com.google.inject.Module getSharedStateModule() { return new SharedStateModule(); } diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/wizard/RDLNewProjectWizard.java b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/wizard/RDLNewProjectWizard.java new file mode 100644 index 0000000..87489d2 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/wizard/RDLNewProjectWizard.java @@ -0,0 +1,55 @@ +/* + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.ui.wizard; + +import org.eclipse.xtext.ui.wizard.XtextNewProjectWizard; + +import org.eclipse.xtext.ui.wizard.IExtendedProjectInfo; +import org.eclipse.xtext.ui.wizard.IProjectCreator; +import com.google.inject.Inject; + +public class RDLNewProjectWizard extends XtextNewProjectWizard { + + private RDLWizardNewProjectCreationPage mainPage; + + @Inject + public RDLNewProjectWizard(IProjectCreator projectCreator) { + super(projectCreator); + setWindowTitle("New RDL Project"); + } + + protected RDLWizardNewProjectCreationPage getMainPage() { + return mainPage; + } + + /** + * Use this method to add pages to the wizard. + * The one-time generated version of this class will add a default new project page to the wizard. + */ + @Override + public void addPages() { + mainPage = createMainPage("basicNewProjectPage"); + mainPage.setTitle("RDL Project"); + mainPage.setDescription("Create a new RDL project."); + addPage(mainPage); + } + + protected RDLWizardNewProjectCreationPage createMainPage(String pageName) { + return new RDLWizardNewProjectCreationPage(pageName); + } + + /** + * Use this method to read the project settings from the wizard pages and feed them into the project info class. + */ + @Override + protected IExtendedProjectInfo getProjectInfo() { + RDLProjectInfo projectInfo = new RDLProjectInfo(); + projectInfo.setProjectName(mainPage.getProjectName()); + if (!mainPage.useDefaults()) { + projectInfo.setLocationPath(mainPage.getLocationPath()); + } + return projectInfo; + } + +} diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/wizard/RDLProjectCreator.java b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/wizard/RDLProjectCreator.java new file mode 100644 index 0000000..3c222b9 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/wizard/RDLProjectCreator.java @@ -0,0 +1,98 @@ +/* + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.ui.wizard; + +import org.eclipse.xtext.ui.wizard.AbstractPluginProjectCreator; + +import java.util.HashMap; +import java.util.List; +import java.util.Set; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.xtext.builder.EclipseResourceFileSystemAccess2; +import org.eclipse.xtext.generator.IFileSystemAccess; +import org.eclipse.xtext.generator.IFileSystemAccess2; +import org.eclipse.xtext.generator.IOutputConfigurationProvider; +import org.eclipse.xtext.generator.OutputConfiguration; +import org.eclipse.xtext.ui.util.PluginProjectFactory; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class RDLProjectCreator extends AbstractPluginProjectCreator { + protected static final String DSL_PROJECT_NAME = "com.minres.rdl"; + + @Inject + private RDLNewProjectWizardInitialContents initialContents; + + @Inject + private Provider fileSystemAccessProvider; + + @Inject + private IOutputConfigurationProvider outputConfigurationProvider; + + @Override + protected PluginProjectFactory createProjectFactory() { + PluginProjectFactory projectFactory = super.createProjectFactory(); + projectFactory.setWithPluginXml(false); + return projectFactory; + } + + @Override + protected RDLProjectInfo getProjectInfo() { + return (RDLProjectInfo) super.getProjectInfo(); + } + + @Override + protected String getModelFolderName() { + return "src"; + } + + @Override + protected List getAllFolders() { + Set outputConfigurations = outputConfigurationProvider.getOutputConfigurations(); + String outputFolder = "src-gen"; + for (OutputConfiguration outputConfiguration : outputConfigurations) { + if (IFileSystemAccess.DEFAULT_OUTPUT.equals(outputConfiguration.getName())) { + outputFolder = outputConfiguration.getOutputDirectory(); + break; + } + } + return ImmutableList.of(getModelFolderName(), outputFolder); + } + + @Override + protected List getRequiredBundles() { + return Lists.newArrayList(DSL_PROJECT_NAME); + } + + @Override + protected void enhanceProject(final IProject project, final IProgressMonitor monitor) throws CoreException { + IFileSystemAccess2 access = getFileSystemAccess(project, monitor); + initialContents.generateInitialContents(access); + project.refreshLocal(IResource.DEPTH_INFINITE, monitor); + } + + protected IFileSystemAccess2 getFileSystemAccess(final IProject project, final IProgressMonitor monitor) { + EclipseResourceFileSystemAccess2 access = fileSystemAccessProvider.get(); + access.setContext(project); + access.setMonitor(monitor); + OutputConfiguration defaultOutput = new OutputConfiguration(IFileSystemAccess.DEFAULT_OUTPUT); + defaultOutput.setDescription("Output Folder"); + defaultOutput.setOutputDirectory("./"); + defaultOutput.setOverrideExistingResources(true); + defaultOutput.setCreateOutputDirectory(true); + defaultOutput.setCleanUpDerivedResources(false); + defaultOutput.setSetDerivedProperty(false); + defaultOutput.setKeepLocalHistory(false); + HashMap outputConfigurations = new HashMap(); + outputConfigurations.put(IFileSystemAccess.DEFAULT_OUTPUT, defaultOutput); + access.setOutputConfigurations(outputConfigurations); + return access; + } +} diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/validation/RDLValidatorConfigurationBlock.java b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/validation/RDLValidatorConfigurationBlock.java new file mode 100644 index 0000000..459d6a5 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/validation/RDLValidatorConfigurationBlock.java @@ -0,0 +1,65 @@ +/* + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.validation; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.dialogs.IDialogSettings; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.xtext.ui.preferences.OptionsConfigurationBlock; +import org.eclipse.xtext.ui.validation.AbstractValidatorConfigurationBlock; +import org.eclipse.xtext.validation.SeverityConverter; + +@SuppressWarnings("restriction") +public class RDLValidatorConfigurationBlock extends AbstractValidatorConfigurationBlock { + + @Override + protected void fillSettingsPage(Composite composite, int nColumns, int defaultIndent) { + addComboBox(RDLConfigurableIssueCodesProvider.DEPRECATED_MODEL_PART, "Deprecated Model Part", composite, defaultIndent); + } + + @Override + protected Job getBuildJob(IProject project) { + Job buildJob = new OptionsConfigurationBlock.BuildJob("Validation Settings Changed", project); + buildJob.setRule(ResourcesPlugin.getWorkspace().getRuleFactory().buildRule()); + buildJob.setUser(true); + return buildJob; + } + + @Override + protected String[] getFullBuildDialogStrings(boolean workspaceSettings) { + return new String[] { "Validation Settings Changed", + "Validation settings have changed. A full rebuild is required for changes to take effect. Do the full build now?" }; + } + + @Override + protected void validateSettings(String changedKey, String oldValue, String newValue) { + } + + protected Combo addComboBox(String prefKey, String label, Composite parent, int indent) { + String[] values = new String[] { SeverityConverter.SEVERITY_ERROR, SeverityConverter.SEVERITY_WARNING, + SeverityConverter.SEVERITY_INFO, SeverityConverter.SEVERITY_IGNORE }; + String[] valueLabels = new String[] { "Error", "Warning", "Info", "Ignore" }; + Combo comboBox = addComboBox(parent, label, prefKey, indent, values, valueLabels); + return comboBox; + } + + @Override + public void dispose() { + storeSectionExpansionStates(getDialogSettings()); + super.dispose(); + } + + @Override + protected IDialogSettings getDialogSettings() { + IDialogSettings dialogSettings = super.getDialogSettings(); + IDialogSettings section = dialogSettings.getSection("RDL"); + if (section == null) { + return dialogSettings.addNewSection("RDL"); + } + return section; + } +} diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/RDLUiModule.xtend b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/RDLUiModule.xtend index f4774d7..967e9ac 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/RDLUiModule.xtend +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/RDLUiModule.xtend @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/contentassist/RDLProposalProvider.xtend b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/contentassist/RDLProposalProvider.xtend index 66a8f3f..027c799 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/contentassist/RDLProposalProvider.xtend +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/contentassist/RDLProposalProvider.xtend @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui.contentassist diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/labeling/RDLDescriptionLabelProvider.xtend b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/labeling/RDLDescriptionLabelProvider.xtend index 98a8708..77663cd 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/labeling/RDLDescriptionLabelProvider.xtend +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/labeling/RDLDescriptionLabelProvider.xtend @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui.labeling diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/labeling/RDLLabelProvider.xtend b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/labeling/RDLLabelProvider.xtend index 1bbc1c2..882f376 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/labeling/RDLLabelProvider.xtend +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/labeling/RDLLabelProvider.xtend @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui.labeling diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/outline/RDLOutlineTreeProvider.xtend b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/outline/RDLOutlineTreeProvider.xtend index d23a5c1..32d2fff 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/outline/RDLOutlineTreeProvider.xtend +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/outline/RDLOutlineTreeProvider.xtend @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui.outline diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/quickfix/RDLQuickfixProvider.xtend b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/quickfix/RDLQuickfixProvider.xtend index ab4a2b1..d7becea 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/quickfix/RDLQuickfixProvider.xtend +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/quickfix/RDLQuickfixProvider.xtend @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui.quickfix diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/wizard/RDLNewProjectWizardInitialContents.xtend b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/wizard/RDLNewProjectWizardInitialContents.xtend new file mode 100644 index 0000000..955db94 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/wizard/RDLNewProjectWizardInitialContents.xtend @@ -0,0 +1,26 @@ +/* + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.ui.wizard + + +import com.google.inject.Inject +import org.eclipse.xtext.generator.IFileSystemAccess2 +import org.eclipse.xtext.resource.FileExtensionProvider + +class RDLNewProjectWizardInitialContents { + @Inject + FileExtensionProvider fileExtensionProvider + + def generateInitialContents(IFileSystemAccess2 fsa) { + fsa.generateFile( + "src/model/Model." + fileExtensionProvider.primaryFileExtension, + ''' + /* + * This is an example model + */ + Hello Xtext! + ''' + ) + } +} diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/wizard/RDLProjectInfo.java b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/wizard/RDLProjectInfo.java new file mode 100644 index 0000000..fdbeab9 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/wizard/RDLProjectInfo.java @@ -0,0 +1,10 @@ +/* + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.ui.wizard; + +import org.eclipse.xtext.ui.wizard.DefaultProjectInfo; + +public class RDLProjectInfo extends DefaultProjectInfo { + +} diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/wizard/RDLWizardNewProjectCreationPage.java b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/wizard/RDLWizardNewProjectCreationPage.java new file mode 100644 index 0000000..b1d11ec --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/wizard/RDLWizardNewProjectCreationPage.java @@ -0,0 +1,14 @@ +/* + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.ui.wizard; + +import org.eclipse.ui.dialogs.WizardNewProjectCreationPage; + +public class RDLWizardNewProjectCreationPage extends WizardNewProjectCreationPage { + + public RDLWizardNewProjectCreationPage(String pageName) { + super(pageName); + } + +} 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 38135bf..048b771 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 @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui; @@ -25,7 +25,7 @@ public class RDLUiModule extends AbstractRDLUiModule { return RDLEObjectDocumentationProvider.class; } - public RDLUiModule(final AbstractUIPlugin plugin) { - super(plugin); + public RDLUiModule(final AbstractUIPlugin arg0) { + super(arg0); } } diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/contentassist/RDLProposalProvider.java b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/contentassist/RDLProposalProvider.java index 123c459..561b4e8 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/contentassist/RDLProposalProvider.java +++ b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/contentassist/RDLProposalProvider.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui.contentassist; diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/labeling/RDLDescriptionLabelProvider.java b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/labeling/RDLDescriptionLabelProvider.java index bdd037f..ff23556 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/labeling/RDLDescriptionLabelProvider.java +++ b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/labeling/RDLDescriptionLabelProvider.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui.labeling; diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/labeling/RDLLabelProvider.java b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/labeling/RDLLabelProvider.java index 2d91ee7..09d07d8 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/labeling/RDLLabelProvider.java +++ b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/labeling/RDLLabelProvider.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui.labeling; diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/outline/RDLOutlineTreeProvider.java b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/outline/RDLOutlineTreeProvider.java index 19fd69c..6c53e86 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/outline/RDLOutlineTreeProvider.java +++ b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/outline/RDLOutlineTreeProvider.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui.outline; diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/quickfix/RDLQuickfixProvider.java b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/quickfix/RDLQuickfixProvider.java index 0c744f1..49e932f 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/quickfix/RDLQuickfixProvider.java +++ b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/quickfix/RDLQuickfixProvider.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.ui.quickfix; diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/wizard/RDLNewProjectWizardInitialContents.java b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/wizard/RDLNewProjectWizardInitialContents.java new file mode 100644 index 0000000..e720aa1 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/wizard/RDLNewProjectWizardInitialContents.java @@ -0,0 +1,32 @@ +/** + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.ui.wizard; + +import com.google.inject.Inject; +import org.eclipse.xtend2.lib.StringConcatenation; +import org.eclipse.xtext.generator.IFileSystemAccess2; +import org.eclipse.xtext.resource.FileExtensionProvider; + +@SuppressWarnings("all") +public class RDLNewProjectWizardInitialContents { + @Inject + private FileExtensionProvider fileExtensionProvider; + + public void generateInitialContents(final IFileSystemAccess2 fsa) { + String _primaryFileExtension = this.fileExtensionProvider.getPrimaryFileExtension(); + String _plus = ("src/model/Model." + _primaryFileExtension); + StringConcatenation _builder = new StringConcatenation(); + _builder.append("/*"); + _builder.newLine(); + _builder.append(" "); + _builder.append("* This is an example model"); + _builder.newLine(); + _builder.append(" "); + _builder.append("*/"); + _builder.newLine(); + _builder.append("Hello Xtext!"); + _builder.newLine(); + fsa.generateFile(_plus, _builder); + } +} diff --git a/com.minres.rdl.parent/com.minres.rdl.web/.classpath b/com.minres.rdl.parent/com.minres.rdl.web/.classpath new file mode 100644 index 0000000..c74fad0 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.web/.project b/com.minres.rdl.parent/com.minres.rdl.web/.project new file mode 100644 index 0000000..dbbc27b --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/.project @@ -0,0 +1,29 @@ + + + com.minres.rdl.web + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.jdt.core.javanature + + diff --git a/com.minres.rdl.parent/com.minres.rdl.web/.settings/org.eclipse.core.resources.prefs b/com.minres.rdl.parent/com.minres.rdl.web/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.minres.rdl.parent/com.minres.rdl.web/.settings/org.eclipse.jdt.core.prefs b/com.minres.rdl.parent/com.minres.rdl.web/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..0c68a61 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +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/com.minres.rdl.parent/com.minres.rdl.web/WebRoot/index.html b/com.minres.rdl.parent/com.minres.rdl.web/WebRoot/index.html new file mode 100644 index 0000000..2a27b01 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/WebRoot/index.html @@ -0,0 +1,44 @@ + + + + + Example Web Editor + + + + + + + +
+
+

Example RDL Web Editor

+
+
+
+
+
+ + + diff --git a/com.minres.rdl.parent/com.minres.rdl.web/WebRoot/style.css b/com.minres.rdl.parent/com.minres.rdl.web/WebRoot/style.css new file mode 100644 index 0000000..9f0724d --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/WebRoot/style.css @@ -0,0 +1,56 @@ +body { + width: 100%; + height: 100%; + overflow: hidden; + font: 16px Helvetica,sans-serif; +} + +a { + color: #22a; + text-decoration: none; +} + +a:hover { + text-decoration: underline; +} + +.container { + display: block; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + margin: 20px; +} + +.header { + display: block; + position: absolute; + background-color: #e8e8e8; + top: 0; + left: 0; + right: 0; + height: 60px; + padding: 10px; +} + +.content { + display: block; + position: absolute; + top: 90px; + bottom: 0; + left: 0; + width: 640px; +} + +#xtext-editor { + display: block; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + padding: 4px; + border: 1px solid #aaa; +} diff --git a/com.minres.rdl.parent/com.minres.rdl.web/WebRoot/xtext-resources/generated/mode-rdl.js b/com.minres.rdl.parent/com.minres.rdl.web/WebRoot/xtext-resources/generated/mode-rdl.js new file mode 100644 index 0000000..98e82d4 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/WebRoot/xtext-resources/generated/mode-rdl.js @@ -0,0 +1,26 @@ +define(["ace/lib/oop", "ace/mode/text", "ace/mode/text_highlight_rules"], function(oop, mText, mTextHighlightRules) { + var HighlightRules = function() { + var keywords = "UNDEFINED|UNSPECIFIED|accesswidth|activehigh|activelow|addressing|addrmap|alias|alignment|all|anded|arbiter|async|bigendian|boolean|bothedge|bridge|clock|compact|component|counter|cpuif_reset|decr|decrsaturate|decrthreshold|decrvalue|decrwidth|default|desc|dontcompare|donttest|enable|encode|enum|errextbus|external|false|field|field_reset|fieldwidth|fullalign|halt|haltenable|haltmask|hw|hwclr|hwenable|hwmask|hwset|incr|incrvalue|incrwidth|internal|intr|level|littleendian|lsb0|mask|msb0|na|name|negedge|next|nonsticky|number|ored|overflow|posedge|precedence|property|r|rclr|ref|reg|regalign|regfile|regwidth|reset|resetsignal|rset|rsvdset|rsvdsetX|rw|saturate|shared|sharedextbus|signal|signalwidth|singlepulse|sticky|stickybit|string|sw|swacc|swmod|swwe|swwel|sync|threshold|true|type|underflow|w|we|wel|woclr|woset|wr|xored"; + this.$rules = { + "start": [ + {token: "lparen", regex: "[\\[{]"}, + {token: "rparen", regex: "[\\]}]"}, + {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"} + ] + }; + }; + oop.inherits(HighlightRules, mTextHighlightRules.TextHighlightRules); + + var Mode = function() { + this.HighlightRules = HighlightRules; + }; + oop.inherits(Mode, mText.Mode); + Mode.prototype.$id = "xtext/rdl"; + Mode.prototype.getCompletions = function(state, session, pos, prefix) { + return []; + } + + return { + Mode: Mode + }; +}); diff --git a/com.minres.rdl.parent/com.minres.rdl.web/pom.xml b/com.minres.rdl.parent/com.minres.rdl.web/pom.xml new file mode 100644 index 0000000..2838bb5 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/pom.xml @@ -0,0 +1,129 @@ + + 4.0.0 + + com.minres.rdl + com.minres.rdl.parent + 1.0.0-SNAPSHOT + + com.minres.rdl.web + war + + + src + + + src + + **/*.java + **/*.xtend + + + + + + org.eclipse.xtend + xtend-maven-plugin + + + maven-war-plugin + 3.2.0 + + WebRoot + false + + + + org.eclipse.jetty + jetty-maven-plugin + 9.4.9.v20180320 + + WebRoot + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + initialize + + add-source + add-resource + + + + src-gen + + + + src-gen + + **/*.java + + + + + + + + + + + + + ${project.groupId} + com.minres.rdl + ${project.version} + + + ${project.groupId} + com.minres.rdl.ide + ${project.version} + + + org.eclipse.xtext + org.eclipse.xtext.xbase.web + ${xtextVersion} + + + org.eclipse.xtext + org.eclipse.xtext.web.servlet + ${xtextVersion} + + + org.eclipse.xtend + org.eclipse.xtend.lib + ${xtextVersion} + + + org.webjars + requirejs + 2.3.2 + + + org.webjars + jquery + 2.2.4 + + + org.webjars + ace + 1.2.3 + + + org.eclipse.jetty + jetty-annotations + 9.4.9.v20180320 + provided + + + org.slf4j + slf4j-simple + 1.7.21 + provided + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.web/src-gen/com/minres/rdl/web/AbstractRDLWebModule.java b/com.minres.rdl.parent/com.minres.rdl.web/src-gen/com/minres/rdl/web/AbstractRDLWebModule.java new file mode 100644 index 0000000..e55b0bd --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/src-gen/com/minres/rdl/web/AbstractRDLWebModule.java @@ -0,0 +1,14 @@ +/* + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.web; + +import org.eclipse.xtext.web.server.DefaultWebModule; + +/** + * Manual modifications go to {@link RDLWebModule}. + */ +@SuppressWarnings("all") +public abstract class AbstractRDLWebModule extends DefaultWebModule { + +} diff --git a/com.minres.rdl.parent/com.minres.rdl.web/src/com/minres/rdl/web/RDLServlet.xtend b/com.minres.rdl.parent/com.minres.rdl.web/src/com/minres/rdl/web/RDLServlet.xtend new file mode 100644 index 0000000..672b526 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/src/com/minres/rdl/web/RDLServlet.xtend @@ -0,0 +1,32 @@ +/* + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.web + +import javax.servlet.annotation.WebServlet +import org.eclipse.xtext.util.DisposableRegistry +import org.eclipse.xtext.web.servlet.XtextServlet + +/** + * Deploy this class into a servlet container to enable DSL-specific services. + */ +@WebServlet(name = 'XtextServices', urlPatterns = '/xtext-service/*') +class RDLServlet extends XtextServlet { + + DisposableRegistry disposableRegistry + + override init() { + super.init() + val injector = new RDLWebSetup().createInjectorAndDoEMFRegistration() + disposableRegistry = injector.getInstance(DisposableRegistry) + } + + override destroy() { + if (disposableRegistry !== null) { + disposableRegistry.dispose() + disposableRegistry = null + } + super.destroy() + } + +} diff --git a/com.minres.rdl.parent/com.minres.rdl.web/src/com/minres/rdl/web/RDLWebModule.xtend b/com.minres.rdl.parent/com.minres.rdl.web/src/com/minres/rdl/web/RDLWebModule.xtend new file mode 100644 index 0000000..2231720 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/src/com/minres/rdl/web/RDLWebModule.xtend @@ -0,0 +1,11 @@ +/* + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.web + + +/** + * Use this class to register additional components to be used within the web application. + */ +class RDLWebModule extends AbstractRDLWebModule { +} diff --git a/com.minres.rdl.parent/com.minres.rdl.web/src/com/minres/rdl/web/RDLWebSetup.xtend b/com.minres.rdl.parent/com.minres.rdl.web/src/com/minres/rdl/web/RDLWebSetup.xtend new file mode 100644 index 0000000..e6c4bb7 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/src/com/minres/rdl/web/RDLWebSetup.xtend @@ -0,0 +1,22 @@ +/* + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.web + +import com.google.inject.Guice +import com.google.inject.Injector +import com.minres.rdl.RDLRuntimeModule +import com.minres.rdl.RDLStandaloneSetup +import com.minres.rdl.ide.RDLIdeModule +import org.eclipse.xtext.util.Modules2 + +/** + * Initialization support for running Xtext languages in web applications. + */ +class RDLWebSetup extends RDLStandaloneSetup { + + override Injector createInjector() { + return Guice.createInjector(Modules2.mixin(new RDLRuntimeModule, new RDLIdeModule, new RDLWebModule)) + } + +} diff --git a/com.minres.rdl.parent/com.minres.rdl.web/src/com/minres/rdl/web/ServerLauncher.xtend b/com.minres.rdl.parent/com.minres.rdl.web/src/com/minres/rdl/web/ServerLauncher.xtend new file mode 100644 index 0000000..0b55da2 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/src/com/minres/rdl/web/ServerLauncher.xtend @@ -0,0 +1,54 @@ +/* + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.web + +import java.net.InetSocketAddress +import org.eclipse.jetty.annotations.AnnotationConfiguration +import org.eclipse.jetty.server.Server +import org.eclipse.jetty.util.log.Slf4jLog +import org.eclipse.jetty.webapp.MetaInfConfiguration +import org.eclipse.jetty.webapp.WebAppContext +import org.eclipse.jetty.webapp.WebInfConfiguration +import org.eclipse.jetty.webapp.WebXmlConfiguration + +/** + * This program starts an HTTP server for testing the web integration of your DSL. + * Just execute it and point a web browser to http://localhost:8080/ + */ +class ServerLauncher { + def static void main(String[] args) { + val server = new Server(new InetSocketAddress('localhost', 8080)) + server.handler = new WebAppContext => [ + resourceBase = 'WebRoot' + welcomeFiles = #["index.html"] + contextPath = "/" + configurations = #[ + new AnnotationConfiguration, + new WebXmlConfiguration, + new WebInfConfiguration, + new MetaInfConfiguration + ] + setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, '.*/com\\.minres\\.rdl\\.web/.*,.*\\.jar') + setInitParameter("org.mortbay.jetty.servlet.Default.useFileMappedBuffer", "false") + ] + val log = new Slf4jLog(ServerLauncher.name) + try { + server.start + log.info('Server started ' + server.getURI + '...') + new Thread[ + log.info('Press enter to stop the server...') + val key = System.in.read + if (key != -1) { + server.stop + } else { + log.warn('Console input is not available. In order to stop the server, you need to cancel process manually.') + } + ].start + server.join + } catch (Exception exception) { + log.warn(exception.message) + System.exit(1) + } + } +} diff --git a/com.minres.rdl.parent/com.minres.rdl.web/xtend-gen/com/minres/rdl/web/RDLServlet.java b/com.minres.rdl.parent/com.minres.rdl.web/xtend-gen/com/minres/rdl/web/RDLServlet.java new file mode 100644 index 0000000..a0ff00d --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/xtend-gen/com/minres/rdl/web/RDLServlet.java @@ -0,0 +1,40 @@ +/** + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.web; + +import com.google.inject.Injector; +import com.minres.rdl.web.RDLWebSetup; +import javax.servlet.annotation.WebServlet; +import org.eclipse.xtext.util.DisposableRegistry; +import org.eclipse.xtext.web.servlet.XtextServlet; +import org.eclipse.xtext.xbase.lib.Exceptions; + +/** + * Deploy this class into a servlet container to enable DSL-specific services. + */ +@WebServlet(name = "XtextServices", urlPatterns = "/xtext-service/*") +@SuppressWarnings("all") +public class RDLServlet extends XtextServlet { + private DisposableRegistry disposableRegistry; + + @Override + public void init() { + try { + super.init(); + final Injector injector = new RDLWebSetup().createInjectorAndDoEMFRegistration(); + this.disposableRegistry = injector.getInstance(DisposableRegistry.class); + } catch (Throwable _e) { + throw Exceptions.sneakyThrow(_e); + } + } + + @Override + public void destroy() { + if ((this.disposableRegistry != null)) { + this.disposableRegistry.dispose(); + this.disposableRegistry = null; + } + super.destroy(); + } +} diff --git a/com.minres.rdl.parent/com.minres.rdl.web/xtend-gen/com/minres/rdl/web/RDLWebModule.java b/com.minres.rdl.parent/com.minres.rdl.web/xtend-gen/com/minres/rdl/web/RDLWebModule.java new file mode 100644 index 0000000..cf4d468 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/xtend-gen/com/minres/rdl/web/RDLWebModule.java @@ -0,0 +1,13 @@ +/** + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.web; + +import com.minres.rdl.web.AbstractRDLWebModule; + +/** + * Use this class to register additional components to be used within the web application. + */ +@SuppressWarnings("all") +public class RDLWebModule extends AbstractRDLWebModule { +} diff --git a/com.minres.rdl.parent/com.minres.rdl.web/xtend-gen/com/minres/rdl/web/RDLWebSetup.java b/com.minres.rdl.parent/com.minres.rdl.web/xtend-gen/com/minres/rdl/web/RDLWebSetup.java new file mode 100644 index 0000000..463acdd --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/xtend-gen/com/minres/rdl/web/RDLWebSetup.java @@ -0,0 +1,26 @@ +/** + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.web; + +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.minres.rdl.RDLRuntimeModule; +import com.minres.rdl.RDLStandaloneSetup; +import com.minres.rdl.ide.RDLIdeModule; +import com.minres.rdl.web.RDLWebModule; +import org.eclipse.xtext.util.Modules2; + +/** + * Initialization support for running Xtext languages in web applications. + */ +@SuppressWarnings("all") +public class RDLWebSetup extends RDLStandaloneSetup { + @Override + public Injector createInjector() { + RDLRuntimeModule _rDLRuntimeModule = new RDLRuntimeModule(); + RDLIdeModule _rDLIdeModule = new RDLIdeModule(); + RDLWebModule _rDLWebModule = new RDLWebModule(); + return Guice.createInjector(Modules2.mixin(_rDLRuntimeModule, _rDLIdeModule, _rDLWebModule)); + } +} diff --git a/com.minres.rdl.parent/com.minres.rdl.web/xtend-gen/com/minres/rdl/web/ServerLauncher.java b/com.minres.rdl.parent/com.minres.rdl.web/xtend-gen/com/minres/rdl/web/ServerLauncher.java new file mode 100644 index 0000000..7eb794a --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.web/xtend-gen/com/minres/rdl/web/ServerLauncher.java @@ -0,0 +1,77 @@ +/** + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.web; + +import java.net.InetSocketAddress; +import java.net.URI; +import org.eclipse.jetty.annotations.AnnotationConfiguration; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.util.log.Slf4jLog; +import org.eclipse.jetty.webapp.Configuration; +import org.eclipse.jetty.webapp.MetaInfConfiguration; +import org.eclipse.jetty.webapp.WebAppContext; +import org.eclipse.jetty.webapp.WebInfConfiguration; +import org.eclipse.jetty.webapp.WebXmlConfiguration; +import org.eclipse.xtext.xbase.lib.Exceptions; +import org.eclipse.xtext.xbase.lib.ObjectExtensions; +import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; + +/** + * This program starts an HTTP server for testing the web integration of your DSL. + * Just execute it and point a web browser to http://localhost:8080/ + */ +@SuppressWarnings("all") +public class ServerLauncher { + public static void main(final String[] args) { + InetSocketAddress _inetSocketAddress = new InetSocketAddress("localhost", 8080); + final Server server = new Server(_inetSocketAddress); + WebAppContext _webAppContext = new WebAppContext(); + final Procedure1 _function = (WebAppContext it) -> { + it.setResourceBase("WebRoot"); + it.setWelcomeFiles(new String[] { "index.html" }); + it.setContextPath("/"); + AnnotationConfiguration _annotationConfiguration = new AnnotationConfiguration(); + WebXmlConfiguration _webXmlConfiguration = new WebXmlConfiguration(); + WebInfConfiguration _webInfConfiguration = new WebInfConfiguration(); + MetaInfConfiguration _metaInfConfiguration = new MetaInfConfiguration(); + it.setConfigurations(new Configuration[] { _annotationConfiguration, _webXmlConfiguration, _webInfConfiguration, _metaInfConfiguration }); + it.setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, ".*/com\\.minres\\.rdl\\.web/.*,.*\\.jar"); + it.setInitParameter("org.mortbay.jetty.servlet.Default.useFileMappedBuffer", "false"); + }; + WebAppContext _doubleArrow = ObjectExtensions.operator_doubleArrow(_webAppContext, _function); + server.setHandler(_doubleArrow); + String _name = ServerLauncher.class.getName(); + final Slf4jLog log = new Slf4jLog(_name); + try { + server.start(); + URI _uRI = server.getURI(); + String _plus = ("Server started " + _uRI); + String _plus_1 = (_plus + "..."); + log.info(_plus_1); + final Runnable _function_1 = () -> { + try { + log.info("Press enter to stop the server..."); + final int key = System.in.read(); + if ((key != (-1))) { + server.stop(); + } else { + log.warn("Console input is not available. In order to stop the server, you need to cancel process manually."); + } + } catch (Throwable _e) { + throw Exceptions.sneakyThrow(_e); + } + }; + new Thread(_function_1).start(); + server.join(); + } catch (final Throwable _t) { + if (_t instanceof Exception) { + final Exception exception = (Exception)_t; + log.warn(exception.getMessage()); + System.exit(1); + } else { + throw Exceptions.sneakyThrow(_t); + } + } + } +} 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 4ed447a..12f0bec 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 @@ -1,4 +1,5 @@ Manifest-Version: 1.0 +Automatic-Module-Name: com.minres.rdl Bundle-ManifestVersion: 2 Bundle-Name: com.minres.rdl Bundle-Vendor: My Company @@ -9,11 +10,11 @@ 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;bundle-version="2.13.0", - org.antlr.runtime, + org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtext.util, - org.eclipse.xtend.lib;bundle-version="2.13.0", org.eclipse.emf.common, + org.eclipse.xtend.lib;bundle-version="2.14.0", + org.antlr.runtime, org.eclipse.equinox.preferences Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: com.minres.rdl, 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 ad0b2bd..214f2c5 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/pom.xml b/com.minres.rdl.parent/com.minres.rdl/pom.xml index 20d939a..5e68908 100644 --- a/com.minres.rdl.parent/com.minres.rdl/pom.xml +++ b/com.minres.rdl.parent/com.minres.rdl/pom.xml @@ -39,7 +39,7 @@ org.eclipse.emf org.eclipse.emf.mwe2.launch - 2.9.0.201605261059 + 2.9.1.201705291010 org.eclipse.xtext @@ -103,6 +103,12 @@ **/* + + ${basedir}/../com.minres.rdl.web/src-gen/ + + **/* + + ${basedir}/model/generated/ 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 641f7b2..4edc1e6 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.13.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl; @@ -14,6 +14,7 @@ import com.minres.rdl.scoping.RDLScopeProvider; import com.minres.rdl.serializer.RDLSemanticSequencer; import com.minres.rdl.serializer.RDLSyntacticSequencer; import com.minres.rdl.services.RDLGrammarAccess; +import com.minres.rdl.validation.RDLConfigurableIssueCodesProvider; import com.minres.rdl.validation.RDLValidator; import java.util.Properties; import org.eclipse.xtext.Constants; @@ -49,6 +50,7 @@ import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer; import org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer; import org.eclipse.xtext.service.DefaultRuntimeModule; import org.eclipse.xtext.service.SingletonBinding; +import org.eclipse.xtext.validation.ConfigurableIssueCodesProvider; /** * Manual modifications go to {@link RDLRuntimeModule}. @@ -141,6 +143,31 @@ public abstract class AbstractRDLRuntimeModule extends DefaultRuntimeModule { return RDLValidator.class; } + // contributed by org.eclipse.xtext.xtext.generator.validation.ValidatorFragment2 + public Class bindConfigurableIssueCodesProvider() { + return RDLConfigurableIssueCodesProvider.class; + } + + // contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2 + public Class bindIScopeProvider() { + return RDLScopeProvider.class; + } + + // contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2 + public void configureIScopeProviderDelegate(Binder binder) { + binder.bind(IScopeProvider.class).annotatedWith(Names.named(AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(ImportedNamespaceAwareLocalScopeProvider.class); + } + + // contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2 + public Class bindIGlobalScopeProvider() { + return DefaultGlobalScopeProvider.class; + } + + // contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2 + public void configureIgnoreCaseLinking(Binder binder) { + binder.bindConstant().annotatedWith(IgnoreCaseLinking.class).to(false); + } + // contributed by org.eclipse.xtext.xtext.generator.builder.BuilderIntegrationFragment2 public Class bindIContainer$Manager() { return StateBasedContainerManager.class; @@ -166,26 +193,6 @@ public abstract class AbstractRDLRuntimeModule extends DefaultRuntimeModule { return RDLGenerator.class; } - // contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2 - public Class bindIScopeProvider() { - return RDLScopeProvider.class; - } - - // contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2 - public void configureIScopeProviderDelegate(Binder binder) { - binder.bind(IScopeProvider.class).annotatedWith(Names.named(AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(ImportedNamespaceAwareLocalScopeProvider.class); - } - - // contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2 - public Class bindIGlobalScopeProvider() { - return DefaultGlobalScopeProvider.class; - } - - // contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2 - public void configureIgnoreCaseLinking(Binder binder) { - binder.bindConstant().annotatedWith(IgnoreCaseLinking.class).to(false); - } - // contributed by org.eclipse.xtext.xtext.generator.exporting.SimpleNamesFragment2 public Class bindIQualifiedNameProvider() { return SimpleNameProvider.class; 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 91e6fe2..d158a40 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.13.0 + * generated by Xtext 2.14.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 f817cfe..2b0e5ff 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.13.0 + * generated by Xtext 2.14.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 8779abc..c2a26cd 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.13.0 + * generated by Xtext 2.14.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 22be1f4..96c3892 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.13.0 + * generated by Xtext 2.14.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 7ed2f42..2a933d7 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.13.0 + * generated by Xtext 2.14.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 b6f26d6..d4521d1 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.13.0 + * generated by Xtext 2.14.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 8a16106..fdf1e01 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.13.0 + * generated by Xtext 2.14.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 bf3446d..cb13014 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.13.0 + * generated by Xtext 2.14.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 1eb2165..b88d088 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.13.0 + * generated by Xtext 2.14.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 ee88330..f42a5e9 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.13.0 + * generated by Xtext 2.14.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 9cff1dd..c0cd959 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.13.0 + * generated by Xtext 2.14.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 014cb21..5070f16 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.13.0 + * generated by Xtext 2.14.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 0069d30..2ee1505 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.13.0 + * generated by Xtext 2.14.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 3c35a85..d683e6f 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.13.0 + * generated by Xtext 2.14.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 5795567..1b38505 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.13.0 + * generated by Xtext 2.14.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 312328c..fd40750 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.13.0 + * generated by Xtext 2.14.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 cc99552..3ef7872 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.13.0 + * generated by Xtext 2.14.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 a0700be..b648fa5 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.13.0 + * generated by Xtext 2.14.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 e4f65ce..0e2b9c3 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.13.0 + * generated by Xtext 2.14.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 61594cd..032c920 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.13.0 + * generated by Xtext 2.14.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 b95d67a..f19b928 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.13.0 + * generated by Xtext 2.14.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 4ccc103..244b731 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.13.0 + * generated by Xtext 2.14.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 453a7de..8199217 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.13.0 + * generated by Xtext 2.14.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 10212a7..d75f81f 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.13.0 + * generated by Xtext 2.14.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 66fa172..38d7a5e 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.13.0 + * generated by Xtext 2.14.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 2f95c24..ac167b9 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.13.0 + * generated by Xtext 2.14.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 1ce7b6e..ea4115a 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.13.0 + * generated by Xtext 2.14.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 33f006d..fcbc308 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.13.0 + * generated by Xtext 2.14.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 22e8f83..ad06fe4 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.13.0 + * generated by Xtext 2.14.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 f427481..a0a5d00 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.13.0 + * generated by Xtext 2.14.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 40abda3..9528610 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.13.0 + * generated by Xtext 2.14.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 4b26037..7c1c59a 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.13.0 + * generated by Xtext 2.14.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 072b393..3f831b4 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.13.0 + * generated by Xtext 2.14.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 6345810..e222939 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.13.0 + * generated by Xtext 2.14.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 ce34a90..108c008 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.13.0 + * generated by Xtext 2.14.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 c43b310..80fbc41 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.13.0 + * generated by Xtext 2.14.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 9d8ef96..7a23c0a 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.13.0 + * generated by Xtext 2.14.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 5b6c974..cbc6818 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.13.0 + * generated by Xtext 2.14.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 3b9fad5..520981d 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.13.0 + * generated by Xtext 2.14.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 647ff32..92ba393 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.13.0 + * generated by Xtext 2.14.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 ddc06c3..d816ec5 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.13.0 + * generated by Xtext 2.14.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 b25f602..3ccc985 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.13.0 + * generated by Xtext 2.14.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 26f6e1d..8eeb7be 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.13.0 + * generated by Xtext 2.14.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 8f33673..925ebb8 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.13.0 + * generated by Xtext 2.14.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 5f0262d..b9b3184 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.13.0 + * generated by Xtext 2.14.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 b90ecbd..b880d61 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.13.0 + * generated by Xtext 2.14.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 bff7f3e..88fcb24 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.13.0 + * generated by Xtext 2.14.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 76685b7..27afb1a 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.13.0 + * generated by Xtext 2.14.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 eb6cb71..fa4dbf7 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.13.0 + * generated by Xtext 2.14.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 053e8bf..4b03b4b 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.13.0 + * generated by Xtext 2.14.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 8edd37a..d8d7788 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.13.0 + * generated by Xtext 2.14.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 df78bf3..9b697d2 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.13.0 + * generated by Xtext 2.14.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 bf839c2..ace3bef 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.13.0 + * generated by Xtext 2.14.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 4f313cb..1f49b0d 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.13.0 + * generated by Xtext 2.14.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 6dd429d..07da1a0 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.13.0 + * generated by Xtext 2.14.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 19bffca..b7402a8 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.13.0 + * generated by Xtext 2.14.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 4eea5c6..b681c1e 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.13.0 + * generated by Xtext 2.14.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 9bfbcf2..298154b 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.13.0 + * generated by Xtext 2.14.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 336ce4a..06d1c14 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.13.0 + * generated by Xtext 2.14.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 a8e2ba1..837a984 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.13.0 + * generated by Xtext 2.14.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 d93274b..0f3f6f0 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.13.0 + * generated by Xtext 2.14.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 97a993f..257d591 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.13.0 + * generated by Xtext 2.14.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 8e3a08b..a1ffd43 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.13.0 + * generated by Xtext 2.14.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 89ef3cd..78049fc 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.13.0 + * generated by Xtext 2.14.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 c21c296..7570a4f 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.13.0 + * generated by Xtext 2.14.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 4800aa0..29da74d 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.13.0 + * generated by Xtext 2.14.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 81465f6..cfd78db 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.13.0 + * generated by Xtext 2.14.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 e10db5d..f893a62 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.13.0 + * generated by Xtext 2.14.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 e3b22f5..023ebf1 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.13.0 + * generated by Xtext 2.14.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 fcee2c0..ae8d3bd 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.13.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.services; @@ -676,8 +676,9 @@ public class RDLGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cComponentInstancesComponentInstanceParserRuleCall_2_1_0 = (RuleCall)cComponentInstancesAssignment_2_1.eContents().get(0); //Instantiation: - // (instanceType=EnumInstanceType? ("alias" alias=ID)? componentRef=[ComponentDefinition] | component=ComponentDefinition - // instanceType=EnumInstanceType?) componentInstances+=ComponentInstance (',' componentInstances+=ComponentInstance)*; + // (instanceType=EnumInstanceType? ("alias" alias=ID)? + // componentRef=[ComponentDefinition] | component=ComponentDefinition instanceType=EnumInstanceType?) + // componentInstances+=ComponentInstance (',' componentInstances+=ComponentInstance)*; @Override public ParserRule getRule() { return rule; } //(instanceType=EnumInstanceType? ("alias" alias=ID)? componentRef=[ComponentDefinition] | component=ComponentDefinition @@ -3602,8 +3603,9 @@ public class RDLGrammarAccess extends AbstractGrammarElementFinder { } //Instantiation: - // (instanceType=EnumInstanceType? ("alias" alias=ID)? componentRef=[ComponentDefinition] | component=ComponentDefinition - // instanceType=EnumInstanceType?) componentInstances+=ComponentInstance (',' componentInstances+=ComponentInstance)*; + // (instanceType=EnumInstanceType? ("alias" alias=ID)? + // componentRef=[ComponentDefinition] | component=ComponentDefinition instanceType=EnumInstanceType?) + // componentInstances+=ComponentInstance (',' componentInstances+=ComponentInstance)*; public InstantiationElements getInstantiationAccess() { return pInstantiation; } 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 524e767..2951309 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.13.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.validation; @@ -16,5 +16,4 @@ public abstract class AbstractRDLValidator extends AbstractDeclarativeValidator result.add(com.minres.rdl.rdl.RdlPackage.eINSTANCE); return result; } - } diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/validation/RDLConfigurableIssueCodesProvider.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/validation/RDLConfigurableIssueCodesProvider.java new file mode 100644 index 0000000..42c1353 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/validation/RDLConfigurableIssueCodesProvider.java @@ -0,0 +1,22 @@ +/* + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.validation; + +import org.eclipse.xtext.preferences.PreferenceKey; +import org.eclipse.xtext.util.IAcceptor; +import org.eclipse.xtext.validation.ConfigurableIssueCodesProvider; +import org.eclipse.xtext.validation.SeverityConverter; + +@SuppressWarnings("restriction") +public class RDLConfigurableIssueCodesProvider extends ConfigurableIssueCodesProvider { + protected static final String ISSUE_CODE_PREFIX = "com.minres.rdl."; + + public static final String DEPRECATED_MODEL_PART = ISSUE_CODE_PREFIX + "deprecatedModelPart"; + + @Override + protected void initialize(IAcceptor acceptor) { + super.initialize(acceptor); + acceptor.accept(create(DEPRECATED_MODEL_PART, SeverityConverter.SEVERITY_WARNING)); + } +} diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/GenerateRDL.mwe2 b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/GenerateRDL.mwe2 index 8b2a4ea..e09fe93 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/GenerateRDL.mwe2 +++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/GenerateRDL.mwe2 @@ -21,6 +21,9 @@ Workflow { eclipsePluginTest = { enabled = true } + web = { + enabled = true + } createEclipseMetaData = true } code = { @@ -33,7 +36,6 @@ Workflow { name = "com.minres.rdl.RDL" fileExtensions = "rdl" - fragment = scoping.ImportNamespacesScopingFragment2 auto-inject {} fragment = exporting.SimpleNamesFragment2 auto-inject {} parserGenerator = { @@ -41,13 +43,18 @@ Workflow { backtrack = true } } - serializer = { generateStub = false } validator = { // composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator" } + generator = { + generateXtendMain = true + } + newProjectWizardForEclipse = { + generate = true + } } } } diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/IntegerWithRadix.java b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/IntegerWithRadix.java index cfe270c..c0f08c5 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/IntegerWithRadix.java +++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/IntegerWithRadix.java @@ -1,121 +1,121 @@ -package com.minres.rdl; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class IntegerWithRadix { - - private static final Pattern bin = Pattern.compile("([0-9]+)?'b([01_]+)"); - private static final Pattern oct = Pattern.compile("([0-9]+)?'o([0-7_]+)"); - private static final Pattern dec = Pattern.compile("([0-9]+)?'d([0-9_]+)"); - private static final Pattern hex = Pattern.compile("([0-9]+)?'h([0-9a-fA-F_]+)"); - - public long value; - public int length; - public int radix; - - - public IntegerWithRadix(Integer valueOf) { - this.value=valueOf; - this.radix=10; - this.length=0; - } - public IntegerWithRadix(Integer valueOf, int radix) { - this.value=valueOf; - this.radix=radix; - this.length=0; - } - - public IntegerWithRadix(Integer valueOf, int radix, int len) { - this.value=valueOf; - this.radix=radix; - this.length=len; - } - - public IntegerWithRadix(String string) { - radix=10; - if(string.contains("'")){ - Matcher matcher=hex.matcher(string); - if(matcher.matches()){ - radix = 16; - if(matcher.groupCount()==2){ - length=Integer.valueOf(matcher.group(1)); - string=matcher.group(2).replaceAll("_", ""); - } else - string=matcher.group(1).replaceAll("_", ""); - value=Long.parseLong(string, radix); - } - matcher =bin.matcher(string); - if(matcher.matches()){ - radix = 2; - if(matcher.groupCount()==2){ - length=Integer.valueOf(matcher.group(1)); - string=matcher.group(2).replaceAll("_", ""); - } else - string=matcher.group(1).replaceAll("_", ""); - value=Long.parseLong(string, radix); - } - matcher =dec.matcher(string); - if(matcher.matches()){ - radix = 10; - if(matcher.groupCount()==2){ - length=Integer.valueOf(matcher.group(1)); - string=matcher.group(2).replaceAll("_", ""); - } else - string=matcher.group(1).replaceAll("_", ""); - value=Long.parseLong(string, radix); - } - matcher =oct.matcher(string); - if(matcher.matches()){ - radix = 8; - if(matcher.groupCount()==2){ - length=Integer.valueOf(matcher.group(1)); - string=matcher.group(2).replaceAll("_", ""); - } else - string=matcher.group(1).replaceAll("_", ""); - value=Long.parseLong(string, radix); - } - } else if(string.startsWith("0x") || string.startsWith("0X")) { - radix = 16; - string = string.substring(2); - } else if(string.startsWith("0") && string.length()>1) { - radix=8; - } - value=Long.parseLong(string, radix); - } - - public String toString(){ - StringBuilder sb = new StringBuilder(); - if(length>0){ - sb.append(length); - switch(radix){ - case 16: - sb.append("'h").append(Long.toHexString(value)); - break; - case 8: - sb.append("'o").append(Long.toOctalString(value)); - break; - case 2: - sb.append("'b").append(Long.toBinaryString(value)); - break; - default: - sb.append("'d").append(value); - break; - } - } else{ - switch(radix){ - case 16: - sb.append("0x").append(Long.toHexString(value)); - break; - case 8: - sb.append("0").append(Long.toOctalString(value)); - break; - default: - sb.append(value); - break; - } - } - return sb.toString(); - } -} - +package com.minres.rdl; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class IntegerWithRadix { + + private static final Pattern bin = Pattern.compile("([0-9]+)?'b([01_]+)"); + private static final Pattern oct = Pattern.compile("([0-9]+)?'o([0-7_]+)"); + private static final Pattern dec = Pattern.compile("([0-9]+)?'d([0-9_]+)"); + private static final Pattern hex = Pattern.compile("([0-9]+)?'h([0-9a-fA-F_]+)"); + + public long value; + public int length; + public int radix; + + + public IntegerWithRadix(Integer valueOf) { + this.value=valueOf; + this.radix=10; + this.length=0; + } + public IntegerWithRadix(Integer valueOf, int radix) { + this.value=valueOf; + this.radix=radix; + this.length=0; + } + + public IntegerWithRadix(Integer valueOf, int radix, int len) { + this.value=valueOf; + this.radix=radix; + this.length=len; + } + + public IntegerWithRadix(String string) { + radix=10; + if(string.contains("'")){ + Matcher matcher=hex.matcher(string); + if(matcher.matches()){ + radix = 16; + if(matcher.groupCount()==2){ + length=Integer.valueOf(matcher.group(1)); + string=matcher.group(2).replaceAll("_", ""); + } else + string=matcher.group(1).replaceAll("_", ""); + value=Long.parseLong(string, radix); + } + matcher =bin.matcher(string); + if(matcher.matches()){ + radix = 2; + if(matcher.groupCount()==2){ + length=Integer.valueOf(matcher.group(1)); + string=matcher.group(2).replaceAll("_", ""); + } else + string=matcher.group(1).replaceAll("_", ""); + value=Long.parseLong(string, radix); + } + matcher =dec.matcher(string); + if(matcher.matches()){ + radix = 10; + if(matcher.groupCount()==2){ + length=Integer.valueOf(matcher.group(1)); + string=matcher.group(2).replaceAll("_", ""); + } else + string=matcher.group(1).replaceAll("_", ""); + value=Long.parseLong(string, radix); + } + matcher =oct.matcher(string); + if(matcher.matches()){ + radix = 8; + if(matcher.groupCount()==2){ + length=Integer.valueOf(matcher.group(1)); + string=matcher.group(2).replaceAll("_", ""); + } else + string=matcher.group(1).replaceAll("_", ""); + value=Long.parseLong(string, radix); + } + } else if(string.startsWith("0x") || string.startsWith("0X")) { + radix = 16; + string = string.substring(2); + } else if(string.startsWith("0") && string.length()>1) { + radix=8; + } + value=Long.parseLong(string, radix); + } + + public String toString(){ + StringBuilder sb = new StringBuilder(); + if(length>0){ + sb.append(length); + switch(radix){ + case 16: + sb.append("'h").append(Long.toHexString(value)); + break; + case 8: + sb.append("'o").append(Long.toOctalString(value)); + break; + case 2: + sb.append("'b").append(Long.toBinaryString(value)); + break; + default: + sb.append("'d").append(value); + break; + } + } else{ + switch(radix){ + case 16: + sb.append("0x").append(Long.toHexString(value)); + break; + case 8: + sb.append("0").append(Long.toOctalString(value)); + break; + default: + sb.append(value); + break; + } + } + return sb.toString(); + } +} + diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RDLRuntimeModule.xtend b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RDLRuntimeModule.xtend index 5dbdd25..ea930a2 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RDLRuntimeModule.xtend +++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RDLRuntimeModule.xtend @@ -1,37 +1,29 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl import org.eclipse.xtext.conversion.IValueConverterService import com.minres.rdl.converter.RdlTerminalConverters import org.eclipse.xtext.scoping.IGlobalScopeProvider -import org.eclipse.xtext.naming.IQualifiedNameProvider /** * Use this class to register components to be used at runtime / without the Equinox extension registry. */ class RDLRuntimeModule extends AbstractRDLRuntimeModule { - override Class bindIValueConverterService() { return typeof(RdlTerminalConverters); } + // the following two are used to allow URI based include mechanism // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment override void configureIScopeProviderDelegate(com.google.inject.Binder binder) { binder.bind(typeof(org.eclipse.xtext.scoping.IScopeProvider)). annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)). to(typeof(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider)); } - // the following two are used to allow URI based include mechanism // contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2 override Class bindIGlobalScopeProvider() { //return typeof(ResourceSetGlobalScopeProvider) return typeof(org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider) } - // contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment - override Class bindIQualifiedNameProvider() { - //return typeof(ResourceSetGlobalScopeProvider) - return typeof(org.eclipse.xtext.naming.SimpleNameProvider) - } - } diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RDLStandaloneSetup.xtend b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RDLStandaloneSetup.xtend index da33b04..21d0e91 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RDLStandaloneSetup.xtend +++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RDLStandaloneSetup.xtend @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/Main.xtend_gen b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/Main.xtend_gen new file mode 100644 index 0000000..de3a94d --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/Main.xtend_gen @@ -0,0 +1,58 @@ +/* + * generated by Xtext 2.14.0 + */ +package com.minres.rdl.generator + +import com.google.inject.Inject +import com.google.inject.Provider +import com.minres.rdl.RDLStandaloneSetup +import org.eclipse.emf.common.util.URI +import org.eclipse.emf.ecore.resource.ResourceSet +import org.eclipse.xtext.generator.GeneratorContext +import org.eclipse.xtext.generator.GeneratorDelegate +import org.eclipse.xtext.generator.JavaIoFileSystemAccess +import org.eclipse.xtext.util.CancelIndicator +import org.eclipse.xtext.validation.CheckMode +import org.eclipse.xtext.validation.IResourceValidator + +class Main { + + def static main(String[] args) { + if (args.empty) { + System::err.println('Aborting: no path to EMF resource provided!') + return + } + val injector = new RDLStandaloneSetup().createInjectorAndDoEMFRegistration + val main = injector.getInstance(Main) + main.runGenerator(args.get(0)) + } + + @Inject Provider resourceSetProvider + + @Inject IResourceValidator validator + + @Inject GeneratorDelegate generator + + @Inject JavaIoFileSystemAccess fileAccess + + def protected runGenerator(String string) { + // Load the resource + val set = resourceSetProvider.get + val resource = set.getResource(URI.createFileURI(string), true) + + // Validate the resource + val issues = validator.validate(resource, CheckMode.ALL, CancelIndicator.NullImpl) + if (!issues.empty) { + issues.forEach[System.err.println(it)] + return + } + + // Configure and start the generator + fileAccess.outputPath = 'src-gen/' + val context = new GeneratorContext => [ + cancelIndicator = CancelIndicator.NullImpl + ] + generator.generate(resource, fileAccess, context) + System.out.println('Code generation finished.') + } +} diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/OptionData.java b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/OptionData.java old mode 100755 new mode 100644 diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/OptionSet.java b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/OptionSet.java old mode 100755 new mode 100644 diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/Options.java b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/Options.java old mode 100755 new mode 100644 diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/validation/RDLValidator.xtend b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/validation/RDLValidator.xtend index 99245c8..b0fdfb5 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/validation/RDLValidator.xtend +++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/validation/RDLValidator.xtend @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.validation diff --git a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/RDLRuntimeModule.java b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/RDLRuntimeModule.java index a58c885..65a219c 100644 --- a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/RDLRuntimeModule.java +++ b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/RDLRuntimeModule.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl; @@ -8,8 +8,6 @@ import com.google.inject.name.Names; import com.minres.rdl.AbstractRDLRuntimeModule; import com.minres.rdl.converter.RdlTerminalConverters; import org.eclipse.xtext.conversion.IValueConverterService; -import org.eclipse.xtext.naming.IQualifiedNameProvider; -import org.eclipse.xtext.naming.SimpleNameProvider; import org.eclipse.xtext.scoping.IGlobalScopeProvider; import org.eclipse.xtext.scoping.IScopeProvider; import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider; @@ -35,9 +33,4 @@ public class RDLRuntimeModule extends AbstractRDLRuntimeModule { public Class bindIGlobalScopeProvider() { return ImportUriGlobalScopeProvider.class; } - - @Override - public Class bindIQualifiedNameProvider() { - return SimpleNameProvider.class; - } } diff --git a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/RDLStandaloneSetup.java b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/RDLStandaloneSetup.java index d295a18..d440897 100644 --- a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/RDLStandaloneSetup.java +++ b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/RDLStandaloneSetup.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl; diff --git a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/Main.java b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/Main.java index 520fee9..bcf799a 100644 --- a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/Main.java +++ b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/Main.java @@ -171,7 +171,6 @@ public class Main { } } catch (final Throwable _t) { if (_t instanceof Exception) { - final Exception e = (Exception)_t; URI _uRI_3 = this.fileAccess.getURI(""); String _plus_3 = ("includes are in " + _uRI_3); InputOutput.println(_plus_3); @@ -187,7 +186,6 @@ public class Main { } } catch (final Throwable _t_1) { if (_t_1 instanceof Exception) { - final Exception e_1 = (Exception)_t_1; URI _uRI_5 = this.fileAccess.getURI(""); String _plus_5 = ("sources are in " + _uRI_5); InputOutput.println(_plus_5); diff --git a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/RDLGenerator.java b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/RDLGenerator.java index ad8b9ef..026e5df 100644 --- a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/RDLGenerator.java +++ b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/RDLGenerator.java @@ -80,7 +80,6 @@ public class RDLGenerator extends AbstractGenerator { fsa.getURI("", output_config); } catch (final Throwable _t) { if (_t instanceof Exception) { - final Exception e = (Exception)_t; output_config = "DEFAULT_OUTPUT"; } else { throw Exceptions.sneakyThrow(_t); diff --git a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/validation/RDLValidator.java b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/validation/RDLValidator.java index 3ca0787..980d13c 100644 --- a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/validation/RDLValidator.java +++ b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/validation/RDLValidator.java @@ -1,5 +1,5 @@ /** - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package com.minres.rdl.validation; diff --git a/com.minres.rdl.parent/pom.xml b/com.minres.rdl.parent/pom.xml index 18d3afc..b8583e2 100644 --- a/com.minres.rdl.parent/pom.xml +++ b/com.minres.rdl.parent/pom.xml @@ -7,16 +7,23 @@ pom - 1.0.0 - 2.12.0 + 2.14.0 UTF-8 1.8 1.8 + + 1.1.0 + + + + + com.minres.rdl com.minres.rdl.ide com.minres.rdl.ui + com.minres.rdl.web com.minres.rdl.target com.minres.rdl.feature com.minres.rdl.repository @@ -25,6 +32,7 @@ com.minres.rdl.product com.minres.rdl.product.feature com.minres.rdl.platform.feature + com.minres.rdl.product.releng com.minres.rdl.standalone @@ -40,7 +48,6 @@ tycho-versions-plugin ${tycho-version} - - + org.eclipse.tycho tycho-p2-plugin ${tycho-version} @@ -102,21 +108,11 @@ cocoa x86_64 - - win32 - win32 - x86 - win32 win32 x86_64 - - linux - gtk - x86 - linux gtk @@ -158,10 +154,6 @@ **/* - ${basedir}/xtend-gen - - **/* - @@ -270,6 +262,22 @@ ${tycho-version} -err:-forbidden + false + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho-version} + + + ${tycho.testArgLine} ${platformSystemProperties} ${systemProperties} ${moduleProperties} + false + false @@ -301,6 +309,29 @@ + + + macos + + + mac + + + + + -XstartOnFirstThread + + + + jdk9-or-newer + + [9,) + + + --add-modules=ALL-SYSTEM + + + diff --git a/com.minres.rdl.parent/pom.xml.old b/com.minres.rdl.parent/pom.xml.old new file mode 100644 index 0000000..18d3afc --- /dev/null +++ b/com.minres.rdl.parent/pom.xml.old @@ -0,0 +1,307 @@ + + 4.0.0 + com.minres.rdl + 1.0.0-SNAPSHOT + com.minres.rdl.parent + pom + + + 1.0.0 + 2.12.0 + UTF-8 + 1.8 + 1.8 + + + com.minres.rdl + com.minres.rdl.ide + com.minres.rdl.ui + com.minres.rdl.target + com.minres.rdl.feature + com.minres.rdl.repository + com.minres.rdl.tests + com.minres.rdl.ui.tests + com.minres.rdl.product + com.minres.rdl.product.feature + com.minres.rdl.platform.feature + com.minres.rdl.standalone + + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho-version} + true + + + org.eclipse.tycho + tycho-versions-plugin + ${tycho-version} + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho-version} + + + attach-p2-metadata + package + + p2-metadata + + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + com.minres.rdl + com.minres.rdl.target + + 1.0.0-SNAPSHOT + + + + + macosx + cocoa + x86_64 + + + win32 + win32 + x86 + + + win32 + win32 + x86_64 + + + linux + gtk + x86 + + + linux + gtk + x86_64 + + + + + + + + + org.eclipse.xtend + xtend-maven-plugin + ${xtextVersion} + + + + compile + xtend-install-debug-info + testCompile + xtend-test-install-debug-info + + + + + ${basedir}/xtend-gen + ${basedir}/xtend-gen + + + + org.apache.maven.plugins + maven-clean-plugin + 2.5 + + + + ${basedir}/xtend-gen + + **/* + + ${basedir}/xtend-gen + + **/* + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-resources-plugin + + + [2.4.3,) + + + resources + testResources + + + + + + + + + + org.codehaus.mojo + + + build-helper-maven-plugin + + + [1.9.1,) + + + add-resource + add-source + add-test-resource + add-test-source + + + + + + + + + + org.eclipse.tycho + + + tycho-compiler-plugin + + + [0.23.1,) + + + compile + + + + + + + + + + org.eclipse.tycho + + + tycho-packaging-plugin + + + [0.23.1,) + + + build-qualifier + build-qualifier-aggregator + validate-id + validate-version + + + + + + + + + + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho-version} + + -err:-forbidden + + + + + + + + codehaus-snapshots + disable dead 'Codehaus Snapshots' repository, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=481478 + http://nexus.codehaus.org/snapshots/ + + false + + + false + + + + + + codehaus-snapshots + disable dead 'Codehaus Snapshots' repository, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=481478 + http://nexus.codehaus.org/snapshots/ + + false + + + false + + + + + + +