diff options
| author | Henrik Rentz-Reichert | 2018-11-23 13:08:16 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2018-11-23 16:07:24 +0000 |
| commit | 5f90e312dbeeffaa057b682e3becb2cee79f6ea0 (patch) | |
| tree | 714ee95ab99632e9f6a612024ae28458e0c2bce1 | |
| parent | 4c57977d9e3f098ffae44ee5f3373878b351feca (diff) | |
| download | org.eclipse.etrice-5f90e312dbeeffaa057b682e3becb2cee79f6ea0.tar.gz org.eclipse.etrice-5f90e312dbeeffaa057b682e3becb2cee79f6ea0.tar.xz org.eclipse.etrice-5f90e312dbeeffaa057b682e3becb2cee79f6ea0.zip | |
reduced warnings in eTrice Java and Xtend sources
174 files changed, 448 insertions, 347 deletions
diff --git a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF index 3136512f3..25c644b8f 100644 --- a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF +++ b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF @@ -15,3 +15,4 @@ Require-Bundle: my.etrice.generator;bundle-version="2.0.0", org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.jdt.launching;bundle-version="3.6.100", org.eclipse.etrice.generator.base;bundle-version="2.0.0" +Automatic-Module-Name: my.etrice.generator.launch diff --git a/examples/my.etrice.generator/META-INF/MANIFEST.MF b/examples/my.etrice.generator/META-INF/MANIFEST.MF index 24e0087b3..45de050c3 100644 --- a/examples/my.etrice.generator/META-INF/MANIFEST.MF +++ b/examples/my.etrice.generator/META-INF/MANIFEST.MF @@ -11,3 +11,4 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0", org.eclipse.etrice.generator.java;bundle-version="2.0.0", com.google.inject;bundle-version="3.0.0" Export-Package: my.etrice.generator +Automatic-Module-Name: my.etrice.generator diff --git a/examples/org.eclipse.etrice.examples.java/.classpath b/examples/org.eclipse.etrice.examples.java/.classpath index d0921240e..a97d6fdd2 100644 --- a/examples/org.eclipse.etrice.examples.java/.classpath +++ b/examples/org.eclipse.etrice.examples.java/.classpath @@ -3,7 +3,7 @@ <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="/org.eclipse.etrice.runtime.java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.modellib.java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/examples/org.eclipse.etrice.tutorials.java/.classpath b/examples/org.eclipse.etrice.tutorials.java/.classpath index cc9822b38..c975f7ad1 100644 --- a/examples/org.eclipse.etrice.tutorials.java/.classpath +++ b/examples/org.eclipse.etrice.tutorials.java/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="src" path="src-gen"/> <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.modellib.java"/> <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.runtime.java"/> diff --git a/examples/org.eclipse.etrice.tutorials.java/.project b/examples/org.eclipse.etrice.tutorials.java/.project index 64b37c4c0..83b58e70b 100644 --- a/examples/org.eclipse.etrice.tutorials.java/.project +++ b/examples/org.eclipse.etrice.tutorials.java/.project @@ -24,6 +24,5 @@ <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> - <nature>org.eclipse.xtend.shared.ui.xtendXPandNature</nature> </natures> </projectDescription> diff --git a/examples/org.eclipse.etrice.tutorials.java/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.etrice.tutorials.java/.settings/org.eclipse.jdt.core.prefs index f32203668..50d2ca595 100644 --- a/examples/org.eclipse.etrice.tutorials.java/.settings/org.eclipse.jdt.core.prefs +++ b/examples/org.eclipse.etrice.tutorials.java/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ -#Mon Sep 19 09:33:05 CEST 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -78,4 +78,5 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/.classpath b/examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/.classpath index 80d796d3b..c52753f81 100644 --- a/examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/.classpath +++ b/examples/org.eclipse.etrice.tutorials.simulators.trafficlight.example/.classpath @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="/org.eclipse.etrice.runtime.java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.modellib.java"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/examples/org.eclipse.etrice.tutorials.simulators.trafficlight/.classpath b/examples/org.eclipse.etrice.tutorials.simulators.trafficlight/.classpath index 18d70f02c..fceb4801b 100644 --- a/examples/org.eclipse.etrice.tutorials.simulators.trafficlight/.classpath +++ b/examples/org.eclipse.etrice.tutorials.simulators.trafficlight/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/examples/org.eclipse.etrice.tutorials.simulators.trafficlight/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.etrice.tutorials.simulators.trafficlight/.settings/org.eclipse.jdt.core.prefs index a23aa28f4..87b7a7a3a 100644 --- a/examples/org.eclipse.etrice.tutorials.simulators.trafficlight/.settings/org.eclipse.jdt.core.prefs +++ b/examples/org.eclipse.etrice.tutorials.simulators.trafficlight/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,13 @@ -#Sat Jun 16 13:47:44 CEST 2012 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF index 8e07fe8fd..75235e8a4 100644 --- a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF @@ -16,3 +16,4 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0", Bundle-Activator: org.eclipse.etrice.abstractexec.behavior.Activator Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.etrice.abstractexec.behavior +Automatic-Module-Name: org.eclipse.etrice.abstractexec.behavior diff --git a/plugins/org.eclipse.etrice.abstractexec.behavior/src/org/eclipse/etrice/abstractexec/behavior/ProposalGenerator.java b/plugins/org.eclipse.etrice.abstractexec.behavior/src/org/eclipse/etrice/abstractexec/behavior/ProposalGenerator.java index b3fe07e17..077f27fa1 100644 --- a/plugins/org.eclipse.etrice.abstractexec.behavior/src/org/eclipse/etrice/abstractexec/behavior/ProposalGenerator.java +++ b/plugins/org.eclipse.etrice.abstractexec.behavior/src/org/eclipse/etrice/abstractexec/behavior/ProposalGenerator.java @@ -78,7 +78,7 @@ public class ProposalGenerator { Set<EObject> messages = new HashSet<EObject>(); for (CommonTrigger t : node.getCaughtTriggers()) { if (t.getIfitem().equals(port)) { - messages.add((EObject)t.getMsg()); + messages.add(t.getMsg()); } } diff --git a/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF index 09ef6d55f..7ec592daa 100644 --- a/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF @@ -35,3 +35,4 @@ Export-Package: org.eclipse.etrice.core.common.ui.autoedit, org.eclipse.etrice.core.common.ui.linking, org.eclipse.etrice.core.common.ui.quickfix Bundle-Activator: org.eclipse.etrice.core.common.ui.ETriceCoreCommonActivator +Automatic-Module-Name: org.eclipse.etrice.core.common.ui diff --git a/plugins/org.eclipse.etrice.core.common.ui/src/org/eclipse/etrice/core/common/ui/hover/KeywordHoverProvider.java b/plugins/org.eclipse.etrice.core.common.ui/src/org/eclipse/etrice/core/common/ui/hover/KeywordHoverProvider.java index b938f1c6e..5e5a5d145 100644 --- a/plugins/org.eclipse.etrice.core.common.ui/src/org/eclipse/etrice/core/common/ui/hover/KeywordHoverProvider.java +++ b/plugins/org.eclipse.etrice.core.common.ui/src/org/eclipse/etrice/core/common/ui/hover/KeywordHoverProvider.java @@ -58,7 +58,7 @@ public class KeywordHoverProvider extends DefaultEObjectHoverProvider { Keyword keyword = (Keyword) element; String html = contentProvider.getHTMLContent(keyword.getValue()); if (html != null) { - StringBuffer buffer = new StringBuffer(html); + StringBuilder buffer = new StringBuilder(html); HTMLPrinter.insertPageProlog(buffer, 0, getKeywordStyleSheet()); HTMLPrinter.addPageEpilog(buffer); return new XtextBrowserInformationControlInput(previous, element, buffer.toString(), labelProvider); diff --git a/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF index 5f6810084..9f854a089 100644 --- a/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport, org.eclipse.emf.codegen.ecore;resolution:=optional, org.eclipse.emf.mwe.utils;resolution:=optional, org.eclipse.emf.mwe2.launch;resolution:=optional, - org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional, + org.objectweb.asm;bundle-version="[5.0.0,7.0.0)";resolution:=optional, org.eclipse.emf.ecore, org.eclipse.emf.common, org.antlr.runtime, @@ -42,4 +42,5 @@ Export-Package: org.eclipse.etrice.core.common, org.eclipse.etrice.core.common.serializer, org.eclipse.etrice.core.common.services, org.eclipse.etrice.core.common.validation +Automatic-Module-Name: org.eclipse.etrice.core.common diff --git a/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/scoping/StandardModelLocator.java b/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/scoping/StandardModelLocator.java index 10e0683e9..853321772 100644 --- a/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/scoping/StandardModelLocator.java +++ b/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/scoping/StandardModelLocator.java @@ -37,7 +37,7 @@ import org.eclipse.xtext.resource.ClasspathUriResolutionException; */ public class StandardModelLocator implements IModelLocator { - private static final String CLASSPATH = "classpath:/"; + private static final String CLASSPATH = "classpath"; private static final Map<String, String> env = System.getenv(); /** @@ -63,7 +63,7 @@ public class StandardModelLocator implements IModelLocator { URIConverter converter = resource==null? null : resource.getResourceSet().getURIConverter(); URI canonical = getCanonicalFileURI(resolve, converter); // TODO handle non-file URIs more generically - if(canonical != null && (canonical.isFile() || canonical.isArchive() || canonical.isPlatform() || canonical.scheme() == "classpath")) { + if(canonical != null && (canonical.isFile() || canonical.isArchive() || canonical.isPlatform() || canonical.scheme() == CLASSPATH)) { resolve = canonical.toString(); } else { @@ -203,7 +203,7 @@ public class StandardModelLocator implements IModelLocator { * exists, or false if platUri is mapped to a different URI * than fileUri. */ - private boolean updateURIMapEntry(Resource res, URI platUri, URI fileUri) { + boolean updateURIMapEntry(Resource res, URI platUri, URI fileUri) { // map the absolute file uri to a platform resource path if(res == null) return false; Map<URI, URI> uriMap = res.getResourceSet().getURIConverter() @@ -260,7 +260,7 @@ public class StandardModelLocator implements IModelLocator { * if the URI is not a platform URI, or if the Eclipse WorkspaceRoot * cannot be accessed. Otherwise true. */ - private boolean existsInPlatform(URI uri) { + boolean existsInPlatform(URI uri) { if(!EMFPlugin.IS_ECLIPSE_RUNNING) return false; @@ -287,7 +287,7 @@ public class StandardModelLocator implements IModelLocator { * @return false if the URI does not point to an existing file resource or * if the URI is not a file URI. Otherwise true. */ - private boolean existsInFileSys(URI uri) { + boolean existsInFileSys(URI uri) { if (!uri.isFile()) return false; java.io.File extFile = new File(uri.toFileString()); @@ -301,7 +301,7 @@ public class StandardModelLocator implements IModelLocator { uri = URI.createURI(uriString); } catch(IllegalArgumentException e1) { } - if(uri == null || !(uri.isFile() || uri.isArchive() || uri.isPlatform() || uri.scheme() == "classpath")) { + if(uri == null || !(uri.isFile() || uri.isArchive() || uri.isPlatform() || uri.scheme() == CLASSPATH)) { // try file path uri = URI.createFileURI(uriString); } diff --git a/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/validation/ValidationHelpers.xtend b/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/validation/ValidationHelpers.xtend index 1125c9c94..29f2c9350 100644 --- a/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/validation/ValidationHelpers.xtend +++ b/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/validation/ValidationHelpers.xtend @@ -27,7 +27,7 @@ import com.google.common.base.Function */ class ValidationHelpers { - public static class NamedObject { + static class NamedObject { @Property String name @Property EObject obj @Property EStructuralFeature feature @@ -39,7 +39,7 @@ class ValidationHelpers { } } - public static class NamedObjectList extends ArrayList<NamedObject> { + static class NamedObjectList extends ArrayList<NamedObject> { def addAll(List<? extends EObject> items, EStructuralFeature feature) { items.forEach[this.add(new NamedObject(it.eGet(feature) as String, it, feature))] } 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 d70612d58..41d149281 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 @@ -30,3 +30,4 @@ Export-Package: org.eclipse.etrice.core.ui.contentassist.antlr, org.eclipse.etrice.core.ui.quickfix, org.eclipse.etrice.core.ui.contentassist.antlr.internal Bundle-Activator: org.eclipse.etrice.core.ui.internal.ConfigActivator +Automatic-Module-Name: org.eclipse.etrice.core.config.ui diff --git a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF index f155f7fb1..50858949a 100644 --- a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF @@ -39,3 +39,4 @@ Export-Package: org.eclipse.etrice.core, org.eclipse.etrice.core.scoping, org.eclipse.etrice.core.generator, org.eclipse.etrice.core.formatting +Automatic-Module-Name: org.eclipse.etrice.core.config diff --git a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/postprocessing/ImplPostprocesser.xtend b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/postprocessing/ImplPostProcessor.xtend index 73e718f50..9f251cf54 100644 --- a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/postprocessing/ImplPostprocesser.xtend +++ b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/postprocessing/ImplPostProcessor.xtend @@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EcorePackage import static extension org.eclipse.etrice.core.common.postprocessing.PostprocessingHelpers.* -class ImplPostProcessing { +class ImplPostProcessor { def process(GeneratedMetamodel metamodel) { val configPackage = metamodel.EPackage diff --git a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/postprocessing/PostprocessorController.java b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/postprocessing/PostprocessorController.java index d7c44d946..da3198beb 100644 --- a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/postprocessing/PostprocessorController.java +++ b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/postprocessing/PostprocessorController.java @@ -19,6 +19,6 @@ import org.eclipse.xtext.GeneratedMetamodel; public class PostprocessorController { public static void process(GeneratedMetamodel metamodel){ new DocuPostprocessor().process(metamodel); - new ImplPostProcessing().process(metamodel); + new ImplPostProcessor().process(metamodel); } } diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF index 43adbc628..6b2c0aa8e 100644 --- a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF @@ -28,3 +28,4 @@ Export-Package: org.eclipse.etrice.core.etmap.ui, org.eclipse.etrice.core.etmap.ui.internal, org.eclipse.etrice.core.etmap.ui.quickfix Bundle-Activator: org.eclipse.etrice.core.etmap.ui.internal.ETMapActivator +Automatic-Module-Name: org.eclipse.etrice.core.etmap.ui diff --git a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF index c82963397..79a524e7a 100644 --- a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF @@ -40,4 +40,5 @@ Export-Package: org.eclipse.etrice.core.etmap, org.eclipse.etrice.core.etmap.services, org.eclipse.etrice.core.etmap.util, org.eclipse.etrice.core.etmap.validation +Automatic-Module-Name: org.eclipse.etrice.core.etmap diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF index 7d5a4b3a0..cb6e6ffa7 100644 --- a/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF @@ -25,3 +25,4 @@ Export-Package: org.eclipse.etrice.core.etphys.ui.contentassist, org.eclipse.etrice.core.etphys.ui.quickfix, org.eclipse.etrice.core.etphys.ui.contentassist.antlr.internal Bundle-Activator: org.eclipse.etrice.core.etphys.ui.internal.ETPhysActivator +Automatic-Module-Name: org.eclipse.etrice.core.etphys.ui diff --git a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF index 93812648b..867c16429 100644 --- a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF @@ -34,4 +34,5 @@ Export-Package: org.eclipse.etrice.core.etphys, org.eclipse.etrice.core.etphys.serializer, org.eclipse.etrice.core.etphys.services, org.eclipse.etrice.core.etphys.validation +Automatic-Module-Name: org.eclipse.etrice.core.etphys diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF index 44bc27f92..d43f3fac0 100644 --- a/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF @@ -29,3 +29,4 @@ Export-Package: org.eclipse.etrice.core.fsm.ui, org.eclipse.etrice.core.fsm.ui.labeling, org.eclipse.etrice.core.fsm.ui.quickfix Bundle-Activator: org.eclipse.etrice.core.fsm.ui.internal.FSMActivator +Automatic-Module-Name: org.eclipse.etrice.core.fsm.ui diff --git a/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF index dff4fc36b..fb03894c1 100644 --- a/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0", org.eclipse.emf.ecore, org.eclipse.emf.common, org.antlr.runtime, - org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional, + org.objectweb.asm;bundle-version="[5.0.1,7.0.0)";resolution:=optional, com.google.guava;bundle-version="8.0.0", org.eclipse.xtext.xbase.lib Import-Package: org.apache.log4j, @@ -38,4 +38,5 @@ Export-Package: org.eclipse.etrice.core.fsm, org.eclipse.etrice.core.fsm.services, org.eclipse.etrice.core.fsm.util, org.eclipse.etrice.core.fsm.validation +Automatic-Module-Name: org.eclipse.etrice.core.fsm diff --git a/plugins/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore b/plugins/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore index 419bacbe0..940eec9f8 100644 --- a/plugins/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore +++ b/plugins/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore @@ -78,7 +78,7 @@ <details key="body" value="return (this instanceof <%org.eclipse.etrice.core.fsm.fSM.SimpleState%>)? ((SimpleState)this).getName() :(this instanceof <%org.eclipse.etrice.core.fsm.fSM.RefinedState%>)? (((RefinedState)this).getTarget()==null? "":((RefinedState)this).getTarget().getName()) :"";"/> </eAnnotations> </eOperations> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> @@ -180,7 +180,7 @@ <details key="documentation" value="<br>By this name the choice point is referred to in the model.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> @@ -188,7 +188,7 @@ </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="TransitionBase" eSuperTypes="#//StateGraphItem"> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> diff --git a/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/formatting2/FSMFormatter.xtend b/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/formatting2/FSMFormatter.xtend index 1a807c87b..a7be98394 100644 --- a/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/formatting2/FSMFormatter.xtend +++ b/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/formatting2/FSMFormatter.xtend @@ -23,14 +23,12 @@ import org.eclipse.etrice.core.fsm.fSM.DetailCode import org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics import org.eclipse.etrice.core.fsm.fSM.State import org.eclipse.etrice.core.fsm.fSM.StateGraph -import org.eclipse.etrice.core.fsm.fSM.Transition +import org.eclipse.etrice.core.fsm.fSM.TransitionBase import org.eclipse.etrice.core.fsm.fSM.Trigger import org.eclipse.etrice.core.fsm.fSM.TriggeredTransition import org.eclipse.etrice.core.fsm.services.FSMGrammarAccess import org.eclipse.xtext.formatting2.IFormattableDocument import org.eclipse.xtext.formatting2.regionaccess.ISemanticRegion -import org.eclipse.etrice.core.fsm.fSM.RefinedTransition -import org.eclipse.etrice.core.fsm.fSM.TransitionBase class FSMFormatter extends BaseFormatter { diff --git a/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.xtend b/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.xtend index ae5fce6a9..9f7606a8b 100644 --- a/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.xtend +++ b/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.xtend @@ -250,9 +250,9 @@ class FSMScopeProvider extends AbstractDeclarativeScopeProvider { def private QualifiedName getStatePath(State bs) { val EObject parent = bs.eContainer.eContainer if (parent instanceof SimpleState) - return getStatePath(parent as SimpleState).append(bs.name) + return getStatePath(parent).append(bs.name) else if (parent instanceof RefinedState) { - val State target = (parent as RefinedState).target + val State target = parent.target if (target!==null) return getStatePath(target).append(bs.name) } diff --git a/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.xtend b/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.xtend index 54bcac8cf..840e82d7f 100644 --- a/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.xtend +++ b/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.xtend @@ -32,12 +32,12 @@ import org.eclipse.etrice.core.fsm.naming.FSMNameProvider class FSMValidationUtilXtend { - public static class Result { - private boolean ok; - private String msg; - private EObject source; - private EStructuralFeature feature; - private int index; + static class Result { + boolean ok; + String msg; + EObject source; + EStructuralFeature feature; + int index; def static FSMValidationUtilXtend.Result ok() { return new FSMValidationUtilXtend.Result(true, "", null, null, 0); @@ -109,7 +109,7 @@ class FSMValidationUtilXtend { var parent = obj.eContainer while (parent!==null) { if (parent instanceof StateGraph) { - return parent as StateGraph + return parent } parent = parent.eContainer } diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF index a76efaf33..2d2899146 100644 --- a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF @@ -19,3 +19,4 @@ Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport, Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Bundle-Localization: plugin +Automatic-Module-Name: org.eclipse.etrice.core.genmodel.fsm diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/src/org/eclipse/etrice/core/genmodel/fsm/BasicFsmGenBuilder.xtend b/plugins/org.eclipse.etrice.core.genmodel.fsm/src/org/eclipse/etrice/core/genmodel/fsm/BasicFsmGenBuilder.xtend index 7123acb5a..fdca73617 100644 --- a/plugins/org.eclipse.etrice.core.genmodel.fsm/src/org/eclipse/etrice/core/genmodel/fsm/BasicFsmGenBuilder.xtend +++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/src/org/eclipse/etrice/core/genmodel/fsm/BasicFsmGenBuilder.xtend @@ -39,7 +39,7 @@ class BasicFsmGenBuilder { protected extension FSMHelpers fsmHelpers protected val factory = FsmGenFactory.eINSTANCE - private var int inheritanceLevel = 0 + var int inheritanceLevel = 0 new(FSMHelpers fsmHelpers) { this.fsmHelpers = fsmHelpers diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/src/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.xtend b/plugins/org.eclipse.etrice.core.genmodel.fsm/src/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.xtend index 0560b154d..71debe196 100644 --- a/plugins/org.eclipse.etrice.core.genmodel.fsm/src/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.xtend +++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/src/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.xtend @@ -36,103 +36,103 @@ import org.eclipse.etrice.core.genmodel.fsm.fsmgen.Node class FsmGenExtensions { - public static def dispatch getName(Node nd) { + static def dispatch getName(Node nd) { nd.stateGraphNode.name } - public static def dispatch getName(Link l) { + static def dispatch getName(Link l) { l.transition.name } - public static def getStateNodes(Graph g) { + static def getStateNodes(Graph g) { g.nodes.filter[stateGraphNode instanceof State] } - public static def getAllNodes(Graph g) { + static def getAllNodes(Graph g) { g.eAllContents.filter(typeof(Node)) } - public static def getAllStateNodes(Graph g) { + static def getAllStateNodes(Graph g) { g.allNodes.filter[stateGraphNode instanceof State] } - public static def getChoicePointNodes(Graph g) { + static def getChoicePointNodes(Graph g) { g.nodes.filter[stateGraphNode instanceof ChoicePoint] } - public static def getAllChoicePointNodes(Graph g) { + static def getAllChoicePointNodes(Graph g) { g.allNodes.filter[stateGraphNode instanceof ChoicePoint] } - public static def getTrPointNodes(Graph g) { + static def getTrPointNodes(Graph g) { g.nodes.filter[stateGraphNode instanceof TrPoint] } - public static def getAllTrPointNodes(Graph g) { + static def getAllTrPointNodes(Graph g) { g.allNodes.filter[stateGraphNode instanceof TrPoint] } - public static def getTransitionPointNodes(Graph g) { + static def getTransitionPointNodes(Graph g) { g.nodes.filter[stateGraphNode instanceof TransitionPoint] } - public static def getAllTransitionPointNodes(Graph g) { + static def getAllTransitionPointNodes(Graph g) { g.allNodes.filter[stateGraphNode instanceof TransitionPoint] } - public static def getEntryPointNodes(Graph g) { + static def getEntryPointNodes(Graph g) { g.nodes.filter[stateGraphNode instanceof EntryPoint] } - public static def getAllEntryPointNodes(Graph g) { + static def getAllEntryPointNodes(Graph g) { g.allNodes.filter[stateGraphNode instanceof EntryPoint] } - public static def getExitPointNodes(Graph g) { + static def getExitPointNodes(Graph g) { g.nodes.filter[stateGraphNode instanceof ExitPoint] } - public static def getAllExitPointNodes(Graph g) { + static def getAllExitPointNodes(Graph g) { g.allNodes.filter[stateGraphNode instanceof ExitPoint] } - public static def getStates(Graph g) { + static def getStates(Graph g) { g.stateNodes.map[stateGraphNode].filter(typeof(State)) } - public static def getAllStates(Graph g) { + static def getAllStates(Graph g) { g.allStateNodes.map[stateGraphNode].filter(typeof(State)) } - public static def getChoicePoints(Graph g) { + static def getChoicePoints(Graph g) { g.choicePointNodes.map[stateGraphNode].filter(typeof(ChoicePoint)) } - public static def getTrPoints(Graph g) { + static def getTrPoints(Graph g) { g.trPointNodes.map[stateGraphNode].filter(typeof(TrPoint)) } - public static def getInitialTransition(Graph g) { + static def getInitialTransition(Graph g) { g.links.map[transition].filter(typeof(InitialTransition)).head } - public static def getAllLinks(Graph g) { + static def getAllLinks(Graph g) { g.eAllContents.filter(typeof(Link)) } - public static def getAllInitialTranisitionLinks(Graph g) { + static def getAllInitialTranisitionLinks(Graph g) { g.allLinks.filter[transition instanceof InitialTransition] } - public static def getAllTriggeredTranisitionLinks(Graph g) { + static def getAllTriggeredTranisitionLinks(Graph g) { g.allLinks.filter[transition instanceof TriggeredTransition] } - public static def getAllContinuationTranisitionLinks(Graph g) { + static def getAllContinuationTranisitionLinks(Graph g) { g.allLinks.filter[transition instanceof ContinuationTransition] } - public static def getAllCPBranchTranisitionLinks(Graph g) { + static def getAllCPBranchTranisitionLinks(Graph g) { g.allLinks.filter[transition instanceof CPBranchTransition] } @@ -144,7 +144,7 @@ class FsmGenExtensions { * * @see #isChainHead(Link)) */ - public static def getAllChainHeads(Graph g) { + static def getAllChainHeads(Graph g) { g.allLinks.filter[isChainHead] } @@ -154,7 +154,7 @@ class FsmGenExtensions { * * @see #isChainHead(TransitionBase)) */ - public static def isChainHead(Link l) { + static def isChainHead(Link l) { l.transition.isChainHead } @@ -164,7 +164,7 @@ class FsmGenExtensions { * @param l a link * @return {@code true} if this transition is of one of the above types */ - public static def boolean isChainHead(TransitionBase t) { + static def boolean isChainHead(TransitionBase t) { if (t instanceof RefinedTransition) { t.target.isChainHead } @@ -175,19 +175,19 @@ class FsmGenExtensions { } } - public static def getOutgoingTriggeredTransitionLinks(Node s) { + static def getOutgoingTriggeredTransitionLinks(Node s) { s.outgoing.filter[transition instanceof TriggeredTransition] } - public static def getOutgoingTriggeredTransitions(Node s) { + static def getOutgoingTriggeredTransitions(Node s) { s.getOutgoingTriggeredTransitionLinks.map[transition].filter(typeof(TriggeredTransition)) } - public static def getOutgoingTransitionsHierarchically(Node s) { + static def getOutgoingTransitionsHierarchically(Node s) { s.getOutgoingLinksHierarchically.map[transition] } - public static def getOutgoingLinksHierarchically(Node s) { + static def getOutgoingLinksHierarchically(Node s) { val result = newArrayList var current = s @@ -205,26 +205,26 @@ class FsmGenExtensions { return result } - public static def isTopLevel(Graph g) { + static def isTopLevel(Graph g) { if (g!==null) { g.eContainer instanceof GraphContainer } else true } - public static def isEmpty(Graph g) { + static def isEmpty(Graph g) { g===null || (g.nodes.empty && g.links.empty) } - public static def isLeaf(Node n) { + static def isLeaf(Node n) { n.subgraph===null } - public static def isTopLevel(Node n) { + static def isTopLevel(Node n) { n.graph.isTopLevel } - public static def getParentState(Node n) { + static def getParentState(Node n) { if (n.isTopLevel) { null } @@ -233,7 +233,7 @@ class FsmGenExtensions { } } - public static def getChoicepointDefaultBranch(Node n) { + static def getChoicepointDefaultBranch(Node n) { if (!(n.stateGraphNode instanceof ChoicePoint)) { return null } @@ -241,7 +241,7 @@ class FsmGenExtensions { return n.outgoing.filter[transition instanceof ContinuationTransition].head } - public static def getParentState(Link l) { + static def getParentState(Link l) { if (l.graph.isTopLevel) { null } @@ -250,7 +250,7 @@ class FsmGenExtensions { } } - public static def isHandler(Link l) { + static def isHandler(Link l) { val sourceNode = l.source.stateGraphNode if (sourceNode instanceof TransitionPoint) { sourceNode.isHandler @@ -260,7 +260,7 @@ class FsmGenExtensions { } } - public static def List<DetailCode> getAllDetailCodes(Graph graph) { + static def List<DetailCode> getAllDetailCodes(Graph graph) { val detailCodes = <DetailCode>newArrayList if (graph!==null) { @@ -276,7 +276,7 @@ class FsmGenExtensions { return detailCodes } - public static def getLinkFor(GraphContainer gc, TransitionBase t) { + static def getLinkFor(GraphContainer gc, TransitionBase t) { gc.graph.allLinks.findFirst[transition===t] } }
\ No newline at end of file diff --git a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF index 4a53a6937..e6d555467 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF @@ -22,3 +22,4 @@ Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0";visibility org.eclipse.emf.ecore.xmi;visibility:=reexport, org.eclipse.etrice.generator.base;bundle-version="2.0.0" Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.eclipse.etrice.core.genmodel diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/util/RoomCrossReferencer.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/util/RoomCrossReferencer.java index fbc45f56d..152683bc1 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/util/RoomCrossReferencer.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/util/RoomCrossReferencer.java @@ -110,7 +110,7 @@ public class RoomCrossReferencer { getReferencedClassesAndModels(dataClasses, enumClasses, protocolClasses, actorClasses, models); - protocolClasses.remove((ProtocolClass) rc); + protocolClasses.remove(rc); } return protocolClasses; } diff --git a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF index d593980bb..e875da7ff 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF @@ -38,3 +38,4 @@ Export-Package: org.eclipse.etrice.core.ui, org.eclipse.etrice.core.ui.quickfix, org.eclipse.etrice.core.ui.util Bundle-Activator: org.eclipse.etrice.core.ui.RoomUiActivator +Automatic-Module-Name: org.eclipse.etrice.core.room.ui diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/editor/RoomEditor.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/editor/RoomEditor.java index 245b4502c..62412554b 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/editor/RoomEditor.java +++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/editor/RoomEditor.java @@ -87,9 +87,9 @@ public class RoomEditor extends XtextEditor implements IValidatingEditor { } @Override - public Object getAdapter(@SuppressWarnings("rawtypes") Class key) { + public <T> T getAdapter(Class<T> key) { if (key.equals(IContextProvider.class)) { - return new SelectedModelHelpProvider(this); + return key.cast(new SelectedModelHelpProvider(this)); } return super.getAdapter(key); diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/util/UIExpressionUtil.xtend b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/util/UIExpressionUtil.xtend index ea60f789a..2caf978d1 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/util/UIExpressionUtil.xtend +++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/util/UIExpressionUtil.xtend @@ -53,7 +53,7 @@ class UIExpressionUtil { val fsmGenBuilderFactory = RoomUiModule.injector.getInstance(ExtendedFsmGenBuilderFactory) Map<ModelComponent, GraphContainer> cache = newHashMap - def public GraphContainer get(ModelComponent mc) { + def GraphContainer get(ModelComponent mc) { if(!cache.containsKey(mc)) { val builder = fsmGenBuilderFactory.create() val gc = builder.createTransformedModel(mc) @@ -76,7 +76,7 @@ class UIExpressionUtil { val exprProvider = RoomUiModule.getInjector().getInstance(DetailExpressionProvider) => [ prov | if(ctx instanceof DetailCode) { prov.owner = ctx.eContainer - prov.reference = ctx.eContainmentFeature as EReference + prov.reference = ctx.eContainmentFeature } else { prov.owner = ctx prov.reference = ref diff --git a/plugins/org.eclipse.etrice.core.room/.project b/plugins/org.eclipse.etrice.core.room/.project index 93b7fb958..4fca370ac 100644 --- a/plugins/org.eclipse.etrice.core.room/.project +++ b/plugins/org.eclipse.etrice.core.room/.project @@ -41,6 +41,5 @@ <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> - <nature>org.eclipse.xtend.shared.ui.xtendXPandNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF index 7c73ad2d9..9dd44b4f0 100644 --- a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF @@ -39,3 +39,4 @@ Export-Package: org.eclipse.etrice.core, org.eclipse.etrice.core.serializer, org.eclipse.etrice.core.services, org.eclipse.etrice.core.validation +Automatic-Module-Name: org.eclipse.etrice.core.room diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore index 84e498b04..dcaf5d9f7 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore @@ -10,14 +10,14 @@ <details key="documentation" value="<br>The model name is a dot separated fully qualified name and is
used to provide a name space. The generators may use that also
to place the generated code into separate directories.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1" - eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Import" + eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Import" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a list of all imported models.
"/> @@ -68,7 +68,7 @@ </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="annotationTypes" upperBound="-1" - eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//AnnotationType" + eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//AnnotationType" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="RoomClass"> @@ -80,7 +80,7 @@ <details key="documentation" value="<br>By this name the actor class is referred to in the model.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> @@ -92,7 +92,7 @@ <details key="documentation" value="<br>This class is the super class of the structural classes
<ul>
 <li>{@link ActorContainerClass}</li>
 <li>{@link LogicalSystem}</li>
</ul>
"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1" - eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" + eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a list of structure class annotations.
"/> @@ -121,19 +121,19 @@ <details key="documentation" value="<br>This is a list of all interface SPPs.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode1" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode1" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode2" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode2" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode3" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode3" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> @@ -196,7 +196,7 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>A primitive type describes a type like int, char, float
and can represent the type with a certain precision
in the target language
"/> </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EEnum platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//LiteralType"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EEnum ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//LiteralType"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is one of the basic variable types.
"/> </eAnnotations> @@ -248,7 +248,7 @@ <details key="documentation" value="<br>The name of the literal.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="literal" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//IntLiteral" + <eStructuralFeatures xsi:type="ecore:EReference" name="literal" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//IntLiteral" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The value of the literal. It is associated with a target type which defaults to
{@code int} and can be set explicitly using the {@link EnumerationType#getPrimitiveType()}
"/> @@ -280,25 +280,25 @@ </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1" - eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" + eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a list of data class annotations.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode1" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode1" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode2" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode2" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode3" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode3" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> @@ -344,7 +344,7 @@ <details key="documentation" value="<br>This is an optional default value literal.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> @@ -372,13 +372,13 @@ <details key="documentation" value="<br>This is an optional return type of the operation.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="detailCode" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="detailCode" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is the operation body written in code generator target language.
"/> @@ -411,7 +411,7 @@ </eAnnotations> </eOperations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="detailCode" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="detailCode" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EEnum" name="CommunicationType"> @@ -424,7 +424,7 @@ <details key="documentation" value="<br>The super class of
<ul>
 <li>{@link ProtocolClass}</li>
 <li>{@link CompoundProtocolClass}</li>
</ul>
"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1" - eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" + eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a list of protocol class annotations.
"/> @@ -445,19 +445,19 @@ <details key="documentation" value="<br>The base class from which all messages are inherited.
The port classes and the semantics are not inherited.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode1" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode1" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode2" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode2" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode3" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode3" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> @@ -487,7 +487,7 @@ <details key="documentation" value="<br>This is the optional conjugate port class specification.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="semantics" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//ProtocolSemantics" + <eStructuralFeatures xsi:type="ecore:EReference" name="semantics" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//ProtocolSemantics" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is the optional semantics specification for this protocol.
"/> @@ -541,9 +541,9 @@ </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1" - eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" + eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> @@ -554,7 +554,7 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>A port class can be specified to customize the behavior of a {@link ProtocolClass}.
There can be one for regular ports and another one for conjugate ports independently.

<p>
Port classes can be used to define attributes and operations and message handlers
(or interceptors).
</p>
"/> </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EReference" name="userCode" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="userCode" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>The user code is treated in a generator dependent way.
"/> @@ -588,7 +588,7 @@ <details key="documentation" value="<br>This is the message that is handled.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="detailCode" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" + <eStructuralFeatures xsi:type="ecore:EReference" name="detailCode" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//DetailCode" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is the handler code written in code generator target language.
"/> @@ -605,7 +605,7 @@ <details key="documentation" value="<br>Is a handler (or interceptor) for outgoing messages. In the generated code the
message is available. It is derived from {@link MessageHandler}.
"/> </eAnnotations> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ActorClass" eSuperTypes="#//ActorContainerClass platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//ModelComponent"> + <eClassifiers xsi:type="ecore:EClass" name="ActorClass" eSuperTypes="#//ActorContainerClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//ModelComponent"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>Together with {@link ProtocolClass} and {@link DataClass} one of
the main class types of the ROOM language.

<p>
The actor class in ROOM has three compartments which aren't represented as separate model objects.
To understand to which compartment an attribute or reference belongs to here is a list
<ul>
 <li>Interface: everything which is visible from the outside from a model point of view
 <ul>
 <li>{@link #getInterfacePorts}: a list of all interface {@link Port}s</li>
 <li>{@link ActorContainerClass#getServiceProvisionPoints()}: a list of all interface {@link SPP}s</li>
 </ul>
 <li>Structure: all internal structural aspects of an actor class</li>
 <ul>
 <li>{@link #getUserCode1}-3: user defined code with generator dependent meaning</li>
 <li>{@link #getInternalPorts}: a list of all internal end {@link Port}s</li>
 <li>{@link #getExternalPorts}: a list of all {@link ExternalPort}s (the interface ports that
 are end ports, not relay ports</li>
 <li>{@link #getServiceImplementations}: a list of all {@link ServiceImplementation}s</li>
 <li>{@link #getServiceAccessPoints}: a list of all {@link SAP}s used by this actor class</li>
 <li>{@link #getAttributes}: a list of all actor class {@link Attribute}s</li>
 <li>{@link #getActorRefs}: a list of all referenced actor classes (an {@link ActorRef}
 has the meaning of a composition)</li>
 <li>{@link #getBindings}: a list of all port {@link Binding}s of this actor class</li>
 <li>{@link #getConnections}: a list of all {@link LayerConnection}s</li>
 </ul>
 <li>Behavior: the behavioral aspects of an actor class</li>
 <ul>
 <li>{@link #getOperations}: a list of {@link Operation}s</li>
 <li>{@link #getStateMachine}: the {@link StateGraph state machine} definition</li>
 </ul>
</ul>
</p>
"/> </eAnnotations> @@ -634,12 +634,12 @@ <details key="body" value="return getName();
"/> </eAnnotations> </eOperations> - <eOperations name="getAbstractInterfaceItems" upperBound="-1" eType="ecore:EClass http://www.eclipse.org/etrice/core/fsm/FSM#//AbstractInterfaceItem"> + <eOperations name="getAbstractInterfaceItems" upperBound="-1" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//AbstractInterfaceItem"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="body" value="return new <%org.eclipse.emf.common.util.BasicEList%><AbstractInterfaceItem>(new <%org.eclipse.etrice.core.room.util.RoomHelpers%>().getInterfaceItems(this));
"/> </eAnnotations> </eOperations> - <eOperations name="getAllAbstractInterfaceItems" upperBound="-1" eType="ecore:EClass http://www.eclipse.org/etrice/core/fsm/FSM#//AbstractInterfaceItem"> + <eOperations name="getAllAbstractInterfaceItems" upperBound="-1" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//AbstractInterfaceItem"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="body" value="return new <%org.eclipse.emf.common.util.BasicEList%><AbstractInterfaceItem>(new <%org.eclipse.etrice.core.room.util.RoomHelpers%>().getAllInterfaceItems(this));
"/> </eAnnotations> @@ -650,7 +650,7 @@ <details key="documentation" value="<br>This is a list containing all ports of the actor interface.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="structureDocu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="structureDocu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation of the actor structure.
"/> @@ -686,14 +686,14 @@ <details key="documentation" value="<br>This is a list containing all ports of the actor interface that are end ports.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="behaviorDocu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="behaviorDocu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation of the actor behavior.
"/> </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="behaviorAnnotations" upperBound="-1" - eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" + eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a list of annotations to the actor behavior.
"/> @@ -708,7 +708,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="structors" upperBound="-1" eType="#//ClassStructor" containment="true"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="InterfaceItem" eSuperTypes="platform:/resource/org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//AbstractInterfaceItem"> + <eClassifiers xsi:type="ecore:EClass" name="InterfaceItem" eSuperTypes="../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//AbstractInterfaceItem"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is a concrete sub class of an {@link AbstractInterfaceItem}.

It is the super class of
<ul>
 <li>{@link Port}</li>
 <li>{@link SAP}</li>
 <li>{@link SPP}</li>
</ul>
"/> </eAnnotations> @@ -717,7 +717,7 @@ <details key="body" value="if (this instanceof <%org.eclipse.etrice.core.room.Port%>)
	return ((Port) this).getProtocol();
else if (this instanceof <%org.eclipse.etrice.core.room.SAP%>)
	return ((SAP) this).getProtocol();
else if (this instanceof <%org.eclipse.etrice.core.room.SPP%>)
	return ((SPP) this).getProtocol();
return null;
"/> </eAnnotations> </eOperations> - <eOperations name="getSemantics" eType="ecore:EClass http://www.eclipse.org/etrice/core/fsm/FSM#//ProtocolSemantics"> + <eOperations name="getSemantics" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.fsm/model/generated/FSM.ecore#//ProtocolSemantics"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="body" value="if (getGeneralProtocol() instanceof <%org.eclipse.etrice.core.room.ProtocolClass%>)
	return ((ProtocolClass)getGeneralProtocol()).getSemantics();
else
	return null;
"/> </eAnnotations> @@ -737,7 +737,7 @@ <details key="body" value="if (getGeneralProtocol() instanceof ProtocolClass)
 return ((ProtocolClass) getGeneralProtocol()).getCommType() == <%org.eclipse.etrice.core.room.CommunicationType%>.EVENT_DRIVEN;
else
 return false;
"/> </eAnnotations> </eOperations> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> @@ -770,7 +770,7 @@ </eAnnotations> </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1" - eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" + eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Annotation" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ExternalPort"> @@ -838,7 +838,7 @@ <details key="documentation" value="<br>By this name the actor container reference is referred to in the model.
"/> </eAnnotations> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" + <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation" containment="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="<br>This is an optional documentation.
"/> diff --git a/plugins/org.eclipse.etrice.dctools.fsm/src/org/eclipse/etrice/dctools/fsm/ast/nodes/DCAstBracketNode.xtend b/plugins/org.eclipse.etrice.dctools.fsm/src/org/eclipse/etrice/dctools/fsm/ast/nodes/DCAstBracketNode.xtend index 19aa9efd9..89cfdcf5b 100644 --- a/plugins/org.eclipse.etrice.dctools.fsm/src/org/eclipse/etrice/dctools/fsm/ast/nodes/DCAstBracketNode.xtend +++ b/plugins/org.eclipse.etrice.dctools.fsm/src/org/eclipse/etrice/dctools/fsm/ast/nodes/DCAstBracketNode.xtend @@ -73,5 +73,5 @@ class DCAstBracketNode extends DCAstTextNode { println(indent + "DCAstBracketNode " + this.toString) } - override def String getText() { toString } + override String getText() { toString } }
\ No newline at end of file diff --git a/plugins/org.eclipse.etrice.dctools/src/org/eclipse/etrice/dctools/GenModelAccess.xtend b/plugins/org.eclipse.etrice.dctools/src/org/eclipse/etrice/dctools/GenModelAccess.xtend index 46f38af15..4ecb95f4c 100644 --- a/plugins/org.eclipse.etrice.dctools/src/org/eclipse/etrice/dctools/GenModelAccess.xtend +++ b/plugins/org.eclipse.etrice.dctools/src/org/eclipse/etrice/dctools/GenModelAccess.xtend @@ -23,7 +23,7 @@ import org.eclipse.etrice.core.genmodel.fsm.NullDiagnostician class GenModelAccess { - private ExtendedFsmGenBuilderFactory fsmGenBuilderFactory + ExtendedFsmGenBuilderFactory fsmGenBuilderFactory Map<ModelComponent, GraphContainer> cache = newHashMap @@ -32,11 +32,11 @@ class GenModelAccess { this.fsmGenBuilderFactory = fsmGenBuilderFactory } - def public clearCache() { + def clearCache() { cache.clear } - def public GraphContainer get(ModelComponent mc) { + def GraphContainer get(ModelComponent mc) { if(!cache.containsKey(mc)) { val builder = fsmGenBuilderFactory.create(new NullDiagnostician) val gc = builder.createTransformedModel(mc) diff --git a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF index bcd289ff0..68fc1dd2c 100644 --- a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF @@ -12,3 +12,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Activator: org.eclipse.etrice.doc.ETriceHelp Export-Package: org.eclipse.etrice.doc Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.eclipse.etrice.doc diff --git a/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF index f4a5f3287..bbee7339d 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF @@ -15,3 +15,4 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.eclipse.etrice.etunit.converter diff --git a/plugins/org.eclipse.etrice.expressions.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.expressions.ui/META-INF/MANIFEST.MF index 39990f5c1..39e95a4c1 100644 --- a/plugins/org.eclipse.etrice.expressions.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.expressions.ui/META-INF/MANIFEST.MF @@ -16,4 +16,5 @@ Export-Package: org.eclipse.etrice.expressions.detailcode, org.eclipse.etrice.expressions.ui.contentassist, org.eclipse.etrice.expressions.ui.highlight Bundle-Vendor: Eclipse eTrice +Automatic-Module-Name: org.eclipse.etrice.expressions.ui diff --git a/plugins/org.eclipse.etrice.generator.base/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.base/META-INF/MANIFEST.MF index 18d19c1f4..ab1a0dabd 100644 --- a/plugins/org.eclipse.etrice.generator.base/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.base/META-INF/MANIFEST.MF @@ -19,3 +19,4 @@ Export-Package: org.eclipse.etrice.generator.base, org.eclipse.etrice.generator.base.setup, org.eclipse.etrice.generator.base.validation Bundle-Name: Base Generator +Automatic-Module-Name: org.eclipse.etrice.generator.base diff --git a/plugins/org.eclipse.etrice.generator.c/.project b/plugins/org.eclipse.etrice.generator.c/.project index 0bbb7217b..1b71c229b 100644 --- a/plugins/org.eclipse.etrice.generator.c/.project +++ b/plugins/org.eclipse.etrice.generator.c/.project @@ -40,6 +40,5 @@ <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> - <nature>org.eclipse.xtend.shared.ui.xtendXPandNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF index 875e4a5f2..f339524dd 100644 --- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF @@ -22,3 +22,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.c, org.eclipse.etrice.generator.c.gen, org.eclipse.etrice.generator.c.setup +Automatic-Module-Name: org.eclipse.etrice.generator.c diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend index b1aa47ff5..43f124459 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend @@ -40,10 +40,10 @@ import org.eclipse.etrice.core.room.PrimitiveType import org.eclipse.etrice.core.room.RoomClass import org.eclipse.etrice.core.room.RoomModel import org.eclipse.etrice.core.room.util.RoomHelpers +import org.eclipse.etrice.generator.c.Main +import org.eclipse.etrice.generator.c.setup.GeneratorOptionsHelper import org.eclipse.etrice.generator.generic.ILanguageExtension import org.eclipse.xtext.util.Pair -import org.eclipse.etrice.generator.c.setup.GeneratorOptionsHelper -import org.eclipse.etrice.generator.c.Main @Singleton class CExtensions implements ILanguageExtension { @@ -54,7 +54,7 @@ class CExtensions implements ILanguageExtension { override String getTypedDataDefinition(EObject msg) { if (msg instanceof Message) { - generateArglistAndTypedData((msg as Message).data).get(TypedDataKind.DECLARATION_AND_INITIALIZATION.ordinal) + generateArglistAndTypedData(msg.data).get(TypedDataKind.DECLARATION_AND_INITIALIZATION.ordinal) } else { "" diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/Initialization.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/Initialization.xtend index ebb1976f6..cc3f0fda4 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/Initialization.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/Initialization.xtend @@ -68,7 +68,7 @@ class Initialization { DataClass: ''' { - «FOR subA : (aType as DataClass).allAttributes SEPARATOR ','» + «FOR subA :aType.allAttributes SEPARATOR ','» «initAttributeArray(instance, path.union(subA))» «ENDFOR» }''' diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend index 428b3071c..7bf1c8885 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend @@ -36,7 +36,7 @@ class MainGen { prepFS.prepare for (e: resource.contents){ if (e instanceof Root) { - doGenerate(e as Root) + doGenerate(e) } } } diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend index a1aadf370..3edaff61e 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend @@ -43,11 +43,11 @@ import org.eclipse.etrice.core.room.util.RoomHelpers import org.eclipse.etrice.generator.base.io.IGeneratorFileIO import org.eclipse.etrice.generator.base.logging.ILogger import org.eclipse.etrice.generator.c.Main +import org.eclipse.etrice.generator.c.setup.GeneratorOptionsHelper import org.eclipse.etrice.generator.fsm.base.IntelligentSeparator import org.eclipse.etrice.generator.generic.ProcedureHelpers import org.eclipse.etrice.generator.generic.RoomExtensions import org.eclipse.etrice.generator.generic.TypeHelpers -import org.eclipse.etrice.generator.c.setup.GeneratorOptionsHelper @Singleton class NodeGen { @@ -388,7 +388,7 @@ class NodeGen { /* nothing to do */ «ELSE» «FOR pi:ai.orderedIfItemInstances» - «IF pi.protocol.getPortClass(pi.conjugated)?.attributes?.size > 0» + «IF pi.portClassAttributesSize > 0» static «pi.protocol.getPortClassName(pi.conjugated)»_var «pi.path.pathName»_var«IF pi.replicated»[«pi.peers.size»]«ENDIF»={ «FOR Integer i:1.. if(pi.peers.size==0)1 else pi.peers.size SEPARATOR ', '» «attrInitGenAddon.generateAttributeInit(pi, pi.interfaceItem.portClass.attributes)» @@ -410,6 +410,16 @@ class NodeGen { ''' } + + private def int getPortClassAttributesSize(InterfaceItemInstance pi) { + val attribs = pi.protocol.getPortClass(pi.conjugated)?.attributes + if (attribs===null) { + 0 + } + else { + attribs.size + } + } def private genActorInstanceInitializer(Root root, ActorInstance ai) { val instName = ai.path.pathName @@ -810,7 +820,7 @@ class NodeGen { while (iter.hasNext) { val obj = iter.next if (obj instanceof PortInstance) { - val pi = obj as PortInstance + val pi = obj if (!pi.port.relay) { // only data driven if (pi.protocol.commType==CommunicationType::DATA_DRIVEN) { diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/StateMachineGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/StateMachineGen.xtend index 1a1e47090..901ccf7cc 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/StateMachineGen.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/StateMachineGen.xtend @@ -69,7 +69,7 @@ class StateMachineGen extends GenericStateMachineGenerator { /** * @param generateImplementation NOT used */ - override public genExtra(GraphContainer gc, boolean generateImplementation) { + override genExtra(GraphContainer gc, boolean generateImplementation) { val mc = gc.component val allStates = gc.graph.allStateNodes.map[stateGraphNode].filter(typeof(State)).toList val states = allStates.getLeafStatesLast @@ -93,7 +93,7 @@ class StateMachineGen extends GenericStateMachineGenerator { ''' } - override public stateType() { + override stateType() { "etInt16" } @@ -106,7 +106,7 @@ class StateMachineGen extends GenericStateMachineGenerator { ((void)trigger__et); /* avoids unused warning */ ''' } - override public unreachableReturn() { + override unreachableReturn() { "/* return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true) */" } diff --git a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF index ac386c668..e62e4d45a 100644 --- a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF @@ -17,4 +17,5 @@ Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0", com.google.guava;bundle-version="8.0.0", org.eclipse.xtext.xbase.lib;bundle-version="2.6.0" Export-Package: org.eclipse.etrice.generator.config +Automatic-Module-Name: org.eclipse.etrice.generator.config diff --git a/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend b/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend index c9a5cef3d..01a36c9ef 100644 --- a/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend +++ b/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend @@ -100,7 +100,7 @@ class DataConfiguration implements IDataConfiguration { // dynamic override getPollingTimerUser(SubSystemInstance subsystem) { val dynConf = subsystem.config?.dynConfig - if (dynConf == null) + if (dynConf === null) 0 else dynConf.polling @@ -108,7 +108,7 @@ class DataConfiguration implements IDataConfiguration { override getUserCode1(SubSystemInstance subsystem) { var dynConfig = subsystem.config?.dynConfig - return if (dynConfig?.filePath != null) + return if (dynConfig?.filePath !== null) "import org.eclipse.etrice.runtime.java.config.ConfigSourceFile;" // TODO JH make lang independent else dynConfig?.userCode1 @@ -116,7 +116,7 @@ class DataConfiguration implements IDataConfiguration { override getUserCode2(SubSystemInstance subsystem) { var dynConfig = subsystem.config?.dynConfig - return if (dynConfig?.filePath != null) '''new ConfigSourceFile("«dynConfig.filePath»")''' else + return if (dynConfig?.filePath !== null) '''new ConfigSourceFile("«dynConfig.filePath»")''' else dynConfig?.userCode2 } @@ -137,7 +137,7 @@ class DataConfiguration implements IDataConfiguration { } override hasVariableService(SubSystemInstance subsystem) { - subsystem.config?.dynConfig != null + subsystem.config?.dynConfig !== null } def private toStringExpr(ConfigValueArray literal) { diff --git a/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF index ef9eb9cb5..f25a85762 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF @@ -21,3 +21,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.cpp, org.eclipse.etrice.generator.cpp.gen, org.eclipse.etrice.generator.cpp.setup +Automatic-Module-Name: org.eclipse.etrice.generator.cpp diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.xtend index 031979876..0991f4d33 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.xtend +++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.xtend @@ -43,13 +43,13 @@ class ConfigGenAddon { // For SubSystemClassGen - def public genActorInstanceConfig(ActorInstance ai, String aiVariableName){''' + def genActorInstanceConfig(ActorInstance ai, String aiVariableName){''' «FOR a : ai.actorClass.allAttributes» «applyInstanceConfig(ai, aiVariableName, new ArrayList<Attribute>().union(a))» «ENDFOR» «FOR pi : ai.orderedIfItemInstances» «var attribs = getPortClass(pi.interfaceItem)?.attributes» - «IF attribs != null» + «IF attribs !== null» «FOR a : attribs» «applyInstanceConfig(pi, aiVariableName+"."+invokeGetter(pi.name, null), new ArrayList<Attribute>().union(a))» «ENDFOR» @@ -77,7 +77,7 @@ class ConfigGenAddon { // TODO-Enum if(aType.primitive){ var value = typeHelpers.getAttrInstanceConfigValue(path, instance) - if(value == null) + if(value === null) '''''' else if(a.size == 0 || aType.characterType) '''«invokes».«a.name.invokeSetter(null, (aType as PrimitiveType).toValueLiteral(value))»;''' @@ -100,7 +100,7 @@ class ConfigGenAddon { // For ActorClassGen - def public genDynConfigGetterSetter(ActorClass ac){''' + def genDynConfigGetterSetter(ActorClass ac){''' «FOR a : dataConfigExt.getDynConfigReadAttributes(ac)» public «a.type.type.typeName»«IF a.size>0»[]«ENDIF» get«a.name.toFirstUpper»(){ if(lock_«a.name» == null) @@ -130,7 +130,7 @@ class ConfigGenAddon { «ENDFOR» '''} - def public genMinMaxConstants(ActorClass ac){ + def genMinMaxConstants(ActorClass ac){ var result = ''' «FOR a : ac.attributes» «genMinMaxConstantsRec(ac, a.name, new ArrayList<Attribute>().union(a))» @@ -159,10 +159,10 @@ class ConfigGenAddon { { var aType = (path.last.type.type as PrimitiveType) ''' - «IF (temp = dataConfigExt.getAttrClassConfigMinValue(ac, path)) != null» + «IF (temp = dataConfigExt.getAttrClassConfigMinValue(ac, path)) !== null» public static «aType.minMaxType» MIN_«varNamePath» = «aType.toValueLiteral(temp)»; «ENDIF» - «IF (temp = dataConfigExt.getAttrClassConfigMaxValue(ac, path)) != null» + «IF (temp = dataConfigExt.getAttrClassConfigMaxValue(ac, path)) !== null» public static «aType.minMaxType» MAX_«varNamePath» = «aType.toValueLiteral(temp)»; «ENDIF» ''' diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/DataClassGen.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/DataClassGen.xtend index d34e5375a..1cb380830 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/DataClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/DataClassGen.xtend @@ -56,7 +56,7 @@ class DataClassGen { «generateIncludeGuardBegin(dc, '')» #include "common/etDatatypesCpp.hpp" - «IF dc.base!=null»#include "«dc.base.path»«dc.base.name».h"«ENDIF» + «IF dc.base!==null»#include "«dc.base.path»«dc.base.name».h"«ENDIF» «FOR classes : root.getReferencedDataClasses(dc)» #include "«classes.path»«classes.name».h" «ENDFOR» @@ -72,7 +72,7 @@ class DataClassGen { «dc.generateNamespaceBegin» - class «dc.name»«IF dc.base!=null» : public «dc.base.name»«ENDIF» { + class «dc.name»«IF dc.base!==null» : public «dc.base.name»«ENDIF» { public: «helpers.userCode(dc.userCode2)» @@ -143,7 +143,7 @@ class DataClassGen { «dc.name»& «dc.name»::operator=(const «dc.name»& rhs) { if (this == &rhs) { return *this; }; - «IF dc.base!=null»«dc.base.name»::operator=(rhs);«ENDIF» + «IF dc.base!==null»«dc.base.name»::operator=(rhs);«ENDIF» «FOR attr : dc.attributes» this->«attr.name» = rhs.«attr.name»; «ENDFOR» @@ -160,7 +160,7 @@ class DataClassGen { val extension initHelper = initHelper var initList = <CharSequence>newArrayList - if(dataClass.base != null) initList += dataClass.base.name + '()' + if(dataClass.base !== null) initList += dataClass.base.name + '()' initList += dataClass.attributes.map['''«name»(«initializerListValue»)'''] initList.generateCtorInitializerList @@ -170,7 +170,7 @@ class DataClassGen { val extension initHelper = initHelper var initList = <CharSequence>newArrayList - if(dataClass.base != null) initList += dataClass.base.name + '(rhs)' + if(dataClass.base !== null) initList += dataClass.base.name + '(rhs)' initList += dataClass.attributes.map['''«name»(rhs.«name»)'''] initList.generateCtorInitializerList @@ -180,7 +180,7 @@ class DataClassGen { val extension initHelper = initHelper var initList = <CharSequence>newArrayList - if(dataClass.base != null) + if(dataClass.base !== null) initList += '''«dataClass.base.name»(«dataClass.base.allAttributes.map[name].join(', ')»)''' initList += dataClass.attributes.map['''«name»(«name»)'''] @@ -222,7 +222,7 @@ class DataClassGen { def deepCopy(DataClass _dc) { var result = "" var dc = _dc - while (dc!=null) { + while (dc!==null) { result = deepCopy(dc.attributes).toString + result dc = dc.base } diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/Initialization.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/Initialization.xtend index 9131665c3..ded45f78b 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/Initialization.xtend +++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/Initialization.xtend @@ -40,7 +40,7 @@ class Initialization { * Generate array and struct initialization */ def genExtraInitializers(Iterable<Attribute> attributes) { - val extraInitAttrs = attributes.filter[initializerListValue == null && initValue != null && initValue.startsWith('{')] + val extraInitAttrs = attributes.filter[initializerListValue === null && initValue !== null && initValue.startsWith('{')] if(extraInitAttrs.empty) return '' ''' // extra initialization @@ -57,12 +57,12 @@ class Initialization { def String getInitializerListValue(Attribute attribute) { val initValue = attribute.initValue - return if(initValue != null && initValue.startsWith('{')) null else initValue + return if(initValue !== null && initValue.startsWith('{')) null else initValue } def protected getInitValue(Attribute attribute) { switch it : attribute { - case defaultValueLiteral != null: defaultValueLiteral + case defaultValueLiteral !== null: defaultValueLiteral case type.ref: languageExt.nullPointer default: languageExt.defaultValue(type.type) } diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/MainGen.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/MainGen.xtend index f5c5bcf89..eda8112e2 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/MainGen.xtend +++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/MainGen.xtend @@ -35,7 +35,7 @@ class MainGen { prepFS.prepare for (e: resource.contents){ if (e instanceof Root) { - doGenerate(e as Root) + doGenerate(e) } } } diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeGen.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeGen.xtend index bea58540a..da7cbef94 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeGen.xtend +++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeGen.xtend @@ -54,7 +54,7 @@ class NodeGen { for (nr : ETMapUtil::getNodeRefs()) { for (instpath : ETMapUtil::getSubSystemInstancePaths(nr)) { val ssi = root.getInstance(instpath) as SubSystemInstance - if (ssi!=null && ssi.subSystemClass.validGenerationLocation) { + if (ssi!==null && ssi.subSystemClass.validGenerationLocation) { val wired = sscc2wired.get(ssi.subSystemClass) val path = ssi.subSystemClass.getPath @@ -71,7 +71,7 @@ class NodeGen { def generateHeaderFile(Root root, SubSystemInstance comp, WiredSubSystemClass wired, Collection<PhysicalThread> usedThreads) { val cc = comp.subSystemClass - val models = root.getReferencedModels(cc) +// val models = root.getReferencedModels(cc) val nr = ETMapUtil::getNodeRef(comp) val clsname = nr.getCppClassName(comp) val threads = nr.type.threads.filter(t|usedThreads.contains(t)) @@ -170,7 +170,7 @@ class NodeGen { def generateSourceFile(Root root, SubSystemInstance comp, WiredSubSystemClass wired, Collection<PhysicalThread> usedThreads) { val cc = comp.subSystemClass - val models = root.getReferencedModels(cc) +// val models = root.getReferencedModels(cc) val nr = ETMapUtil::getNodeRef(comp) val clsname = nr.getCppClassName(comp) val threads = nr.type.threads.filter(t|usedThreads.contains(t)) diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeRunnerGen.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeRunnerGen.xtend index 4ae998776..575cb51f1 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeRunnerGen.xtend +++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/NodeRunnerGen.xtend @@ -39,7 +39,7 @@ class NodeRunnerGen { for (nr : ETMapUtil::getNodeRefs()) { for (instpath : ETMapUtil::getSubSystemInstancePaths(nr)) { val ssi = root.getInstance(instpath) as SubSystemInstance - if (ssi!=null && ssi.subSystemClass.validGenerationLocation) { + if (ssi!==null && ssi.subSystemClass.validGenerationLocation) { val filepath = ssi.subSystemClass.getPath fileIO.generateFile("generating SubSystemRunner declaration", filepath + nr.getCppClassName(ssi)+"Runner.h", root.generateHeaderFile(ssi)) fileIO.generateFile("generating SubSystemRunner implementation", filepath + nr.getCppClassName(ssi)+"Runner.cpp", root.generateSourceFile(ssi)) diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.xtend index 9cb81b539..815e4c17e 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.xtend @@ -529,17 +529,14 @@ class ProtocolClassGen extends GenericProtocolClassGenerator { override getMessageID(Message msg, InterfaceItem item) { if (item instanceof Port) { - var p = item as Port; - var direction = if (p.isConjugated())"OUT_" else "IN_" - return enumInUse(p.getProtocol().getName(), direction+msg.getName()) + var direction = if (item.isConjugated())"OUT_" else "IN_" + return enumInUse(item.getProtocol().getName(), direction+msg.getName()) } else if (item instanceof SAP) { - var sap = item as SAP; - return enumInUse(sap.getProtocol().getName(), "OUT_"+msg.getName()) + return enumInUse(item.getProtocol().getName(), "OUT_"+msg.getName()) } else if (item instanceof SPP) { - var spp = item as SPP; - return enumInUse(spp.getProtocol().getName(), "IN_"+msg.getName()) + return enumInUse(item.getProtocol().getName(), "IN_"+msg.getName()) } return "unknown interface item"; diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.xtend index 6cbb9d3e4..9d0344a3c 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.xtend +++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.xtend @@ -78,7 +78,7 @@ class StateMachineGen extends GenericStateMachineGenerator { ''' } - override public stateType() { + override stateType() { "etInt16" } diff --git a/plugins/org.eclipse.etrice.generator.doc/.project b/plugins/org.eclipse.etrice.generator.doc/.project index 8c086ee1d..f606afe43 100644 --- a/plugins/org.eclipse.etrice.generator.doc/.project +++ b/plugins/org.eclipse.etrice.generator.doc/.project @@ -30,6 +30,5 @@ <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> - <nature>org.eclipse.xtend.shared.ui.xtendXPandNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF index fda0f2fad..3437cb2e7 100644 --- a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF @@ -24,3 +24,4 @@ Import-Package: org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.doc;uses:="org.eclipse.etrice.generator.base", org.eclipse.etrice.generator.doc.gen +Automatic-Module-Name: org.eclipse.etrice.generator.doc diff --git a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/DocGen.xtend b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/DocGen.xtend index 989debf37..3bdff414c 100644 --- a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/DocGen.xtend +++ b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/DocGen.xtend @@ -16,11 +16,9 @@ package org.eclipse.etrice.generator.doc.gen import com.google.inject.Inject import com.google.inject.Singleton -import java.io.File import java.util.List import java.util.Set import org.eclipse.etrice.core.common.base.Documentation -import org.eclipse.etrice.core.common.base.util.RelativePathHelpers import org.eclipse.etrice.core.fsm.fSM.State import org.eclipse.etrice.core.genmodel.etricegen.Root import org.eclipse.etrice.core.room.ActorClass @@ -36,9 +34,9 @@ import org.eclipse.etrice.core.room.RoomModel import org.eclipse.etrice.core.room.StandardOperation import org.eclipse.etrice.core.room.SubSystemClass import org.eclipse.etrice.core.room.util.RoomHelpers -import org.eclipse.etrice.generator.fsm.base.CodegenHelpers -import org.eclipse.etrice.generator.base.logging.ILogger import org.eclipse.etrice.generator.base.io.IGeneratorFileIO +import org.eclipse.etrice.generator.base.logging.ILogger +import org.eclipse.etrice.generator.fsm.base.CodegenHelpers @Singleton class DocGen { @@ -48,15 +46,13 @@ class DocGen { @Inject IGeneratorFileIO fileIO @Inject ILogger logger - final val IMGDIR_DEFAULT = "./images" - final val IMGWIDTH_DEFAULT = "1.0\\textwidth" + val IMGDIR_DEFAULT = "./images" + val IMGWIDTH_DEFAULT = "1.0\\textwidth" static class DocGenContext { - val Root root val RoomModel model new(Root r, RoomModel m) { - root = r model = m } @@ -94,11 +90,11 @@ class DocGen { } } - def private removeLast(String str) { + def package removeLast(String str) { str.substring(0, str.length-1) } - def private appendIfNotEmpty(String txt, String suffix) { + def package appendIfNotEmpty(String txt, String suffix) { if (txt.empty) txt else diff --git a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF index b5c00bd3e..9dff0de57 100644 --- a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF @@ -14,3 +14,4 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0", org.eclipse.xtend.lib;bundle-version="2.6.0", org.eclipse.etrice.generator.base;bundle-version="2.0.0" Import-Package: org.eclipse.core.runtime +Automatic-Module-Name: org.eclipse.etrice.generator.fsm diff --git a/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/generic/AbstractStateMachineGenerator.xtend b/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/generic/AbstractStateMachineGenerator.xtend index 617439632..2c09bd179 100644 --- a/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/generic/AbstractStateMachineGenerator.xtend +++ b/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/generic/AbstractStateMachineGenerator.xtend @@ -62,7 +62,7 @@ abstract class AbstractStateMachineGenerator { * @param gc the {@link GraphContainer} * @return the generated code */ - def public String genTriggerConstants(GraphContainer gc) { + def String genTriggerConstants(GraphContainer gc) { gc.genTriggerConstants(langExt.usesInheritance) } @@ -75,7 +75,7 @@ abstract class AbstractStateMachineGenerator { * * @return the generated code */ - def public String genTriggerConstants(GraphContainer gc, boolean omitBase) { + def String genTriggerConstants(GraphContainer gc, boolean omitBase) { val triggers = if (omitBase) gc.component.ownMessagesFromInterfaces else gc.component.allMessagesFromInterfaces @@ -102,7 +102,7 @@ abstract class AbstractStateMachineGenerator { * @param gc the {@link GraphContainer} * @return the generated code */ - def public genStateIdConstants(GraphContainer gc) { + def genStateIdConstants(GraphContainer gc) { gc.genStateIdConstants(langExt.usesInheritance) } @@ -115,7 +115,7 @@ abstract class AbstractStateMachineGenerator { * * @return the generated code */ - def public genStateIdConstants(GraphContainer gc, boolean omitBase) { + def genStateIdConstants(GraphContainer gc, boolean omitBase) { // with inheritance we exclude inherited states val allStateNodes = gc.graph.allStateNodes.toList // TODO: without toList this didn't work - why? @@ -155,7 +155,7 @@ abstract class AbstractStateMachineGenerator { * * @return the generated code */ - def public genTransitionChainConstants(GraphContainer gc) { + def genTransitionChainConstants(GraphContainer gc) { gc.genTransitionChainConstants(false/*langExt.usesInheritance*/) } @@ -170,7 +170,7 @@ abstract class AbstractStateMachineGenerator { * * @return the generated code */ - def public genTransitionChainConstants(GraphContainer gc, boolean omitBase) { + def genTransitionChainConstants(GraphContainer gc, boolean omitBase) { val chains = (if (omitBase) gc.graph.allLinks.filter[!inherited] else gc.graph.allLinks).map[transition].filter[isChainHead].filter(typeof(Transition)).toList var offset = if (omitBase) @@ -193,7 +193,7 @@ abstract class AbstractStateMachineGenerator { * * @return the generated code */ - def public String genEntryAndExitCodes(GraphContainer gc, boolean generateImplementation) { + def String genEntryAndExitCodes(GraphContainer gc, boolean generateImplementation) { gc.genEntryAndExitCodes(generateImplementation, langExt.usesInheritance) } @@ -206,7 +206,7 @@ abstract class AbstractStateMachineGenerator { * * @return the generated code */ - def public String genEntryAndExitCodes(GraphContainer gc, boolean generateImplementation, boolean omitBase) { + def String genEntryAndExitCodes(GraphContainer gc, boolean generateImplementation, boolean omitBase) { val states = gc.graph.allStateNodes.filter[!omitBase || !inherited].toList ''' «FOR state : states» @@ -223,7 +223,7 @@ abstract class AbstractStateMachineGenerator { * * @return the generated code */ - def public String genActionCodes(GraphContainer gc, boolean generateImplementation) { + def String genActionCodes(GraphContainer gc, boolean generateImplementation) { gc.genActionCodes(generateImplementation, langExt.usesInheritance) } @@ -236,7 +236,7 @@ abstract class AbstractStateMachineGenerator { * * @return the generated code */ - def public String genActionCodes(GraphContainer gc, boolean generateImplementation, boolean omitBase) { + def String genActionCodes(GraphContainer gc, boolean generateImplementation, boolean omitBase) { val transitions = gc.graph.allLinks.filter[!omitBase || !inherited].filter[transition.action.hasDetailCode].toList ''' «FOR tr : transitions» @@ -245,7 +245,7 @@ abstract class AbstractStateMachineGenerator { ''' } - def public String genStateSwitchMethods(GraphContainer gc, boolean generateImplementation) { + def String genStateSwitchMethods(GraphContainer gc, boolean generateImplementation) { val mc = gc.component val async = mc.commType==ComponentCommunicationType::ASYNCHRONOUS val eventDriven = mc.commType==ComponentCommunicationType::EVENT_DRIVEN @@ -470,7 +470,7 @@ abstract class AbstractStateMachineGenerator { * @param state the {@link State} * @return the generated code */ - def public String genDoCodes(State state) {''' + def String genDoCodes(State state) {''' «IF state.hasDoCode(true)» «state.doCodeOperationName»(«langExt.selfPointer(false)»); «ENDIF» @@ -488,7 +488,7 @@ abstract class AbstractStateMachineGenerator { * at all then unused variables can be avoided by passing <code>true</code> * @return the generated code */ - def public genStateSwitch(GraphContainer gc, boolean usesHdlr) { + def genStateSwitch(GraphContainer gc, boolean usesHdlr) { var async = gc.component.commType==ComponentCommunicationType::ASYNCHRONOUS var eventDriven = gc.component.commType==ComponentCommunicationType::EVENT_DRIVEN var dataDriven = gc.component.commType==ComponentCommunicationType::DATA_DRIVEN @@ -537,7 +537,7 @@ abstract class AbstractStateMachineGenerator { * at all then unused variables can be avoided by passing <code>true</code> * @return the generated code */ - def public genDataDrivenTriggers(GraphContainer gc, Node stateNode, boolean usesHdlr) { + def genDataDrivenTriggers(GraphContainer gc, Node stateNode, boolean usesHdlr) { val chainIDScope = if (langExt.usesInheritance) gc.className+langExt.scopeSeparator else "" val state = stateNode.stateGraphNode as State ''' @@ -568,7 +568,7 @@ abstract class AbstractStateMachineGenerator { * at all then unused variables can be avoided by passing <code>true</code> * @return the generated code */ - def public genEventDrivenTriggers(GraphContainer gc, Node stateNode, boolean usesHdlr) { + def genEventDrivenTriggers(GraphContainer gc, Node stateNode, boolean usesHdlr) { val caughtTriggers = new ArrayList(stateNode.caughtTriggers).sortBy[triggerCodeName] val chainIDScope = if (langExt.usesInheritance) gc.className+langExt.scopeSeparator else "" ''' @@ -595,11 +595,11 @@ abstract class AbstractStateMachineGenerator { ''' } - def public getClassName(GraphContainer gc) { + def getClassName(GraphContainer gc) { gc.component.className } - def public getClassName(ModelComponent mc) { + def getClassName(ModelComponent mc) { mc.componentName } @@ -614,7 +614,7 @@ abstract class AbstractStateMachineGenerator { * @param state the ID of the history state * @return the generated code */ - def public getHistory(String state) { + def getHistory(String state) { langExt.memberAccess+"history["+state+"]" } @@ -625,7 +625,7 @@ abstract class AbstractStateMachineGenerator { * @param historyState the ID of the state that should be assigned * @return the generated code */ - def public setHistory(String state, String historyState) { + def setHistory(String state, String historyState) { langExt.memberAccess+"history["+state+"] = "+historyState } @@ -633,7 +633,7 @@ abstract class AbstractStateMachineGenerator { * @return the type of (temporary) state variables (defaults to "int") * and has to be signed */ - def public stateType() { + def stateType() { "int" } @@ -642,7 +642,7 @@ abstract class AbstractStateMachineGenerator { * The default is just a comment. * @return the generated code */ - def public unreachableReturn() { + def unreachableReturn() { "/* return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true) */" } @@ -650,21 +650,21 @@ abstract class AbstractStateMachineGenerator { * type of (temporary) boolean variables (defaults to "boolean") * @return the generated code */ - def public boolType() { + def boolType() { return "boolean" } /** * empty, but may be overridden */ - def public finalAction() { + def finalAction() { '''''' } /** * the type of the interface item passed into the receiveEvent() method */ - def public interfaceItemType() { + def interfaceItemType() { "InterfaceItemBase" } @@ -682,12 +682,12 @@ abstract class AbstractStateMachineGenerator { * @param xpax the {@link GraphContainer} * @return <code>true</code> if the state machine uses handler transition points */ - def public usesHandlerTrPoints(GraphContainer gc) { + def usesHandlerTrPoints(GraphContainer gc) { !gc.graph.allTransitionPointNodes.filter(t|((t.stateGraphNode as TransitionPoint).handler)).empty } - def public String genTriggeredTransitionGuard(Link link, String trigger, GraphContainer mc) - def public String genGuardedTransitionGuard(Link link, String trigger, GraphContainer mc) - def public String genActionCodeMethod(GraphContainer gc, Link link, boolean generateImplementation) - def public String genActionCodeMethods(GraphContainer gc, Node node, boolean generateImplementation) + def String genTriggeredTransitionGuard(Link link, String trigger, GraphContainer mc) + def String genGuardedTransitionGuard(Link link, String trigger, GraphContainer mc) + def String genActionCodeMethod(GraphContainer gc, Link link, boolean generateImplementation) + def String genActionCodeMethods(GraphContainer gc, Node node, boolean generateImplementation) }
\ No newline at end of file diff --git a/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF index e0c527545..f8380642b 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF @@ -22,3 +22,4 @@ Export-Package: org.eclipse.etrice.generator.ui.contentassist, org.eclipse.etrice.generator.ui.contentassist.antlr, org.eclipse.etrice.generator.ui.internal Bundle-Activator: org.eclipse.etrice.generator.ui.internal.FSMtestActivator +Automatic-Module-Name: org.eclipse.etrice.generator.fsmtest.ui diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF index 29cf26ab1..6e5be66e4 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF @@ -32,4 +32,5 @@ Export-Package: org.eclipse.etrice.generator, org.eclipse.etrice.generator.scoping, org.eclipse.etrice.generator.generator, org.eclipse.etrice.generator.formatting +Automatic-Module-Name: org.eclipse.etrice.generator.fsmtest diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/plugin.xml b/plugins/org.eclipse.etrice.generator.fsmtest/plugin.xml index 3fc746238..99c9c5dcd 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest/plugin.xml +++ b/plugins/org.eclipse.etrice.generator.fsmtest/plugin.xml @@ -4,10 +4,10 @@ <plugin> <extension point="org.eclipse.emf.ecore.generated_package"> - <package + <package uri = "http://www.eclipse.org/etrice/generator/FSMtest" class = "org.eclipse.etrice.generator.fsmtest.FsmtestPackage" - genModel = "org/eclipse/etrice/generator/FSMtest.genmodel" /> + genModel = "src-gen/org/eclipse/etrice/generator/FSMtest.genmodel" /> </extension> diff --git a/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF index ce8b6b2fa..9ce7816c1 100644 --- a/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF @@ -20,3 +20,4 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.etrice.generator.base;bundle-version="2.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.eclipse.etrice.generator.gnuplot diff --git a/plugins/org.eclipse.etrice.generator.gnuplot/src/org/eclipse/etrice/generator/gnuplot/GnuplotScriptGenerator.xtend b/plugins/org.eclipse.etrice.generator.gnuplot/src/org/eclipse/etrice/generator/gnuplot/GnuplotScriptGenerator.xtend index a69ccace1..f878b1cdd 100644 --- a/plugins/org.eclipse.etrice.generator.gnuplot/src/org/eclipse/etrice/generator/gnuplot/GnuplotScriptGenerator.xtend +++ b/plugins/org.eclipse.etrice.generator.gnuplot/src/org/eclipse/etrice/generator/gnuplot/GnuplotScriptGenerator.xtend @@ -90,22 +90,22 @@ class GnuplotScriptGenerator { def protected generatePlotScript(SubSystemInstance ssi) { // TODO: warn if more than one GnuPlot annotation - val plotAnnotation = ssi.subSystemClass.annotations.filter [ a | - a.type.name == "Gnuplot" - ].head - - val defaultFontsize = 10 +// val plotAnnotation = ssi.subSystemClass.annotations.filter [ a | +// a.type.name == "Gnuplot" +// ].head +// +// val defaultFontsize = 10 // TODO: error checking - val format = plotAnnotation?.getAttribute("format")?.asString - val outputfile = plotAnnotation?.getAttribute("outputfile")?.asString - val width = plotAnnotation?.getAttribute("width")?.asInteger - val height = plotAnnotation?.getAttribute("height")?.asInteger - val fontsize = plotAnnotation?.getAttribute("fontsize")?.asInteger ?: defaultFontsize - - val graphAnnotations = ssi.subSystemClass.annotations.filter [ a | - a.type.name == "GnuplotGraph" - ].toList +// val format = plotAnnotation?.getAttribute("format")?.asString +// val outputfile = plotAnnotation?.getAttribute("outputfile")?.asString +// val width = plotAnnotation?.getAttribute("width")?.asInteger +// val height = plotAnnotation?.getAttribute("height")?.asInteger +// val fontsize = plotAnnotation?.getAttribute("fontsize")?.asInteger ?: defaultFontsize +// +// val graphAnnotations = ssi.subSystemClass.annotations.filter [ a | +// a.type.name == "GnuplotGraph" +// ].toList ''' #!/gnuplot @@ -120,18 +120,18 @@ class GnuplotScriptGenerator { cd 'log' set datafile separator comma - set terminal «format» size «width»,«height» font ",«fontsize»" background "white" - set output '«outputfile»' + set terminal �format� size �width�,�height� font ",�fontsize�" background "white" + set output '�outputfile�' set size 1,1 - set multiplot layout «graphAnnotations.size»,1 + set multiplot layout �graphAnnotations.size�,1 set grid show grid set format y "% 5.3f" - «var i = 0» - «FOR a : graphAnnotations» + �var i = 0� + �FOR a : graphAnnotations� - «ssi.generateGraph(a, i++, graphAnnotations.size)» - «ENDFOR» + �ssi.generateGraph(a, i++, graphAnnotations.size)� + �ENDFOR� unset multiplot unset output @@ -142,28 +142,28 @@ class GnuplotScriptGenerator { def protected generateGraph(SubSystemInstance ssi, Annotation graph, int index, int total) { // TODO: handle multiple paths in the same graph - val paths = graph.getAttribute("paths")?.asString +// val paths = graph.getAttribute("paths")?.asString // TODO: take interval from physical thread associated with actor instance instead of annotation attribute - val interval = graph.getAttribute("interval")?.asInteger ?: 20 - val xtics = graph.getAttribute("xtics")?.asReal ?: 100 - val mxtics = graph.getAttribute("mxtics")?.asInteger ?: 4 - val ymin = graph.getAttribute("ymin")?.asReal - val ymax = graph.getAttribute("ymax")?.asReal - - val vertOrigin = ((total - (index + 1)) as double) / total - val vertSize = 1.0F / total +// val interval = graph.getAttribute("interval")?.asInteger ?: 20 +// val xtics = graph.getAttribute("xtics")?.asReal ?: 100 +// val mxtics = graph.getAttribute("mxtics")?.asInteger ?: 4 +// val ymin = graph.getAttribute("ymin")?.asReal +// val ymax = graph.getAttribute("ymax")?.asReal +// +// val vertOrigin = ((total - (index + 1)) as double) / total +// val vertSize = 1.0F / total ''' - set yrange [«ymin ?: "*"» : «ymax ?: "*"»] - set xtics rotate «xtics» - set mxtics «mxtics» + set yrange [�ymin ?: "*"� : �ymax ?: "*"�] + set xtics rotate �xtics� + set mxtics �mxtics� set ylabel set xlabel "time (ms)" - timeInMs(x) = «interval» * x - set origin 0,«vertOrigin» - set size 1,«vertSize» - plot 'main.data.csv' using (timeInMs(column(1))):(column("«paths»")) with lines + timeInMs(x) = �interval� * x + set origin 0,�vertOrigin� + set size 1,�vertSize� + plot 'main.data.csv' using (timeInMs(column(1))):(column("�paths�")) with lines ''' } } diff --git a/plugins/org.eclipse.etrice.generator.java/.project b/plugins/org.eclipse.etrice.generator.java/.project index b88e23b7d..606dd4f9a 100644 --- a/plugins/org.eclipse.etrice.generator.java/.project +++ b/plugins/org.eclipse.etrice.generator.java/.project @@ -46,6 +46,5 @@ <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> - <nature>org.eclipse.xtend.shared.ui.xtendXPandNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF index 1a3a725c4..ab798710d 100644 --- a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF @@ -20,3 +20,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.java, org.eclipse.etrice.generator.java.gen, org.eclipse.etrice.generator.java.setup +Automatic-Module-Name: org.eclipse.etrice.generator.java diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.xtend index 3c0dfbcf5..7f6b2fa87 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.xtend @@ -42,7 +42,7 @@ class ConfigGenAddon { // For SubSystemClassGen - def public genActorInstanceConfig(ActorInstance ai, String aiVariableName){''' + def genActorInstanceConfig(ActorInstance ai, String aiVariableName){''' «FOR a : ai.actorClass.allAttributes» «applyInstanceConfig(ai, aiVariableName, new ArrayList<Attribute>().union(a))» «ENDFOR» @@ -73,7 +73,7 @@ class ConfigGenAddon { } DataClass: ''' - «FOR e : (aType as DataClass).allAttributes» + «FOR e : aType.allAttributes» «applyInstanceConfig(instance, invokes+"."+a.name.invokeGetter(null), path.union(e))» «ENDFOR» ''' @@ -82,7 +82,7 @@ class ConfigGenAddon { // For ActorClassGen - def public genDynConfigGetterSetter(ActorClass ac){''' + def genDynConfigGetterSetter(ActorClass ac){''' «FOR a : dataConfigExt.getDynConfigReadAttributes(ac)» public «a.type.type.typeName»«IF a.size>0»[]«ENDIF» get«a.name.toFirstUpper»(){ if(lock_«a.name» == null) @@ -112,7 +112,7 @@ class ConfigGenAddon { «ENDFOR» '''} - def public genMinMaxConstants(ActorClass ac){ + def genMinMaxConstants(ActorClass ac){ var result = ''' «FOR a : ac.allAttributes» «genMinMaxConstantsRec(ac, a.name, new ArrayList<Attribute>().union(a))» @@ -128,7 +128,7 @@ class ConfigGenAddon { switch aType { DataClass: ''' - «FOR e : (aType as DataClass).allAttributes» + «FOR e : aType.allAttributes» «genMinMaxConstantsRec(ac, varNamePath+"_"+e.name, path.union(e))» «ENDFOR» ''' diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/Initialization.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/Initialization.xtend index 539fe8728..98abc87d5 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/Initialization.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/Initialization.xtend @@ -81,7 +81,7 @@ class Initialization { switch (aType) { DataClass: return ''' - «FOR e : (aType as DataClass).allAttributes» + «FOR e : aType.allAttributes» «attributeInitPrimitiveRec(path.union(e), roomClass)» «ENDFOR» ''' diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaExtensions.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaExtensions.xtend index 5f2a5e64b..6848cc105 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaExtensions.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaExtensions.xtend @@ -37,9 +37,9 @@ import org.eclipse.etrice.core.room.PrimitiveType import org.eclipse.etrice.core.room.RoomClass import org.eclipse.etrice.generator.generic.ILanguageExtension import org.eclipse.etrice.generator.generic.TypeHelpers -import org.eclipse.xtext.util.Pair import org.eclipse.etrice.generator.java.Main import org.eclipse.etrice.generator.java.setup.GeneratorOptionsHelper +import org.eclipse.xtext.util.Pair @Singleton class JavaExtensions implements ILanguageExtension { @@ -49,7 +49,7 @@ class JavaExtensions implements ILanguageExtension { override String getTypedDataDefinition(EObject msg) { if (msg instanceof Message) { - generateArglistAndTypedData((msg as Message).data).get(TypedDataKind.DECLARATION_AND_INITIALIZATION.ordinal) + generateArglistAndTypedData(msg.data).get(TypedDataKind.DECLARATION_AND_INITIALIZATION.ordinal) } else { "" @@ -215,9 +215,9 @@ class JavaExtensions implements ILanguageExtension { EnumerationType: dt.defaultValue ExternalType: - "new "+(dt as ExternalType).targetName+"()" + "new "+ dt.targetName+"()" default: - "new "+dt.name+"()" + "new "+ dt.name+"()" } } diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/MainGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/MainGen.xtend index f6c41eaee..a8f7f0399 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/MainGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/MainGen.xtend @@ -42,7 +42,7 @@ class MainGen { prepFS.prepare for (e: resource.contents){ if (e instanceof Root) { - doGenerate(e as Root) + doGenerate(e) } } } diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/NodeGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/NodeGen.xtend index 7ac34c3d5..eefc984d1 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/NodeGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/NodeGen.xtend @@ -90,7 +90,7 @@ class NodeGen { */ def private HashSet<ActorClass> getOptionalActorClasses(Root root, StructureInstance si) { val aifs = Lists::newArrayList(si.eAllContents.filter(i|i instanceof ActorInterfaceInstance).map[aii|aii as ActorInterfaceInstance]) - val result = Sets::newHashSet(aifs.map[aii|(aii as ActorInterfaceInstance).actorClass]) + val result = Sets::newHashSet(aifs.map[aii|aii.actorClass]) for (ai : aifs) { for (oi : ai.optionalInstances) { result.addAll(root.getOptionalActorClasses(oi)) diff --git a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF index 27fb91787..822ebd82b 100644 --- a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF @@ -23,3 +23,4 @@ Import-Package: org.eclipse.jdt.launching, org.eclipse.ui.dialogs Bundle-Vendor: Eclipse eTrice Export-Package: org.eclipse.etrice.generator.launch.c +Automatic-Module-Name: org.eclipse.etrice.generator.launch.c diff --git a/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF index 6bd837ffb..83d4fc1ae 100644 --- a/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF @@ -23,3 +23,4 @@ Import-Package: org.eclipse.jdt.launching, org.eclipse.ui.dialogs Bundle-Vendor: Eclipse eTrice Export-Package: org.eclipse.etrice.generator.launch.cpp +Automatic-Module-Name: org.eclipse.etrice.generator.launch.cpp diff --git a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF index 56e5979ed..18ca42191 100644 --- a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF @@ -23,3 +23,4 @@ Import-Package: org.eclipse.jdt.launching, org.eclipse.ui.dialogs Bundle-Vendor: Eclipse eTrice Export-Package: org.eclipse.etrice.generator.launch.java +Automatic-Module-Name: org.eclipse.etrice.generator.launch.java diff --git a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF index 059c8ad61..2daa273f8 100644 --- a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF @@ -25,3 +25,4 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice Export-Package: org.eclipse.etrice.generator.launch +Automatic-Module-Name: org.eclipse.etrice.generator.launch diff --git a/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF index 0e5a38314..7bf9f1aa6 100644 --- a/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF @@ -20,3 +20,4 @@ Import-Package: org.eclipse.core.resources, org.eclipse.core.runtime.jobs Bundle-Activator: org.eclipse.etrice.generator.ui.cdt.Activator Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.eclipse.etrice.generator.ui.cdt diff --git a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF index 7b4b95618..f00b1a2bd 100644 --- a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF @@ -32,3 +32,4 @@ Bundle-Activator: org.eclipse.etrice.generator.ui.Activator Export-Package: org.eclipse.etrice.generator.ui.configurator, org.eclipse.etrice.generator.ui.preferences, org.eclipse.etrice.generator.ui.wizard +Automatic-Module-Name: org.eclipse.etrice.generator.ui diff --git a/plugins/org.eclipse.etrice.generator/.project b/plugins/org.eclipse.etrice.generator/.project index b81cd7c49..6d8182e0b 100644 --- a/plugins/org.eclipse.etrice.generator/.project +++ b/plugins/org.eclipse.etrice.generator/.project @@ -40,7 +40,6 @@ <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.xtend.shared.ui.xtendXPandNature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF index 9ab994acf..30060d745 100644 --- a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF @@ -25,3 +25,4 @@ Require-Bundle: org.eclipse.etrice.generator.base;bundle-version="2.0.0", org.eclipse.etrice.core.config Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.etrice.generator.generic +Automatic-Module-Name: org.eclipse.etrice.generator diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend index 9d5223f6b..40ae6f7a8 100644 --- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend +++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend @@ -213,5 +213,5 @@ class GenericStateMachineGenerator extends AbstractStateMachineGenerator { * @param generateImplementation or declaration only * @return the generated code */ - def public genExtra(GraphContainer gc, boolean generateImplementation) {''''''} + def genExtra(GraphContainer gc, boolean generateImplementation) {''''''} } diff --git a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF index f85df0789..efc993c10 100644 --- a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF @@ -6,3 +6,4 @@ Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Eclipse eTrice Fragment-Host: org.apache.log4j;bundle-version="1.2.15" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Automatic-Module-Name: org.eclipse.etrice.logging diff --git a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF index 9d0d29e0f..789b6cd20 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF @@ -28,4 +28,5 @@ Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.etrice.ui.behavior.actioneditor, org.eclipse.etrice.ui.behavior.actioneditor.sourceviewer Bundle-Vendor: eTrice +Automatic-Module-Name: org.eclipse.etrice.ui.behavior.actioneditor diff --git a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/src/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/SourceViewerActionCodeEditor.java b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/src/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/SourceViewerActionCodeEditor.java index 82b87a930..e2689e85e 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/src/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/SourceViewerActionCodeEditor.java +++ b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/src/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/SourceViewerActionCodeEditor.java @@ -363,7 +363,7 @@ public class SourceViewerActionCodeEditor extends AbstractActionCodeEditor { * commands. */ protected void activateContext() { - IContextService contextService = (IContextService) PlatformUI + IContextService contextService = PlatformUI .getWorkbench().getService(IContextService.class); if (contextService != null) fActivation = contextService @@ -379,12 +379,12 @@ public class SourceViewerActionCodeEditor extends AbstractActionCodeEditor { * Deactivate editors context and command handlers. */ protected void deactivateContext() { - IContextService contextService = (IContextService) PlatformUI + IContextService contextService = PlatformUI .getWorkbench().getService(IContextService.class); if (contextService != null) contextService.deactivateContext(fActivation); - IHandlerService handlerService = (IHandlerService) PlatformUI + IHandlerService handlerService = PlatformUI .getWorkbench().getService(IHandlerService.class); if (handlerService != null && activatedHandlers != null) { handlerService.deactivateHandlers(activatedHandlers.values()); @@ -402,7 +402,7 @@ public class SourceViewerActionCodeEditor extends AbstractActionCodeEditor { * the operation code for the required operation to be performed */ protected void activateHandler(String commandId, int operation) { - IHandlerService handlerService = (IHandlerService) PlatformUI + IHandlerService handlerService = PlatformUI .getWorkbench().getService(IHandlerService.class); if (handlerService != null) { IHandlerActivation contentAssistHandlerActivation = handlerService @@ -421,7 +421,7 @@ public class SourceViewerActionCodeEditor extends AbstractActionCodeEditor { * the Id of the command. */ protected void deactivateHandler(String commandId) { - IHandlerService handlerService = (IHandlerService) PlatformUI + IHandlerService handlerService = PlatformUI .getWorkbench().getService(IHandlerService.class); if (handlerService != null && activatedHandlers != null) { handlerService.deactivateHandler(activatedHandlers.get(commandId)); diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF index 8c5c5671e..75ca69783 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF @@ -32,3 +32,4 @@ Export-Package: org.eclipse.etrice.ui.behavior.fsm, org.eclipse.etrice.ui.behavior.fsm.provider, org.eclipse.etrice.ui.behavior.fsm.support, org.eclipse.etrice.ui.behavior.fsm.support.util +Automatic-Module-Name: org.eclipse.etrice.ui.behavior.fsm diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/actioneditor/ActionCodeEditorRegistry.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/actioneditor/ActionCodeEditorRegistry.java index bfc1a81e9..4fcfe4f51 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/actioneditor/ActionCodeEditorRegistry.java +++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/actioneditor/ActionCodeEditorRegistry.java @@ -210,7 +210,7 @@ public class ActionCodeEditorRegistry { found.add(entry); } - return (ActionCodeEditorRegistryEntry[]) found + return found .toArray(new ActionCodeEditorRegistryEntry[found.size()]); } @@ -241,7 +241,7 @@ public class ActionCodeEditorRegistry { } } - cachedEditorEntries = (ActionCodeEditorRegistryEntry[]) found + cachedEditorEntries = found .toArray(new ActionCodeEditorRegistryEntry[found.size()]); return cachedEditorEntries; } diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/actioneditor/preferences/ActionEditorPreferencePage.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/actioneditor/preferences/ActionEditorPreferencePage.java index d3854f7ab..4cda15dc3 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/actioneditor/preferences/ActionEditorPreferencePage.java +++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/actioneditor/preferences/ActionEditorPreferencePage.java @@ -83,7 +83,7 @@ public class ActionEditorPreferencePage extends FieldEditorPreferencePage editorChoices.add(choice); } - return (String[][]) editorChoices.toArray(new String[editorChoices + return editorChoices.toArray(new String[editorChoices .size()][]); } diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/ChoicePointSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/ChoicePointSupport.java index 735ad57d8..e1ed454c4 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/ChoicePointSupport.java +++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/ChoicePointSupport.java @@ -603,7 +603,7 @@ public class ChoicePointSupport { i++; } - return (IDecorator[]) decorators + return decorators .toArray(new IDecorator[decorators.size()]); } } diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java index 5db32c425..b9c0868b6 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java +++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java @@ -114,7 +114,7 @@ public class StateGraphSupport { @Override public PictogramElement add(IAddContext context) { StateGraph sg = (StateGraph) context.getNewObject(); - ContainerShape targetContainer = (ContainerShape) context.getTargetContainer(); + ContainerShape targetContainer = context.getTargetContainer(); // CONTAINER SHAPE WITH RECTANGLE IPeCreateService peCreateService = Graphiti.getPeCreateService(); @@ -674,7 +674,7 @@ public class StateGraphSupport { i++; } - return (IDecorator[]) decorators + return decorators .toArray(new IDecorator[decorators.size()]); } } diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java index 83a64b281..3134f8849 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java +++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java @@ -685,7 +685,7 @@ public class StateSupport { GraphicsAlgorithm invisibleRect = containerShape.getGraphicsAlgorithm(); if (!invisibleRect.getGraphicsAlgorithmChildren().isEmpty()) { GraphicsAlgorithm borderRect = invisibleRect.getGraphicsAlgorithmChildren().get(0); - updateHints(s, (RoundedRectangle) borderRect); + updateHints(s, borderRect); } } @@ -1108,7 +1108,7 @@ public class StateSupport { i++; } - return (IDecorator[]) decorators + return decorators .toArray(new IDecorator[decorators.size()]); } } diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TrPointSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TrPointSupport.java index 8917ec3fc..24fb6ea99 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TrPointSupport.java +++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TrPointSupport.java @@ -1030,7 +1030,7 @@ public class TrPointSupport { i++; } - return (IDecorator[]) decorators + return decorators .toArray(new IDecorator[decorators.size()]); } } diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java index f8a95ab0a..7bb3615fe 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java +++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java @@ -1052,7 +1052,7 @@ public class TransitionSupport { i++; } - return (IDecorator[]) decorators + return decorators .toArray(new IDecorator[decorators.size()]); } } diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.xtend b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.xtend index 3bd5500b7..449ac787a 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.xtend +++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.xtend @@ -28,11 +28,11 @@ import org.eclipse.graphiti.mm.pictograms.ContainerShape */ class ModelEditingUtil { - def static public RefinedState getOrCreateRefinedStateFor(State s, ModelComponent mc) { + def static RefinedState getOrCreateRefinedStateFor(State s, ModelComponent mc) { val target2rs = new HashMap<State, RefinedState>(); for (State st : mc.getStateMachine().getStates()) { if (st instanceof RefinedState) - target2rs.put((st as RefinedState).getTarget(), st as RefinedState); + target2rs.put(st.getTarget(), st); } var RefinedState rs = null; @@ -69,7 +69,7 @@ class ModelEditingUtil { - def static public StateGraph getOrCreateSubGraphOfRefinedStateFor(State s, ModelComponent mc) { + def static StateGraph getOrCreateSubGraphOfRefinedStateFor(State s, ModelComponent mc) { val rs = getOrCreateRefinedStateFor(s, mc); if (rs.getSubgraph()===null) @@ -78,7 +78,7 @@ class ModelEditingUtil { return rs.getSubgraph(); } - def static public StateGraph insertRefinedState(StateGraph sg, ModelComponent mc, ContainerShape targetContainer, IFeatureProvider fp) { + def static StateGraph insertRefinedState(StateGraph sg, ModelComponent mc, ContainerShape targetContainer, IFeatureProvider fp) { val sg2 = getOrCreateSubGraphOfRefinedStateFor(sg.eContainer() as State, mc); fp.link(targetContainer, sg2); return sg2; diff --git a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF index 8bf515816..f104a6fb8 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF @@ -29,3 +29,4 @@ Bundle-Vendor: Eclipse eTrice Export-Package: org.eclipse.etrice.ui.behavior, org.eclipse.etrice.ui.behavior.editor, org.eclipse.etrice.ui.behavior.support +Automatic-Module-Name: org.eclipse.etrice.ui.behavior diff --git a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF index e9fceb08f..e0adbf383 100644 --- a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF @@ -21,3 +21,4 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0", Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.etrice.ui.commands +Automatic-Module-Name: org.eclipse.etrice.ui.commands diff --git a/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF index fec558aec..54d745155 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF @@ -40,3 +40,4 @@ Export-Package: org.eclipse.etrice.ui.common.base, org.eclipse.etrice.ui.common.base.refactoring, org.eclipse.etrice.ui.common.base.resource, org.eclipse.etrice.ui.common.base.support +Automatic-Module-Name: org.eclipse.etrice.ui.common.base diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java index 8b5007b8e..f25be7e36 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java +++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java @@ -74,6 +74,7 @@ import org.eclipse.xtext.resource.IEObjectDescription; // note: the FormDialog of org.eclipse.ui.forms.source_3.7.0 requires JavaSE-1.8 // therefore we need to set the BREE of this plug-in also to Java 8 +@SuppressWarnings({"rawtypes", "unchecked"}) public abstract class AbstractPropertyDialog extends FormDialog { private class GlobalStatus extends ComputedValue { diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/MultiValidator2.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/MultiValidator2.java index b6f938f1b..17f91d427 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/MultiValidator2.java +++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/MultiValidator2.java @@ -36,6 +36,7 @@ import org.eclipse.core.runtime.IStatus; * But is aware of converters and pre-validators and treats a last valid state of any value as failure. * */ +@SuppressWarnings({"rawtypes", "unchecked"}) public abstract class MultiValidator2 extends MultiValidator { private int targetCount; diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/refactoring/DiagramReferenceUpdater.xtend b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/refactoring/DiagramReferenceUpdater.xtend index 5d78aab4c..e371b65db 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/refactoring/DiagramReferenceUpdater.xtend +++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/refactoring/DiagramReferenceUpdater.xtend @@ -29,7 +29,6 @@ import org.eclipse.ltk.core.refactoring.resource.RenameResourceChange import org.eclipse.xtext.resource.IReferenceDescription import org.eclipse.xtext.ui.refactoring.ElementRenameArguments import org.eclipse.xtext.ui.refactoring.IRefactoringUpdateAcceptor -import org.eclipse.xtext.ui.refactoring.impl.EmfResourceChangeUtil import org.eclipse.xtext.ui.refactoring.impl.EmfResourceReferenceUpdater /** @@ -38,7 +37,6 @@ import org.eclipse.xtext.ui.refactoring.impl.EmfResourceReferenceUpdater class DiagramReferenceUpdater extends EmfResourceReferenceUpdater { @Inject DiagramAccessBase diagramAccess - @Inject EmfResourceChangeUtil changeUtil override protected createReferenceUpdates(ElementRenameArguments elementRenameArguments, Multimap<URI, IReferenceDescription> resource2references, ResourceSet resourceSet, IRefactoringUpdateAcceptor updateAcceptor, IProgressMonitor monitor) { diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/support/HelpFeature.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/support/HelpFeature.java index 606e380c3..deef77c22 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/support/HelpFeature.java +++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/support/HelpFeature.java @@ -41,10 +41,9 @@ public class HelpFeature extends AbstractCustomFeature { } public String getFeatureId(ICustomContext context) { - if (context instanceof ICustomContext) { - ICustomContext peContext = (ICustomContext) context; - if (peContext.getPictogramElements() != null && peContext.getPictogramElements().length == 1){ - PictogramElement pe = peContext.getPictogramElements()[0]; + if (context != null) { + if (context.getPictogramElements() != null && context.getPictogramElements().length == 1){ + PictogramElement pe = context.getPictogramElements()[0]; // don't show help for diagram input if(getBusinessObjectForPictogramElement(pe) == getBusinessObjectForPictogramElement(getDiagram())) return null; @@ -70,7 +69,7 @@ public class HelpFeature extends AbstractCustomFeature { @Override public IStatus runInUIThread(IProgressMonitor monitor) { - ContextHelpProvider.showHelp(getBoClassName(((ICustomContext) context).getPictogramElements()[0])); + ContextHelpProvider.showHelp(getBoClassName(context.getPictogramElements()[0])); return Status.OK_STATUS; } diff --git a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF index f678dccf3..681aa5ad7 100644 --- a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF @@ -29,3 +29,4 @@ Export-Package: org.eclipse.etrice.ui.common, Bundle-Activator: org.eclipse.etrice.ui.common.Activator Bundle-ActivationPolicy: lazy Import-Package: org.apache.log4j +Automatic-Module-Name: org.eclipse.etrice.ui.common diff --git a/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF index a8476a5e8..2fa41eee1 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF @@ -13,3 +13,4 @@ Require-Bundle: org.eclipse.ui, Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.etrice.ui.runtime +Automatic-Module-Name: org.eclipse.etrice.ui.runtime diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip Binary files differindex c92e987f7..130fa594f 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.java.zip Binary files differindex 5453bafc8..9e60947f9 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.java.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.java.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip Binary files differindex 2a8e43c73..75e82abe3 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip Binary files differindex a26558e52..143b51a59 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip Binary files differindex 43062a492..5f7e2b6e3 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip Binary files differindex 24c900955..7f91657e1 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip Binary files differindex fe13fef3d..7a89fee80 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip Binary files differindex 4fa2a0357..b65e659ee 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip Binary files differindex 47920b350..74011ea40 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.cpp.zip Binary files differindex 25431c5de..73aa8f6e1 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.cpp.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.cpp.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip Binary files differindex 448d9b124..8b4fbf839 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.cpp.zip Binary files differindex db5f72e92..d634b7af2 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.cpp.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.cpp.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip Binary files differindex 06af784a4..d040fc4b1 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/plugin.xml b/plugins/org.eclipse.etrice.ui.runtime/plugin.xml index e745dfafc..e3fe8fa52 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/plugin.xml +++ b/plugins/org.eclipse.etrice.ui.runtime/plugin.xml @@ -24,17 +24,17 @@ <category id="org.eclipse.etrice.core.ui.libraryCCategory" name="Libraries" - parentCategory="org.eclipse.etrice.core.ui.wizardCategory/org.eclipse.etrice.core.ui.wizardCCategory"> + parentCategory="org.eclipse.etrice.core.ui.wizardCCategory"> </category> <category id="org.eclipse.etrice.core.ui.libraryCppCategory" name="Libraries" - parentCategory="org.eclipse.etrice.core.ui.wizardCategory/org.eclipse.etrice.core.ui.wizardCppCategory"> + parentCategory="org.eclipse.etrice.core.ui.wizardCppCategory"> </category> <category id="org.eclipse.etrice.core.ui.libraryJavaCategory" name="Libraries" - parentCategory="org.eclipse.etrice.core.ui.wizardCategory/org.eclipse.etrice.core.ui.wizardJavaCategory"> + parentCategory="org.eclipse.etrice.core.ui.wizardJavaCategory"> </category> </extension> diff --git a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF index c5f562e35..629073a6e 100644 --- a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF @@ -26,3 +26,4 @@ Export-Package: org.eclipse.etrice.ui.structure, org.eclipse.etrice.ui.structure.editor, org.eclipse.etrice.ui.structure.support Import-Package: org.eclipse.etrice.ui.commands +Automatic-Module-Name: org.eclipse.etrice.ui.structure diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/ProviderDispatcher.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/ProviderDispatcher.java index 9ae72f8e5..0d892dd88 100644 --- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/ProviderDispatcher.java +++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/ProviderDispatcher.java @@ -476,6 +476,7 @@ public class ProviderDispatcher { return featureSwitch.getCreateConnectionFeatures(); } + @SafeVarargs private static <T> T[] concatAll(T[] first, T[]... rest) { int totalLength = first.length; for (T[] array : rest) { diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/dialogs/ActorContainerRefPropertyDialog.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/dialogs/ActorContainerRefPropertyDialog.java index 87f1ecfa4..3193aa4a2 100644 --- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/dialogs/ActorContainerRefPropertyDialog.java +++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/dialogs/ActorContainerRefPropertyDialog.java @@ -51,6 +51,7 @@ import org.eclipse.ui.forms.IManagedForm; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.scoping.IScope; +@SuppressWarnings("rawtypes") public class ActorContainerRefPropertyDialog extends AbstractPropertyDialog { class NameValidator implements IValidator { diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/dialogs/PortPropertyDialog.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/dialogs/PortPropertyDialog.java index 37048222f..476d4430e 100644 --- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/dialogs/PortPropertyDialog.java +++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/dialogs/PortPropertyDialog.java @@ -58,6 +58,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.scoping.IScope; +@SuppressWarnings({"rawtypes", "unchecked", "deprecation"}) public class PortPropertyDialog extends AbstractPropertyDialog { class NameValidator implements IValidator { diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/dialogs/SPPPropertyDialog.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/dialogs/SPPPropertyDialog.java index e89d15be7..fb31b8763 100644 --- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/dialogs/SPPPropertyDialog.java +++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/dialogs/SPPPropertyDialog.java @@ -43,6 +43,7 @@ import org.eclipse.xtext.scoping.IScope; public class SPPPropertyDialog extends AbstractPropertyDialog { + @SuppressWarnings("rawtypes") class NameValidator implements IValidator { @Override @@ -60,6 +61,7 @@ public class SPPPropertyDialog extends AbstractPropertyDialog { } } + @SuppressWarnings("rawtypes") class ProtocolValidator implements IValidator { @Override diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/BindingSupport.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/BindingSupport.java index 997541931..4cb906c08 100644 --- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/BindingSupport.java +++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/BindingSupport.java @@ -359,7 +359,7 @@ public class BindingSupport { GeneralProtocolClass srcGPC = src.getProtocol(); GeneralProtocolClass dstGPC = dst.getProtocol(); - if (srcGPC instanceof GeneralProtocolClass || dstGPC instanceof GeneralProtocolClass) { + if (srcGPC != null || dstGPC != null) { Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); SubProtocolSelectionDialog dlg = new SubProtocolSelectionDialog(shell, src, ar1, dst, ar2, bind, sc); if (dlg.open()!=Window.OK) diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/provider/SuperDiagramPositionProvider.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/provider/SuperDiagramPositionProvider.java index 4558f9efd..a2eef0ea1 100644 --- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/provider/SuperDiagramPositionProvider.java +++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/support/provider/SuperDiagramPositionProvider.java @@ -192,7 +192,7 @@ public class SuperDiagramPositionProvider implements IPositionProvider { parent.inner = acInner; // refs & interface items - for (Shape shape : ((ContainerShape) acShape).getChildren()) { + for (Shape shape : acShape.getChildren()) { EObject obj = linkService.getBusinessObjectForLinkedPictogramElement(shape); // positions diff --git a/runtime/org.eclipse.etrice.modellib.java/.classpath b/runtime/org.eclipse.etrice.modellib.java/.classpath index 13453a62f..0e7dd0764 100644 --- a/runtime/org.eclipse.etrice.modellib.java/.classpath +++ b/runtime/org.eclipse.etrice.modellib.java/.classpath @@ -9,7 +9,7 @@ </classpathentry> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.runtime.java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> diff --git a/runtime/org.eclipse.etrice.modellib.java/.settings/org.eclipse.jdt.core.prefs b/runtime/org.eclipse.etrice.modellib.java/.settings/org.eclipse.jdt.core.prefs index 3c082d56e..5d6e0348b 100644 --- a/runtime/org.eclipse.etrice.modellib.java/.settings/org.eclipse.jdt.core.prefs +++ b/runtime/org.eclipse.etrice.modellib.java/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,7 @@ -#Mon Sep 19 09:34:05 CEST 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -74,4 +73,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF index 8b772fd34..325a9e533 100644 --- a/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF +++ b/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF @@ -4,4 +4,5 @@ Bundle-Name: eTrice Java ModelLib Bundle-SymbolicName: org.eclipse.etrice.modellib.java Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Eclipse eTrice -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Automatic-Module-Name: org.eclipse.etrice.modellib.java diff --git a/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF index 54c38e555..5c8c997f9 100644 --- a/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF +++ b/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF @@ -5,3 +5,4 @@ Bundle-SymbolicName: org.eclipse.etrice.runtime.java.aspects Bundle-Version: 2.0.0.qualifier Export-Package: org.eclipse.etrice.runtime.java.aspects Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Automatic-Module-Name: org.eclipse.etrice.runtime.java.aspects diff --git a/runtime/org.eclipse.etrice.runtime.java/.classpath b/runtime/org.eclipse.etrice.runtime.java/.classpath index 695d89ba1..94f98107f 100644 --- a/runtime/org.eclipse.etrice.runtime.java/.classpath +++ b/runtime/org.eclipse.etrice.runtime.java/.classpath @@ -11,7 +11,7 @@ <attribute name="ignore_optional_problems" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> diff --git a/runtime/org.eclipse.etrice.runtime.java/.settings/org.eclipse.jdt.core.prefs b/runtime/org.eclipse.etrice.runtime.java/.settings/org.eclipse.jdt.core.prefs index 107056a36..91ca62e27 100644 --- a/runtime/org.eclipse.etrice.runtime.java/.settings/org.eclipse.jdt.core.prefs +++ b/runtime/org.eclipse.etrice.runtime.java/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,14 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF index 64aa8044c..31276323c 100644 --- a/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF +++ b/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF @@ -9,4 +9,5 @@ Export-Package: org.eclipse.etrice.runtime.java.config, org.eclipse.etrice.runtime.java.messaging, org.eclipse.etrice.runtime.java.modelbase Bundle-Vendor: Eclipse eTrice -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Automatic-Module-Name: org.eclipse.etrice.runtime.java diff --git a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/config/AbstractVariableService.java b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/config/AbstractVariableService.java index 040f2fd9e..c9006f555 100644 --- a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/config/AbstractVariableService.java +++ b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/config/AbstractVariableService.java @@ -560,7 +560,7 @@ public abstract class AbstractVariableService implements IVariableService { + ((id != null) ? " (" + id + ")" : "")); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({ "rawtypes" }) private static final Set<Class> PRIMITIVE_TYPES = new HashSet<Class>( Arrays.asList(Boolean.class, Character.class, String.class, Byte.class, Short.class, Integer.class, Long.class, diff --git a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF index 41a358408..052ce01d5 100644 --- a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF @@ -16,3 +16,4 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0", Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.etrice.abstractexec.behavior +Automatic-Module-Name: org.eclipse.etrice.abstractexec.behavior.tests diff --git a/tests/org.eclipse.etrice.core.common.tests/.classpath b/tests/org.eclipse.etrice.core.common.tests/.classpath index 1cf555d1b..d4fb90f92 100644 --- a/tests/org.eclipse.etrice.core.common.tests/.classpath +++ b/tests/org.eclipse.etrice.core.common.tests/.classpath @@ -2,7 +2,11 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src-gen"/> + <classpathentry kind="src" path="src-gen"> + <attributes> + <attribute name="ignore_optional_problems" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="src" path="models"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="xtend-gen"/> diff --git a/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF index 6c21fd186..8401997fa 100644 --- a/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF @@ -7,10 +7,11 @@ Bundle-SymbolicName: org.eclipse.etrice.core.common.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.etrice.core.common, org.eclipse.core.runtime, - org.eclipse.xtext.junit4;bundle-version="2.6.0", org.eclipse.xtext.xbase.lib, org.eclipse.etrice.core.common.ui, - org.eclipse.ui.workbench;resolution:=optional + org.eclipse.ui.workbench;resolution:=optional, + org.eclipse.xtext.testing;bundle-version="2.15.0", + org.eclipse.xtext.junit4;bundle-version="2.15.0" Import-Package: org.apache.log4j, org.junit;version="4.5.0", org.junit.runner;version="4.5.0", @@ -22,3 +23,4 @@ Import-Package: org.apache.log4j, Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.common.tests, org.eclipse.etrice.core.common +Automatic-Module-Name: org.eclipse.etrice.core.common.tests diff --git a/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestInjectorProvider.java b/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestInjectorProvider.java index ffea490b8..64862ce29 100644 --- a/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestInjectorProvider.java +++ b/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestInjectorProvider.java @@ -5,10 +5,10 @@ package org.eclipse.etrice.core.common; import com.google.inject.Guice; import com.google.inject.Injector; -import org.eclipse.xtext.junit4.GlobalRegistries; -import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento; -import org.eclipse.xtext.junit4.IInjectorProvider; -import org.eclipse.xtext.junit4.IRegistryConfigurator; +import org.eclipse.xtext.testing.GlobalRegistries; +import org.eclipse.xtext.testing.GlobalRegistries.GlobalStateMemento; +import org.eclipse.xtext.testing.IInjectorProvider; +import org.eclipse.xtext.testing.IRegistryConfigurator; public class BaseTestInjectorProvider implements IInjectorProvider, IRegistryConfigurator { diff --git a/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestUiInjectorProvider.java b/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestUiInjectorProvider.java index b22656d72..799fce1ac 100644 --- a/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestUiInjectorProvider.java +++ b/tests/org.eclipse.etrice.core.common.tests/src-gen/org/eclipse/etrice/core/common/BaseTestUiInjectorProvider.java @@ -3,7 +3,7 @@ */ package org.eclipse.etrice.core.common; -import org.eclipse.xtext.junit4.IInjectorProvider; +import org.eclipse.xtext.testing.IInjectorProvider; import com.google.inject.Injector; diff --git a/tests/org.eclipse.etrice.core.common.tests/src/org/eclipse/etrice/core/common/tests/CCStringTest.xtend b/tests/org.eclipse.etrice.core.common.tests/src/org/eclipse/etrice/core/common/tests/CCStringTest.xtend index a62517236..f71f93f5e 100644 --- a/tests/org.eclipse.etrice.core.common.tests/src/org/eclipse/etrice/core/common/tests/CCStringTest.xtend +++ b/tests/org.eclipse.etrice.core.common.tests/src/org/eclipse/etrice/core/common/tests/CCStringTest.xtend @@ -18,8 +18,10 @@ import com.google.inject.Inject import org.eclipse.etrice.core.common.BaseTestInjectorProvider import org.eclipse.etrice.core.common.converter.BaseConverterService import org.eclipse.etrice.core.common.converter.CCStringIndentation -import org.eclipse.xtext.junit4.InjectWith -import org.eclipse.xtext.junit4.XtextRunner +import org.eclipse.xtext.testing.InjectWith +import org.eclipse.xtext.testing.XtextRunner +//import org.eclipse.xtext.junit4.InjectWith +//import org.eclipse.xtext.junit4.XtextRunner import org.eclipse.xtext.util.Strings import org.junit.Test import org.junit.runner.RunWith @@ -220,7 +222,7 @@ text assertEquals(''' - + text '''.toString, toValue(text)) assertFalse(new CCStringIndentation(text).hasConsistentIndentation) diff --git a/tests/org.eclipse.etrice.core.common.tests/src/org/eclipse/etrice/core/common/tests/RelativeFileURITest.xtend b/tests/org.eclipse.etrice.core.common.tests/src/org/eclipse/etrice/core/common/tests/RelativeFileURITest.xtend index 61c46a4a6..5a8553fad 100644 --- a/tests/org.eclipse.etrice.core.common.tests/src/org/eclipse/etrice/core/common/tests/RelativeFileURITest.xtend +++ b/tests/org.eclipse.etrice.core.common.tests/src/org/eclipse/etrice/core/common/tests/RelativeFileURITest.xtend @@ -62,7 +62,7 @@ class RelativeFileURITest { ] // require ResourcePlugin and actual files to test - val static ENCODED_PLATFORM_PATH_URIS = #[ + package val static ENCODED_PLATFORM_PATH_URIS = #[ "platform:/resource/project/myfile.txt", "platform:/resource/My%20Project%20%231/My%20File.txt", "platform:/resource/are%20you%20there%3F", diff --git a/tests/org.eclipse.etrice.core.config.tests/.classpath b/tests/org.eclipse.etrice.core.config.tests/.classpath index d2fd5c857..1c48e500d 100644 --- a/tests/org.eclipse.etrice.core.config.tests/.classpath +++ b/tests/org.eclipse.etrice.core.config.tests/.classpath @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src-gen"/> + <classpathentry kind="src" path="src-gen"> + <attributes> + <attribute name="ignore_optional_problems" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> 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 2071d395c..5c0588bb5 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 @@ -23,3 +23,4 @@ Import-Package: org.apache.log4j, org.hamcrest.core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core +Automatic-Module-Name: org.eclipse.etrice.core.config.tests diff --git a/tests/org.eclipse.etrice.core.etmap.tests/.classpath b/tests/org.eclipse.etrice.core.etmap.tests/.classpath index fe30bcbba..a3a110f03 100644 --- a/tests/org.eclipse.etrice.core.etmap.tests/.classpath +++ b/tests/org.eclipse.etrice.core.etmap.tests/.classpath @@ -3,6 +3,10 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="src-gen"/> + <classpathentry kind="src" path="src-gen"> + <attributes> + <attribute name="ignore_optional_problems" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF index 50c8a751c..f11c38e68 100644 --- a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF @@ -21,3 +21,4 @@ Import-Package: org.apache.log4j, org.hamcrest.core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.etmap +Automatic-Module-Name: org.eclipse.etrice.core.etmap.tests diff --git a/tests/org.eclipse.etrice.core.etphys.tests/.classpath b/tests/org.eclipse.etrice.core.etphys.tests/.classpath index fe30bcbba..a3a110f03 100644 --- a/tests/org.eclipse.etrice.core.etphys.tests/.classpath +++ b/tests/org.eclipse.etrice.core.etphys.tests/.classpath @@ -3,6 +3,10 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="src-gen"/> + <classpathentry kind="src" path="src-gen"> + <attributes> + <attribute name="ignore_optional_problems" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF index ad0ea5d3b..fb4f8704f 100644 --- a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF @@ -21,3 +21,4 @@ Import-Package: org.apache.log4j, org.hamcrest.core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.etphys +Automatic-Module-Name: org.eclipse.etrice.core.etphys.tests diff --git a/tests/org.eclipse.etrice.core.fsm.tests/.classpath b/tests/org.eclipse.etrice.core.fsm.tests/.classpath index 8e001f780..a5d9f4e95 100644 --- a/tests/org.eclipse.etrice.core.fsm.tests/.classpath +++ b/tests/org.eclipse.etrice.core.fsm.tests/.classpath @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src-gen"/> + <classpathentry kind="src" path="src-gen"> + <attributes> + <attribute name="ignore_optional_problems" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF index 40bae65a9..7ad31023b 100644 --- a/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.etrice.core.common, org.eclipse.core.runtime, org.eclipse.xtext.junit4;bundle-version="2.6.0", org.eclipse.ui.workbench;resolution:=optional, - org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional, + org.objectweb.asm;bundle-version="[5.0.1,7.0.0)";resolution:=optional, org.eclipse.xtext.xbase.lib Import-Package: org.apache.log4j, org.junit;version="4.5.0", @@ -23,3 +23,4 @@ Import-Package: org.apache.log4j, org.hamcrest.core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.fsm +Automatic-Module-Name: org.eclipse.etrice.core.fsm.tests diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/.classpath b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/.classpath index 325150d24..ef58158d6 100644 --- a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/.classpath +++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/.classpath @@ -1,8 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="xtend-gen"/> + <classpathentry kind="src" path="src"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" path="xtend-gen"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/.settings/org.eclipse.jdt.core.prefs index f42de363a..0c68a61dc 100644 --- a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/META-INF/MANIFEST.MF index 1222539d9..e50e94337 100644 --- a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: FSM GenModel Tests Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.fsm.tests Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Eclipse eTrice -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.osgi;bundle-version="3.11.2", org.eclipse.core.runtime;bundle-version="3.12.0", @@ -14,3 +14,4 @@ Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.etrice.generator.base;bundle-version="2.0.0" Bundle-Activator: org.eclipse.etrice.core.genmodel.fsm.tests.FSMGenModelTestsActivator Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.eclipse.etrice.core.genmodel.fsm.tests diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF index ddfe2f980..2d3c9c7f5 100644 --- a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF @@ -13,3 +13,4 @@ Require-Bundle: org.eclipse.etrice.core.room;bundle-version="2.0.0", org.eclipse.etrice.generator.base;bundle-version="2.0.0" Bundle-Activator: org.eclipse.etrice.core.genmodel.GenmodelTestsActivator Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.eclipse.etrice.core.genmodel.tests diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestLayers.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestLayers.java index 27d3aa1ac..fc17cbae7 100644 --- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestLayers.java +++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestLayers.java @@ -57,7 +57,7 @@ public class TestLayers extends TestInstanceModelBuilderBase { SAPInstance sap = (SAPInstance) getInstance(saps, "/CMain/app/subsysA/userX/sap"); assertNotNull("sap expected", sap); - InterfaceItemInstance peer = ((SAPInstance)sap).getPeers().get(0); + InterfaceItemInstance peer = sap.getPeers().get(0); assertTrue("peer is a service", (peer instanceof ServiceImplInstance)); ServiceImplInstance svc = (ServiceImplInstance) peer; assertEquals("number of serviceA peers", 3, svc.getPeers().size()); diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestOptionalActors.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestOptionalActors.java index 30b5c8560..803c926ad 100644 --- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestOptionalActors.java +++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestOptionalActors.java @@ -64,7 +64,7 @@ public class TestOptionalActors extends TestInstanceModelBuilderBase { SAPInstance sap = (SAPInstance) getInstance(saps, "/OptionalForSvcOK/ref0/sap1"); assertNotNull("sap expected", sap); assertEquals("SAP has one peer", 1, sap.getPeers().size()); - InterfaceItemInstance peer = ((SAPInstance)sap).getPeers().get(0); + InterfaceItemInstance peer = sap.getPeers().get(0); assertTrue("peer is a service", (peer instanceof ServiceImplInstance)); ServiceImplInstance svc = (ServiceImplInstance) peer; assertEquals("number of service peers", 1, svc.getPeers().size()); diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStructureInheritance.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStructureInheritance.java index 23cfcd478..c3a11bbf6 100644 --- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStructureInheritance.java +++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStructureInheritance.java @@ -85,7 +85,7 @@ public class TestStructureInheritance extends TestInstanceModelBuilderBase { SAPInstance sap = (SAPInstance) getInstance(saps, "/CMain/application/fcta/sub2/timeout"); assertNotNull("sap expected", sap); - InterfaceItemInstance peer = ((SAPInstance)sap).getPeers().get(0); + InterfaceItemInstance peer = sap.getPeers().get(0); assertTrue("peer is a service", (peer instanceof ServiceImplInstance)); ServiceImplInstance svc = (ServiceImplInstance) peer; assertEquals("number of serviceA peers", 8, svc.getPeers().size()); diff --git a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF index 1aa9aa9cf..72721653b 100644 --- a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF @@ -19,3 +19,4 @@ Require-Bundle: org.eclipse.etrice.core.room;bundle-version="2.0.0", Bundle-Activator: org.eclipse.etrice.core.CoreTestsActivator Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.etrice.core +Automatic-Module-Name: org.eclipse.etrice.core.room.tests diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF index 8b854973c..2d87b0ba7 100644 --- a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF @@ -12,3 +12,4 @@ Require-Bundle: org.eclipse.etrice.etunit.converter;bundle-version="2.0.0", Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: com.google.common.io +Automatic-Module-Name: org.eclipse.etrice.etunit.converter.tests diff --git a/tests/org.eclipse.etrice.generator.fsmtest.tests/.classpath b/tests/org.eclipse.etrice.generator.fsmtest.tests/.classpath index d2fd5c857..1c48e500d 100644 --- a/tests/org.eclipse.etrice.generator.fsmtest.tests/.classpath +++ b/tests/org.eclipse.etrice.generator.fsmtest.tests/.classpath @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src-gen"/> + <classpathentry kind="src" path="src-gen"> + <attributes> + <attribute name="ignore_optional_problems" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF index af4c8075d..68fa8e95a 100644 --- a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF @@ -20,3 +20,4 @@ Import-Package: org.apache.log4j, org.hamcrest.core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator +Automatic-Module-Name: org.eclipse.etrice.generator.fsmtest.tests diff --git a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF index be6f44429..2e098df0d 100644 --- a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF @@ -16,3 +16,4 @@ Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0", org.eclipse.core.runtime;bundle-version="3.6.0" Bundle-Activator: org.eclipse.etrice.generator.InstanceTestsActivator Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.eclipse.etrice.generator.tests diff --git a/tests/org.eclipse.etrice.runtime.java.tests/.classpath b/tests/org.eclipse.etrice.runtime.java.tests/.classpath index 707c20f92..42836419d 100644 --- a/tests/org.eclipse.etrice.runtime.java.tests/.classpath +++ b/tests/org.eclipse.etrice.runtime.java.tests/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.runtime.java"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF index 8476b8996..02a5bb890 100644 --- a/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF @@ -17,4 +17,5 @@ Require-Bundle: org.junit;bundle-version="4.8.1", Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.tests.base +Automatic-Module-Name: org.eclipse.etrice.ui.base.tests diff --git a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF index 00cd13711..02c3759cf 100644 --- a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF @@ -24,3 +24,4 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="2.0.0", Import-Package: org.eclipse.xtext.xbase.lib Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.eclipse.etrice.ui.behavior.tests diff --git a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF index fc10f1a43..484601ad2 100644 --- a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF @@ -18,3 +18,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.etrice.ui.structure.StructureTestActivator +Automatic-Module-Name: org.eclipse.etrice.ui.structure.tests diff --git a/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithBindings.java b/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithBindings.java index b4f93da16..2df1f85e0 100644 --- a/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithBindings.java +++ b/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithBindings.java @@ -112,7 +112,7 @@ public class TestActorClassWithBindings extends TestBase { // the second ref is represented once in the diagram assertNotNull("second ref", b.getEndpoint2().getActorRef()); - pes = Graphiti.getLinkService().getPictogramElements(diagram, ((ActorRef)b.getEndpoint2().getActorRef())); + pes = Graphiti.getLinkService().getPictogramElements(diagram, b.getEndpoint2().getActorRef()); assertEquals("instances of second ref", 1, pes.size()); } } diff --git a/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithInheritance.java b/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithInheritance.java index 2bff6a7dd..2e80ae338 100644 --- a/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithInheritance.java +++ b/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithInheritance.java @@ -171,7 +171,7 @@ public class TestActorClassWithInheritance extends TestBase { // the second ref is represented once in the diagram assertNotNull("second ref", b.getEndpoint2().getActorRef()); - pes = Graphiti.getLinkService().getPictogramElements(diagram, ((ActorRef)b.getEndpoint2().getActorRef())); + pes = Graphiti.getLinkService().getPictogramElements(diagram, b.getEndpoint2().getActorRef()); assertEquals("instances of second ref", 1, pes.size()); } } |