remove not needed target definitions

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

@@ -21,13 +21,5 @@
 <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.14.0/"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
-<unit id="org.junit" version="4.12.0.v201504281640"/>
-<unit id="org.objectweb.asm" version="6.1.1.v20180414-0329"/>
-<unit id="org.objectweb.asm.tree" version="6.1.1.v20180414-0329"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180504181223/repository"/>
-</location>
 </locations>
 </target>

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

@@ -20,7 +20,9 @@ Require-Bundle: com.minres.rdl,
  org.eclipse.xtend.lib;resolution:=optional,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.ui.forms
+ org.eclipse.ui.forms,
+ org.eclipse.jdt.core,
+ org.eclipse.pde.core
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.minres.rdl.ui.internal,

com.minres.rdl.parent/com.minres.rdl/model/generated/RDL.genmodel

@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.14.0" modelDirectory="/com.minres.rdl/src-gen"
     modelPluginID="com.minres.rdl" forceOverwrite="true" modelName="RDL" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="6.0"
-    copyrightFields="false" runtimeVersion="2.14">
+    copyrightFields="false" runtimeVersion="2.12">
   <genPackages prefix="Rdl" basePackage="com.minres.rdl" disposableProviderFactory="true"
       fileExtensions="rdl" ecorePackage="RDL.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="RDL.ecore#//PropertyTypeName">

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentDefinitionImpl.java

@@ -402,7 +402,7 @@ public class ComponentDefinitionImpl extends MinimalEObjectImpl.Container implem
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (type: ");
     result.append(type);
     result.append(", name: ");

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentInstanceImpl.java

@@ -417,7 +417,7 @@ public class ComponentInstanceImpl extends EntityImpl implements ComponentInstan
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (reset: ");
     result.append(reset);
     result.append(", address: ");

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ConcatElemImpl.java

@@ -256,7 +256,7 @@ public class ConcatElemImpl extends MinimalEObjectImpl.Container implements Conc
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (value: ");
     result.append(value);
     result.append(')');

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EntityImpl.java

@@ -168,7 +168,7 @@ public class EntityImpl extends MinimalEObjectImpl.Container implements Entity
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
     result.append(name);
     result.append(')');

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumEntryImpl.java

@@ -285,7 +285,7 @@ public class EnumEntryImpl extends MinimalEObjectImpl.Container implements EnumE
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
     result.append(name);
     result.append(", index: ");

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumInstanceTypeImpl.java

@@ -222,7 +222,7 @@ public class EnumInstanceTypeImpl extends MinimalEObjectImpl.Container implement
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (EXTERNAL: ");
     result.append(external);
     result.append(", INTERNAL: ");

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumPropertyImpl.java

@@ -222,7 +222,7 @@ public class EnumPropertyImpl extends MinimalEObjectImpl.Container implements En
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
     result.append(name);
     result.append(", value: ");

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ExplicitPropertyAssignmentImpl.java

@@ -311,7 +311,7 @@ public class ExplicitPropertyAssignmentImpl extends PropertyAssignmentImpl imple
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (modifier: ");
     result.append(modifier);
     result.append(", name: ");

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/IncludeImpl.java

@@ -168,7 +168,7 @@ public class IncludeImpl extends MinimalEObjectImpl.Container implements Include
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (importURI: ");
     result.append(importURI);
     result.append(')');

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstancePropertyRefImpl.java

@@ -323,7 +323,7 @@ public class InstancePropertyRefImpl extends MinimalEObjectImpl.Container implem
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (propertyEnum: ");
     result.append(propertyEnum);
     result.append(')');

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstantiationImpl.java

@@ -440,7 +440,7 @@ public class InstantiationImpl extends MinimalEObjectImpl.Container implements I
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (alias: ");
     result.append(alias);
     result.append(')');

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PostPropertyAssignmentImpl.java

@@ -394,7 +394,7 @@ public class PostPropertyAssignmentImpl extends PropertyAssignmentImpl implement
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (propertyEnum: ");
     result.append(propertyEnum);
     result.append(')');

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefaultImpl.java

@@ -222,7 +222,7 @@ public class PropertyDefaultImpl extends MinimalEObjectImpl.Container implements
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (string: ");
     result.append(string);
     result.append(", value: ");

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefinitionImpl.java

@@ -328,7 +328,7 @@ public class PropertyDefinitionImpl extends EntityImpl implements PropertyDefini
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (type: ");
     result.append(type);
     result.append(')');

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyUsageImpl.java

@@ -155,7 +155,7 @@ public class PropertyUsageImpl extends MinimalEObjectImpl.Container implements P
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (components: ");
     result.append(components);
     result.append(')');

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RValueImpl.java

@@ -277,7 +277,7 @@ public class RValueImpl extends MinimalEObjectImpl.Container implements RValue
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (val: ");
     result.append(val);
     result.append(", num: ");

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RangeImpl.java

@@ -276,7 +276,7 @@ public class RangeImpl extends MinimalEObjectImpl.Container implements Range
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuilder result = new StringBuilder(super.toString());
+    StringBuffer result = new StringBuffer(super.toString());
     result.append(" (left: ");
     result.append(left);
     result.append(", right: ");

com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RdlPackageImpl.java

@@ -314,8 +314,7 @@ public class RdlPackageImpl extends EPackageImpl implements RdlPackage
     if (isInited) return (RdlPackage)EPackage.Registry.INSTANCE.getEPackage(RdlPackage.eNS_URI);
 
     // Obtain or create and register package
-    Object registeredRdlPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+    RdlPackageImpl theRdlPackage = (RdlPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RdlPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RdlPackageImpl());
-    RdlPackageImpl theRdlPackage = registeredRdlPackage instanceof RdlPackageImpl ? (RdlPackageImpl)registeredRdlPackage : new RdlPackageImpl();
 
     isInited = true;
 
@@ -328,6 +327,7 @@ public class RdlPackageImpl extends EPackageImpl implements RdlPackage
     // Mark meta-data to indicate it can't be changed
     theRdlPackage.freeze();
 
+  
     // Update the registry and return the package
     EPackage.Registry.INSTANCE.put(RdlPackage.eNS_URI, theRdlPackage);
     return theRdlPackage;

com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/Main.java

@@ -180,17 +180,17 @@ public class Main {
         }
         try {
           if (verbose) {
-            URI _uRI_4 = this.fileAccess.getURI("", "src-out");
+            URI _uRI_2 = this.fileAccess.getURI("", "src-out");
-            String _plus_4 = ("sources are in  " + _uRI_4);
+            String _plus_2 = ("sources are in  " + _uRI_2);
-            InputOutput.<String>println(_plus_4);
+            InputOutput.<String>println(_plus_2);
           }
-        } catch (final Throwable _t_1) {
+        } catch (final Throwable _t) {
-          if (_t_1 instanceof Exception) {
+          if (_t instanceof Exception) {
-            URI _uRI_5 = this.fileAccess.getURI("");
+            URI _uRI_3 = this.fileAccess.getURI("");
-            String _plus_5 = ("sources are in  " + _uRI_5);
+            String _plus_3 = ("sources are in  " + _uRI_3);
-            InputOutput.<String>println(_plus_5);
+            InputOutput.<String>println(_plus_3);
           } else {
-            throw Exceptions.sneakyThrow(_t_1);
+            throw Exceptions.sneakyThrow(_t);
           }
         }
       } catch (Throwable _e) {

com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/messages/RDLSyntaxErrorMessageProvider.java

@@ -13,7 +13,7 @@ import org.eclipse.xtext.xbase.lib.InputOutput;
 
 @SuppressWarnings("all")
 public class RDLSyntaxErrorMessageProvider extends SyntaxErrorMessageProvider {
-  public final static String USED_RESERVED_KEYWORD = "USED_RESERVED_KEYWORD";
+  public static final String USED_RESERVED_KEYWORD = "USED_RESERVED_KEYWORD";
   
   @Inject
   private IGrammarAccess grammarAccess;