add read-only/write-only reg gen

Merge for patch release

.gitignore

@@ -3,3 +3,6 @@ com.minres.rdl.parent/*/target
 *.xtextbin
 *.xtendbin
 *._trace
+/.envrc
+/*.py
+/*.txt

README.md

@@ -1,37 +1,9 @@
-## Welcome to GitHub Pages
+## RDL Editor
 
-You can use the [editor on GitHub](https://github.com/Minres/RDL-Editor/edit/master/README.md) to maintain and preview the content for your website in Markdown files.
+This is an editor for [SystemRDL](http://www.accellera.org/activities/working-groups/systemrdl/).
 
-Whenever you commit to this repository, GitHub Pages will run [Jekyll](https://jekyllrb.com/) to rebuild the pages in your site, from the content in your Markdown files.
+Quote from Accellera: "SystemRDL is designed to increase productivity, quality, and reuse during the design and development of complex digital systems. It can be used to share IP within and between groups, companies, and consortiums. This is accomplished by specifying a single source for the register description from which all views can be automatically generated, which ensures consistency between multiple views. A view is any output generated from the SystemRDL description, e.g., RTL code or documentation."
 
-### Markdown
+The editor is build on top of [Eclipse Xtext](http://www.eclipse.org/Xtext/), a framework to build **D**omain **S**pecific **L**anguages (DSL).
 
-Markdown is a lightweight and easy-to-use syntax for styling your writing. It includes conventions for
+It has a code generator to create the register models using the [SC-Components](https://github.com/Minres/SystemC-Components) library. Due to the nature of Xtext this generator can easily be tailored to various needs.
-
-```markdown
-Syntax highlighted code block
-
-# Header 1
-## Header 2
-### Header 3
-
-- Bulleted
-- List
-
-1. Numbered
-2. List
-
-**Bold** and _Italic_ and `Code` text
-
-[Link](url) and ![Image](src)
-```
-
-For more details see [GitHub Flavored Markdown](https://guides.github.com/features/mastering-markdown/).
-
-### Jekyll Themes
-
-Your Pages site will use the layout and styles from the Jekyll theme you have selected in your [repository settings](https://github.com/Minres/RDL-Editor/settings). The name of this theme is saved in the Jekyll `_config.yml` configuration file.
-
-### Support or Contact
-
-Having trouble with Pages? Check out our [documentation](https://help.github.com/categories/github-pages-basics/) or [contact support](https://github.com/contact) and we’ll help you sort it out.

_config.yml

@@ -1 +1 @@
-theme: jekyll-theme-minimal
+theme: jekyll-theme-tactile

com.minres.rdl.parent/com.minres.rdl.feature/feature.xml

@@ -2,31 +2,8 @@
 <feature
       id="com.minres.rdl.feature"
       label="RDL Feature "
-      version="1.0.0.qualifier">
+      version="1.0.0.qualifier"
-
+      provider-name="MINRES Technologies GmbH">
-   <requires>
-      <import plugin="org.eclipse.xtext"/>
-      <import plugin="org.eclipse.xtext.xbase"/>
-      <import plugin="org.eclipse.equinox.common" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.xtext.xbase.lib"/>
-      <import plugin="org.antlr.runtime"/>
-      <import plugin="org.eclipse.xtext.util"/>
-      <import plugin="org.eclipse.xtend.lib"/>
-      <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.eclipse.equinox.preferences"/>
-      <import plugin="org.apache.log4j"/>
-      <import plugin="org.eclipse.xtext.ide"/>
-      <import plugin="org.eclipse.xtext.xbase.ide"/>
-      <import plugin="org.eclipse.xtext.ui"/>
-      <import plugin="org.eclipse.xtext.ui.shared"/>
-      <import plugin="org.eclipse.xtext.ui.codetemplates.ui"/>
-      <import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.xtext.builder"/>
-   </requires>
 
    <plugin
          id="com.minres.rdl"

com.minres.rdl.parent/com.minres.rdl.ide/.classpath

@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.minres.rdl.parent/com.minres.rdl.ide/.gitignore

@@ -0,0 +1 @@
+/xtend-gen/

com.minres.rdl.parent/com.minres.rdl.ide/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,10 @@
 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.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

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
@@ -8,8 +9,7 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.rdl,
  org.eclipse.xtext.ide,
  org.eclipse.xtext.xbase.ide,
- org.antlr.runtime
+ org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: com.minres.rdl.ide.contentassist.antlr.internal,
  com.minres.rdl.ide.contentassist.antlr
-

com.minres.rdl.parent/com.minres.rdl.ide/pom.xml

@@ -9,12 +9,177 @@
 	<artifactId>com.minres.rdl.ide</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
+	<dependencies>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.lsp4j</groupId>
+			<artifactId>org.eclipse.lsp4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm-commons</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm-tree</artifactId>
+		</dependency>
+	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.eclipse.xtend</groupId>
 				<artifactId>xtend-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<configuration>
+					<pomDependencies>consider</pomDependencies>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.0.1</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/libs</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>false</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
+							<excludeTransitive>true</excludeTransitive>
+							<excludeArtifactIds>
+								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,
+							</excludeArtifactIds>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>com.googlecode.addjars-maven-plugin</groupId>
+				<artifactId>addjars-maven-plugin</artifactId>
+				<version>1.0.5</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>add-jars</goal>
+						</goals>
+						<configuration>
+							<resources>
+								<resource>
+									<directory>${project.build.directory}/libs</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>3.0.0</version>
+				<configuration>
+					<transformers>
+						<transformer
+							implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+							<mainClass>org.eclipse.xtext.ide.server.ServerLauncher</mainClass>
+						</transformer>
+						<transformer
+							implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+							<resource>plugin.properties</resource>
+						</transformer>
+					</transformers>
+					<artifactSet>
+						<excludes><!-- avoid duplicate inclusion due to addjars plugin -->
+							<exclude>*:com.minres.rdl.ide-org.eclipse.lsp4j*</exclude>
+							<exclude>*:com.minres.rdl.ide-org.eclipse.xtext.xbase.lib*</exclude>
+							<exclude>*:com.minres.rdl.ide-org.eclipse.xtend.lib*</exclude>
+							<exclude>*:com.minres.rdl.ide-com.google.guava*</exclude>
+							<exclude>*:com.minres.rdl.ide-asm*</exclude>
+							<exclude>*:com.minres.rdl.ide-log4j*</exclude>
+							<exclude>*:com.minres.rdl.ide-org.objectweb.asm*</exclude>
+							<exclude>*:com.minres.rdl.ide-org.apache.log4j*</exclude>
+						</excludes>
+					</artifactSet>
+					<filters>
+						<filter>
+							<artifact>*:*</artifact>
+							<excludes>
+								<exclude>META-INF/INDEX.LIST</exclude>
+								<exclude>META-INF/*.SF</exclude>
+								<exclude>META-INF/*.DSA</exclude>
+								<exclude>META-INF/*.RSA</exclude>
+								<exclude>.options</exclude>
+								<exclude>.api_description</exclude>
+								<exclude>*.profile</exclude>
+								<exclude>*.html</exclude>
+								<exclude>about.*</exclude>
+								<exclude>about_files/*</exclude>
+								<exclude>plugin.xml</exclude>
+								<exclude>modeling32.png</exclude>
+								<exclude>systembundle.properties</exclude>
+								<exclude>profile.list</exclude>
+								<exclude>**/*._trace</exclude>
+								<exclude>**/*.g</exclude>
+								<exclude>**/*.mwe2</exclude>
+								<exclude>**/*.xtext</exclude>
+							</excludes>
+						</filter>
+					</filters>
+					<shadedArtifactAttached>true</shadedArtifactAttached>
+					<shadedClassifierName>ls</shadedClassifierName>
+					<minimizeJar>false</minimizeJar>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

com.minres.rdl.parent/com.minres.rdl.ide/src-gen/.gitignore

@@ -0,0 +1 @@
+/*

com.minres.rdl.parent/com.minres.rdl.ide/src-gen/META-INF/services/org.eclipse.xtext.ISetup

@@ -1 +0,0 @@
-com.minres.rdl.ide.RDLIdeSetup

com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/AbstractRDLIdeModule.java

@@ -1,47 +0,0 @@
-/*
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ide;
-
-import com.google.inject.Binder;
-import com.google.inject.name.Names;
-import com.minres.rdl.ide.contentassist.antlr.RDLParser;
-import com.minres.rdl.ide.contentassist.antlr.internal.InternalRDLLexer;
-import org.eclipse.xtext.ide.DefaultIdeModule;
-import org.eclipse.xtext.ide.LexerIdeBindings;
-import org.eclipse.xtext.ide.editor.contentassist.FQNPrefixMatcher;
-import org.eclipse.xtext.ide.editor.contentassist.IPrefixMatcher;
-import org.eclipse.xtext.ide.editor.contentassist.IProposalConflictHelper;
-import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper;
-import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser;
-import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer;
-
-/**
- * Manual modifications go to {@link RDLIdeModule}.
- */
-@SuppressWarnings("all")
-public abstract class AbstractRDLIdeModule extends DefaultIdeModule {
-
-	// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
-	public void configureContentAssistLexer(Binder binder) {
-		binder.bind(Lexer.class)
-			.annotatedWith(Names.named(LexerIdeBindings.CONTENT_ASSIST))
-			.to(InternalRDLLexer.class);
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
-	public Class<? extends IContentAssistParser> bindIContentAssistParser() {
-		return RDLParser.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
-	public Class<? extends IProposalConflictHelper> bindIProposalConflictHelper() {
-		return AntlrProposalConflictHelper.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2
-	public Class<? extends IPrefixMatcher> bindIPrefixMatcher() {
-		return FQNPrefixMatcher.class;
-	}
-	
-}

com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/PartialRDLContentAssistParser.java

@@ -1,34 +0,0 @@
-/*
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ide.contentassist.antlr;
-
-import java.util.Collection;
-import java.util.Collections;
-import org.eclipse.xtext.AbstractRule;
-import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement;
-import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
-import org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser;
-import org.eclipse.xtext.util.PolymorphicDispatcher;
-
-public class PartialRDLContentAssistParser extends RDLParser implements IPartialEditingContentAssistParser {
-
-	private AbstractRule rule;
-
-	@Override
-	public void initializeFor(AbstractRule rule) {
-		this.rule = rule;
-	}
-
-	@Override
-	protected Collection<FollowElement> getFollowElements(AbstractInternalContentAssistParser parser) {
-		if (rule == null || rule.eIsProxy())
-			return Collections.emptyList();
-		String methodName = "entryRule" + rule.getName();
-		PolymorphicDispatcher<Collection<FollowElement>> dispatcher = 
-			new PolymorphicDispatcher<Collection<FollowElement>>(methodName, 0, 0, Collections.singletonList(parser));
-		dispatcher.invoke();
-		return parser.getFollowElements();
-	}
-
-}

com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/RDLParser.java

@@ -1,229 +0,0 @@
-/*
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ide.contentassist.antlr;
-
-import com.google.inject.Inject;
-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 {
-
-	@Inject
-	private RDLGrammarAccess grammarAccess;
-
-	private Map<AbstractElement, String> nameMappings;
-
-	@Override
-	protected InternalRDLParser createParser() {
-		InternalRDLParser result = new InternalRDLParser(null);
-		result.setGrammarAccess(grammarAccess);
-		return result;
-	}
-
-	@Override
-	protected String getRuleName(AbstractElement element) {
-		if (nameMappings == null) {
-			nameMappings = new HashMap<AbstractElement, String>() {
-				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);
-	}
-			
-	@Override
-	protected String[] getInitialHiddenTokens() {
-		return new String[] { "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_ESCAPE_JSP", "RULE_ESCAPE_ORDL" };
-	}
-
-	public RDLGrammarAccess getGrammarAccess() {
-		return this.grammarAccess;
-	}
-
-	public void setGrammarAccess(RDLGrammarAccess grammarAccess) {
-		this.grammarAccess = grammarAccess;
-	}
-}

com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.tokens

@@ -1,254 +0,0 @@
-'%='=127
-'+='=126
-','=124
-'->'=131
-'.'=132
-':'=130
-';'=113
-'='=119
-'@'=125
-'UNDEFINED'=97
-'['=128
-']'=129
-'`include'=114
-'accesswidth'=81
-'activehigh'=60
-'activelow'=61
-'addressing'=84
-'addrmap'=15
-'alias'=123
-'alignment'=77
-'all'=21
-'anded'=40
-'arbiter'=24
-'async'=57
-'bigendian'=49
-'boolean'=14
-'bothedge'=110
-'bridge'=52
-'clock'=88
-'compact'=105
-'component'=121
-'counter'=43
-'cpuif_reset'=58
-'decr'=65
-'decrsaturate'=71
-'decrthreshold'=73
-'decrvalue'=69
-'decrwidth'=67
-'default'=120
-'desc'=23
-'dontcompare'=74
-'donttest'=75
-'enable'=90
-'encode'=86
-'enum'=133
-'errextbus'=46
-'external'=134
-'false'=99
-'field'=18
-'field_reset'=59
-'fieldwidth'=79
-'fullalign'=107
-'halt'=95
-'haltenable'=94
-'haltmask'=93
-'hw'=83
-'hwclr'=34
-'hwenable'=91
-'hwmask'=92
-'hwset'=33
-'incr'=64
-'incrvalue'=68
-'incrwidth'=66
-'internal'=76
-'intr'=39
-'level'=111
-'littleendian'=48
-'lsb0'=55
-'mask'=89
-'msb0'=54
-'na'=104
-'name'=22
-'negedge'=109
-'next'=96
-'nonsticky'=112
-'number'=13
-'ored'=41
-'overflow'=44
-'posedge'=108
-'precedence'=85
-'property'=115
-'r'=102
-'rclr'=26
-'ref'=19
-'reg'=16
-'regalign'=106
-'regfile'=17
-'regwidth'=78
-'reset'=47
-'resetsignal'=87
-'rset'=25
-'rsvdset'=50
-'rsvdsetX'=51
-'rw'=100
-'saturate'=70
-'shared'=53
-'sharedextbus'=45
-'signal'=20
-'signalwidth'=80
-'singlepulse'=62
-'sticky'=37
-'stickybit'=38
-'string'=12
-'sw'=82
-'swacc'=36
-'swmod'=35
-'swwe'=31
-'swwel'=32
-'sync'=56
-'threshold'=72
-'true'=98
-'type'=118
-'underflow'=63
-'w'=103
-'we'=29
-'wel'=30
-'woclr'=27
-'woset'=28
-'wr'=101
-'xored'=42
-'{'=116
-'|'=122
-'}'=117
-RULE_ESCAPE_JSP=10
-RULE_ESCAPE_ORDL=11
-RULE_ID=5
-RULE_ML_COMMENT=8
-RULE_NUM=6
-RULE_SL_COMMENT=9
-RULE_STR=4
-RULE_WS=7
-T__100=100
-T__101=101
-T__102=102
-T__103=103
-T__104=104
-T__105=105
-T__106=106
-T__107=107
-T__108=108
-T__109=109
-T__110=110
-T__111=111
-T__112=112
-T__113=113
-T__114=114
-T__115=115
-T__116=116
-T__117=117
-T__118=118
-T__119=119
-T__120=120
-T__121=121
-T__122=122
-T__123=123
-T__124=124
-T__125=125
-T__126=126
-T__127=127
-T__128=128
-T__129=129
-T__12=12
-T__130=130
-T__131=131
-T__132=132
-T__133=133
-T__134=134
-T__13=13
-T__14=14
-T__15=15
-T__16=16
-T__17=17
-T__18=18
-T__19=19
-T__20=20
-T__21=21
-T__22=22
-T__23=23
-T__24=24
-T__25=25
-T__26=26
-T__27=27
-T__28=28
-T__29=29
-T__30=30
-T__31=31
-T__32=32
-T__33=33
-T__34=34
-T__35=35
-T__36=36
-T__37=37
-T__38=38
-T__39=39
-T__40=40
-T__41=41
-T__42=42
-T__43=43
-T__44=44
-T__45=45
-T__46=46
-T__47=47
-T__48=48
-T__49=49
-T__50=50
-T__51=51
-T__52=52
-T__53=53
-T__54=54
-T__55=55
-T__56=56
-T__57=57
-T__58=58
-T__59=59
-T__60=60
-T__61=61
-T__62=62
-T__63=63
-T__64=64
-T__65=65
-T__66=66
-T__67=67
-T__68=68
-T__69=69
-T__70=70
-T__71=71
-T__72=72
-T__73=73
-T__74=74
-T__75=75
-T__76=76
-T__77=77
-T__78=78
-T__79=79
-T__80=80
-T__81=81
-T__82=82
-T__83=83
-T__84=84
-T__85=85
-T__86=86
-T__87=87
-T__88=88
-T__89=89
-T__90=90
-T__91=91
-T__92=92
-T__93=93
-T__94=94
-T__95=95
-T__96=96
-T__97=97
-T__98=98
-T__99=99

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
 

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
 

com.minres.rdl.parent/com.minres.rdl.ide/xtend-gen/com/minres/rdl/ide/RDLIdeModule.java

@@ -1,13 +0,0 @@
-/**
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ide;
-
-import com.minres.rdl.ide.AbstractRDLIdeModule;
-
-/**
- * Use this class to register ide components.
- */
-@SuppressWarnings("all")
-public class RDLIdeModule extends AbstractRDLIdeModule {
-}

com.minres.rdl.parent/com.minres.rdl.ide/xtend-gen/com/minres/rdl/ide/RDLIdeSetup.java

@@ -1,24 +0,0 @@
-/**
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ide;
-
-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 as language servers.
- */
-@SuppressWarnings("all")
-public class RDLIdeSetup extends RDLStandaloneSetup {
-  @Override
-  public Injector createInjector() {
-    RDLRuntimeModule _rDLRuntimeModule = new RDLRuntimeModule();
-    RDLIdeModule _rDLIdeModule = new RDLIdeModule();
-    return Guice.createInjector(Modules2.mixin(_rDLRuntimeModule, _rDLIdeModule));
-  }
-}

com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml

@@ -2,8 +2,8 @@
 <feature
       id="com.minres.rdl.platform.feature"
       label="Xtext Platform Feature"
-      version="1.0.0.qualifier"
+      version="1.1.0.qualifier"
-      provider-name="MINRES">
+      provider-name="MINRES Technologies GmbH">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,400 +17,21 @@
       [Enter License Description here.]
    </license>
 
-   <includes
-         id="org.eclipse.xtext.runtime"
-         version="0.0.0"/>
-
    <includes
          id="org.eclipse.rcp"
          version="0.0.0"/>
 
-   <requires>
+   <includes
-      <import plugin="org.eclipse.e4.core.di" version="1.5.1" match="greaterOrEqual"/>
+         id="org.eclipse.xtext.redist"
-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
+         version="0.0.0"/>
-      <import plugin="org.eclipse.core.resources" version="3.5.0" match="compatible"/>
+
-      <import plugin="org.eclipse.jdt.core" version="3.5.0" match="compatible"/>
+   <includes
-      <import plugin="org.eclipse.jdt.launching" version="3.5.0" match="compatible"/>
+         id="org.eclipse.xtext.ui"
-      <import plugin="org.eclipse.emf.ecore" version="2.12.0" match="compatible"/>
+         version="0.0.0"/>
-      <import plugin="org.eclipse.emf.codegen" version="2.11.0" match="compatible"/>
+
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.12.0" match="compatible"/>
+   <includes
-      <import plugin="org.eclipse.text" version="3.5.0" match="compatible"/>
+         id="org.eclipse.help"
-      <import plugin="org.apache.batik.util.gui" version="1.7.0" match="equivalent"/>
+         version="0.0.0"/>
-      <import plugin="org.eclipse.equinox.common" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.common" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.registry" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.debug.core" version="3.9.0" match="compatible"/>
-      <import plugin="org.eclipse.core.variables" version="3.2.800" match="compatible"/>
-      <import plugin="org.eclipse.xtend" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xpand" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtend.typesystem.emf" version="1.0.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.10.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.common" version="2.10.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.security" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.common" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.preferences" version="3.2.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.registry" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.console" version="3.5.300" match="compatible"/>
-      <import plugin="org.eclipse.help" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.editors" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.11.0" match="compatible"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.codegen.ecore" version="2.10.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.core" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.pde.core" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.editors" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.ui" version="3.10.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.launching" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.pde.build" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.search" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.team.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ant.launching" version="1.0.400" match="compatible"/>
-      <import plugin="org.eclipse.ant.ui" version="3.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.junit" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.intro" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.cheatsheets" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.update.configurator" version="3.1.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.views.log" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.ltk.core.refactoring" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.variables" version="3.1.0" match="compatible"/>
-      <import plugin="org.eclipse.compare" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.ltk.ui.refactoring" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.navigator.resources" version="3.3.100" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.ui" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.metadata" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.engine" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.director" version="2.1.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.artifact.repository" version="1.0.100" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.metadata.repository" version="1.0.100" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.operations" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.repository" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.frameworkadmin" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.frameworkadmin.equinox" version="1.0.100" match="compatible"/>
-      <import plugin="org.eclipse.pde.launching" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.console" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.simpleconfigurator" version="1.0.200" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.repository.tools" version="2.0.100" match="compatible"/>
-      <import plugin="org.eclipse.team.ui" version="3.6.100" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.10.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.trace" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.bidi" version="0.10.0"/>
-      <import plugin="org.eclipse.equinox.registry" version="3.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.codegen.ecore" version="2.12.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit.ui" version="2.12.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.edit" version="2.9.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.common" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.core.jobs" version="3.3.0" match="compatible"/>
-      <import plugin="org.sat4j.core" version="2.3.5" match="compatible"/>
-      <import plugin="org.sat4j.pb" version="2.3.5" match="compatible"/>
-      <import plugin="org.eclipse.swt" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jface" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.common" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.databinding.observable" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.core.databinding.property" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.core.databinding" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.registry" version="3.4.0" match="compatible"/>
-      <import plugin="com.google.guava" version="14.0.0"/>
-      <import plugin="com.google.inject" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.model.workbench" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.core.contexts" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.core.di" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.workbench" version="0.9.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.core.services" version="0.9.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi.services" version="3.2.100" match="compatible"/>
-      <import plugin="org.eclipse.e4.ui.workbench.renderers.swt" version="0.9.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.widgets" version="0.11.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.css.swt" version="0.9.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.css.core" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.swt" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.jface" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.e4.ui.di" version="0.10.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.services" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.7.0" match="greaterOrEqual"/>
-      <import plugin="org.apache.ant" version="1.9.4" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ant.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.externaltools" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.console" version="3.1.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.ui" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.junit" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ant.launching" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.core.externaltools" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit" version="2.10.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.preferences" version="3.2.200" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.swt" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.common" version="3.6.0" match="compatible"/>
-      <import plugin="org.w3c.css.sac" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.registry" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.preferences" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jface" version="3.9.0" match="compatible"/>
-      <import plugin="org.eclipse.swt" version="3.101.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.databinding" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.core.databinding.property" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.databinding.observable" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.e4.core.services" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.core.contexts" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.core.di" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.workbench.swt" version="0.9.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.di" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.model.workbench" version="0.9.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.css.swt.theme" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.bindings" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.workbench3" version="0.12.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.workbench.addons.swt" version="0.10.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.11.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.core.di.extensions" version="0.13.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.workbench.renderers.swt" version="0.10.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.common" version="3.3.0" match="greaterOrEqual"/>
-      <import plugin="org.tukaani.xz" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.text" version="3.1.0" match="compatible"/>
-      <import plugin="org.eclipse.core.filebuffers" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ant.core" version="3.1.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.simpleconfigurator.manipulator" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.repository" version="2.0.0"/>
-      <import plugin="org.eclipse.equinox.p2.garbagecollector" version="1.0.100" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.touchpoint.eclipse" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.common" version="2.12.0" match="compatible"/>
-      <import plugin="org.eclipse.core.commands" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.common" version="3.8.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.107.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.security.ui" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.compare.core" version="3.5.200" match="compatible"/>
-      <import plugin="org.eclipse.osgi" version="3.10.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.core" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.debug.ui" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.help" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.editors" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.compare" version="3.5.101" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface.databinding" version="1.3.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.databinding" version="1.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.databinding.beans" version="1.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.databinding.property" version="1.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.launching" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.apache.batik.util" version="1.7.0" match="equivalent"/>
-      <import plugin="org.eclipse.emf.common.ui" version="2.11.0" match="compatible"/>
-      <import plugin="org.eclipse.e4.core.services" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.core.di" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.emf.xpath" version="0.1.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore.editor" version="2.10.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.views" version="3.3.100" match="compatible"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.100" match="compatible"/>
-      <import plugin="org.eclipse.debug.ui" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.core" version="3.12.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.12.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.debug.ui" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.junit.runtime" version="3.4.100" match="compatible"/>
-      <import plugin="org.eclipse.compare" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ltk.core.refactoring" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.core.variables" version="3.2.200" match="compatible"/>
-      <import plugin="org.eclipse.ltk.ui.refactoring" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.junit.core" version="3.6.0" match="compatible"/>
-      <import plugin="com.ibm.icu" version="4.4.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.10.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.common" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.8.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.compare.core" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.e4.ui.workbench" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.services" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.swt" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.jface" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.e4.ui.workbench.swt" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.model.workbench" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi.services" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.e4.core.commands" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.200" match="compatible"/>
-      <import plugin="org.eclipse.osgi" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.e4.ui.css.swt" version="0.11.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.core.di.extensions" version="0.12.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.preferences" version="3.5.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi" version="3.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
-      <import plugin="com.jcraft.jsch" version="0.1.50" match="compatible"/>
-      <import plugin="org.eclipse.core.net" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.swt" version="3.104.0" match="compatible"/>
-      <import plugin="org.eclipse.core.commands" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.106.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.e4.core.services" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.core.contexts" version="1.3.100" match="compatible"/>
-      <import plugin="org.eclipse.e4.ui.workbench" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.e4.core.commands" version="0.11.0" match="compatible"/>
-      <import plugin="org.eclipse.e4.ui.model.workbench" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.e4.core.di" version="1.6.0" match="compatible"/>
-      <import plugin="org.eclipse.e4.core.di.extensions" version="0.14.0" match="compatible"/>
-      <import plugin="org.eclipse.osgi.services" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.core" version="3.8.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.12.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.mwe2.runtime" version="2.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext" version="2.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.common.types" version="2.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.swt" version="3.4.1" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.forms" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.help" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.common" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.swt" version="3.103.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.9.0" match="compatible"/>
-      <import plugin="org.objectweb.asm" version="5.0.1" match="compatible"/>
-      <import plugin="org.eclipse.jdt.debug" version="3.7.100" match="compatible"/>
-      <import plugin="org.eclipse.core.variables" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.osgi" version="3.8.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.search" version="3.5.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ltk.ui.refactoring" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.core.manipulation" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.swt" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.core.filebuffers" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.debug" version="3.10.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.launching" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.8.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.console" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.core.manipulation" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.search" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.forms" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.core.jobs" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.junit" version="3.8.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.console" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.core.jobs" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.preferences" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.core.contenttype" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.app" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.p2.metadata.repository" version="0.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.p2.artifact.repository" version="0.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ltk.core.refactoring" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.navigator" version="3.3.200" match="compatible"/>
-      <import plugin="org.eclipse.team.core" version="3.4.100" match="compatible"/>
-      <import plugin="org.eclipse.team.ui" version="3.4.100" match="compatible"/>
-      <import plugin="org.eclipse.ui.forms" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.3.0" match="compatible"/>
-      <import plugin="org.apache.commons.lang" version="2.0.0" match="compatible"/>
-      <import plugin="org.apache.commons.logging" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.3.0" match="compatible"/>
-      <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.preferences" version="3.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.jface" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.navigator" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.jface" version="3.10.100" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench" version="3.105.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.navigator" version="3.4.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.core.di.extensions" version="0.13.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.editors" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface.text" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.views" version="3.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.edit.ui" version="2.10.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.forms" version="3.4.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.css.core" version="0.10.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.css.swt" version="0.11.100" match="greaterOrEqual"/>
-      <import plugin="org.apache.commons.jxpath" version="1.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.core.di.annotations" version="1.4.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.1.0" match="compatible"/>
-      <import plugin="org.eclipse.core.externaltools" version="1.0.300" match="compatible"/>
-      <import plugin="org.apache.lucene.core" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.views" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit" version="2.12.0" match="compatible"/>
-      <import plugin="org.eclipse.core.jobs" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.search" version="3.10.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.ui" version="3.11.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.launching" version="3.8.0" match="compatible"/>
-      <import plugin="org.eclipse.jface" version="3.11.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.10.0" match="compatible"/>
-      <import plugin="org.eclipse.ltk.ui.refactoring" version="3.8.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.navigator.resources" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.core.manipulation" version="1.7.0" match="compatible"/>
-      <import plugin="org.w3c.dom.smil" version="1.0.0" match="equivalent"/>
-      <import plugin="org.eclipse.core.runtime" version="3.12.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.8.100" match="compatible"/>
-      <import plugin="org.eclipse.e4.ui.model.workbench" version="1.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.e4.core.commands" version="0.11.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore.change" version="2.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.preferences" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.registry" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.xtext.ide" version="2.11.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ant.core" version="3.1.100" match="compatible"/>
-      <import plugin="org.eclipse.osgi" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.jarprocessor" version="1.0.1" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.publisher" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.p2.director.app" version="1.0.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.p2.publisher.eclipse" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.team.core" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.compare" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.navigator" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.editors" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.ltk.core.refactoring" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.pde.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.debug" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.help.base" version="4.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.app" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.e4.ui.workbench" version="0.10.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.services" version="0.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.css.swt" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.workbench3" version="0.11.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.jobs" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.apache.lucene.analysis" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.core.net" version="1.2.200" match="greaterOrEqual"/>
-      <import plugin="org.apache.batik.css" version="1.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.mwe.utils" version="1.3.0" match="greaterOrEqual"/>
-   </requires>
 
    <plugin
          id="org.eclipse.e4.core.di.extensions"
@@ -433,13 +54,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.batik.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.p2.director.app"
          download-size="0"
@@ -516,28 +130,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jdt.compiler.tool"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.minres.rdl.ide"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.p2.repository"
          download-size="0"
@@ -657,13 +249,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.minres.rdl.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.ui.workbench"
          download-size="0"
@@ -678,13 +263,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.pde.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.emf.codegen"
          download-size="0"
@@ -713,13 +291,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="javax.xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.core.jobs"
          download-size="0"
@@ -784,13 +355,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.batik.css"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.emf.common"
          download-size="0"
@@ -812,20 +376,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.xtext.ui.ecore"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.junit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.xtext"
          download-size="0"
@@ -909,19 +459,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="org.eclipse.jdt.debug"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="com.minres.rdl.product"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.emf.mwe2.language"
          download-size="0"
@@ -1006,13 +543,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jdt.launching"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.emf.mwe2.runtime"
          download-size="0"
@@ -1111,13 +641,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jdt.debug.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.p2.operations"
          download-size="0"
@@ -1125,13 +648,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jdt.junit.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.ant.launching"
          download-size="0"
@@ -1279,13 +795,6 @@
          fragment="true"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.equinox.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.core.variables"
          download-size="0"
@@ -1313,13 +822,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.minres.rdl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.ui.navigator.resources"
          download-size="0"
@@ -1348,13 +850,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.xtext.ui.codetemplates.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.e4.ui.di"
          download-size="0"
@@ -1362,13 +857,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.xtext.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.ui.forms"
          download-size="0"
@@ -1411,13 +899,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.batik.util.gui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.e4.emf.xpath"
          download-size="0"
@@ -1446,13 +927,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.lucene.analysis"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.emf.edit.ui"
          download-size="0"
@@ -1481,13 +955,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jdt.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.w3c.dom.svg"
          download-size="0"
@@ -1509,13 +976,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jdt.junit.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.e4.ui.workbench"
          download-size="0"
@@ -1600,12 +1060,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.pde.build"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="org.eclipse.ant.core"
          download-size="0"
@@ -1627,13 +1081,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.xtext.ui.shared"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.emf.ecore.editor"
          download-size="0"
@@ -1690,13 +1137,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jdt.core.manipulation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.ui.trace"
          download-size="0"
@@ -1718,13 +1158,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.pde.launching"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.commons.lang"
          download-size="0"
@@ -1739,13 +1172,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.xtext.ui.codetemplates"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.xtend.lib"
          download-size="0"
@@ -1767,14 +1193,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jdt.compiler.apt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.osgi.services"
          download-size="0"
@@ -1817,13 +1235,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jdt.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.ui.editors"
          download-size="0"
@@ -1838,13 +1249,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.equinox.ds"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.xtext.common.types"
          download-size="0"
@@ -1901,4 +1305,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.antlr.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.genericeditor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml

@@ -8,7 +8,26 @@
 	</parent>
 	<artifactId>com.minres.rdl.platform.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
+	<version>1.1.0-SNAPSHOT</version>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>none</phase>
+<!-- 						<goals>
+							<goal>source-feature</goal>
+						</goals>
+ -->					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 
 	<dependencies>
 	</dependencies>

com.minres.rdl.parent/com.minres.rdl.product.feature/feature.xml

@@ -2,7 +2,8 @@
 <feature
       id="com.minres.rdl.product.feature"
       label="RDL Feature "
-      version="1.0.0.qualifier">
+      version="1.0.0.qualifier"
+      provider-name="MINRES Technologies GmbH">
 
    <requires>
       <import feature="com.minres.rdl.feature" version="1.0.0.qualifier"/>

com.minres.rdl.parent/com.minres.rdl.product.releng/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.minres.rdl.product.releng</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

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

com.minres.rdl.parent/com.minres.rdl.product.releng/com.minres.rdl.product.product

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="RDL" uid="com.minres.rdl.product.product" id="com.minres.rdl.product.product" application="org.eclipse.ui.ide.workbench" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="RDL Editor" uid="com.minres.rdl.product.product" id="com.minres.rdl.product.product" application="org.eclipse.ui.ide.workbench" version="1.3.0.qualifier" useFeatures="true" includeLaunchers="true">
-
 
    <configIni use="default">
    </configIni>
@@ -14,14 +13,12 @@
 
    <windowImages/>
 
-   <launcher>
+   <launcher name="rdl-editor">
-      <solaris/>
       <win useIco="false">
          <bmp/>
       </win>
    </launcher>
 
-
    <vm>
    </vm>
 
@@ -103,9 +100,19 @@
    </plugins>
 
    <features>
-      <feature id="com.minres.rdl.platform.feature" version="1.0.0.qualifier"/>
+      <feature id="com.minres.rdl.platform.feature"/>
-      <feature id="com.minres.rdl.product.feature" version="1.0.0.qualifier"/>
+      <feature id="com.minres.rdl.product.feature"/>
-      <feature id="com.minres.rdl.feature" version="1.0.0.qualifier"/>
+      <feature id="com.minres.rdl.feature"/>
+      <feature id="org.eclipse.emf.ecore"/>
+      <feature id="org.eclipse.rcp"/>
+      <feature id="org.eclipse.emf.common"/>
+      <feature id="org.eclipse.xtext.runtime"/>
+      <feature id="org.eclipse.e4.rcp"/>
+      <feature id="org.eclipse.xtext.xbase"/>
+      <feature id="org.eclipse.help"/>
+      <feature id="org.eclipse.xtext.redist"/>
+      <feature id="org.eclipse.xtext.xbase.lib"/>
+      <feature id="org.eclipse.xtext.ui"/>
    </features>
 
    <configurations>

com.minres.rdl.parent/com.minres.rdl.product.releng/pom.xml

@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>com.minres.rdl.product.releng</artifactId>
+	<packaging>eclipse-repository</packaging>
+	<name>RDL Editor</name>
+	<version>1.3.0-SNAPSHOT</version>
+
+	<parent>
+		<version>1.0.0-SNAPSHOT</version>
+		<groupId>com.minres.rdl</groupId>
+		<artifactId>com.minres.rdl.parent</artifactId>
+	</parent>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-director-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<formats>
+						<win32>zip</win32>
+						<linux>tar.gz</linux>
+						<macosx>tar.gz</macosx>
+					</formats>
+					<products>
+						<product>
+							<id>com.minres.rdl.product.product</id>
+							<archiveFileName>RDL-Editor-${project.version}</archiveFileName>
+						</product>
+					</products>
+				</configuration>
+				<executions>
+					<execution>
+						<id>materialize-products</id>
+						<goals>
+							<goal>materialize-products</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>archive-products</id>
+						<goals>
+							<goal>archive-products</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

com.minres.rdl.parent/com.minres.rdl.product/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8

com.minres.rdl.parent/com.minres.rdl.product/META-INF/MANIFEST.MF

@@ -2,7 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: RDL Editor
 Bundle-SymbolicName: com.minres.rdl.product;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
-Bundle-Vendor: MINRES
+Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0"
+Automatic-Module-Name: com.minres.rdl.product

com.minres.rdl.parent/com.minres.rdl.product/build.properties

@@ -1,5 +1,4 @@
 source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml

com.minres.rdl.parent/com.minres.rdl.product/plugin.xml

@@ -6,10 +6,10 @@
          point="org.eclipse.core.runtime.products">
       <product
             application="org.eclipse.ui.ide.workbench"
-            name="RDL">
+            name="RDL Editor">
          <property
                name="appName"
-               value="RDL">
+               value="RDL Editor">
          </property>
       </product>
    </extension>

com.minres.rdl.parent/com.minres.rdl.product/pom.xml

@@ -4,18 +4,9 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.minres.rdl.product</artifactId>
-	<packaging>eclipse-application</packaging>
+	<packaging>eclipse-plugin</packaging>
-
+	<version>1.1.1-SNAPSHOT</version>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.xtend</groupId>
-				<artifactId>xtend-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-
 </project>

com.minres.rdl.parent/com.minres.rdl.repository/category.xml

@@ -3,5 +3,9 @@
 	<feature id="com.minres.rdl.feature" version="0.0.0">
 		<category name="main"/>
 	</feature>
+	<feature id="com.minres.rdl.feature.source" version="0.0.0">
+		<category name="main.source"/>
+	</feature>
 	<category-def name="main" label="RDL"/>
+	<category-def name="main.source" label="RDL (Sources)"/>
 </site>

com.minres.rdl.parent/com.minres.rdl.repository/packaging-p2-composite.ant

@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<project name="project">
+
+    <target name="getMajorMinorVersion">
+        <script language="javascript">
+            <![CDATA[
+
+                  // getting the value
+                  buildnumber = project.getProperty("unqualifiedVersion");
+                  index = buildnumber.lastIndexOf(".");
+                  counter = buildnumber.substring(0, index);
+            project.setProperty("majorMinorVersion",counter);
+
+              ]]>
+        </script>
+    </target>
+
+    <target name="test_getMajorMinor" depends="getMajorMinorVersion">
+        <echo message="majorMinorVersion: ${majorMinorVersion}"/>
+    </target>
+
+    <!--
+    site.label      The name/title/label of the created composite site
+    unqualifiedVersion  The version without any qualifier replacement
+    buildQualifier    The build qualifier
+  -->
+    <target name="compute.child.repository.data" depends="getMajorMinorVersion">
+        <property name="full.version" value="${unqualifiedVersion}" />
+
+        <property name="software.download.area" location="${user.home}/p2.repositories" />
+        <property name="updates.dir" value="updates" />
+
+        <property name="site.composite.name" value="${site.label} ${majorMinorVersion}" />
+        <property name="main.site.composite.name" value="${site.label} All Versions" />
+
+    	<!--
+        <property name="main.composite.repository.directory" location="${software.download.area}/${updates.dir}" />
+      -->
+        <property name="main.composite.repository.directory" location="${software.download.area}" />
+
+        <property name="composite.repository.directory" value="${main.composite.repository.directory}/${majorMinorVersion}" />
+        <property name="child.repository" value="${full.version}" />
+        <property name="child.repository.directory" value="${composite.repository.directory}/${child.repository}/" />
+    </target>
+
+    <target name="p2.composite.add" depends="compute.child.repository.data">
+        <property name="source.repository" location="${project.build.directory}/repository"/>
+
+        <echo message=" " />
+
+        <echo message="Source repository path: ${source.repository}" />
+
+        <echo message="Copying to ${child.repository.directory}..." />
+
+        <mkdir dir="${child.repository.directory}"/>
+        <copy todir="${child.repository.directory}" overwrite="true">
+            <fileset dir="${source.repository}" />
+        </copy>
+
+        <add.composite.repository.internal
+      composite.repository.location="${composite.repository.directory}"
+      composite.repository.name="${site.composite.name}"
+      composite.repository.child="${child.repository}"
+    />
+
+        <add.composite.repository.internal
+      composite.repository.location="${main.composite.repository.directory}"
+      composite.repository.name="${main.site.composite.name}"
+      composite.repository.child="${majorMinorVersion}"
+    />
+
+    </target>
+
+    <!-- = = = = = = = = = = = = = = = = =
+          macrodef: add.composite.repository.internal          
+         = = = = = = = = = = = = = = = = = -->
+    <macrodef name="add.composite.repository.internal">
+        <attribute name="composite.repository.location" />
+        <attribute name="composite.repository.name" />
+        <attribute name="composite.repository.child" />
+        <sequential>
+
+            <echo message=" " />
+            <echo message="Composite repository       : @{composite.repository.location}" />
+            <echo message="Composite name             : @{composite.repository.name}" />
+            <echo message="Adding child repository    : @{composite.repository.child}" />
+
+            <p2.composite.repository>
+                <repository compressed="false" location="@{composite.repository.location}" name="@{composite.repository.name}" />
+                <add>
+                    <repository location="@{composite.repository.child}" />
+                </add>
+            </p2.composite.repository>
+
+            <echo file="@{composite.repository.location}/p2.index">version=1
+metadata.repository.factory.order=compositeContent.xml,\!
+artifact.repository.factory.order=compositeArtifacts.xml,\!
+</echo>
+
+        </sequential>
+    </macrodef>
+
+
+</project>

com.minres.rdl.parent/com.minres.rdl.repository/pom.xml

@@ -7,6 +7,7 @@
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.minres.rdl.repository</artifactId>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<build>
@@ -46,6 +47,96 @@
 		</pluginManagement>
 	</build>
 
+    <profiles>
+        <profile>
+            <!-- Activate this profile to perform the release to Bintray -->
+            <id>release-composite</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>3.0.0</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <executable>bash</executable>
+                            <!-- optional -->
+                            <workingDirectory>${software.download.area}</workingDirectory>
+                            <arguments>
+                                <argument>-c</argument>
+                                <argument>if [ -d RDL-Editor-GHP ]; then cd RDL-Editor-GHP; git pull; else git clone -v --branch gh-pages https://github.com/Minres/RDL-Editor.git RDL-Editor-GHP; fi</argument>
+                            </arguments>
+                            <environmentVariables>
+                                <LANG>en_US</LANG>
+                            </environmentVariables>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.eclipse.tycho.extras</groupId>
+                        <artifactId>tycho-eclipserun-plugin</artifactId>
+                        <version>${tycho-version}</version>
+                        <configuration>
+                            <!-- IMPORTANT: DO NOT split the arg line -->
+                            <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2-composite.ant p2.composite.add -Dsite.label="RDL-Editor Software Repository" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -Dsoftware.download.area="${software.download.area}/RDL-Editor-GHP/repository"</appArgLine>
+                            <repositories>
+                                <repository>
+                                    <id>2021-03</id>
+                                    <layout>p2</layout>
+                                    <url>http://download.eclipse.org/releases/2021-03/</url>
+                                </repository>
+                            </repositories>
+                            <dependencies>
+                                <dependency>
+                                    <artifactId>org.eclipse.ant.core</artifactId>
+                                    <type>eclipse-plugin</type>
+                                </dependency>
+                                <dependency>
+                                    <artifactId>org.apache.ant</artifactId>
+                                    <type>eclipse-plugin</type>
+                                </dependency>
+                                <dependency>
+                                    <artifactId>org.eclipse.equinox.p2.repository.tools</artifactId>
+                                    <type>eclipse-plugin</type>
+                                </dependency>
+                                <dependency>
+                                    <artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
+                                    <type>eclipse-feature</type>
+                                </dependency>
+                                <dependency>
+                                    <artifactId>org.eclipse.equinox.p2.extras.feature</artifactId>
+                                    <type>eclipse-feature</type>
+                                </dependency>
+                                <dependency>
+                                    <artifactId>org.eclipse.equinox.ds</artifactId>
+                                    <type>eclipse-plugin</type>
+                                </dependency>
+                            </dependencies>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>add-p2-composite-repository</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>eclipse-run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 	<dependencies>
 	</dependencies>
 </project>

com.minres.rdl.parent/com.minres.rdl.standalone/.classpath

@@ -12,11 +12,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -24,5 +19,6 @@
 	</classpathentry>
 	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.minres.rdl.parent/com.minres.rdl.standalone/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +1,11 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

com.minres.rdl.parent/com.minres.rdl.standalone/pom.xml

@@ -1,7 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>com.minres.rdl.parent</artifactId>
+		<groupId>com.minres.rdl</groupId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
 	<artifactId>com.minres.rdl.standalone</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<build>
 		<pluginManagement>
@@ -71,7 +77,7 @@
 								<artifactItem>
 									<groupId>com.minres.rdl</groupId>
 									<artifactId>com.minres.rdl</artifactId>
-									<version>1.0.0-SNAPSHOT</version>
+									<version>${rdl-plugin.version}</version>
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -165,9 +171,12 @@
 			</snapshots>
 		</repository>
 	</repositories>
-	<parent>
+	<dependencies>
-		<artifactId>com.minres.rdl.parent</artifactId>
+		<dependency>
 			<groupId>com.minres.rdl</groupId>
-		<version>1.1.0-SNAPSHOT</version>
+			<artifactId>com.minres.rdl</artifactId>
-	</parent>
+			<version>${rdl-plugin.version}</version>
+			<type>eclipse-plugin</type>
+		</dependency>
+	</dependencies>
 </project>

com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target

@@ -1,25 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="com.minres.rdl.target" sequenceNumber="3">
+<?pde version="3.8"?>
+<target name="com.minres.rdl.target" sequenceNumber="1">
 <locations>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.0/"/>
+			<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-</location>
+			<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"/>
+			<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-</location>
+			<repository location="https://download.eclipse.org/releases/2021-03"/>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+		</location>
-<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/>
-<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+		</location>
-<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xpand" version="0.0.0"/>
+			<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/"/>
-<unit id="org.eclipse.xtend" version="0.0.0"/>
+		</location>
-<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="http://download.eclipse.org/releases/neon/201606221000/"/>
+			<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
-</location>
+			<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
+			<unit id="org.junit" version="4.12.0.v201504281640"/>
+			<unit id="org.junit.jupiter.api" version="5.7.1.v20210222-1948"/>
+			<unit id="org.junit.jupiter.engine" version="5.7.1.v20210222-1948"/>
+			<unit id="org.junit.platform.commons" version="1.7.1.v20210222-1948"/>
+			<unit id="org.junit.platform.engine" version="1.7.1.v20210222-1948"/>
+			<unit id="org.junit.platform.launcher" version="1.7.1.v20210222-1948"/>
+			<unit id="org.junit.platform.runner" version="1.7.1.v20210222-1948"/>
+			<unit id="org.opentest4j" version="1.2.0.v20190826-0900"/>
+			<unit id="org.objectweb.asm" version="9.1.0.v20210209-1849"/>
+			<unit id="org.objectweb.asm.tree" version="9.1.0.v20210209-1849"/>
+			<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-03"/>
+		</location>
 </locations>
 </target>

com.minres.rdl.parent/com.minres.rdl.target/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.minres.rdl.target</artifactId>
 	<packaging>eclipse-target-definition</packaging>

com.minres.rdl.parent/com.minres.rdl.tests/.classpath

@@ -3,7 +3,12 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.minres.rdl.parent/com.minres.rdl.tests/.gitignore

@@ -0,0 +1 @@
+/xtend-gen/

com.minres.rdl.parent/com.minres.rdl.tests/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,10 @@
 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.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

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
@@ -6,16 +7,9 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-SymbolicName: com.minres.rdl.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.rdl,
- org.junit;bundle-version="4.12.0",
+ org.junit.jupiter.api;bundle-version="[5.1.0,6.0.0)",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.xbase.lib
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 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"

com.minres.rdl.parent/com.minres.rdl.tests/pom.xml

@@ -18,7 +18,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+<!-- 				<version>${tycho-version}</version> -->
 				<configuration>
 					<failIfNoTests>false</failIfNoTests>
 				</configuration>

com.minres.rdl.parent/com.minres.rdl.tests/src-gen/.gitignore

@@ -0,0 +1 @@
+/*

com.minres.rdl.parent/com.minres.rdl.tests/src-gen/com/minres/rdl/tests/RDLInjectorProvider.java

@@ -1,66 +0,0 @@
-/*
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.tests;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.minres.rdl.RDLRuntimeModule;
-import com.minres.rdl.RDLStandaloneSetup;
-import org.eclipse.xtext.testing.GlobalRegistries;
-import org.eclipse.xtext.testing.GlobalRegistries.GlobalStateMemento;
-import org.eclipse.xtext.testing.IInjectorProvider;
-import org.eclipse.xtext.testing.IRegistryConfigurator;
-
-public class RDLInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
-
-	protected GlobalStateMemento stateBeforeInjectorCreation;
-	protected GlobalStateMemento stateAfterInjectorCreation;
-	protected Injector injector;
-
-	static {
-		GlobalRegistries.initializeDefaults();
-	}
-
-	@Override
-	public Injector getInjector() {
-		if (injector == null) {
-			stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
-			this.injector = internalCreateInjector();
-			stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
-		}
-		return injector;
-	}
-
-	protected Injector internalCreateInjector() {
-		return new RDLStandaloneSetup() {
-			@Override
-			public Injector createInjector() {
-				return Guice.createInjector(createRuntimeModule());
-			}
-		}.createInjectorAndDoEMFRegistration();
-	}
-
-	protected RDLRuntimeModule createRuntimeModule() {
-		// make it work also with Maven/Tycho and OSGI
-		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
-		return new RDLRuntimeModule() {
-			@Override
-			public ClassLoader bindClassLoaderToInstance() {
-				return RDLInjectorProvider.class
-						.getClassLoader();
-			}
-		};
-	}
-
-	@Override
-	public void restoreRegistry() {
-		stateBeforeInjectorCreation.restoreGlobalState();
-	}
-
-	@Override
-	public void setupRegistry() {
-		getInjector();
-		stateAfterInjectorCreation.restoreGlobalState();
-	}
-}

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)
 	}
 }

com.minres.rdl.parent/com.minres.rdl.tests/xtend-gen/com/minres/rdl/tests/RDLParsingTest.java

@@ -1,38 +0,0 @@
-/**
- * generated by Xtext 2.12.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.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.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(XtextRunner.class)
-@InjectWith(RDLInjectorProvider.class)
-@SuppressWarnings("all")
-public class RDLParsingTest {
-  @Inject
-  private ParseHelper<Root> parseHelper;
-  
-  @Test
-  public void loadModel() {
-    try {
-      StringConcatenation _builder = new StringConcatenation();
-      _builder.append("Hello Xtext!");
-      _builder.newLine();
-      final Root result = this.parseHelper.parse(_builder);
-      Assert.assertNotNull(result);
-      Assert.assertTrue(result.eResource().getErrors().isEmpty());
-    } catch (Throwable _e) {
-      throw Exceptions.sneakyThrow(_e);
-    }
-  }
-}

com.minres.rdl.parent/com.minres.rdl.ui.tests/.classpath

@@ -3,7 +3,8 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.minres.rdl.parent/com.minres.rdl.ui.tests/.gitignore

@@ -0,0 +1 @@
+/xtend-gen/

com.minres.rdl.parent/com.minres.rdl.ui.tests/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,10 @@
 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.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

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
@@ -6,19 +7,12 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-SymbolicName: com.minres.rdl.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.rdl.ui,
- org.junit;bundle-version="4.12.0",
+ org.junit.jupiter.api;bundle-version="[5.1.0,6.0.0)",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.junit4,
  org.eclipse.xtext.xbase.junit,
  org.eclipse.core.runtime,
+ org.eclipse.xtext.ui.testing,
  org.eclipse.ui.workbench;resolution:=optional
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 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"

com.minres.rdl.parent/com.minres.rdl.ui.tests/pom.xml

@@ -18,45 +18,12 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
 				<configuration>
 					<failIfNoTests>false</failIfNoTests>
 					<useUIHarness>true</useUIHarness>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<configuration>
-					<dependency-resolution>
-						<extraRequirements>
-							<!-- to get the org.eclipse.osgi.compatibility.state plugin
-							if the target platform is Luna or later.
-							(backward compatible with kepler and previous versions)
-							see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
-							<requirement>
-								<type>eclipse-feature</type>
-								<id>org.eclipse.rcp</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-						</extraRequirements>
-					</dependency-resolution>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
-	<profiles>
-		<profile>
-			<id>testing-on-mac</id>
-			<activation>
-				<os>
-					<family>mac</family>
-				</os>
-			</activation>
-			<properties>
-				<tycho.testArgLine>-XstartOnFirstThread</tycho.testArgLine>
-			</properties>
-		</profile>
-	</profiles>
 </project>

com.minres.rdl.parent/com.minres.rdl.ui.tests/src-gen/.gitignore

@@ -0,0 +1 @@
+/*

com.minres.rdl.parent/com.minres.rdl.ui.tests/src-gen/com/minres/rdl/ui/tests/RDLUiInjectorProvider.java

@@ -1,17 +0,0 @@
-/*
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ui.tests;
-
-import com.google.inject.Injector;
-import com.minres.rdl.ui.internal.RdlActivator;
-import org.eclipse.xtext.testing.IInjectorProvider;
-
-public class RDLUiInjectorProvider implements IInjectorProvider {
-
-	@Override
-	public Injector getInjector() {
-		return RdlActivator.getInstance().getInjector("com.minres.rdl.RDL");
-	}
-
-}

com.minres.rdl.parent/com.minres.rdl.ui.tests/xtend-gen/.gitignore

@@ -0,0 +1 @@
+/*

com.minres.rdl.parent/com.minres.rdl.ui/.classpath

@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.minres.rdl.parent/com.minres.rdl.ui/.gitignore

@@ -0,0 +1,2 @@
+/plugin.xml_gen
+/xtend-gen/

com.minres.rdl.parent/com.minres.rdl.ui/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,10 @@
 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.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF

@@ -1,8 +1,9 @@
 Manifest-Version: 1.0
+Automatic-Module-Name: com.minres.rdl.ui
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.rdl.ui
-Bundle-Vendor: My Company
+Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-SymbolicName: com.minres.rdl.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.rdl,
@@ -15,11 +16,17 @@ Require-Bundle: com.minres.rdl,
  org.eclipse.ui,
  org.eclipse.compare,
  org.eclipse.xtext.builder,
- org.eclipse.xtend.lib;resolution:=optional,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
- org.eclipse.xtext.xbase.lib
+ org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui.forms,
+ org.eclipse.jdt.core,
+ org.eclipse.pde.core
 Import-Package: org.apache.log4j
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: com.minres.rdl.ui.internal,
+ com.minres.rdl.ui.contentassist,
  com.minres.rdl.ui.quickfix,
- com.minres.rdl.ui.contentassist
+ com.minres.rdl.ui.wizard
 Bundle-Activator: com.minres.rdl.ui.internal.RdlActivator

com.minres.rdl.parent/com.minres.rdl.ui/build.properties

@@ -3,5 +3,6 @@ source.. = src/,\
            xtend-gen/
 bin.includes = .,\
                META-INF/,\
-               plugin.xml
+               plugin.xml,\
+               icons/
 bin.excludes = **/*.xtend

com.minres.rdl.parent/com.minres.rdl.ui/plugin.xml

@@ -98,16 +98,12 @@
 			<keywordReference id="com.minres.rdl.ui.keyword_RDL"/>
 		</page>
 	    <page category="com.minres.rdl.RDL"
-		    class="com.minres.rdl.ui.preferences.RdlPreferencePage"
+		    class="com.minres.rdl.ui.RDLExecutableExtensionFactory:com.minres.rdl.ui.preferences.RdlPreferencePage"
-		    id="com.minres.rdl.ui.preferences.TextPreferencePage"
+		    id="com.minres.rdl.RDL.preferences"
 		    name="Generator">
 			<keywordReference id="com.minres.rdl.ui.keyword_RDL"/>
 	    </page>
 	</extension>
-	<extension point="org.eclipse.core.runtime.preferences">
-		<initializer class="com.minres.rdl.preferences.PreferenceInitializer">
-		</initializer>
-	</extension>
 	<extension
 			point="org.eclipse.ui.propertyPages">
 		<page
@@ -214,6 +210,15 @@
 			</activeWhen>
 		</handler>
 	</extension>
+	<extension point="org.eclipse.core.contenttype.contentTypes">
+		<content-type
+			base-type="org.eclipse.core.runtime.text"
+			file-extensions="rdl"
+			id="com.minres.rdl.RDL.contenttype"
+			name="RDL File"
+			priority="normal">
+		</content-type>
+	</extension>
 	<!-- adding resource factories -->
 	<extension
 		point="org.eclipse.emf.ecore.extension_parser">
@@ -250,6 +255,15 @@
 		<super type="org.eclipse.xtext.ui.check.expensive"/>
 		<persistent value="true"/>
 	</extension>
+	<extension point="org.eclipse.ui.preferencePages">
+		<page
+			category="com.minres.rdl.RDL"
+			class="com.minres.rdl.ui.RDLExecutableExtensionFactory:org.eclipse.xtext.ui.validation.ValidatorPreferencePage"
+			id="com.minres.rdl.RDL.validator.preferencePage"
+			name="Errors/Warnings">
+			<keywordReference id="com.minres.rdl.ui.keyword_RDL"/>
+		</page>
+	</extension>
 	<extension point="org.eclipse.xtext.builder.participant">
 		<participant
 			class="com.minres.rdl.ui.RDLExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
@@ -398,12 +412,18 @@
 			class="com.minres.rdl.ui.RDLExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
 			extensions="rdl">
 		</viewer>
+		<contentTypeBinding
+			contentTypeId="com.minres.rdl.RDL.contenttype"
+			contentViewerId="com.minres.rdl.RDL.compare.contentViewers" />
 	</extension>
 	<extension point="org.eclipse.compare.contentMergeViewers">
 		<viewer id="com.minres.rdl.RDL.compare.contentMergeViewers"
 			class="com.minres.rdl.ui.RDLExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
 			extensions="rdl" label="RDL Compare">
 		</viewer>
+		<contentTypeBinding
+			contentTypeId="com.minres.rdl.RDL.contenttype"
+			contentMergeViewerId="com.minres.rdl.RDL.compare.contentMergeViewers" />
 	</extension>
 	<extension point="org.eclipse.ui.editors.documentProviders">
 		<provider id="com.minres.rdl.RDL.editors.documentProviders"
@@ -417,4 +437,30 @@
 			type="text">
 		</fileTypes>
 	</extension>
+	<extension
+		point="org.eclipse.ui.newWizards">
+		<category id="com.minres.category" name="MINRES">
+		</category>
+		<wizard
+			category="com.minres.category"
+			class="com.minres.rdl.ui.RDLExecutableExtensionFactory:org.eclipse.xtext.ui.wizard.template.TemplateNewProjectWizard"
+			id="com.minres.rdl.ui.wizard.RDLNewProjectWizard"
+			name="RDL Project"
+			icon="icons/new_RDL_proj.gif"
+			project="true">
+		</wizard>
+	</extension>
+	<extension
+	      point="org.eclipse.xtext.ui.projectTemplate">
+	   <projectTemplateProvider
+	         class="com.minres.rdl.ui.wizard.RDLProjectTemplateProvider"
+	         grammarName="com.minres.rdl.RDL">
+	   </projectTemplateProvider>
+	</extension>
+	<extension
+		point="org.eclipse.ui.perspectiveExtensions">
+		<perspectiveExtension targetID="org.eclipse.ui.resourcePerspective">
+			<newWizardShortcut id="com.minres.rdl.ui.wizard.RDLNewProjectWizard"/>
+		</perspectiveExtension>
+	</extension>
 </plugin>

com.minres.rdl.parent/com.minres.rdl.ui/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.minres.rdl.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
@@ -18,4 +18,5 @@
 		</plugins>
 	</build>
 
+	<version>1.2.0-SNAPSHOT</version>
 </project>

com.minres.rdl.parent/com.minres.rdl.ui/src-gen/.gitignore

@@ -0,0 +1 @@
+/*

com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/AbstractRDLUiModule.java

@@ -1,286 +0,0 @@
-/*
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ui;
-
-import com.google.inject.Binder;
-import com.google.inject.Provider;
-import com.google.inject.name.Names;
-import com.minres.rdl.ide.contentassist.antlr.PartialRDLContentAssistParser;
-import com.minres.rdl.ide.contentassist.antlr.RDLParser;
-import com.minres.rdl.ide.contentassist.antlr.internal.InternalRDLLexer;
-import com.minres.rdl.ui.contentassist.RDLProposalProvider;
-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 org.eclipse.compare.IViewerCreator;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.xtext.builder.BuilderParticipant;
-import org.eclipse.xtext.builder.EclipseOutputConfigurationProvider;
-import org.eclipse.xtext.builder.IXtextBuilderParticipant;
-import org.eclipse.xtext.builder.builderState.IBuilderState;
-import org.eclipse.xtext.builder.clustering.CurrentDescriptions;
-import org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource;
-import org.eclipse.xtext.builder.nature.NatureAddingEditorCallback;
-import org.eclipse.xtext.builder.preferences.BuilderPreferenceAccess;
-import org.eclipse.xtext.generator.IContextualOutputConfigurationProvider;
-import org.eclipse.xtext.ide.LexerIdeBindings;
-import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser;
-import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer;
-import org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser;
-import org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider;
-import org.eclipse.xtext.parser.antlr.ITokenDefProvider;
-import org.eclipse.xtext.parser.antlr.LexerProvider;
-import org.eclipse.xtext.resource.IResourceDescriptions;
-import org.eclipse.xtext.resource.containers.IAllContainersState;
-import org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider;
-import org.eclipse.xtext.service.SingletonBinding;
-import org.eclipse.xtext.ui.DefaultUiModule;
-import org.eclipse.xtext.ui.UIBindings;
-import org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator;
-import org.eclipse.xtext.ui.codetemplates.ui.partialEditing.IPartialEditingContentAssistContextFactory;
-import org.eclipse.xtext.ui.codetemplates.ui.partialEditing.PartialEditingContentAssistContextFactory;
-import org.eclipse.xtext.ui.codetemplates.ui.preferences.AdvancedTemplatesPreferencePage;
-import org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration;
-import org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistrar;
-import org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistry;
-import org.eclipse.xtext.ui.compare.DefaultViewerCreator;
-import org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource;
-import org.eclipse.xtext.ui.editor.IXtextEditorCallback;
-import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
-import org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher;
-import org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider;
-import org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper;
-import org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.DelegatingContentAssistContextFactory;
-import org.eclipse.xtext.ui.editor.outline.IOutlineTreeProvider;
-import org.eclipse.xtext.ui.editor.outline.impl.IOutlineTreeStructureProvider;
-import org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreInitializer;
-import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionProvider;
-import org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage;
-import org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator;
-import org.eclipse.xtext.ui.refactoring.IReferenceUpdater;
-import org.eclipse.xtext.ui.refactoring.IRenameRefactoringProvider;
-import org.eclipse.xtext.ui.refactoring.IRenameStrategy;
-import org.eclipse.xtext.ui.refactoring.impl.DefaultDependentElementsCalculator;
-import org.eclipse.xtext.ui.refactoring.impl.DefaultReferenceUpdater;
-import org.eclipse.xtext.ui.refactoring.impl.DefaultRenameRefactoringProvider;
-import org.eclipse.xtext.ui.refactoring.impl.DefaultRenameStrategy;
-import org.eclipse.xtext.ui.refactoring.ui.DefaultRenameSupport;
-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;
-
-/**
- * Manual modifications go to {@link RDLUiModule}.
- */
-@SuppressWarnings("all")
-public abstract class AbstractRDLUiModule extends DefaultUiModule {
-
-	public AbstractRDLUiModule(AbstractUIPlugin plugin) {
-		super(plugin);
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ImplicitFragment
-	public Provider<? extends IAllContainersState> provideIAllContainersState() {
-		return Access.getJavaProjectsState();
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
-	public Class<? extends IProposalConflictHelper> bindIProposalConflictHelper() {
-		return AntlrProposalConflictHelper.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
-	public void configureContentAssistLexer(Binder binder) {
-		binder.bind(Lexer.class)
-			.annotatedWith(Names.named(LexerIdeBindings.CONTENT_ASSIST))
-			.to(InternalRDLLexer.class);
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
-	public void configureHighlightingLexer(Binder binder) {
-		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class)
-			.annotatedWith(Names.named(LexerIdeBindings.HIGHLIGHTING))
-			.to(com.minres.rdl.parser.antlr.internal.InternalRDLLexer.class);
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
-	public void configureHighlightingTokenDefProvider(Binder binder) {
-		binder.bind(ITokenDefProvider.class)
-			.annotatedWith(Names.named(LexerIdeBindings.HIGHLIGHTING))
-			.to(AntlrTokenDefProvider.class);
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
-	public Class<? extends ContentAssistContext.Factory> bindContentAssistContext$Factory() {
-		return DelegatingContentAssistContextFactory.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
-	public Class<? extends IContentAssistParser> bindIContentAssistParser() {
-		return RDLParser.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
-	public void configureContentAssistLexerProvider(Binder binder) {
-		binder.bind(InternalRDLLexer.class).toProvider(LexerProvider.create(InternalRDLLexer.class));
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2
-	public Class<? extends PrefixMatcher> bindPrefixMatcher() {
-		return FQNPrefixMatcher.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.builder.BuilderIntegrationFragment2
-	public void configureIResourceDescriptionsBuilderScope(Binder binder) {
-		binder.bind(IResourceDescriptions.class).annotatedWith(Names.named(ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(CurrentDescriptions.ResourceSetAware.class);
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.builder.BuilderIntegrationFragment2
-	public Class<? extends IXtextEditorCallback> bindIXtextEditorCallback() {
-		return NatureAddingEditorCallback.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.builder.BuilderIntegrationFragment2
-	public Class<? extends IContextualOutputConfigurationProvider> bindIContextualOutputConfigurationProvider() {
-		return EclipseOutputConfigurationProvider.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.builder.BuilderIntegrationFragment2
-	public void configureIResourceDescriptionsPersisted(Binder binder) {
-		binder.bind(IResourceDescriptions.class).annotatedWith(Names.named(ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(IBuilderState.class);
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.builder.BuilderIntegrationFragment2
-	public Class<? extends DocumentBasedDirtyResource> bindDocumentBasedDirtyResource() {
-		return PersistentDataAwareDirtyResource.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.generator.GeneratorFragment2
-	public Class<? extends IXtextBuilderParticipant> bindIXtextBuilderParticipant() {
-		return BuilderParticipant.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.generator.GeneratorFragment2
-	public IWorkspaceRoot bindIWorkspaceRootToInstance() {
-		return ResourcesPlugin.getWorkspace().getRoot();
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.generator.GeneratorFragment2
-	public void configureBuilderPreferenceStoreInitializer(Binder binder) {
-		binder.bind(IPreferenceStoreInitializer.class)
-			.annotatedWith(Names.named("builderPreferenceInitializer"))
-			.to(BuilderPreferenceAccess.Initializer.class);
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.labeling.LabelProviderFragment2
-	public Class<? extends ILabelProvider> bindILabelProvider() {
-		return RDLLabelProvider.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.labeling.LabelProviderFragment2
-	public void configureResourceUIServiceLabelProvider(Binder binder) {
-		binder.bind(ILabelProvider.class).annotatedWith(ResourceServiceDescriptionLabelProvider.class).to(RDLDescriptionLabelProvider.class);
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.outline.OutlineTreeProviderFragment2
-	public Class<? extends IOutlineTreeProvider> bindIOutlineTreeProvider() {
-		return RDLOutlineTreeProvider.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.outline.OutlineTreeProviderFragment2
-	public Class<? extends IOutlineTreeStructureProvider> bindIOutlineTreeStructureProvider() {
-		return RDLOutlineTreeProvider.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.quickfix.QuickfixProviderFragment2
-	public Class<? extends IssueResolutionProvider> bindIssueResolutionProvider() {
-		return RDLQuickfixProvider.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.contentAssist.ContentAssistFragment2
-	public Class<? extends IContentProposalProvider> bindIContentProposalProvider() {
-		return RDLProposalProvider.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2
-	public Class<? extends IRenameStrategy> bindIRenameStrategy() {
-		return DefaultRenameStrategy.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2
-	public Class<? extends IReferenceUpdater> bindIReferenceUpdater() {
-		return DefaultReferenceUpdater.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2
-	public void configureIPreferenceStoreInitializer(Binder binder) {
-		binder.bind(IPreferenceStoreInitializer.class)
-			.annotatedWith(Names.named("RefactoringPreferences"))
-			.to(RefactoringPreferences.Initializer.class);
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2
-	public Class<? extends IRenameRefactoringProvider> bindIRenameRefactoringProvider() {
-		return DefaultRenameRefactoringProvider.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2
-	public Class<? extends IRenameSupport.Factory> bindIRenameSupport$Factory() {
-		return DefaultRenameSupport.Factory.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.templates.CodetemplatesGeneratorFragment2
-	public Provider<? extends TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
-		return AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.templates.CodetemplatesGeneratorFragment2
-	public Provider<? extends LanguageRegistry> provideLanguageRegistry() {
-		return AccessibleCodetemplatesActivator.getLanguageRegistry();
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.templates.CodetemplatesGeneratorFragment2
-	@SingletonBinding(eager=true)
-	public Class<? extends LanguageRegistrar> bindLanguageRegistrar() {
-		return LanguageRegistrar.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.templates.CodetemplatesGeneratorFragment2
-	public Class<? extends XtextTemplatePreferencePage> bindXtextTemplatePreferencePage() {
-		return AdvancedTemplatesPreferencePage.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.templates.CodetemplatesGeneratorFragment2
-	public Class<? extends IPartialEditingContentAssistParser> bindIPartialEditingContentAssistParser() {
-		return PartialRDLContentAssistParser.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.templates.CodetemplatesGeneratorFragment2
-	public Class<? extends IPartialEditingContentAssistContextFactory> bindIPartialEditingContentAssistContextFactory() {
-		return PartialEditingContentAssistContextFactory.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.compare.CompareFragment2
-	public Class<? extends IViewerCreator> bindIViewerCreator() {
-		return DefaultViewerCreator.class;
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.ui.compare.CompareFragment2
-	public void configureCompareViewerTitle(Binder binder) {
-		binder.bind(String.class).annotatedWith(Names.named(UIBindings.COMPARE_VIEWER_TITLE)).toInstance("RDL Compare");
-	}
-	
-	// contributed by org.eclipse.xtext.xtext.generator.exporting.SimpleNamesFragment2
-	public Class<? extends IDependentElementsCalculator> bindIDependentElementsCalculator() {
-		return DefaultDependentElementsCalculator.class;
-	}
-	
-}

com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/RDLExecutableExtensionFactory.java

@@ -1,27 +0,0 @@
-/*
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ui;
-
-import com.google.inject.Injector;
-import com.minres.rdl.ui.internal.RdlActivator;
-import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
-import org.osgi.framework.Bundle;
-
-/**
- * This class was generated. Customizations should only happen in a newly
- * introduced subclass. 
- */
-public class RDLExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
-
-	@Override
-	protected Bundle getBundle() {
-		return RdlActivator.getInstance().getBundle();
-	}
-	
-	@Override
-	protected Injector getInjector() {
-		return RdlActivator.getInstance().getInjector(RdlActivator.COM_MINRES_RDL_RDL);
-	}
-	
-}

com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/contentassist/AbstractRDLProposalProvider.java

@@ -1,358 +0,0 @@
-/*
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ui.contentassist;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.Assignment;
-import org.eclipse.xtext.CrossReference;
-import org.eclipse.xtext.Keyword;
-import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.editor.contentassist.AbstractJavaBasedContentProposalProvider;
-import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
-import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
-
-/**
- * Represents a generated, default implementation of superclass {@link AbstractJavaBasedContentProposalProvider}.
- * Methods are dynamically dispatched on the first parameter, i.e., you can override them 
- * with a more concrete subtype. 
- */
-public abstract class AbstractRDLProposalProvider extends AbstractJavaBasedContentProposalProvider {
-
-	public void completeRoot_Includes(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeRoot_ComponentDefinitions(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeRoot_EnumDefinitions(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeRoot_Instantiations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeRoot_PropertyAssignments(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeRoot_PropertyDefinitions(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeInclude_ImportURI(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePropertyDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePropertyDefinition_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePropertyDefinition_Usage(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePropertyDefinition_Default(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePropertyDefault_String(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		if (assignment.getTerminal() instanceof RuleCall) {
-			completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-		}
-		if (assignment.getTerminal() instanceof Keyword) {
-			// subclasses may override
-		}
-	}
-	public void completePropertyDefault_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePropertyUsage_Components(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeComponentDefinition_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeComponentDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeComponentDefinition_ComponentDefinitions(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeComponentDefinition_Instantiations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeComponentDefinition_PropertyAssignments(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeComponentDefinition_EnumDefinitions(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeInstantiation_InstanceType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeInstantiation_Alias(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeInstantiation_ComponentRef(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeInstantiation_Component(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeInstantiation_ComponentInstances(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeComponentInstance_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeComponentInstance_Range(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeComponentInstance_Reset(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeComponentInstance_Address(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeComponentInstance_AddrInc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeComponentInstance_AddrMod(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeRange_Left(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeRange_Right(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeRange_Size(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeExplicitPropertyAssignment_Modifier(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeExplicitPropertyAssignment_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeExplicitPropertyAssignment_Rhs(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePostPropertyAssignment_Instance(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePostPropertyAssignment_PropertyEnum(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePostPropertyAssignment_Property(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePostPropertyAssignment_Rhs(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeInstancePropertyRef_Instance(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeInstancePropertyRef_PropertyEnum(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeInstancePropertyRef_Property(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeInstanceRef_Instance(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeInstanceRef_Tail(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeHierInstanceRef_Instance(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeHierInstanceRef_Tail(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePropertyAssignmentRhs_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePropertyAssignmentRhs_InstPropRef(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePropertyAssignmentRhs_EnumRef(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePropertyAssignmentRhs_Enums(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePropertyAssignmentRhs_Elements(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeConcat_Elements(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeConcatElem_InstPropRef(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeConcatElem_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePropertyRvalueConstant_Val(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePropertyRvalueConstant_Num(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completePropertyRvalueConstant_Str(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeEnumDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeEnumDefinition_Body(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeEnumBody_Entries(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeEnumEntry_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeEnumEntry_Index(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeEnumEntry_Properties(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeEnumProperty_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void completeEnumProperty_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeEnumInstanceType_EXTERNAL(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void completeEnumInstanceType_INTERNAL(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Root(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Include(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_PropertyDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_PropertyTypeName(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_PropertyDefault(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_PropertyUsage(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_PropertyComponent(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_ComponentDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_ComponentDefinitionType(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Instantiation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_ComponentInstance(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Range(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_PropertyAssignment(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_DefaultProperyAssignment(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_ExplicitPropertyAssignment(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_PostPropertyAssignment(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_InstancePropertyRef(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Entity(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_InstanceRef(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_HierInstanceRef(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_PropertyAssignmentRhs(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Concat(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_ConcatElem(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_PropertyEnum(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Property(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_PropertyRvalueConstant(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_RValueConstant(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_PropertyModifier(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_EnumDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_EnumBody(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_EnumEntry(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_EnumProperty(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_EnumInstanceType(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_ID(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_WS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_ML_COMMENT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_SL_COMMENT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_ESCAPE_JSP(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_ESCAPE_ORDL(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_NUM(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_STR(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-}

com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/internal/RdlActivator.java

@@ -1,93 +0,0 @@
-/*
- * generated by Xtext 2.12.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;
-import java.util.Map;
-import org.apache.log4j.Logger;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.xtext.ui.shared.SharedStateModule;
-import org.eclipse.xtext.util.Modules2;
-import org.osgi.framework.BundleContext;
-
-/**
- * This class was generated. Customizations should only happen in a newly
- * introduced subclass. 
- */
-public class RdlActivator extends AbstractUIPlugin {
-
-	public static final String COM_MINRES_RDL_RDL = "com.minres.rdl.RDL";
-	
-	private static final Logger logger = Logger.getLogger(RdlActivator.class);
-	
-	private static RdlActivator INSTANCE;
-	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
-	
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		INSTANCE = this;
-	}
-	
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		injectors.clear();
-		INSTANCE = null;
-		super.stop(context);
-	}
-	
-	public static RdlActivator getInstance() {
-		return INSTANCE;
-	}
-	
-	public Injector getInjector(String language) {
-		synchronized (injectors) {
-			Injector injector = injectors.get(language);
-			if (injector == null) {
-				injectors.put(language, injector = createInjector(language));
-			}
-			return injector;
-		}
-	}
-	
-	protected Injector createInjector(String language) {
-		try {
-			Module runtimeModule = getRuntimeModule(language);
-			Module sharedStateModule = getSharedStateModule();
-			Module uiModule = getUiModule(language);
-			Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule);
-			return Guice.createInjector(mergedModule);
-		} catch (Exception e) {
-			logger.error("Failed to create injector for " + language);
-			logger.error(e.getMessage(), e);
-			throw new RuntimeException("Failed to create injector for " + language, e);
-		}
-	}
-	
-	protected Module getRuntimeModule(String grammar) {
-		if (COM_MINRES_RDL_RDL.equals(grammar)) {
-			return new RDLRuntimeModule();
-		}
-		throw new IllegalArgumentException(grammar);
-	}
-	
-	protected Module getUiModule(String grammar) {
-		if (COM_MINRES_RDL_RDL.equals(grammar)) {
-			return new RDLUiModule(this);
-		}
-		throw new IllegalArgumentException(grammar);
-	}
-	
-	protected Module getSharedStateModule() {
-		return new SharedStateModule();
-	}
-	
-}

com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/RDLUiModule.xtend

@@ -1,11 +1,17 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.14.0
  */
 package com.minres.rdl.ui
 
+import com.minres.structural.ui.hyperlink.MyHyperlinkHelper
+import com.minres.structural.ui.hyperlink.MyXtextHyperlink
 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
-import org.eclipse.xtext.ui.editor.hover.IEObjectHoverProvider
 import org.eclipse.xtext.documentation.IEObjectDocumentationProvider
+import org.eclipse.xtext.ui.editor.hover.IEObjectHoverProvider
+import org.eclipse.xtext.ui.editor.hyperlinking.HyperlinkHelper
+import org.eclipse.xtext.ui.editor.hyperlinking.XtextHyperlink
+import org.eclipse.xtext.ui.resource.IResourceSetProvider
+import org.eclipse.xtext.ui.resource.SimpleResourceSetProvider
 
 /**
  * Use this class to register components to be used within the Eclipse IDE.
@@ -21,4 +27,20 @@ class RDLUiModule extends AbstractRDLUiModule {
         typeof(RDLEObjectDocumentationProvider);
     }
 
+//	override Class<? extends IProjectCreator> bindIProjectCreator() {
+//		return JDTFreeStructuralProjectCreator;
+//	}
+	
+	override Class<? extends IResourceSetProvider> bindIResourceSetProvider() {
+    	return SimpleResourceSetProvider
+  	}
+  	
+  	def Class<? extends HyperlinkHelper> bindHyperlinkHelper() {
+		return MyHyperlinkHelper
+	}
+	
+  	def Class<? extends XtextHyperlink> bindHyperlink() {
+		return MyXtextHyperlink
+	}
+	
 }

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
 

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
 

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
 
@@ -43,7 +43,10 @@ class RDLLabelProvider extends DefaultEObjectLabelProvider {
 			val pa = e.propertyAssignments.findFirst[PropertyAssignment pa | 
 				pa instanceof ExplicitPropertyAssignment && (pa as ExplicitPropertyAssignment).name==PropertyEnum.NAME
 			]
+			if(pa!== null)
 				e.type.literal+' '+ text((pa as ExplicitPropertyAssignment).rhs)
+			else
+				e.type.literal
 		}
 	} 
 	

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
 

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
 

com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/wizard/Messages.java

@@ -0,0 +1,20 @@
+package com.minres.rdl.ui.wizard;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "com.minres.rdl.ui.wizard.messages"; //$NON-NLS-1$
+	
+	public static String HelloWorldProject_Label;
+	public static String HelloWorldProject_Description;
+	public static String RdlProject_Label;
+	public static String RdlProject_Description;
+	
+	static {
+	// initialize resource bundle
+	NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}

com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/wizard/RDLProjectTemplateProvider.xtend

@@ -0,0 +1,81 @@
+/*
+ * generated by Xtext 2.14.0
+ */
+package com.minres.rdl.ui.wizard
+
+import org.eclipse.xtext.ui.XtextProjectHelper
+import org.eclipse.xtext.ui.util.PluginProjectFactory
+import org.eclipse.xtext.ui.wizard.template.IProjectGenerator
+import org.eclipse.xtext.ui.wizard.template.IProjectTemplateProvider
+import org.eclipse.xtext.ui.wizard.template.ProjectTemplate
+
+/**
+ * Create a list with all project templates to be shown in the template new project wizard.
+ * 
+ * Each template is able to generate one or more projects. Each project can be configured such that any number of files are included.
+ */
+class RDLProjectTemplateProvider implements IProjectTemplateProvider {
+	override getProjectTemplates() {
+		#[new RdlProject]
+	}
+}
+
+@ProjectTemplate(
+	label="RDL template",
+	icon="project_template.png",
+	description="<p><b>RDL</b></p><p>This is a simple project for RDL.</p>")
+final class RdlProject {
+//	val advanced = check("Advanced:", false)
+//	val advancedGroup = group("Properties")
+//	val name = combo("Name:", #["Xtext", "World", "Foo", "Bar"], "The name to say 'Hello' to", advancedGroup)
+//	val path = text("Package:", "mydsl", "The package path to place the files in", advancedGroup)
+//
+//	override protected updateVariables() {
+//		name.enabled = advanced.value
+//		path.enabled = advanced.value
+//		if (!advanced.value) {
+//			name.value = "Xtext"
+//			path.value = "rdl"
+//		}
+//	}
+//
+//	override protected validate() {
+//		if (path.value.matches('[a-z][a-z0-9_]*(/[a-z][a-z0-9_]*)*'))
+//			null
+//		else
+//			new Status(ERROR, "Wizard", "'" + path + "' is not a valid package name")
+//	}
+
+	override generateProjects(IProjectGenerator generator) {
+		generator.generate(new PluginProjectFactory => [
+			projectName = projectInfo.projectName
+			location = projectInfo.locationPath
+			projectNatures += XtextProjectHelper.NATURE_ID //#[JavaCore.NATURE_ID, "org.eclipse.pde.PluginNature", XtextProjectHelper.NATURE_ID]
+			builderIds += XtextProjectHelper.BUILDER_ID //JavaCore.BUILDER_ID
+			folders += "src"
+			addFile('''src/Model.rdl''', '''
+				enum ERRSLICE0_MISSIONERR_ENABLE_ERR25_enum{
+				  DISABLE = 1'd0;
+				  ENABLE = 1'd1;
+				};
+				addrmap  {
+				    name = "foo registers";
+				    desc = "this is a bunch of foo regs bla bla bla";
+				    
+				    regfile bar_regs  {
+				        name = "bar registers";
+				        desc = "this is a bunch of bar regs bla bla bla";
+				        
+					    reg {
+				            field { name="field 1"; sw=rw; hw=rw; we; } fld1[9:0] = 10'd0;
+				            field { name="field 2"; sw=rw; hw=r; } fld2[15:15];
+				            field {encode=ERRSLICE0_MISSIONERR_ENABLE_ERR25_enum; sw=rw; hw=r; reset=1'h1;} ERR25[25:25];
+					    } a_reg[2];	    
+					    
+				    } bar;
+				    
+				} foo;
+			''')
+		])
+	}
+}

com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/rdl/ui/wizard/messages.properties

@@ -0,0 +1,4 @@
+HelloWorldProject_Label=Hello World
+HelloWorldProject_Description=<p><b>Hello World</b></p> <p>This is a parameterized hello world for RDL. You can set a parameter to modify the content in the generated file and a parameter to set the package the file is created in.</p>
+RdlProject_Label=RDL template
+RdlProject_Description=<p><b>RDL</b></p><p>This is a simple project for RDL.</p>

com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/structural/ui/hyperlink/MyHyperlinkHelper.xtend

@@ -0,0 +1,53 @@
+package com.minres.structural.ui.hyperlink
+
+import com.google.inject.Inject
+import org.eclipse.emf.common.util.URI
+import org.eclipse.emf.ecore.util.EcoreUtil
+import org.eclipse.jface.text.Region
+import org.eclipse.xtext.EcoreUtil2
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils
+import org.eclipse.xtext.resource.XtextResource
+import org.eclipse.xtext.scoping.impl.ImportUriResolver
+import org.eclipse.xtext.ui.editor.hyperlinking.HyperlinkHelper
+import org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkAcceptor
+import org.eclipse.xtext.util.TextRegion
+import org.eclipse.jface.text.IRegion
+
+class MyHyperlinkHelper extends HyperlinkHelper {
+	
+	@Inject	ImportUriResolver resolver;
+
+	override createHyperlinksByOffset(XtextResource resource, int offset, IHyperlinkAcceptor acceptor) {
+		val region = new TextRegion(offset, 0)
+		val crossRefNode = getEObjectAtOffsetHelper().getCrossReferenceNode(resource, region);
+		if (crossRefNode === null){
+			val parseResult = resource.getParseResult();
+			if (parseResult !== null) {
+				val leaf = NodeModelUtils.findLeafNodeAtOffset(parseResult.getRootNode(), region.getOffset());
+				//val rule = EcoreUtil2.getContainerOfType(leaf.grammarElement, AbstractRule);
+				val semObj = NodeModelUtils.findActualSemanticObjectFor(leaf);
+				val importURI = resolver.resolve(semObj);
+				if (importURI !== null && EcoreUtil2.isValidUri(semObj, URI.createURI(importURI))) {
+					val referencedResource = EcoreUtil2.getResource(resource, importURI)
+					if(referencedResource !== null && referencedResource.contents.size>0){
+						val top = referencedResource.contents.get(0)
+						val textRegion = leaf.getTextRegion();
+						val uri = EcoreUtil.getURI(top);
+						val result = hyperlinkProvider.get();
+						result.setHyperlinkRegion(new Region(textRegion.getOffset(), textRegion.getLength()) as IRegion);
+						result.setURI(if(uri.isPlatformResource()) uri else resource.getResourceSet().getURIConverter().normalize(uri));
+						result.setHyperlinkText(labelProvider.getText(top));
+						if(result instanceof MyXtextHyperlink) result.selectTarget=false
+						acceptor.accept(result);
+					}
+				}
+			}
+		} else {
+			val crossLinkedEObject = getEObjectAtOffsetHelper().getCrossReferencedElement(crossRefNode);
+			if (crossLinkedEObject !== null && !crossLinkedEObject.eIsProxy()) {
+				createHyperlinksTo(resource, crossRefNode, crossLinkedEObject, acceptor);
+			}
+		}
+	}
+		
+}

com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/structural/ui/hyperlink/MyXtextHyperlink.xtend

@@ -0,0 +1,24 @@
+package com.minres.structural.ui.hyperlink
+
+import com.google.inject.Inject
+import org.eclipse.xtext.ui.editor.IURIEditorOpener
+import org.eclipse.xtext.ui.editor.hyperlinking.XtextHyperlink
+
+class MyXtextHyperlink extends XtextHyperlink {
+		
+	var boolean select = true
+	
+	@Inject var IURIEditorOpener uriEditorOpener;
+
+	override void open() {
+		uriEditorOpener.open(getURI(), select);
+	}
+
+	def boolean getSelectTarget(){
+		return select
+	}
+	
+	def void setSelectTarget(boolean select){
+		this.select=select
+	}
+}

com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/RDLEObjectDocumentationProvider.java

@@ -1,12 +0,0 @@
-package com.minres.rdl.ui;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.documentation.IEObjectDocumentationProvider;
-
-@SuppressWarnings("all")
-public class RDLEObjectDocumentationProvider implements IEObjectDocumentationProvider {
-  @Override
-  public String getDocumentation(final EObject o) {
-    return null;
-  }
-}

com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/RDLEObjectHoverProvider.java

@@ -1,46 +0,0 @@
-package com.minres.rdl.ui;
-
-import com.minres.rdl.rdl.ComponentDefinition;
-import com.minres.rdl.rdl.ComponentDefinitionType;
-import com.minres.rdl.rdl.ComponentInstance;
-import com.minres.rdl.rdl.Instantiation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.ui.editor.hover.html.DefaultEObjectHoverProvider;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-
-@SuppressWarnings("all")
-public class RDLEObjectHoverProvider extends DefaultEObjectHoverProvider {
-  @Override
-  protected String getFirstLine(final EObject o) {
-    boolean _matched = false;
-    if (o instanceof ComponentDefinition) {
-      _matched=true;
-      String _name = ((ComponentDefinition)o).getName();
-      String _plus = ("Component " + _name);
-      String _plus_1 = (_plus + " of type ");
-      String _literal = ((ComponentDefinition)o).getType().getLiteral();
-      return (_plus_1 + _literal);
-    }
-    if (!_matched) {
-      if (o instanceof ComponentInstance) {
-        _matched=true;
-        final EObject parent = ((ComponentInstance)o).eContainer();
-        if ((parent instanceof Instantiation)) {
-          ComponentDefinitionType _xifexpression = null;
-          ComponentDefinition _componentRef = ((Instantiation)parent).getComponentRef();
-          boolean _tripleNotEquals = (_componentRef != null);
-          if (_tripleNotEquals) {
-            _xifexpression = ((Instantiation)parent).getComponentRef().getType();
-          } else {
-            _xifexpression = ((Instantiation)parent).getComponent().getType();
-          }
-          String _firstUpper = StringExtensions.toFirstUpper(_xifexpression.getLiteral());
-          String _plus = (_firstUpper + " ");
-          String _name = ((ComponentInstance)o).getName();
-          return (_plus + _name);
-        }
-      }
-    }
-    return super.getFirstLine(o);
-  }
-}

com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/RDLUiModule.java

@@ -1,31 +0,0 @@
-/**
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ui;
-
-import com.minres.rdl.ui.AbstractRDLUiModule;
-import com.minres.rdl.ui.RDLEObjectDocumentationProvider;
-import com.minres.rdl.ui.RDLEObjectHoverProvider;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor;
-import org.eclipse.xtext.documentation.IEObjectDocumentationProvider;
-import org.eclipse.xtext.ui.editor.hover.IEObjectHoverProvider;
-
-/**
- * Use this class to register components to be used within the Eclipse IDE.
- */
-@FinalFieldsConstructor
-@SuppressWarnings("all")
-public class RDLUiModule extends AbstractRDLUiModule {
-  public Class<? extends IEObjectHoverProvider> bindIEObjectHoverProvider() {
-    return RDLEObjectHoverProvider.class;
-  }
-  
-  public Class<? extends IEObjectDocumentationProvider> bindIEObjectDocumentationProviderr() {
-    return RDLEObjectDocumentationProvider.class;
-  }
-  
-  public RDLUiModule(final AbstractUIPlugin arg0) {
-    super(arg0);
-  }
-}

com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/contentassist/RDLProposalProvider.java

@@ -1,14 +0,0 @@
-/**
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ui.contentassist;
-
-import com.minres.rdl.ui.contentassist.AbstractRDLProposalProvider;
-
-/**
- * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#content-assist
- * on how to customize the content assistant.
- */
-@SuppressWarnings("all")
-public class RDLProposalProvider extends AbstractRDLProposalProvider {
-}

com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/labeling/RDLDescriptionLabelProvider.java

@@ -1,15 +0,0 @@
-/**
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ui.labeling;
-
-import org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider;
-
-/**
- * Provides labels for IEObjectDescriptions and IResourceDescriptions.
- * 
- * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#label-provider
- */
-@SuppressWarnings("all")
-public class RDLDescriptionLabelProvider extends DefaultDescriptionLabelProvider {
-}

com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/labeling/RDLLabelProvider.java

@@ -1,375 +0,0 @@
-/**
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ui.labeling;
-
-import com.google.common.base.Objects;
-import com.google.inject.Inject;
-import com.minres.rdl.IntegerWithRadix;
-import com.minres.rdl.rdl.ComponentDefinition;
-import com.minres.rdl.rdl.ComponentDefinitionType;
-import com.minres.rdl.rdl.ComponentInstance;
-import com.minres.rdl.rdl.EnumDefinition;
-import com.minres.rdl.rdl.EnumEntry;
-import com.minres.rdl.rdl.EnumProperty;
-import com.minres.rdl.rdl.ExplicitPropertyAssignment;
-import com.minres.rdl.rdl.InstancePropertyRef;
-import com.minres.rdl.rdl.InstanceRef;
-import com.minres.rdl.rdl.PostPropertyAssignment;
-import com.minres.rdl.rdl.PropertyAssignment;
-import com.minres.rdl.rdl.PropertyAssignmentRhs;
-import com.minres.rdl.rdl.PropertyDefinition;
-import com.minres.rdl.rdl.PropertyEnum;
-import com.minres.rdl.rdl.PropertyModifier;
-import com.minres.rdl.rdl.RValue;
-import com.minres.rdl.rdl.RValueConstant;
-import com.minres.rdl.rdl.Range;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider;
-import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ListExtensions;
-
-/**
- * Provides labels for EObjects.
- * 
- * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#label-provider
- */
-@SuppressWarnings("all")
-public class RDLLabelProvider extends DefaultEObjectLabelProvider {
-  @Inject
-  public RDLLabelProvider(final AdapterFactoryLabelProvider delegate) {
-    super(delegate);
-  }
-  
-  public String text(final ComponentDefinition e) {
-    String _xifexpression = null;
-    String _name = e.getName();
-    boolean _tripleNotEquals = (_name != null);
-    if (_tripleNotEquals) {
-      String _literal = e.getType().getLiteral();
-      String _plus = (_literal + " ");
-      String _name_1 = e.getName();
-      _xifexpression = (_plus + _name_1);
-    } else {
-      String _xblockexpression = null;
-      {
-        final Function1<PropertyAssignment, Boolean> _function = (PropertyAssignment pa) -> {
-          return Boolean.valueOf(((pa instanceof ExplicitPropertyAssignment) && Objects.equal(((ExplicitPropertyAssignment) pa).getName(), PropertyEnum.NAME)));
-        };
-        final PropertyAssignment pa = IterableExtensions.<PropertyAssignment>findFirst(e.getPropertyAssignments(), _function);
-        String _literal_1 = e.getType().getLiteral();
-        String _plus_1 = (_literal_1 + " ");
-        Object _text = this.text(((ExplicitPropertyAssignment) pa).getRhs());
-        _xblockexpression = (_plus_1 + _text);
-      }
-      _xifexpression = _xblockexpression;
-    }
-    return _xifexpression;
-  }
-  
-  public String text(final ExplicitPropertyAssignment e) {
-    String res = "";
-    PropertyModifier _modifier = e.getModifier();
-    boolean _notEquals = (!Objects.equal(_modifier, PropertyModifier.UNDEFINED));
-    if (_notEquals) {
-      String _res = res;
-      String _literal = e.getModifier().getLiteral();
-      String _plus = (_literal + " ");
-      res = (_res + _plus);
-    }
-    String _res_1 = res;
-    PropertyEnum _name = e.getName();
-    res = (_res_1 + _name);
-    PropertyAssignmentRhs _rhs = e.getRhs();
-    boolean _tripleNotEquals = (_rhs != null);
-    if (_tripleNotEquals) {
-      String _res_2 = res;
-      Object _text = this.text(e.getRhs());
-      String _plus_1 = (" = " + _text);
-      res = (_res_2 + _plus_1);
-    }
-    return res;
-  }
-  
-  public String text(final PostPropertyAssignment e) {
-    String res = "";
-    String _res = res;
-    String _text = this.text(e.getInstance());
-    res = (_res + _text);
-    PropertyDefinition _property = e.getProperty();
-    boolean _tripleNotEquals = (_property != null);
-    if (_tripleNotEquals) {
-      String _res_1 = res;
-      String _name = e.getProperty().getName();
-      String _plus = ("->" + _name);
-      res = (_res_1 + _plus);
-    } else {
-      PropertyEnum _propertyEnum = e.getPropertyEnum();
-      boolean _notEquals = (!Objects.equal(_propertyEnum, PropertyEnum.UNSPECIFIED));
-      if (_notEquals) {
-        String _res_2 = res;
-        String _literal = e.getPropertyEnum().getLiteral();
-        String _plus_1 = ("->" + _literal);
-        res = (_res_2 + _plus_1);
-      }
-    }
-    return res;
-  }
-  
-  public String text(final InstanceRef e) {
-    String _xifexpression = null;
-    InstanceRef _tail = e.getTail();
-    boolean _tripleNotEquals = (_tail != null);
-    if (_tripleNotEquals) {
-      String _name = e.getInstance().getName();
-      String _plus = (_name + ".");
-      String _text = this.text(e.getTail());
-      _xifexpression = (_plus + _text);
-    } else {
-      _xifexpression = e.getInstance().getName();
-    }
-    return _xifexpression;
-  }
-  
-  public String text(final ComponentInstance e) {
-    String res = e.getName();
-    Range _range = e.getRange();
-    boolean _tripleNotEquals = (_range != null);
-    if (_tripleNotEquals) {
-      String _res = res;
-      String _xifexpression = null;
-      Object _size = e.getRange().getSize();
-      boolean _tripleNotEquals_1 = (_size != null);
-      if (_tripleNotEquals_1) {
-        _xifexpression = e.getRange().getSize().toString();
-      } else {
-        Object _left = e.getRange().getLeft();
-        String _plus = (_left + ":");
-        Object _right = e.getRange().getRight();
-        _xifexpression = (_plus + _right);
-      }
-      String _plus_1 = ("[" + _xifexpression);
-      String _plus_2 = (_plus_1 + "]");
-      res = (_res + _plus_2);
-    }
-    Object _address = e.getAddress();
-    boolean _tripleNotEquals_2 = (_address != null);
-    if (_tripleNotEquals_2) {
-      String _res_1 = res;
-      Object _address_1 = e.getAddress();
-      String _plus_3 = (" @" + _address_1);
-      res = (_res_1 + _plus_3);
-    }
-    return res;
-  }
-  
-  public Object text(final PropertyAssignmentRhs e) {
-    Object _xifexpression = null;
-    RValue _value = e.getValue();
-    boolean _tripleNotEquals = (_value != null);
-    if (_tripleNotEquals) {
-      _xifexpression = this.text(e.getValue());
-    } else {
-      Object _xifexpression_1 = null;
-      InstancePropertyRef _instPropRef = e.getInstPropRef();
-      boolean _tripleNotEquals_1 = (_instPropRef != null);
-      if (_tripleNotEquals_1) {
-        _xifexpression_1 = this.text(e.getInstPropRef());
-      } else {
-        Object _xifexpression_2 = null;
-        EnumDefinition _enumRef = e.getEnumRef();
-        boolean _tripleNotEquals_2 = (_enumRef != null);
-        if (_tripleNotEquals_2) {
-          _xifexpression_2 = this.text(e.getEnumRef());
-        }
-        _xifexpression_1 = _xifexpression_2;
-      }
-      _xifexpression = _xifexpression_1;
-    }
-    return _xifexpression;
-  }
-  
-  public String text(final InstancePropertyRef ref) {
-    String _text = this.text(ref.getInstance());
-    String _xifexpression = null;
-    PropertyDefinition _property = ref.getProperty();
-    boolean _tripleNotEquals = (_property != null);
-    if (_tripleNotEquals) {
-      String _name = ref.getProperty().getName();
-      _xifexpression = ("->" + _name);
-    } else {
-      String _xifexpression_1 = null;
-      PropertyEnum _propertyEnum = ref.getPropertyEnum();
-      boolean _notEquals = (!Objects.equal(_propertyEnum, PropertyEnum.UNSPECIFIED));
-      if (_notEquals) {
-        String _literal = ref.getPropertyEnum().getLiteral();
-        _xifexpression_1 = ("->" + _literal);
-      } else {
-        _xifexpression_1 = "";
-      }
-      _xifexpression = _xifexpression_1;
-    }
-    return (_text + _xifexpression);
-  }
-  
-  public String text(final RValue e) {
-    String _xifexpression = null;
-    String _str = e.getStr();
-    boolean _tripleNotEquals = (_str != null);
-    if (_tripleNotEquals) {
-      _xifexpression = this.elipse(e.getStr());
-    } else {
-      RValueConstant _val = e.getVal();
-      boolean _notEquals = (!Objects.equal(_val, RValueConstant.UNDEFINED));
-      if (_notEquals) {
-        return e.getVal().getLiteral();
-      } else {
-        Object _num = e.getNum();
-        boolean _tripleNotEquals_1 = (_num != null);
-        if (_tripleNotEquals_1) {
-          Object _num_1 = e.getNum();
-          final IntegerWithRadix num = ((IntegerWithRadix) _num_1);
-          return num.toString();
-        }
-      }
-    }
-    return _xifexpression;
-  }
-  
-  public String elipse(final String string) {
-    final int pos = string.indexOf("\n");
-    if ((pos > 0)) {
-      String _substring = string.substring(0, (pos - 1));
-      return (_substring + "...");
-    } else {
-      int _length = string.length();
-      boolean _greaterThan = (_length > 30);
-      if (_greaterThan) {
-        String _substring_1 = string.substring(0, 30);
-        return (_substring_1 + "...");
-      } else {
-        return string;
-      }
-    }
-  }
-  
-  public String text(final EnumEntry e) {
-    String _xifexpression = null;
-    Object _index = e.getIndex();
-    boolean _tripleNotEquals = (_index != null);
-    if (_tripleNotEquals) {
-      String _name = e.getName();
-      String _plus = (_name + "=");
-      String _string = e.getIndex().toString();
-      _xifexpression = (_plus + _string);
-    } else {
-      String _name_1 = e.getName();
-      String _plus_1 = (_name_1 + "=");
-      final Function1<EnumProperty, String> _function = (EnumProperty it) -> {
-        return this.text(it);
-      };
-      String _join = IterableExtensions.join(ListExtensions.<EnumProperty, String>map(e.getProperties(), _function), ",");
-      _xifexpression = (_plus_1 + _join);
-    }
-    return _xifexpression;
-  }
-  
-  public String text(final EnumProperty e) {
-    String _name = e.getName();
-    String _plus = (_name + "=");
-    String _elipse = this.elipse(e.getValue());
-    return (_plus + _elipse);
-  }
-  
-  public String image(final ComponentDefinition e) {
-    ComponentDefinitionType _type = e.getType();
-    if (_type != null) {
-      switch (_type) {
-        case ADDRMAP:
-          return "A.png";
-        case FIELD:
-          return "F.png";
-        case REG:
-          return "R.png";
-        case REGFILE:
-          return "R.png";
-        case SIGNAL:
-          return "S.png";
-        default:
-          break;
-      }
-    }
-    return null;
-  }
-  
-  public String image(final PropertyAssignmentRhs e) {
-    String _xifexpression = null;
-    RValue _value = e.getValue();
-    boolean _tripleNotEquals = (_value != null);
-    if (_tripleNotEquals) {
-      _xifexpression = "V.png";
-    } else {
-      String _xifexpression_1 = null;
-      InstancePropertyRef _instPropRef = e.getInstPropRef();
-      boolean _tripleNotEquals_1 = (_instPropRef != null);
-      if (_tripleNotEquals_1) {
-        _xifexpression_1 = this.image(e.getInstPropRef());
-      } else {
-        String _xifexpression_2 = null;
-        EnumDefinition _enumRef = e.getEnumRef();
-        boolean _tripleNotEquals_2 = (_enumRef != null);
-        if (_tripleNotEquals_2) {
-          _xifexpression_2 = "E.png";
-        }
-        _xifexpression_1 = _xifexpression_2;
-      }
-      _xifexpression = _xifexpression_1;
-    }
-    return _xifexpression;
-  }
-  
-  public String image(final InstancePropertyRef ref) {
-    String _xifexpression = null;
-    PropertyDefinition _property = ref.getProperty();
-    boolean _tripleNotEquals = (_property != null);
-    if (_tripleNotEquals) {
-      _xifexpression = "P.png";
-    } else {
-      String _xifexpression_1 = null;
-      PropertyEnum _propertyEnum = ref.getPropertyEnum();
-      boolean _notEquals = (!Objects.equal(_propertyEnum, PropertyEnum.UNSPECIFIED));
-      if (_notEquals) {
-        _xifexpression_1 = "E.png";
-      } else {
-        _xifexpression_1 = "I.png";
-      }
-      _xifexpression = _xifexpression_1;
-    }
-    return _xifexpression;
-  }
-  
-  public String image(final EnumDefinition e) {
-    return "E.png";
-  }
-  
-  public String image(final ExplicitPropertyAssignment e) {
-    return "P.png";
-  }
-  
-  public String image(final PostPropertyAssignment e) {
-    return "P.png";
-  }
-  
-  public String image(final ComponentInstance e) {
-    return "I.png";
-  }
-  
-  public String image(final EnumEntry v) {
-    return "V.png";
-  }
-  
-  public String image(final EnumProperty e) {
-    return "P.png";
-  }
-}

com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/outline/RDLOutlineTreeProvider.java

@@ -1,118 +0,0 @@
-/**
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ui.outline;
-
-import com.minres.rdl.rdl.ComponentDefinition;
-import com.minres.rdl.rdl.ComponentInstance;
-import com.minres.rdl.rdl.EnumDefinition;
-import com.minres.rdl.rdl.EnumEntry;
-import com.minres.rdl.rdl.ExplicitPropertyAssignment;
-import com.minres.rdl.rdl.Instantiation;
-import com.minres.rdl.rdl.PostPropertyAssignment;
-import com.minres.rdl.rdl.PropertyAssignment;
-import com.minres.rdl.rdl.PropertyAssignmentRhs;
-import com.minres.rdl.rdl.PropertyDefinition;
-import com.minres.rdl.rdl.Root;
-import java.util.function.Consumer;
-import org.eclipse.xtext.ui.editor.outline.IOutlineNode;
-import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
-import org.eclipse.xtext.ui.editor.outline.impl.DocumentRootNode;
-
-/**
- * Customization of the default outline structure.
- * 
- * See https://www.eclipse.org/Xtext/documentation/310_eclipse_support.html#outline
- */
-@SuppressWarnings("all")
-public class RDLOutlineTreeProvider extends DefaultOutlineTreeProvider {
-  protected void _createChildren(final DocumentRootNode parentNode, final Root domainModel) {
-    final Consumer<EnumDefinition> _function = (EnumDefinition it) -> {
-      this.createNode(parentNode, it);
-    };
-    domainModel.getEnumDefinitions().forEach(_function);
-    final Consumer<PropertyDefinition> _function_1 = (PropertyDefinition it) -> {
-      this.createNode(parentNode, it);
-    };
-    domainModel.getPropertyDefinitions().forEach(_function_1);
-    final Consumer<ComponentDefinition> _function_2 = (ComponentDefinition it) -> {
-      this.createNode(parentNode, it);
-    };
-    domainModel.getComponentDefinitions().forEach(_function_2);
-    final Consumer<PropertyAssignment> _function_3 = (PropertyAssignment it) -> {
-      this.createNode(parentNode, it);
-    };
-    domainModel.getPropertyAssignments().forEach(_function_3);
-    final Consumer<Instantiation> _function_4 = (Instantiation instantiation) -> {
-      ComponentDefinition _component = instantiation.getComponent();
-      boolean _tripleNotEquals = (_component != null);
-      if (_tripleNotEquals) {
-        this.createNode(parentNode, instantiation.getComponent());
-      }
-      final Consumer<ComponentInstance> _function_5 = (ComponentInstance it) -> {
-        this.createNode(parentNode, it);
-      };
-      instantiation.getComponentInstances().forEach(_function_5);
-    };
-    domainModel.getInstantiations().forEach(_function_4);
-  }
-  
-  protected void _createChildren(final IOutlineNode parentNode, final ComponentDefinition compDef) {
-    final Consumer<EnumDefinition> _function = (EnumDefinition it) -> {
-      this.createNode(parentNode, it);
-    };
-    compDef.getEnumDefinitions().forEach(_function);
-    final Consumer<ComponentDefinition> _function_1 = (ComponentDefinition it) -> {
-      this.createNode(parentNode, it);
-    };
-    compDef.getComponentDefinitions().forEach(_function_1);
-    final Consumer<PropertyAssignment> _function_2 = (PropertyAssignment it) -> {
-      this.createNode(parentNode, it);
-    };
-    compDef.getPropertyAssignments().forEach(_function_2);
-    final Consumer<Instantiation> _function_3 = (Instantiation instantiation) -> {
-      ComponentDefinition _component = instantiation.getComponent();
-      boolean _tripleNotEquals = (_component != null);
-      if (_tripleNotEquals) {
-        this.createNode(parentNode, instantiation.getComponent());
-      }
-      final Consumer<ComponentInstance> _function_4 = (ComponentInstance it) -> {
-        this.createNode(parentNode, it);
-      };
-      instantiation.getComponentInstances().forEach(_function_4);
-    };
-    compDef.getInstantiations().forEach(_function_3);
-  }
-  
-  protected void _createChildren(final IOutlineNode parentNode, final EnumDefinition e) {
-    final Consumer<EnumEntry> _function = (EnumEntry it) -> {
-      this.createNode(parentNode, it);
-    };
-    e.getBody().getEntries().forEach(_function);
-  }
-  
-  protected void _createChildren(final IOutlineNode parentNode, final PostPropertyAssignment p) {
-    this.createNode(parentNode, p.getRhs());
-  }
-  
-  protected boolean _isLeaf(final ExplicitPropertyAssignment feature) {
-    return true;
-  }
-  
-  protected boolean _isLeaf(final Instantiation feature) {
-    return ((feature.getComponent() == null) && (feature.getComponentInstances().size() == 0));
-  }
-  
-  protected boolean _isLeaf(final PropertyAssignmentRhs feature) {
-    return true;
-  }
-  
-  protected boolean _isLeaf(final ComponentInstance feature) {
-    return true;
-  }
-  
-  protected boolean _isLeaf(final EnumEntry feature) {
-    int _size = feature.getProperties().size();
-    return (_size == 0);
-  }
-}

com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/preferences/RdlPreferencePage.java

@@ -1,35 +0,0 @@
-package com.minres.rdl.ui.preferences;
-
-import com.minres.rdl.preferences.PreferenceConstants;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.ComboFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
-
-@SuppressWarnings("all")
-public class RdlPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-  public RdlPreferencePage() {
-    super(FieldEditorPreferencePage.GRID);
-    final ScopedPreferenceStore store = new ScopedPreferenceStore(InstanceScope.INSTANCE, PreferenceConstants.SCOPE_NAME);
-    this.setPreferenceStore(store);
-    this.setDescription("Code generator configuration options");
-  }
-  
-  @Override
-  public void createFieldEditors() {
-    Composite _fieldEditorParent = this.getFieldEditorParent();
-    BooleanFieldEditor _booleanFieldEditor = new BooleanFieldEditor(PreferenceConstants.P_GENERATE_CSV, "Generate CSV:", _fieldEditorParent);
-    this.addField(_booleanFieldEditor);
-    Composite _fieldEditorParent_1 = this.getFieldEditorParent();
-    ComboFieldEditor _comboFieldEditor = new ComboFieldEditor(PreferenceConstants.P_ADDRESSUNIT, "Address unit size", new String[][] { new String[] { "Byte (8bit)", "byte" }, new String[] { "Word (16bit)", "word" }, new String[] { "DWord (32bit)", "dword" } }, _fieldEditorParent_1);
-    this.addField(_comboFieldEditor);
-  }
-  
-  @Override
-  public void init(final IWorkbench workbench) {
-  }
-}

com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/quickfix/RDLQuickfixProvider.java

@@ -1,15 +0,0 @@
-/**
- * generated by Xtext 2.12.0
- */
-package com.minres.rdl.ui.quickfix;
-
-import org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider;
-
-/**
- * Custom quickfixes.
- * 
- * See https://www.eclipse.org/Xtext/documentation/310_eclipse_support.html#quick-fixes
- */
-@SuppressWarnings("all")
-public class RDLQuickfixProvider extends DefaultQuickfixProvider {
-}

com.minres.rdl.parent/com.minres.rdl.web/.classpath

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="src" path="xtend-gen"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

com.minres.rdl.parent/com.minres.rdl.web/.gitignore

@@ -0,0 +1 @@
+/xtend-gen/

com.minres.rdl.parent/com.minres.rdl.web/.project

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.minres.rdl.web</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

com.minres.rdl.parent/com.minres.rdl.web/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

com.minres.rdl.parent/com.minres.rdl.web/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,10 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

com.minres.rdl.parent/com.minres.rdl.web/WebRoot/index.html

@@ -0,0 +1,44 @@
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<meta http-equiv="Content-Language" content="en-us">
+	<title>Example Web Editor</title>
+	<link rel="stylesheet" type="text/css" href="xtext/2.14.0/xtext-ace.css"/>
+	<link rel="stylesheet" type="text/css" href="style.css"/>
+	<script src="webjars/requirejs/2.3.2/require.min.js"></script>
+	<script type="text/javascript">
+		var baseUrl = window.location.pathname;
+		var fileIndex = baseUrl.indexOf("index.html");
+		if (fileIndex > 0)
+			baseUrl = baseUrl.slice(0, fileIndex);
+		require.config({
+			baseUrl: baseUrl,
+			paths: {
+				"jquery": "webjars/jquery/2.2.4/jquery.min",
+				"ace/ext/language_tools": "webjars/ace/1.2.3/src/ext-language_tools",
+				"xtext/xtext-ace": "xtext/2.14.0/xtext-ace"
+			}
+		});
+		require(["webjars/ace/1.2.3/src/ace"], function() {
+			require(["xtext/xtext-ace"], function(xtext) {
+				xtext.createEditor({
+					baseUrl: baseUrl,
+					syntaxDefinition: "xtext-resources/generated/mode-rdl"
+				});
+			});
+		});
+	</script>
+</head>
+<body>
+
+<div class="container">
+	<div class="header">
+		<h1>Example RDL Web Editor</h1>
+	</div>
+	<div class="content">
+		<div id="xtext-editor" data-editor-xtext-lang="rdl"></div>
+	</div>
+</div>
+
+</body>
+</html>