diff --git a/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target b/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target index 0874d48..fbd1431 100644 --- a/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target +++ b/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target @@ -21,13 +21,5 @@ - - - - - - - - diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF b/com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF index 3e2bd04..60cadfb 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF +++ b/com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF @@ -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, diff --git a/com.minres.rdl.parent/com.minres.rdl/model/generated/RDL.genmodel b/com.minres.rdl.parent/com.minres.rdl/model/generated/RDL.genmodel index 1a725c6..214f2c5 100644 --- a/com.minres.rdl.parent/com.minres.rdl/model/generated/RDL.genmodel +++ b/com.minres.rdl.parent/com.minres.rdl/model/generated/RDL.genmodel @@ -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"> diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentDefinitionImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentDefinitionImpl.java index 7b608cb..cbc6818 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentDefinitionImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentDefinitionImpl.java @@ -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: "); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentInstanceImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentInstanceImpl.java index 8b4a017..520981d 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentInstanceImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ComponentInstanceImpl.java @@ -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: "); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ConcatElemImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ConcatElemImpl.java index f206288..92ba393 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ConcatElemImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ConcatElemImpl.java @@ -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(')'); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EntityImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EntityImpl.java index 9925fa9..8eeb7be 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EntityImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EntityImpl.java @@ -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(')'); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumEntryImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumEntryImpl.java index f14e771..b880d61 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumEntryImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumEntryImpl.java @@ -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: "); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumInstanceTypeImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumInstanceTypeImpl.java index 0878074..88fcb24 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumInstanceTypeImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumInstanceTypeImpl.java @@ -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: "); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumPropertyImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumPropertyImpl.java index 1ec2dda..27afb1a 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumPropertyImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/EnumPropertyImpl.java @@ -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: "); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ExplicitPropertyAssignmentImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ExplicitPropertyAssignmentImpl.java index 51b74df..fa4dbf7 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ExplicitPropertyAssignmentImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/ExplicitPropertyAssignmentImpl.java @@ -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: "); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/IncludeImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/IncludeImpl.java index 1d341d0..4b03b4b 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/IncludeImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/IncludeImpl.java @@ -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(')'); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstancePropertyRefImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstancePropertyRefImpl.java index bf83d82..d8d7788 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstancePropertyRefImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstancePropertyRefImpl.java @@ -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(')'); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstantiationImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstantiationImpl.java index 51b9089..ace3bef 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstantiationImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/InstantiationImpl.java @@ -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(')'); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PostPropertyAssignmentImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PostPropertyAssignmentImpl.java index 0ce4b21..1f49b0d 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PostPropertyAssignmentImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PostPropertyAssignmentImpl.java @@ -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(')'); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefaultImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefaultImpl.java index 49af695..b681c1e 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefaultImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefaultImpl.java @@ -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: "); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefinitionImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefinitionImpl.java index 00e8d5f..298154b 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefinitionImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyDefinitionImpl.java @@ -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(')'); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyUsageImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyUsageImpl.java index ddea28c..06d1c14 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyUsageImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/PropertyUsageImpl.java @@ -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(')'); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RValueImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RValueImpl.java index fcded16..837a984 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RValueImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RValueImpl.java @@ -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: "); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RangeImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RangeImpl.java index 64c2990..0f3f6f0 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RangeImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RangeImpl.java @@ -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: "); diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RdlPackageImpl.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RdlPackageImpl.java index bb0e740..a1ffd43 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RdlPackageImpl.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/rdl/impl/RdlPackageImpl.java @@ -299,7 +299,7 @@ public class RdlPackageImpl extends EPackageImpl implements RdlPackage /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link RdlPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -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 = registeredRdlPackage instanceof RdlPackageImpl ? (RdlPackageImpl)registeredRdlPackage : new RdlPackageImpl(); + RdlPackageImpl theRdlPackage = (RdlPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RdlPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : 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; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/RdlUtil.java b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/RdlUtil.java similarity index 100% rename from com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/RdlUtil.java rename to com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/RdlUtil.java diff --git a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/Main.java b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/Main.java index bcf799a..88c191d 100644 --- a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/Main.java +++ b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/Main.java @@ -180,17 +180,17 @@ public class Main { } try { if (verbose) { - URI _uRI_4 = this.fileAccess.getURI("", "src-out"); - String _plus_4 = ("sources are in " + _uRI_4); - InputOutput.println(_plus_4); + URI _uRI_2 = this.fileAccess.getURI("", "src-out"); + String _plus_2 = ("sources are in " + _uRI_2); + InputOutput.println(_plus_2); } - } catch (final Throwable _t_1) { - if (_t_1 instanceof Exception) { - URI _uRI_5 = this.fileAccess.getURI(""); - String _plus_5 = ("sources are in " + _uRI_5); - InputOutput.println(_plus_5); + } catch (final Throwable _t) { + if (_t instanceof Exception) { + URI _uRI_3 = this.fileAccess.getURI(""); + String _plus_3 = ("sources are in " + _uRI_3); + InputOutput.println(_plus_3); } else { - throw Exceptions.sneakyThrow(_t_1); + throw Exceptions.sneakyThrow(_t); } } } catch (Throwable _e) { diff --git a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/messages/RDLSyntaxErrorMessageProvider.java b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/messages/RDLSyntaxErrorMessageProvider.java index 8b12cd5..745d9a6 100644 --- a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/messages/RDLSyntaxErrorMessageProvider.java +++ b/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;