diff options
60 files changed, 317 insertions, 327 deletions
diff --git a/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF index 59313f8c6..916cb2630 100644 --- a/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF @@ -21,5 +21,6 @@ Import-Package: org.apache.log4j, org.apache.commons.logging
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.etrice.core.ui.contentassist.antlr,
- org.eclipse.etrice.core.ui.internal
+ org.eclipse.etrice.core.ui.internal,
+ org.eclipse.etrice.core.ui.contentassist
Bundle-Activator: org.eclipse.etrice.core.ui.internal.ConfigActivator
diff --git a/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen b/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen index 88804d58a..b8d0938cc 100644 --- a/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen +++ b/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen @@ -151,6 +151,28 @@ </extension> + <!-- marker definitions for org.eclipse.etrice.core.Config --> + <extension + id="config.check.fast" + name="Config Problem" + point="org.eclipse.core.resources.markers"> + <super type="org.eclipse.xtext.ui.check.fast"/> + <persistent value="true"/> + </extension> + <extension + id="config.check.normal" + name="Config Problem" + point="org.eclipse.core.resources.markers"> + <super type="org.eclipse.xtext.ui.check.normal"/> + <persistent value="true"/> + </extension> + <extension + id="config.check.expensive" + name="Config Problem" + point="org.eclipse.core.resources.markers"> + <super type="org.eclipse.xtext.ui.check.expensive"/> + <persistent value="true"/> + </extension> <extension point="org.eclipse.xtext.builder.participant"> @@ -216,13 +238,34 @@ </command> </menuContribution> </extension> - <!-- quickfix marker resolution generator --> - <extension - point="org.eclipse.ui.ide.markerResolution"> - <markerResolutionGenerator - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"> - </markerResolutionGenerator> - </extension> + <!-- quickfix marker resolution generator for org.eclipse.etrice.core.Config --> + <extension + point="org.eclipse.ui.ide.markerResolution"> + <markerResolutionGenerator + class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator" + markerType="org.eclipse.etrice.core.ui.config.check.fast"> + <attribute + name="FIXABLE_KEY" + value="true"> + </attribute> + </markerResolutionGenerator> + <markerResolutionGenerator + class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator" + markerType="org.eclipse.etrice.core.ui.config.check.normal"> + <attribute + name="FIXABLE_KEY" + value="true"> + </attribute> + </markerResolutionGenerator> + <markerResolutionGenerator + class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator" + markerType="org.eclipse.etrice.core.ui.config.check.expensive"> + <attribute + name="FIXABLE_KEY" + value="true"> + </attribute> + </markerResolutionGenerator> + </extension> <!-- Rename Refactoring --> <extension point="org.eclipse.ui.handlers"> <handler @@ -258,7 +301,6 @@ </page> </extension> - <extension point="org.eclipse.compare.contentViewers"> <viewer id="org.eclipse.etrice.core.Config.compare.contentViewers" class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator" diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/ConfigExecutableExtensionFactory.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/ConfigExecutableExtensionFactory.java index 492ef4f22..24bd98894 100644 --- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/ConfigExecutableExtensionFactory.java +++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/ConfigExecutableExtensionFactory.java @@ -8,6 +8,8 @@ import org.osgi.framework.Bundle; import com.google.inject.Injector; +import org.eclipse.etrice.core.ui.internal.ConfigActivator; + /** * This class was generated. Customizations should only happen in a newly * introduced subclass. @@ -16,12 +18,12 @@ public class ConfigExecutableExtensionFactory extends AbstractGuiceAwareExecutab @Override protected Bundle getBundle() { - return org.eclipse.etrice.core.ui.internal.ConfigActivator.getInstance().getBundle(); + return ConfigActivator.getInstance().getBundle(); } @Override protected Injector getInjector() { - return org.eclipse.etrice.core.ui.internal.ConfigActivator.getInstance().getInjector("org.eclipse.etrice.core.Config"); + return ConfigActivator.getInstance().getInjector(ConfigActivator.ORG_ECLIPSE_ETRICE_CORE_CONFIG); } } diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/internal/ConfigActivator.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/internal/ConfigActivator.java index 6d008c213..f266afb93 100644 --- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/internal/ConfigActivator.java +++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/internal/ConfigActivator.java @@ -3,49 +3,38 @@ */ package org.eclipse.etrice.core.ui.internal; -import static com.google.inject.util.Modules.override; -import static com.google.inject.Guice.createInjector; +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; +import com.google.common.collect.Maps; +import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; -import java.util.Map; -import java.util.HashMap; - /** * This class was generated. Customizations should only happen in a newly * introduced subclass. */ public class ConfigActivator extends AbstractUIPlugin { - - private Map<String,Injector> injectors = new HashMap<String,Injector>(); + + public static final String ORG_ECLIPSE_ETRICE_CORE_CONFIG = "org.eclipse.etrice.core.Config"; + + private static final Logger logger = Logger.getLogger(ConfigActivator.class); + private static ConfigActivator INSTANCE; - - public Injector getInjector(String languageName) { - return injectors.get(languageName); - } + + 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; - try { - registerInjectorFor("org.eclipse.etrice.core.Config"); - - } catch (Exception e) { - Logger.getLogger(getClass()).error(e.getMessage(), e); - throw e; - } - } - - protected void registerInjectorFor(String language) throws Exception { - injectors.put(language, createInjector( - override(override(getRuntimeModule(language)).with(getSharedStateModule())).with(getUiModule(language)))); } @Override @@ -59,24 +48,48 @@ public class ConfigActivator extends AbstractUIPlugin { 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 ("org.eclipse.etrice.core.Config".equals(grammar)) { - return new org.eclipse.etrice.core.ConfigRuntimeModule(); + if (ORG_ECLIPSE_ETRICE_CORE_CONFIG.equals(grammar)) { + return new org.eclipse.etrice.core.ConfigRuntimeModule(); } throw new IllegalArgumentException(grammar); } protected Module getUiModule(String grammar) { - if ("org.eclipse.etrice.core.Config".equals(grammar)) { - return new org.eclipse.etrice.core.ui.ConfigUiModule(this); + if (ORG_ECLIPSE_ETRICE_CORE_CONFIG.equals(grammar)) { + return new org.eclipse.etrice.core.ui.ConfigUiModule(this); } throw new IllegalArgumentException(grammar); } protected Module getSharedStateModule() { - return new org.eclipse.xtext.ui.shared.SharedStateModule(); + return new SharedStateModule(); } } diff --git a/plugins/org.eclipse.etrice.core.config/plugin.xml_gen b/plugins/org.eclipse.etrice.core.config/plugin.xml_gen index fc1516a0f..86ac574da 100644 --- a/plugins/org.eclipse.etrice.core.config/plugin.xml_gen +++ b/plugins/org.eclipse.etrice.core.config/plugin.xml_gen @@ -14,5 +14,4 @@ - </plugin> diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java index 62629fabd..61110b1ad 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java @@ -35,18 +35,23 @@ public abstract class AbstractConfigRuntimeModule extends DefaultRuntimeModule { } // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment + public java.lang.ClassLoader bindClassLoaderToInstance() { + return getClass().getClassLoader(); + } + + // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() { return org.eclipse.etrice.core.services.ConfigGrammarAccess.class; } // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment public Class<? extends org.eclipse.xtext.serializer.sequencer.ISemanticSequencer> bindISemanticSequencer() { - return org.eclipse.etrice.core.serializer.AbstractConfigSemanticSequencer.class; + return org.eclipse.etrice.core.serializer.ConfigSemanticSequencer.class; } // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment public Class<? extends org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer> bindISyntacticSequencer() { - return org.eclipse.etrice.core.serializer.AbstractConfigSyntacticSequencer.class; + return org.eclipse.etrice.core.serializer.ConfigSyntacticSequencer.class; } // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.ecore b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.ecore index 564faf105..9d60629e8 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.ecore +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.ecore @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="config"
- nsURI="http://www.eclipse.org/etrice/core/Config" nsPrefix="config">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="config" nsURI="http://www.eclipse.org/etrice/core/Config" nsPrefix="config">
<eClassifiers xsi:type="ecore:EClass" name="ConfigModel">
<eOperations name="getActorClassConfigs" upperBound="-1" eType="#//ActorClassConfig">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.genmodel b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.genmodel index 6c8e52d53..d65a29062 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.genmodel +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.genmodel @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.core.config/src-gen"
- editDirectory="/org.eclipse.etrice.core.config.edit/src" editorDirectory="/org.eclipse.etrice.core.config.editor/src"
- modelPluginID="org.eclipse.etrice.core.config" forceOverwrite="true" modelName="Config"
- updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.core.config/src-gen" editDirectory="/org.eclipse.etrice.core.config.edit/src"
+ editorDirectory="/org.eclipse.etrice.core.config.editor/src" modelPluginID="org.eclipse.etrice.core.config"
+ forceOverwrite="true" modelName="Config" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.config.edit"
- editorPluginID="org.eclipse.etrice.core.config.editor" usedGenPackages="../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel#//room">
+ editorPluginID="org.eclipse.etrice.core.config.editor" runtimeVersion="2.8" usedGenPackages="../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel#//room">
<genPackages prefix="Config" basePackage="org.eclipse.etrice.core" disposableProviderFactory="true"
ecorePackage="Config.ecore#/">
<genClasses ecoreClass="Config.ecore#//ConfigModel">
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/ConfigStandaloneSetupGenerated.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/ConfigStandaloneSetupGenerated.java index aa48b185e..4651430a3 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/ConfigStandaloneSetupGenerated.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/ConfigStandaloneSetupGenerated.java @@ -39,6 +39,5 @@ public class ConfigStandaloneSetupGenerated implements ISetup { - } } diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorClassConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorClassConfig.java index 0e6d91c5b..204549fd3 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorClassConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorClassConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java index 9adbc13de..c287b81a7 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrClassConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrClassConfig.java index f9f9fd8b3..4c1a167b2 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrClassConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrClassConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrConfig.java index a57bcc7a2..593ddc202 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrInstanceConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrInstanceConfig.java index 2caaad75f..b9750bb19 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrInstanceConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrInstanceConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/BooleanLiteral.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/BooleanLiteral.java index 87fe90860..be596d60f 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/BooleanLiteral.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/BooleanLiteral.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigElement.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigElement.java index cb8e913ef..0947cf678 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigElement.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigElement.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigFactory.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigFactory.java index 9313feb2b..9490d0e47 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigFactory.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigFactory.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigModel.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigModel.java index 74481ea13..dd2539827 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigModel.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigModel.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigPackage.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigPackage.java index 3c4c1e860..fa8c4dcbd 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigPackage.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigPackage.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Import.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Import.java index 41e340a6c..065a725f5 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Import.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Import.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/IntLiteral.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/IntLiteral.java index d20edffaa..c3904f137 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/IntLiteral.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/IntLiteral.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Literal.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Literal.java index 7d91b19a1..01f5ed2c7 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Literal.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Literal.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/LiteralArray.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/LiteralArray.java index 96ace1424..684ba279f 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/LiteralArray.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/LiteralArray.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/NumberLiteral.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/NumberLiteral.java index e3f819a33..7d460e3c5 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/NumberLiteral.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/NumberLiteral.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortClassConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortClassConfig.java index 6041023cf..c6524ac29 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortClassConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortClassConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortInstanceConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortInstanceConfig.java index 15de2b5f9..b0d95a7c6 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortInstanceConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortInstanceConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ProtocolClassConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ProtocolClassConfig.java index cdaf63618..86e385f93 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ProtocolClassConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ProtocolClassConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RealLiteral.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RealLiteral.java index 785450d9b..299ce9870 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RealLiteral.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RealLiteral.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java index 961a1c97a..1e2afb6d6 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/StringLiteral.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/StringLiteral.java index 1baefaeb8..d38bc73dc 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/StringLiteral.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/StringLiteral.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorClassConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorClassConfigImpl.java index 2d4ec73fd..960e7a879 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorClassConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorClassConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorInstanceConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorInstanceConfigImpl.java index e063b02d0..e4d4fe31d 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorInstanceConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorInstanceConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrClassConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrClassConfigImpl.java index 1467d622b..6da8632ee 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrClassConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrClassConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrConfigImpl.java index ebc0f0477..1d21f952c 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrInstanceConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrInstanceConfigImpl.java index 9c3388fe3..e1e26984d 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrInstanceConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrInstanceConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/BooleanLiteralImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/BooleanLiteralImpl.java index 8a3e86415..886e74824 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/BooleanLiteralImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/BooleanLiteralImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigElementImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigElementImpl.java index b6b21c28e..af2e436b2 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigElementImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigElementImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigFactoryImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigFactoryImpl.java index 3d95aa14f..3f9571218 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigFactoryImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigFactoryImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigModelImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigModelImpl.java index cee85b1e7..bd9377e3a 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigModelImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigModelImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigPackageImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigPackageImpl.java index 3e46fb475..5a50f70a3 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigPackageImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigPackageImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ImportImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ImportImpl.java index ae852a322..7e6ca1ef6 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ImportImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ImportImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/IntLiteralImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/IntLiteralImpl.java index 34f0c6c1d..5f3084db1 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/IntLiteralImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/IntLiteralImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralArrayImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralArrayImpl.java index 06d0a0675..d34deedc7 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralArrayImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralArrayImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralImpl.java index 38d74d581..68618b637 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/NumberLiteralImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/NumberLiteralImpl.java index bb0954791..e844fdd6e 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/NumberLiteralImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/NumberLiteralImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortClassConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortClassConfigImpl.java index 1b8a98616..156cf19f1 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortClassConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortClassConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortInstanceConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortInstanceConfigImpl.java index abd628923..31178530d 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortInstanceConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortInstanceConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ProtocolClassConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ProtocolClassConfigImpl.java index 4ee488add..eb390ff1e 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ProtocolClassConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ProtocolClassConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RealLiteralImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RealLiteralImpl.java index 468cd3e37..91c660a80 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RealLiteralImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RealLiteralImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefPathImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefPathImpl.java index 83ffa3a80..4d1c97ac6 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefPathImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefPathImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/StringLiteralImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/StringLiteralImpl.java index 784f68e57..d9f598fe9 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/StringLiteralImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/StringLiteralImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigAdapterFactory.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigAdapterFactory.java index 8f62360de..ff95dcf08 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigAdapterFactory.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigAdapterFactory.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.util;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigSwitch.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigSwitch.java index a3073d32f..ab7d81a01 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigSwitch.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigSwitch.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.util;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/AbstractConfigSemanticSequencer.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSemanticSequencer.java index f7f789dd7..7c6fe60ee 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/AbstractConfigSemanticSequencer.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSemanticSequencer.java @@ -24,38 +24,18 @@ import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor; import org.eclipse.xtext.serializer.acceptor.SequenceFeeder; import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider; import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor; -import org.eclipse.xtext.serializer.sequencer.AbstractSemanticSequencer; +import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer; import org.eclipse.xtext.serializer.sequencer.GenericSequencer; import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider; import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer; import org.eclipse.xtext.serializer.sequencer.ITransientValueService; import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient; -@SuppressWarnings("restriction")
-public class AbstractConfigSemanticSequencer extends AbstractSemanticSequencer {
+@SuppressWarnings("all")
+public class ConfigSemanticSequencer extends AbstractDelegatingSemanticSequencer {
@Inject
- protected ConfigGrammarAccess grammarAccess;
-
- @Inject
- protected ISemanticSequencerDiagnosticProvider diagnosticProvider;
-
- @Inject
- protected ITransientValueService transientValues;
-
- @Inject
- @GenericSequencer
- protected Provider<ISemanticSequencer> genericSequencerProvider;
-
- protected ISemanticSequencer genericSequencer;
-
-
- @Override
- public void init(ISemanticSequencer sequencer, ISemanticSequenceAcceptor sequenceAcceptor, Acceptor errorAcceptor) {
- super.init(sequencer, sequenceAcceptor, errorAcceptor);
- this.genericSequencer = genericSequencerProvider.get();
- this.genericSequencer.init(sequencer, sequenceAcceptor, errorAcceptor);
- }
+ private ConfigGrammarAccess grammarAccess;
public void createSequence(EObject context, EObject semanticObject) {
if(semanticObject.eClass().getEPackage() == ConfigPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/AbstractConfigSyntacticSequencer.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java index 0d927a00e..15a0879a3 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/AbstractConfigSyntacticSequencer.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java @@ -14,8 +14,8 @@ import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISyn import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition; import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer; -@SuppressWarnings("restriction")
-public class AbstractConfigSyntacticSequencer extends AbstractSyntacticSequencer {
+@SuppressWarnings("all")
+public class ConfigSyntacticSequencer extends AbstractSyntacticSequencer {
protected ConfigGrammarAccess grammarAccess;
protected AbstractElementAlias match_AttrClassConfig___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/services/ConfigGrammarAccess.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/services/ConfigGrammarAccess.java index e5f0d5019..12c5938be 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/services/ConfigGrammarAccess.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/services/ConfigGrammarAccess.java @@ -7,6 +7,8 @@ package org.eclipse.etrice.core.services; import com.google.inject.Singleton; import com.google.inject.Inject; +import java.util.List; + import org.eclipse.xtext.*; import org.eclipse.xtext.service.GrammarProvider; import org.eclipse.xtext.service.AbstractElementFinder.*; @@ -29,6 +31,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { // * Postprocessor: // * getActor(Class|Instance)Config() // * / ConfigModel: + // // imports+=Import* configElements+=ConfigElement*; public ParserRule getRule() { return rule; } @@ -56,6 +59,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cProtocolClassConfigParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2); //ConfigElement: + // // ActorClassConfig | ActorInstanceConfig | ProtocolClassConfig; public ParserRule getRule() { return rule; } @@ -88,6 +92,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { // * Validation: // * duplicates config, attributes // * / ActorClassConfig: + // // "ActorClassConfig" actor=[room::ActorClass|FQN] "{" attributes+=AttrClassConfig* "}"; public ParserRule getRule() { return rule; } @@ -142,12 +147,17 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { // * valid instance reference // * Proposal: // * attributes - // * / ActorInstanceConfig: + // * / + // + //ActorInstanceConfig: + // // "ActorInstanceConfig" root=[room::SubSystemClass|FQN] "/" path=RefPath "{" attributes+=AttrInstanceConfig* + // // ports+=PortInstanceConfig* "}"; public ParserRule getRule() { return rule; } //"ActorInstanceConfig" root=[room::SubSystemClass|FQN] "/" path=RefPath "{" attributes+=AttrInstanceConfig* + // //ports+=PortInstanceConfig* "}" public Group getGroup() { return cGroup; } @@ -211,11 +221,14 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4); //ProtocolClassConfig: + // // "ProtocolClassConfig" protocol=[room::ProtocolClass|FQN] "{" (("regular" regular=PortClassConfig)? & ("conjugate" + // // conjugated=PortClassConfig)?) "}"; public ParserRule getRule() { return rule; } //"ProtocolClassConfig" protocol=[room::ProtocolClass|FQN] "{" (("regular" regular=PortClassConfig)? & ("conjugate" + // //conjugated=PortClassConfig)?) "}" public Group getGroup() { return cGroup; } @@ -276,6 +289,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4); //PortClassConfig: + // // {PortClassConfig} "Port" "{" attributes+=AttrClassConfig* "}"; public ParserRule getRule() { return rule; } @@ -314,6 +328,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4); //PortInstanceConfig: + // // "InterfaceItem" item=[room::InterfaceItem] "{" attributes+=AttrInstanceConfig* "}"; public ParserRule getRule() { return rule; } @@ -357,6 +372,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { // * Proposal: // * correct Literal // * / AttrConfig: + // // AttrClassConfig | AttrInstanceConfig; public ParserRule getRule() { return rule; } @@ -403,12 +419,17 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { // * if !value -> min <= attribute.defaultValue <= max // * character length // * - // * / AttrClassConfig: + // * / + // + //AttrClassConfig: + // // "Attr" attribute=[room::Attribute] ("=" value=LiteralArray)? ("{" (("min" "=" min=NumberLiteral)? & ("max" "=" + // // max=NumberLiteral)?) "}")?; public ParserRule getRule() { return rule; } //"Attr" attribute=[room::Attribute] ("=" value=LiteralArray)? ("{" (("min" "=" min=NumberLiteral)? & ("max" "=" + // //max=NumberLiteral)?) "}")? public Group getGroup() { return cGroup; } @@ -492,6 +513,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cValueLiteralArrayParserRuleCall_2_1_0 = (RuleCall)cValueAssignment_2_1.eContents().get(0); //AttrInstanceConfig: + // // "Attr" attribute=[room::Attribute] ("=" value=LiteralArray)?; public ParserRule getRule() { return rule; } @@ -537,6 +559,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { // * Proposal: // * for ActorInstanceConfig // * / RefPath: + // // refs+=ID ("/" refs+=ID)*; public ParserRule getRule() { return rule; } @@ -576,7 +599,8 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cImportURISTRINGTerminalRuleCall_2_0 = (RuleCall)cImportURIAssignment_2.eContents().get(0); //// -------------------- from org.eclipse.etrice.core.Room.xtext --------------- - //Import: + // Import: + // // "import" (importedNamespace=ImportedFQN "from" | "model") importURI=STRING; public ParserRule getRule() { return rule; } @@ -618,6 +642,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cFullStopAsteriskKeyword_1 = (Keyword)cGroup.eContents().get(1); //ImportedFQN: + // // FQN ".*"?; public ParserRule getRule() { return rule; } @@ -640,6 +665,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cIDTerminalRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1); //FQN: + // // ID ("." ID)*; public ParserRule getRule() { return rule; } @@ -670,21 +696,28 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cLiteralsLiteralParserRuleCall_1_1_0 = (RuleCall)cLiteralsAssignment_1_1.eContents().get(0); //// ----------------------------------------------------------------------------- - ////enum Unit: - //// N| - //// W| + // //enum Unit: + // // N| + // // W| + // + // //// S = 's'| - //// KG = 'kg'| - //// M = 'm'| - //// C| - //// NM| - //// RPM| - //// V| - //// A| - //// HZ = 'Hz'| - //// KW - ////; - //LiteralArray: + // // KG = 'kg'| + // // M = 'm'| + // // C| + // // NM| + // // RPM| + // // V| + // // A| + // // HZ = 'Hz'| + // // KW + // //; + // + // + //// LiteralArray = BooleanLiteral+|NumberLiteral+ + // // LiteralArray = StringLiteral + // LiteralArray: + // // literals+=Literal ("," literals+=Literal)*; public ParserRule getRule() { return rule; } @@ -718,7 +751,8 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cStringLiteralParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2); //// Value Types for Attributes - //Literal: + // Literal: + // // BooleanLiteral | NumberLiteral | StringLiteral; public ParserRule getRule() { return rule; } @@ -745,6 +779,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cIsTrueTrueKeyword_1_1_0 = (Keyword)cIsTrueAssignment_1_1.eContents().get(0); //BooleanLiteral: + // // {BooleanLiteral} ("false" | isTrue?="true"); public ParserRule getRule() { return rule; } @@ -774,6 +809,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cRealLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //NumberLiteral: + // // IntLiteral | RealLiteral; public ParserRule getRule() { return rule; } @@ -795,6 +831,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cValueRealParserRuleCall_1_0 = (RuleCall)cValueAssignment_1.eContents().get(0); //RealLiteral: + // // {RealLiteral} value=Real; public ParserRule getRule() { return rule; } @@ -819,6 +856,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cValueIntegerParserRuleCall_1_0 = (RuleCall)cValueAssignment_1.eContents().get(0); //IntLiteral: + // // {IntLiteral} value=Integer; public ParserRule getRule() { return rule; } @@ -843,6 +881,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cValueSTRINGTerminalRuleCall_1_0 = (RuleCall)cValueAssignment_1.eContents().get(0); //StringLiteral: + // // {StringLiteral} value=STRING; public ParserRule getRule() { return rule; } @@ -866,6 +905,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cHexadecimalParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //Integer returns ecore::EInt: + // // SignedInteger | Hexadecimal; public ParserRule getRule() { return rule; } @@ -888,6 +928,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1); //SignedInteger hidden(): + // // ("+" | "-")? INT; public ParserRule getRule() { return rule; } @@ -912,6 +953,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cHEXTerminalRuleCall = (RuleCall)rule.eContents().get(1); //Hexadecimal hidden(): + // // HEX; public ParserRule getRule() { return rule; } @@ -928,6 +970,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cDecimalExpParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3); //Real returns ecore::EDouble: + // // Decimal | DotDecimal | DecimalDot | DecimalExp; public ParserRule getRule() { return rule; } @@ -958,6 +1001,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cINTTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3); //Decimal hidden(): + // // ("+" | "-")? INT "." INT; public ParserRule getRule() { return rule; } @@ -993,6 +1037,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cINTTerminalRuleCall_2 = (RuleCall)cGroup.eContents().get(2); //DotDecimal hidden(): + // // ("+" | "-")? "." INT; public ParserRule getRule() { return rule; } @@ -1025,6 +1070,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cFullStopKeyword_2 = (Keyword)cGroup.eContents().get(2); //DecimalDot hidden(): + // // ("+" | "-")? INT "."; public ParserRule getRule() { return rule; } @@ -1063,6 +1109,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cINTTerminalRuleCall_6 = (RuleCall)cGroup.eContents().get(6); //DecimalExp hidden(): + // // ("+" | "-")? INT "." INT ID ("+" | "-")? INT; public ParserRule getRule() { return rule; } @@ -1135,19 +1182,36 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { private DecimalExpElements pDecimalExp; private TerminalRule tHEX; - private final GrammarProvider grammarProvider; + private final Grammar grammar; private TerminalsGrammarAccess gaTerminals; @Inject public ConfigGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess gaTerminals) { - this.grammarProvider = grammarProvider; + this.grammar = internalFindGrammar(grammarProvider); this.gaTerminals = gaTerminals; } - public Grammar getGrammar() { - return grammarProvider.getGrammar(this); + protected Grammar internalFindGrammar(GrammarProvider grammarProvider) { + Grammar grammar = grammarProvider.getGrammar(this); + while (grammar != null) { + if ("org.eclipse.etrice.core.Config".equals(grammar.getName())) { + return grammar; + } + List<Grammar> grammars = grammar.getUsedGrammars(); + if (!grammars.isEmpty()) { + grammar = grammars.iterator().next(); + } else { + return null; + } + } + return grammar; + } + + + public Grammar getGrammar() { + return grammar; } @@ -1160,6 +1224,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { // * Postprocessor: // * getActor(Class|Instance)Config() // * / ConfigModel: + // // imports+=Import* configElements+=ConfigElement*; public ConfigModelElements getConfigModelAccess() { return (pConfigModel != null) ? pConfigModel : (pConfigModel = new ConfigModelElements()); @@ -1170,6 +1235,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //ConfigElement: + // // ActorClassConfig | ActorInstanceConfig | ProtocolClassConfig; public ConfigElementElements getConfigElementAccess() { return (pConfigElement != null) ? pConfigElement : (pConfigElement = new ConfigElementElements()); @@ -1183,6 +1249,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { // * Validation: // * duplicates config, attributes // * / ActorClassConfig: + // // "ActorClassConfig" actor=[room::ActorClass|FQN] "{" attributes+=AttrClassConfig* "}"; public ActorClassConfigElements getActorClassConfigAccess() { return (pActorClassConfig != null) ? pActorClassConfig : (pActorClassConfig = new ActorClassConfigElements()); @@ -1198,8 +1265,12 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { // * valid instance reference // * Proposal: // * attributes - // * / ActorInstanceConfig: + // * / + // + //ActorInstanceConfig: + // // "ActorInstanceConfig" root=[room::SubSystemClass|FQN] "/" path=RefPath "{" attributes+=AttrInstanceConfig* + // // ports+=PortInstanceConfig* "}"; public ActorInstanceConfigElements getActorInstanceConfigAccess() { return (pActorInstanceConfig != null) ? pActorInstanceConfig : (pActorInstanceConfig = new ActorInstanceConfigElements()); @@ -1210,7 +1281,9 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //ProtocolClassConfig: + // // "ProtocolClassConfig" protocol=[room::ProtocolClass|FQN] "{" (("regular" regular=PortClassConfig)? & ("conjugate" + // // conjugated=PortClassConfig)?) "}"; public ProtocolClassConfigElements getProtocolClassConfigAccess() { return (pProtocolClassConfig != null) ? pProtocolClassConfig : (pProtocolClassConfig = new ProtocolClassConfigElements()); @@ -1221,6 +1294,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //PortClassConfig: + // // {PortClassConfig} "Port" "{" attributes+=AttrClassConfig* "}"; public PortClassConfigElements getPortClassConfigAccess() { return (pPortClassConfig != null) ? pPortClassConfig : (pPortClassConfig = new PortClassConfigElements()); @@ -1231,6 +1305,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //PortInstanceConfig: + // // "InterfaceItem" item=[room::InterfaceItem] "{" attributes+=AttrInstanceConfig* "}"; public PortInstanceConfigElements getPortInstanceConfigAccess() { return (pPortInstanceConfig != null) ? pPortInstanceConfig : (pPortInstanceConfig = new PortInstanceConfigElements()); @@ -1246,6 +1321,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { // * Proposal: // * correct Literal // * / AttrConfig: + // // AttrClassConfig | AttrInstanceConfig; public AttrConfigElements getAttrConfigAccess() { return (pAttrConfig != null) ? pAttrConfig : (pAttrConfig = new AttrConfigElements()); @@ -1262,8 +1338,12 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { // * if !value -> min <= attribute.defaultValue <= max // * character length // * - // * / AttrClassConfig: + // * / + // + //AttrClassConfig: + // // "Attr" attribute=[room::Attribute] ("=" value=LiteralArray)? ("{" (("min" "=" min=NumberLiteral)? & ("max" "=" + // // max=NumberLiteral)?) "}")?; public AttrClassConfigElements getAttrClassConfigAccess() { return (pAttrClassConfig != null) ? pAttrClassConfig : (pAttrClassConfig = new AttrClassConfigElements()); @@ -1274,6 +1354,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //AttrInstanceConfig: + // // "Attr" attribute=[room::Attribute] ("=" value=LiteralArray)?; public AttrInstanceConfigElements getAttrInstanceConfigAccess() { return (pAttrInstanceConfig != null) ? pAttrInstanceConfig : (pAttrInstanceConfig = new AttrInstanceConfigElements()); @@ -1287,6 +1368,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { // * Proposal: // * for ActorInstanceConfig // * / RefPath: + // // refs+=ID ("/" refs+=ID)*; public RefPathElements getRefPathAccess() { return (pRefPath != null) ? pRefPath : (pRefPath = new RefPathElements()); @@ -1297,7 +1379,8 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //// -------------------- from org.eclipse.etrice.core.Room.xtext --------------- - //Import: + // Import: + // // "import" (importedNamespace=ImportedFQN "from" | "model") importURI=STRING; public ImportElements getImportAccess() { return (pImport != null) ? pImport : (pImport = new ImportElements()); @@ -1308,6 +1391,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //ImportedFQN: + // // FQN ".*"?; public ImportedFQNElements getImportedFQNAccess() { return (pImportedFQN != null) ? pImportedFQN : (pImportedFQN = new ImportedFQNElements()); @@ -1318,6 +1402,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //FQN: + // // ID ("." ID)*; public FQNElements getFQNAccess() { return (pFQN != null) ? pFQN : (pFQN = new FQNElements()); @@ -1328,21 +1413,28 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //// ----------------------------------------------------------------------------- - ////enum Unit: - //// N| - //// W| + // //enum Unit: + // // N| + // // W| + // + // //// S = 's'| - //// KG = 'kg'| - //// M = 'm'| - //// C| - //// NM| - //// RPM| - //// V| - //// A| - //// HZ = 'Hz'| - //// KW - ////; - //LiteralArray: + // // KG = 'kg'| + // // M = 'm'| + // // C| + // // NM| + // // RPM| + // // V| + // // A| + // // HZ = 'Hz'| + // // KW + // //; + // + // + //// LiteralArray = BooleanLiteral+|NumberLiteral+ + // // LiteralArray = StringLiteral + // LiteralArray: + // // literals+=Literal ("," literals+=Literal)*; public LiteralArrayElements getLiteralArrayAccess() { return (pLiteralArray != null) ? pLiteralArray : (pLiteralArray = new LiteralArrayElements()); @@ -1353,7 +1445,8 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //// Value Types for Attributes - //Literal: + // Literal: + // // BooleanLiteral | NumberLiteral | StringLiteral; public LiteralElements getLiteralAccess() { return (pLiteral != null) ? pLiteral : (pLiteral = new LiteralElements()); @@ -1364,6 +1457,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //BooleanLiteral: + // // {BooleanLiteral} ("false" | isTrue?="true"); public BooleanLiteralElements getBooleanLiteralAccess() { return (pBooleanLiteral != null) ? pBooleanLiteral : (pBooleanLiteral = new BooleanLiteralElements()); @@ -1374,6 +1468,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //NumberLiteral: + // // IntLiteral | RealLiteral; public NumberLiteralElements getNumberLiteralAccess() { return (pNumberLiteral != null) ? pNumberLiteral : (pNumberLiteral = new NumberLiteralElements()); @@ -1384,6 +1479,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //RealLiteral: + // // {RealLiteral} value=Real; public RealLiteralElements getRealLiteralAccess() { return (pRealLiteral != null) ? pRealLiteral : (pRealLiteral = new RealLiteralElements()); @@ -1394,6 +1490,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //IntLiteral: + // // {IntLiteral} value=Integer; public IntLiteralElements getIntLiteralAccess() { return (pIntLiteral != null) ? pIntLiteral : (pIntLiteral = new IntLiteralElements()); @@ -1404,6 +1501,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //StringLiteral: + // // {StringLiteral} value=STRING; public StringLiteralElements getStringLiteralAccess() { return (pStringLiteral != null) ? pStringLiteral : (pStringLiteral = new StringLiteralElements()); @@ -1414,6 +1512,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //Integer returns ecore::EInt: + // // SignedInteger | Hexadecimal; public IntegerElements getIntegerAccess() { return (pInteger != null) ? pInteger : (pInteger = new IntegerElements()); @@ -1424,6 +1523,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //SignedInteger hidden(): + // // ("+" | "-")? INT; public SignedIntegerElements getSignedIntegerAccess() { return (pSignedInteger != null) ? pSignedInteger : (pSignedInteger = new SignedIntegerElements()); @@ -1434,6 +1534,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //Hexadecimal hidden(): + // // HEX; public HexadecimalElements getHexadecimalAccess() { return (pHexadecimal != null) ? pHexadecimal : (pHexadecimal = new HexadecimalElements()); @@ -1444,6 +1545,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //Real returns ecore::EDouble: + // // Decimal | DotDecimal | DecimalDot | DecimalExp; public RealElements getRealAccess() { return (pReal != null) ? pReal : (pReal = new RealElements()); @@ -1454,6 +1556,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //Decimal hidden(): + // // ("+" | "-")? INT "." INT; public DecimalElements getDecimalAccess() { return (pDecimal != null) ? pDecimal : (pDecimal = new DecimalElements()); @@ -1464,6 +1567,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //DotDecimal hidden(): + // // ("+" | "-")? "." INT; public DotDecimalElements getDotDecimalAccess() { return (pDotDecimal != null) ? pDotDecimal : (pDotDecimal = new DotDecimalElements()); @@ -1474,6 +1578,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //DecimalDot hidden(): + // // ("+" | "-")? INT "."; public DecimalDotElements getDecimalDotAccess() { return (pDecimalDot != null) ? pDecimalDot : (pDecimalDot = new DecimalDotElements()); @@ -1484,6 +1589,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } //DecimalExp hidden(): + // // ("+" | "-")? INT "." INT ID ("+" | "-")? INT; public DecimalExpElements getDecimalExpAccess() { return (pDecimalExp != null) ? pDecimalExp : (pDecimalExp = new DecimalExpElements()); @@ -1494,51 +1600,60 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder { } ////DecimalPosExp hidden(): - //// ('+' | '-')? INT '.' INT ID; - //terminal HEX: + // // ('+' | '-')? INT '.' INT ID; + // terminal HEX: + // // ("0x" | "0X") ("0".."9" | "a".."f" | "A".."F")+; public TerminalRule getHEXRule() { return (tHEX != null) ? tHEX : (tHEX = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "HEX")); } //terminal ID: + // // "^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*; public TerminalRule getIDRule() { return gaTerminals.getIDRule(); } //terminal INT returns ecore::EInt: + // // "0".."9"+; public TerminalRule getINTRule() { return gaTerminals.getINTRule(); } //terminal STRING: + // // "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" | + // // "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'"; public TerminalRule getSTRINGRule() { return gaTerminals.getSTRINGRule(); } //terminal ML_COMMENT: + // // "/ *"->"* /"; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } //terminal SL_COMMENT: + // // "//" !("\n" | "\r")* ("\r"? "\n")?; public TerminalRule getSL_COMMENTRule() { return gaTerminals.getSL_COMMENTRule(); } //terminal WS: + // // (" " | "\t" | "\r" | "\n")+; public TerminalRule getWSRule() { return gaTerminals.getWSRule(); } //terminal ANY_OTHER: + // // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); diff --git a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/GenerateConfig.mwe2 b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/GenerateConfig.mwe2 index a682a1b7f..3f91f6b54 100644 --- a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/GenerateConfig.mwe2 +++ b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/GenerateConfig.mwe2 @@ -38,7 +38,7 @@ Workflow { component = Generator { pathRtProject = runtimeProject pathUiProject = "${runtimeProject}.ui" - pathTestProject = "${runtimeProject}.tests" + pathTestProject = "../../tests/${projectName}.tests" projectNameRt = projectName projectNameUi = "${projectName}.ui" language = { diff --git a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF index f173174cd..2197226d4 100644 --- a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF @@ -1,18 +1,25 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: eTrice Config DSL Tests -Bundle-Vendor: eTrice (Incubation) -Bundle-Version: 0.2.0.qualifier -Bundle-SymbolicName: org.eclipse.etrice.core.config.tests; singleton:=true -Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.config, - org.eclipse.etrice.core.config.ui, - org.eclipse.core.runtime, - org.eclipse.xtext, - org.eclipse.xtext.junit4, - org.eclipse.xtext.ui.junit, - org.junit4, - org.eclipse.ui.workbench;resolution:=optional -Import-Package: org.apache.log4j, - org.apache.commons.logging -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: eTrice Config DSL Tests
+Bundle-Vendor: eTrice (Incubation)
+Bundle-Version: 0.2.0.qualifier
+Bundle-SymbolicName: org.eclipse.etrice.core.config.tests; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.etrice.core.config,
+ org.eclipse.etrice.core.config.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.xtext,
+ org.eclipse.xtext.junit4,
+ org.eclipse.xtext.ui.junit,
+ org.junit4,
+ org.eclipse.ui.workbench;resolution:=optional
+Import-Package: org.apache.log4j,
+ org.apache.commons.logging,
+ org.junit.runner;version="4.5.0",
+ org.junit.runner.manipulation;version="4.5.0",
+ org.junit.runner.notification;version="4.5.0",
+ org.junit.runners;version="4.5.0",
+ org.junit.runners.model;version="4.5.0",
+ org.hamcrest.core
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.etrice.core
diff --git a/tests/org.eclipse.etrice.core.config.tests/bin/org/eclipse/etrice/core/ConfigInjectorProvider.class b/tests/org.eclipse.etrice.core.config.tests/bin/org/eclipse/etrice/core/ConfigInjectorProvider.class Binary files differindex 479db8e27..3614da7e0 100644 --- a/tests/org.eclipse.etrice.core.config.tests/bin/org/eclipse/etrice/core/ConfigInjectorProvider.class +++ b/tests/org.eclipse.etrice.core.config.tests/bin/org/eclipse/etrice/core/ConfigInjectorProvider.class diff --git a/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java b/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java index a7c3c34a0..81ed8313a 100644 --- a/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java +++ b/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java @@ -11,28 +11,35 @@ import org.eclipse.xtext.junit4.IRegistryConfigurator; import com.google.inject.Injector; public class ConfigInjectorProvider implements IInjectorProvider, IRegistryConfigurator { - protected GlobalStateMemento globalStateMemento; + + protected GlobalStateMemento stateBeforeInjectorCreation; + protected GlobalStateMemento stateAfterInjectorCreation; protected Injector injector; static { GlobalRegistries.initializeDefaults(); } - - public Injector getInjector() { + + public Injector getInjector() + { if (injector == null) { - this.injector = new ConfigStandaloneSetup().createInjectorAndDoEMFRegistration(); + stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); + this.injector = internalCreateInjector(); + stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); } return injector; } + protected Injector internalCreateInjector() { + return new ConfigStandaloneSetup().createInjectorAndDoEMFRegistration(); + } + public void restoreRegistry() { - globalStateMemento.restoreGlobalState(); + stateBeforeInjectorCreation.restoreGlobalState(); } public void setupRegistry() { - globalStateMemento = GlobalRegistries.makeCopyOfGlobalState(); - if (injector != null) - new ConfigStandaloneSetup().register(injector); + getInjector(); + stateAfterInjectorCreation.restoreGlobalState(); } - } |