diff options
| author | Juergen Haug | 2018-06-18 08:25:01 +0000 |
|---|---|---|
| committer | Juergen Haug | 2018-06-18 08:25:01 +0000 |
| commit | 842d1ee0c1cb95148ba3815cc66024317e37eb2e (patch) | |
| tree | e7ee889793d4cf5ec16419fbdc8a73889154361a | |
| parent | 29873f1151bb915cf3044f21deca9c756d3f95e0 (diff) | |
| parent | 3a0767800bb81a9f3f1f84024cfc3fcd5769df3f (diff) | |
| download | org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.tar.gz org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.tar.xz org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.zip | |
Merge remote-tracking branch 'gerrit/master' into newfsmgen_finalize
Conflicts:
plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF
plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java
plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java
plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
pom.xml
releng/org.eclipse.etrice.parent/pom.xml
tests/org.eclipse.etrice.generator.c.tests/.gitignore
tests/org.eclipse.etrice.generator.cpp.tests/.gitignore
tests/org.eclipse.etrice.generator.java.tests/.gitignore
Change-Id: I048e62574a0bca94bf86ed19bba6ed4325a37e81
101 files changed, 533 insertions, 373 deletions
diff --git a/.gitignore b/.gitignore index 9805706a8..07d680877 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ target/ xtend-gen/ build/ .gradle/ -log/
\ No newline at end of file +log/ +.polyglot.build.properties
\ No newline at end of file diff --git a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF index 83982e3e8..2451e2c20 100644 --- a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF +++ b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Derived Generator Launcher Bundle-SymbolicName: my.etrice.generator.launch;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: my.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.launch;bundle-version="1.1.1", - org.eclipse.etrice.generator.launch.java;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator.java;bundle-version="1.1.1", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.launch;bundle-version="1.1.2", + org.eclipse.etrice.generator.launch.java;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator.java;bundle-version="1.1.2", org.eclipse.debug.ui;bundle-version="3.8.1", org.eclipse.swt;bundle-version="3.100.1", org.eclipse.core.runtime;bundle-version="3.8.0", diff --git a/examples/my.etrice.generator/META-INF/MANIFEST.MF b/examples/my.etrice.generator/META-INF/MANIFEST.MF index 111888072..52e695383 100644 --- a/examples/my.etrice.generator/META-INF/MANIFEST.MF +++ b/examples/my.etrice.generator/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Derived Generator Bundle-SymbolicName: my.etrice.generator -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.java;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.java;bundle-version="1.1.2", com.google.inject;bundle-version="3.0.0" Export-Package: my.etrice.generator diff --git a/features/org.eclipse.etrice.cdt-integration.feature/feature.xml b/features/org.eclipse.etrice.cdt-integration.feature/feature.xml index 97c277b16..5777cf74d 100644 --- a/features/org.eclipse.etrice.cdt-integration.feature/feature.xml +++ b/features/org.eclipse.etrice.cdt-integration.feature/feature.xml @@ -17,7 +17,7 @@ <feature id="org.eclipse.etrice.cdt-integration.feature" label="%featureName" - version="1.1.1.qualifier" + version="1.1.2.qualifier" provider-name="%providerName" plugin="org.eclipse.etrice.core.room.ui" license-feature="org.eclipse.license" diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml index 38f929ce9..c11eb38b3 100644 --- a/features/org.eclipse.etrice.feature/feature.xml +++ b/features/org.eclipse.etrice.feature/feature.xml @@ -17,7 +17,7 @@ <feature id="org.eclipse.etrice.feature" label="%featureName" - version="1.1.1.qualifier" + version="1.1.2.qualifier" provider-name="%providerName" plugin="org.eclipse.etrice.core.room.ui" license-feature="org.eclipse.license" diff --git a/features/org.eclipse.etrice.fsm.feature/feature.xml b/features/org.eclipse.etrice.fsm.feature/feature.xml index 5c2da09f0..014d1be03 100644 --- a/features/org.eclipse.etrice.fsm.feature/feature.xml +++ b/features/org.eclipse.etrice.fsm.feature/feature.xml @@ -17,7 +17,7 @@ <feature id="org.eclipse.etrice.fsm.feature" label="eTrice.FSM Feature" - version="1.1.1.qualifier" + version="1.1.2.qualifier" provider-name="eTrice" license-feature="org.eclipse.license" license-feature-version="1.0.1.v20140414-1359"> diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml index 70946640b..0aec1ef90 100644 --- a/features/org.eclipse.etrice.tests.feature/feature.xml +++ b/features/org.eclipse.etrice.tests.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.etrice.tests.feature" label="%featureName" - version="1.1.1.qualifier" + version="1.1.2.qualifier" provider-name="%providerName"> <description> diff --git a/features/pom.xml b/features/pom.xml index 01951fa06..49b8e7b74 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.parent</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> <relativePath>../releng/org.eclipse.etrice.parent</relativePath> </parent> <groupId>org.eclipse.etrice</groupId> 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 04de872a9..ff854679c 100644 --- a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Abstract Execution for State Machines Bundle-SymbolicName: org.eclipse.etrice.abstractexec.behavior;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", org.eclipse.emf.ecore;bundle-version="2.7.0", org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.core.runtime, 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 fcd5cb719..c97585356 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Common eTrice DSL UI classes Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.common.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport, 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 e7d6930f9..cfd46ba4d 100644 --- a/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Common eTrice Grammar Fragment and Utility Classes Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.common; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport, 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 ddf23819b..87c13207f 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 @@ -25,6 +25,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.plugin.EcorePlugin; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.URIConverter; import org.eclipse.xtext.resource.ClasspathUriResolutionException; @@ -158,7 +159,18 @@ public class StandardModelLocator implements IModelLocator { } catch (Throwable e) { } + } + else if (uri.isPlatform()) { + String platformResourcePath = uri.toPlatformString(true); + + // if workspace is not available, convert platform URI to absolute URI + if (EcorePlugin.getWorkspaceRoot() == null) { + URI resolvedURI = EcorePlugin.resolvePlatformResourcePath(platformResourcePath); + if(resolvedURI != null) + resolve = resolvedURI.toString(); + } } + return resolve; } 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 5c24dfe06..267dd8580 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 @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Config DSL UI Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.config.ui; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.config;bundle-version="1.1.1";visibility:=reexport, +Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.config;bundle-version="1.1.2";visibility:=reexport, org.eclipse.xtext.ui;bundle-version="2.6.0", org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0", 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 2fca5a3fa..b726befc5 100644 --- a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Config DSL Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.config; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport, org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport, org.apache.log4j;bundle-version="1.2.15";visibility:=reexport, 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 0ebfcf75f..9c6d757ff 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 @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.etrice.core.etmap.ui Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.etmap.ui; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1";visibility:=reexport, - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2";visibility:=reexport, + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", org.eclipse.xtext.ui;bundle-version="2.6.0", org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0", @@ -17,8 +17,8 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", org.antlr.runtime, org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0", org.eclipse.compare, - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1" + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2" Import-Package: org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: 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 2408c1d51..530524c02 100644 --- a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.etrice.core.etmap Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.etmap; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport, org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport, org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional, 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 a4ff647f8..0b3cd9cf9 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 @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.etrice.core.etphys.ui Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.etphys.ui; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1";visibility:=reexport, +Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2";visibility:=reexport, org.eclipse.xtext.ui;bundle-version="2.6.0", org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0", @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", org.antlr.runtime, org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0", org.eclipse.compare, - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1" + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2" Import-Package: org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.etphys.ui.contentassist, 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 8878d9eab..5f6eb56f9 100644 --- a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.etrice.core.etphys Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.etphys; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.2", org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport, org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional, org.antlr.runtime, @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", org.eclipse.xtext.util;bundle-version="2.6.0", org.eclipse.emf.ecore, org.eclipse.emf.common, - org.eclipse.etrice.core.common;bundle-version="1.1.1", + org.eclipse.etrice.core.common;bundle-version="1.1.2", org.eclipse.xtext.xbase.lib Import-Package: org.apache.log4j, org.eclipse.xtext.xbase.lib 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 a4cd839d5..c6a2b4d67 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 @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: FSM DSL UI Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.fsm.ui; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", org.eclipse.etrice.core.fsm;visibility:=reexport, org.eclipse.xtext.ui;bundle-version="2.6.0", org.eclipse.ui.editors;bundle-version="3.5.0", 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 46fdc34cf..cd8432c93 100644 --- a/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: FSM DSL Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.fsm; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.2", org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport, org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport, org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional, 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 4dc77f836..a0a0b2e1c 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.fsm;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.genmodel.fsm, @@ -10,7 +10,7 @@ Export-Package: org.eclipse.etrice.core.genmodel.fsm, org.eclipse.etrice.core.genmodel.fsm.fsmgen.impl, org.eclipse.etrice.core.genmodel.fsm.fsmgen.util Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport, - org.eclipse.etrice.core.fsm;bundle-version="1.1.1";visibility:=reexport, + org.eclipse.etrice.core.fsm;bundle-version="1.1.2";visibility:=reexport, org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport, 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 02335205b..efaf169da 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.etrice.core.genmodel;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse eTrice Bundle-Localization: plugin @@ -13,10 +13,10 @@ Export-Package: org.eclipse.etrice.core.genmodel, org.eclipse.etrice.core.genmodel.etricegen.impl, org.eclipse.etrice.core.genmodel.etricegen.util, org.eclipse.etrice.core.genmodel.util -Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1";visibility:=reexport, - org.eclipse.etrice.core.fsm;bundle-version="1.1.1";visibility:=reexport, - org.eclipse.etrice.core.room;bundle-version="1.1.1";visibility:=reexport, - org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1";visibility:=reexport, +Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.2";visibility:=reexport, + org.eclipse.etrice.core.fsm;bundle-version="1.1.2";visibility:=reexport, + org.eclipse.etrice.core.room;bundle-version="1.1.2";visibility:=reexport, + org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.2";visibility:=reexport, org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport 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 8d6a423a2..1db465e7e 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 @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ROOM DSL UI Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.room.ui;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1";visibility:=reexport, - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", - org.eclipse.etrice.doc;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2";visibility:=reexport, + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", + org.eclipse.etrice.doc;bundle-version="1.1.2", org.eclipse.ui;bundle-version="3.6.0", org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0", 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 769e55efb..44c0d5d65 100644 --- a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ROOM DSL Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.room;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional, org.eclipse.xtext.util;bundle-version="2.6.0", diff --git a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF index 397dfaee9..e3f5d9312 100644 --- a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Documentation Bundle-SymbolicName: org.eclipse.etrice.doc;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, 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 f3e835463..d3bac62e2 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: etUnit File Converter Bundle-SymbolicName: org.eclipse.etrice.etunit.converter;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse eTrice Bundle-Localization: plugin diff --git a/plugins/org.eclipse.etrice.etunit.converter/model/readme.md b/plugins/org.eclipse.etrice.etunit.converter/model/readme.md new file mode 100644 index 000000000..f7e6a7f18 --- /dev/null +++ b/plugins/org.eclipse.etrice.etunit.converter/model/readme.md @@ -0,0 +1,7 @@ +# XML Schema for XUnit + +There seems to be a "more official" XML schema: +[stackoverflow on Spec. for JUnit XML output](https://stackoverflow.com/questions/442556/spec-for-junit-xml-output) +mentions +[a github project for the JUnit schema used by Apache Ant](https://github.com/windyroad/JUnit-Schema). +The [schema file](https://github.com/windyroad/JUnit-Schema/blob/master/JUnit.xsd) has Apache License Version 2.0.
\ No newline at end of file diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java index d61327eed..34d2cb765 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java @@ -450,7 +450,8 @@ public class EtUnitReportConverter { input.close(); return null; } - tc.setTime(BigDecimal.valueOf(time)); + // time was measured in ms. Convert to s + tc.setTime(BigDecimal.valueOf(time/1000.0)); } line = bufRead.readLine(); ++count; 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 c37ee22c3..31ec749d0 100644 --- a/plugins/org.eclipse.etrice.expressions.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.expressions.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Expressions UI Bundle-SymbolicName: org.eclipse.etrice.expressions.ui;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.jface.text, org.eclipse.xtext.xbase.lib, 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 d075329b9..cbd523bc7 100644 --- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF @@ -2,20 +2,20 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice C Generator Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.generator.c;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.config;bundle-version="1.1.1", - org.eclipse.etrice.generator.doc;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.config;bundle-version="1.1.2", + org.eclipse.etrice.generator.doc;bundle-version="1.1.2", org.eclipse.xtend.lib;bundle-version="2.6.0", org.eclipse.xtext.generator;bundle-version="2.6.0", org.eclipse.xtext.util;bundle-version="2.6.0", - org.eclipse.etrice.generator.gnuplot;bundle-version="1.1.1" + org.eclipse.etrice.generator.gnuplot;bundle-version="1.1.2" Import-Package: org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.c, 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 004ee69f6..a02d7e180 100644 --- a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Generator Config Bundle-SymbolicName: org.eclipse.etrice.generator.config;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.config;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.config;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.generator;bundle-version="1.1.2", org.eclipse.xtend.lib;bundle-version="2.6.0", com.google.guava;bundle-version="8.0.0", org.eclipse.xtext.xbase.lib;bundle-version="2.6.0" 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 01cec3227..5ff8533f7 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice C++ Generator Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.generator.cpp;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.config;bundle-version="1.1.1", - org.eclipse.etrice.generator.doc;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.config;bundle-version="1.1.2", + org.eclipse.etrice.generator.doc;bundle-version="1.1.2", org.eclipse.xtend.lib;bundle-version="2.6.0", org.eclipse.xtext.generator;bundle-version="2.6.0", org.eclipse.xtext.util;bundle-version="2.6.0", 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 b4efe6456..2361f0f63 100644 --- a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Document Generator Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.generator.doc;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", org.eclipse.core.resources;bundle-version="3.6.0", org.eclipse.core.runtime;bundle-version="3.6.0", org.eclipse.ui;bundle-version="3.7.0", 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 d45d6d851..f18f70f68 100644 --- a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Generator for Finite State Machines Bundle-SymbolicName: org.eclipse.etrice.generator.fsm -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Vendor: eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.fsm.base, org.eclipse.etrice.generator.fsm.generic -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.2", org.eclipse.emf;bundle-version="2.6.0", org.apache.commons.io;bundle-version="2.0.1", org.eclipse.core.resources, 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 3488486d6..d518a192c 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.etrice.generator.fsmtest.ui Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.etrice.generator.fsmtest;visibility:=reexport, 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 2889332a9..94e234281 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.etrice.generator.fsmtest Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport, 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 438c6c882..8c36a7b7f 100644 --- a/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF @@ -2,21 +2,21 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gnuplot generator Bundle-SymbolicName: org.eclipse.etrice.generator.gnuplot -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Export-Package: org.eclipse.etrice.generator.gnuplot Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.xtend.lib;bundle-version="2.6.0", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", - org.eclipse.etrice.generator.config;bundle-version="1.1.1", - org.eclipse.etrice.generator.java;bundle-version="1.1.1", - org.eclipse.etrice.core.config;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", + org.eclipse.etrice.generator.config;bundle-version="1.1.2", + org.eclipse.etrice.generator.java;bundle-version="1.1.2", + org.eclipse.etrice.core.config;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2", org.eclipse.core.runtime;bundle-version="3.10.0", - org.eclipse.etrice.generator.doc;bundle-version="1.1.1", - org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.1" + org.eclipse.etrice.generator.doc;bundle-version="1.1.2", + org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.2" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.etrice.generator.java.mvn/pom.xml b/plugins/org.eclipse.etrice.generator.java.mvn/pom.xml index f171f4763..fe3397081 100644 --- a/plugins/org.eclipse.etrice.generator.java.mvn/pom.xml +++ b/plugins/org.eclipse.etrice.generator.java.mvn/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.eclipse.etrice</groupId> <artifactId>java-generator</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath> </parent> @@ -188,67 +188,67 @@ <dependency> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.generator.java</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.generator.config</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.generator.doc</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.generator.fsm</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.generator</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.core.common</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.core.fsm</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.core.room</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.core.etphys</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.core.etmap</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.core.config</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.core.genmodel.fsm</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.core.genmodel</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> </dependency> <!-- IMPORTANT: runtime-assembler-cli uses another version of com.google.guava 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 6efbb9b3d..9f8b5e72f 100644 --- a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Java Generator Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.generator.java;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.config;bundle-version="1.1.1", - org.eclipse.etrice.generator.doc;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.config;bundle-version="1.1.2", + org.eclipse.etrice.generator.doc;bundle-version="1.1.2", org.eclipse.xtend.lib;bundle-version="2.6.0", org.eclipse.xtext.generator;bundle-version="2.6.0", org.eclipse.xtext.util;bundle-version="2.6.0" 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 52edbfecf..5c9872b0d 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 @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice C Generator Launcher Bundle-SymbolicName: org.eclipse.etrice.generator.launch.c;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.generator.launch.c.Activator -Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator.c;bundle-version="1.1.1", - org.eclipse.etrice.generator.launch;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator.c;bundle-version="1.1.2", + org.eclipse.etrice.generator.launch;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.debug.core, @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", org.eclipse.jdt.ui;bundle-version="3.7.0", org.eclipse.jdt.core;bundle-version="3.7.0", org.eclipse.core.variables;bundle-version="3.2.500", - org.eclipse.etrice.generator.ui;bundle-version="1.1.1" + org.eclipse.etrice.generator.ui;bundle-version="1.1.2" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.jdt.launching, 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 47c0ec3c6..7409640f6 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 @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Cpp Generator Launcher Bundle-SymbolicName: org.eclipse.etrice.generator.launch.cpp;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.generator.launch.cpp.Activator -Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator.cpp;bundle-version="1.1.1", - org.eclipse.etrice.generator.launch;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator.cpp;bundle-version="1.1.2", + org.eclipse.etrice.generator.launch;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.debug.core, @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", org.eclipse.jdt.ui;bundle-version="3.7.0", org.eclipse.jdt.core;bundle-version="3.7.0", org.eclipse.core.variables;bundle-version="3.2.500", - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1" + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.jdt.launching, 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 ba0d656db..ebbefa8eb 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 @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Java Generator Launcher Bundle-SymbolicName: org.eclipse.etrice.generator.launch.java;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.generator.launch.java.Activator -Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator.java;bundle-version="1.1.1", - org.eclipse.etrice.generator.launch;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator.java;bundle-version="1.1.2", + org.eclipse.etrice.generator.launch;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.debug.core, @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", org.eclipse.jdt.ui;bundle-version="3.7.0", org.eclipse.jdt.core;bundle-version="3.7.0", org.eclipse.core.variables;bundle-version="3.2.500", - org.eclipse.etrice.generator.ui;bundle-version="1.1.1" + org.eclipse.etrice.generator.ui;bundle-version="1.1.2" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.jdt.launching, 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 6a554b5ce..a2f1650cc 100644 --- a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Generator Launch Base Classes Bundle-SymbolicName: org.eclipse.etrice.generator.launch;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.generator.launch.Activator -Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.core.common;bundle-version="1.1.1", - org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.core.common;bundle-version="1.1.2", + org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.ui.console, org.eclipse.xtext.ui.shared;bundle-version="2.6.0", 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 730341885..6a5e9a3c7 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 @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CDT integration of eTrice Bundle-SymbolicName: org.eclipse.etrice.generator.ui.cdt;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.etrice.generator.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.generator.ui;bundle-version="1.1.2", org.eclipse.cdt.core;bundle-version="5.5.0", org.eclipse.cdt.managedbuilder.core;bundle-version="8.2.0", org.eclipse.equinox.common;bundle-version="3.6.200", 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 fe072c7a7..08bc1caa3 100644 --- a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF @@ -2,30 +2,30 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Generator UI Bundle-SymbolicName: org.eclipse.etrice.generator.ui;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.ui.common;bundle-version="1.1.1", - org.eclipse.etrice.ui.runtime;bundle-version="1.1.1", - org.eclipse.etrice.core.common;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.ui.common;bundle-version="1.1.2", + org.eclipse.etrice.ui.runtime;bundle-version="1.1.2", + org.eclipse.etrice.core.common;bundle-version="1.1.2", org.eclipse.core.runtime, org.eclipse.ui, org.apache.log4j;bundle-version="1.2.15", org.eclipse.core.resources;bundle-version="3.8.100", org.eclipse.emf.ecore;bundle-version="2.9.0", - org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", + org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", org.eclipse.jdt.core;bundle-version="3.9.0", org.eclipse.jdt.launching;bundle-version="3.7.0", org.eclipse.ui.ide;bundle-version="3.9.0", org.eclipse.xtext.xbase.lib;bundle-version="2.6.0", org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.xtext.ui;bundle-version="2.6.0", - org.eclipse.etrice.generator;bundle-version="1.1.1" + org.eclipse.etrice.generator;bundle-version="1.1.2" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.etrice.generator.ui.Activator Export-Package: org.eclipse.etrice.generator.ui.configurator, diff --git a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF index 34933a83b..e7f81905d 100644 --- a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Generator Model Bundle-SymbolicName: org.eclipse.etrice.generator;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.base, org.eclipse.etrice.generator.generic -Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", org.eclipse.core.runtime;bundle-version="3.6.0", org.eclipse.emf.ecore;bundle-version="2.6.0";visibility:=reexport, org.eclipse.emf.ecore.xmi;bundle-version="2.5.0", diff --git a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF index 262f93b0e..6842f9e52 100644 --- a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Logging Fragment Bundle-SymbolicName: org.eclipse.etrice.logging -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Fragment-Host: org.apache.log4j;bundle-version="1.2.15" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 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 7ede8e195..37bb22c07 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 @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ROOM Action Code Editor Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.actioneditor;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.behavior.actioneditor.Activator -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.ui.behavior;bundle-version="1.1.1", - org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.ui.behavior;bundle-version="1.1.2", + org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.emf.common, @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", org.eclipse.xtext.xbase.lib, org.eclipse.ui.workbench.texteditor, org.eclipse.etrice.core.room.ui, - org.eclipse.etrice.expressions.ui;bundle-version="1.1.1" + org.eclipse.etrice.expressions.ui;bundle-version="1.1.2" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.etrice.ui.behavior.actioneditor, 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 7c15e7750..3ad1b1eba 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 @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Abstract FSM Diagram Editor Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.fsm;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.behavior.fsm.Activator Bundle-Vendor: eTrice -Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.0", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.0", - org.eclipse.etrice.core.fsm;bundle-version="1.1.0", - org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.0", - org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.0", +Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.2", org.eclipse.graphiti;bundle-version="0.8.0", org.eclipse.graphiti.ui;bundle-version="0.8.0", org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100", @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.0", org.eclipse.xtext.ui;bundle-version="2.7.0", org.eclipse.xtend.lib;bundle-version="2.7.0", org.eclipse.xtext.ui.shared;bundle-version="2.7.0", - org.eclipse.etrice.expressions.ui;bundle-version="1.1.1", + org.eclipse.etrice.expressions.ui;bundle-version="1.1.2", org.eclipse.xtext.ui.shared;bundle-version="2.7.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy 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 ebd6c7cfc..43d846452 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 @@ -157,12 +157,11 @@ public class StateSupport { ContainerShape targetContainer = context.getTargetContainer(); ModelComponent mc = FSMSupportUtil.getInstance().getModelComponent(getDiagram()); - StateGraph sg = (StateGraph) targetContainer.getLink().getBusinessObjects().get(0); - + StateGraph sg = (StateGraph) targetContainer.getLink().getBusinessObjects().get(0); if (!FSMSupportUtil.getInstance().isOwnedBy(mc, sg)) { sg = ModelEditingUtil.insertRefinedState(sg, mc, targetContainer, getFeatureProvider()); - } - + + } // create new State and add it SimpleState s = FSMFactory.eINSTANCE.createSimpleState(); s.setName(FSMSupportUtil.getInstance().getFSMNewNamingUtil().getUniqueName("state", sg)); 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 5da072ad2..233b4de27 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Actor Behavior Diagram Editor Bundle-SymbolicName: org.eclipse.etrice.ui.behavior;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.behavior.Activator -Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", - org.eclipse.etrice.ui.common;bundle-version="1.1.1", - org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", + org.eclipse.etrice.ui.common;bundle-version="1.1.2", + org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.2", org.eclipse.graphiti;bundle-version="0.8.0", org.eclipse.graphiti.ui;bundle-version="0.8.0", org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100", @@ -19,9 +19,9 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", org.eclipse.emf.transaction;bundle-version="1.4.0", org.eclipse.xtext.ui;bundle-version="2.6.0", org.eclipse.xtext.ui.shared;bundle-version="2.6.0", - org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.expressions.ui;bundle-version="1.1.1", + org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.expressions.ui;bundle-version="1.1.2", org.eclipse.etrice.generator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/DiagramAccess.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/DiagramAccess.java index 5265579a9..9e1d304fa 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/DiagramAccess.java +++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/DiagramAccess.java @@ -74,7 +74,7 @@ public class DiagramAccess extends DiagramAccessBase { * @see org.eclipse.etrice.ui.common.DiagramAccessBase#getFileExtension() */ @Override - protected String getDigramFileName(EObject rootObject) { + public String getDigramFileName(EObject rootObject) { if (rootObject instanceof ActorClass) { ActorClass ac = (ActorClass) rootObject; String modelName = ((RoomModel) ac.eContainer()).getName(); diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/link/ExecutableExtensionFactory.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/link/ExecutableExtensionFactory.java index efc2f0097..cd2ccabdc 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/link/ExecutableExtensionFactory.java +++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/link/ExecutableExtensionFactory.java @@ -11,8 +11,7 @@ import org.osgi.framework.Bundle; import com.google.inject.Injector; -public class ExecutableExtensionFactory extends - AbstractGuiceAwareExecutableExtensionFactory { +public class ExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory { @Override protected Bundle getBundle() { @@ -21,9 +20,8 @@ public class ExecutableExtensionFactory extends @Override protected Injector getInjector() { - return createInjector(override( - override(new ResourceModule()).with(new SharedStateModule())) - .with(new EmfUiModule(Activator.getDefault()))); + return createInjector(override(override(new SharedStateModule()).with(new EmfUiModule(Activator.getDefault()))) + .with(new ResourceModule())); } } diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/link/ResourceModule.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/link/ResourceModule.java index 4ce58931f..cf1ec8b00 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/link/ResourceModule.java +++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/link/ResourceModule.java @@ -8,14 +8,17 @@ package org.eclipse.etrice.ui.behavior.link; +import org.eclipse.etrice.ui.behavior.DiagramAccess; +import org.eclipse.etrice.ui.common.base.refactoring.DiagramReferenceUpdater; +import org.eclipse.etrice.ui.common.base.support.DiagramAccessBase; import org.eclipse.xtext.resource.generic.AbstractGenericResourceRuntimeModule; +import org.eclipse.xtext.ui.refactoring.IReferenceUpdater; /** * @author Henrik Rentz-Reichert - initial contribution and API * */ -public class ResourceModule extends - AbstractGenericResourceRuntimeModule { +public class ResourceModule extends AbstractGenericResourceRuntimeModule { /* (non-Javadoc) * @see org.eclipse.xtext.resource.generic.AbstractGenericResourceRuntimeModule#getLanguageName() @@ -32,5 +35,13 @@ public class ResourceModule extends protected String getFileExtensions() { return "behavior"; } + + public Class<? extends IReferenceUpdater> bindIReferenceUpdater() { + return DiagramReferenceUpdater.class; + } + + public Class<? extends DiagramAccessBase> bindDiagramAccess() { + return DiagramAccess.class; + } } 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 4d5380aeb..e5e41618c 100644 --- a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Commands Bundle-SymbolicName: org.eclipse.etrice.ui.commands; singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.commands.Activator Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", - org.eclipse.etrice.ui.common;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", - org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", + org.eclipse.etrice.ui.common;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", + org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.2", org.eclipse.graphiti;bundle-version="0.8.0", org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100", org.eclipse.xtext.ui;bundle-version="2.6.0", diff --git a/plugins/org.eclipse.etrice.ui.common.base/.classpath b/plugins/org.eclipse.etrice.ui.common.base/.classpath index eca7bdba8..13a6c6528 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/.classpath +++ b/plugins/org.eclipse.etrice.ui.common.base/.classpath @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="xtend-gen"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.etrice.ui.common.base/.project b/plugins/org.eclipse.etrice.ui.common.base/.project index 5fc4c5fa1..623f7fcf2 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/.project +++ b/plugins/org.eclipse.etrice.ui.common.base/.project @@ -6,6 +6,11 @@ </projects> <buildSpec> <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> @@ -24,5 +29,6 @@ <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> </natures> </projectDescription> 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 219fd0bf8..38cea1465 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 @@ -2,18 +2,19 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Common Base for UI Bundle-SymbolicName: org.eclipse.etrice.ui.common.base;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.common.base.UIBaseActivator Bundle-Vendor: eTrice -Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.1", - org.eclipse.etrice.doc;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.2", + org.eclipse.etrice.doc;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.emf.transaction;bundle-version="1.4.0", org.eclipse.graphiti;bundle-version="0.8.0", org.eclipse.xtext.ui;bundle-version="2.6.0", org.eclipse.xtext.ui.shared;bundle-version="2.6.0", + org.eclipse.xtend.lib;bundle-version="2.6.0", org.eclipse.emf.databinding, org.eclipse.jface.databinding, org.eclipse.core.databinding.property;bundle-version="1.4.200", @@ -36,5 +37,6 @@ Export-Package: org.eclipse.etrice.ui.common.base, org.eclipse.etrice.ui.common.base.export, org.eclipse.etrice.ui.common.base.preferences, org.eclipse.etrice.ui.common.base.quickfix, + org.eclipse.etrice.ui.common.base.refactoring, org.eclipse.etrice.ui.common.base.resource, org.eclipse.etrice.ui.common.base.support diff --git a/plugins/org.eclipse.etrice.ui.common.base/build.properties b/plugins/org.eclipse.etrice.ui.common.base/build.properties index 060a9e9fd..a5c6610f7 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/build.properties +++ b/plugins/org.eclipse.etrice.ui.common.base/build.properties @@ -1,4 +1,5 @@ -source.. = src/ +source.. = src/,\ + xtend-gen/ output.. = bin/ bin.includes = META-INF/,\ .,\ diff --git a/plugins/org.eclipse.etrice.ui.common.base/schema/org.eclipse.etrice.ui.common.base.refactoring.rename.exsd b/plugins/org.eclipse.etrice.ui.common.base/schema/org.eclipse.etrice.ui.common.base.refactoring.rename.exsd index f15dd8dd4..cb29e6fc0 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/schema/org.eclipse.etrice.ui.common.base.refactoring.rename.exsd +++ b/plugins/org.eclipse.etrice.ui.common.base/schema/org.eclipse.etrice.ui.common.base.refactoring.rename.exsd @@ -3,7 +3,7 @@ <schema targetNamespace="org.eclipse.etrice.ui.common" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appinfo> - <meta.schema plugin="org.eclipse.etrice.ui.common" id="org.eclipse.etrice.ui.common.refactoring.rename" name="Diagram Rename Participant"/> + <meta.schema plugin="org.eclipse.etrice.ui.common.base" id="org.eclipse.etrice.ui.common.base.refactoring.rename" name="Diagram Rename Participant"/> </appinfo> <documentation> [Enter description of this extension point.] 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 912f9f31a..0b2fe8c74 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 @@ -92,7 +92,7 @@ public abstract class AbstractPropertyDialog extends FormDialog { if (!newStatus.getMessage().isEmpty()) validationText.setText(newStatus.getMessage()); - // iterate over all decoration and there validation status + // iterate over all decoration and their validation status for(ControlDecoration decoration: decorations){ IObservableValue observableValue = decoratorMap.get(decoration); IStatus status = (IStatus) observableValue.getValue(); 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 new file mode 100644 index 000000000..d2502b191 --- /dev/null +++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/refactoring/DiagramReferenceUpdater.xtend @@ -0,0 +1,79 @@ +/******************************************************************************* + * Copyright (c) 2011 protos software gmbh (http://www.protos.de). + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * CONTRIBUTORS: + * Juergen Haug (initial contribution) + * + *******************************************************************************/ + +package org.eclipse.etrice.ui.common.base.refactoring + +import org.eclipse.core.runtime.IProgressMonitor +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.EmfResourceReferenceUpdater +import com.google.common.collect.Multimap +import org.eclipse.emf.common.util.URI +import org.eclipse.emf.ecore.resource.ResourceSet +import org.eclipse.graphiti.mm.pictograms.Diagram +import org.eclipse.graphiti.services.Graphiti +import org.eclipse.emf.ecore.util.EcoreUtil +import org.eclipse.etrice.core.fsm.fSM.ModelComponent +import com.google.inject.Inject +import org.eclipse.etrice.ui.common.base.support.DiagramAccessBase +import org.eclipse.graphiti.ui.internal.GraphitiUIPlugin +import org.eclipse.graphiti.internal.GraphitiPlugin +import org.eclipse.xtext.ui.refactoring.impl.EmfResourceChangeUtil +import org.eclipse.ltk.core.refactoring.resource.RenameResourceChange +import org.eclipse.etrice.core.common.scoping.StandardModelLocator +import org.eclipse.core.runtime.Path +import org.eclipse.core.runtime.Platform +import org.eclipse.core.resources.ResourcesPlugin +import com.google.common.collect.Multimaps +import com.google.common.collect.MultimapBuilder +import com.google.common.collect.ArrayListMultimap + +/** + * Update diagrams in case of xtext rename refactoring + */ +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) { + + //-- update references in diagrams + super.createReferenceUpdates(elementRenameArguments, resource2references, resourceSet, updateAcceptor, monitor) + + //-- rename diagrams + val diagramMap = ArrayListMultimap.create => [map | + // there could be several (orphaned) diagrams for one ActorClass + resource2references.keySet.map[uri | resourceSet.getResource(uri, false)].map[contents].flatten.filter(Diagram).forEach[diagram | + map.put(diagram.link.businessObjects.head, diagram) + ] + ] + elementRenameArguments.renamedElementURIs.map[origURI | resourceSet.getEObject(elementRenameArguments.getNewElementURI(origURI), false)].filter(ModelComponent).forEach[mc | + val wsDiagrams = diagramMap.get(mc).filter[eResource.URI.isPlatformResource].toList + val newFileName = diagramAccess.getDigramFileName(mc) + + val workspaceRoot = ResourcesPlugin.workspace.root + val parents = wsDiagrams.groupBy[workspaceRoot.getFile(new Path(eResource.URI.segmentsList.tail.join('/'))).parent] + parents.forEach[parent, diagrams | + // avoid file name conflicts => choose latest modified + val diagram = diagrams.maxBy[eResource.timeStamp] + val diagFile = workspaceRoot.getFile(new Path(diagram.eResource.URI.segmentsList.tail.join('/'))) + updateAcceptor.accept(diagram.eResource.URI, new RenameResourceChange(diagFile.fullPath, newFileName)) + // TODO update name of diagram + ] + ] + + } + +} diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/refactoring/DiagramRenameParticipant.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/refactoring/DiagramRenameParticipant.java index 3c03dee42..631f0c64e 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/refactoring/DiagramRenameParticipant.java +++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/refactoring/DiagramRenameParticipant.java @@ -62,7 +62,7 @@ public class DiagramRenameParticipant extends RenameParticipant { private static String[] diagramEditorsIds; static { - IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.etrice.ui.common.refactoring.rename"); + IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.etrice.ui.common.base.refactoring.rename"); diagramExtensions = new String[elements.length]; diagramEditorsIds = new String[elements.length]; for(int i=0;i<elements.length;i++){ diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/resource/DiagramResource.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/resource/DiagramResource.java index 2ee928879..d17c34742 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/resource/DiagramResource.java +++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/resource/DiagramResource.java @@ -21,6 +21,9 @@ import org.eclipse.etrice.core.common.scoping.RelativeFileURIHandler; import com.google.common.collect.Maps; +/** + * Customize load/save of diagram resources, e.g. serialized URIs to .room. + */ public class DiagramResource extends XMIResourceImpl { public DiagramResource() { diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/support/DiagramAccessBase.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/support/DiagramAccessBase.java index 99df454b1..00cab7af3 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/support/DiagramAccessBase.java +++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/support/DiagramAccessBase.java @@ -257,7 +257,7 @@ public abstract class DiagramAccessBase { public abstract String getDiagramName(EObject rootObject); public abstract IBulkDiagramExporter getDiagramExporter(); - abstract protected String getDigramFileName(EObject rootObject); + public abstract String getDigramFileName(EObject rootObject); abstract protected String getDiagramTypeId(); abstract protected String getEditorId(); abstract protected Command getInitialCommand(EObject rootObject, Diagram diagram, TransactionalEditingDomain editingDomain); 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 7b143ab27..3e9c5f083 100644 --- a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: UI Common Bundle-SymbolicName: org.eclipse.etrice.ui.common;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", org.eclipse.emf.transaction;bundle-version="1.4.0", org.eclipse.graphiti;bundle-version="0.8.0", org.eclipse.ui.ide;bundle-version="3.6.0", 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 3f33378ba..83bb26771 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: New Wizards for Runtime Bundle-SymbolicName: org.eclipse.etrice.ui.runtime;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.etrice.ui.runtime/pom.xml b/plugins/org.eclipse.etrice.ui.runtime/pom.xml index b4f90a7bf..e192255b5 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/pom.xml +++ b/plugins/org.eclipse.etrice.ui.runtime/pom.xml @@ -5,8 +5,8 @@ <parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.parent</artifactId> - <version>1.1.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath> + <version>1.1.2-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.etrice.parent</relativePath> </parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.ui.runtime</artifactId> 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 064442645..14e8895a8 100644 --- a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Actor Structure Diagram Editor Bundle-SymbolicName: org.eclipse.etrice.ui.structure;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.structure.Activator Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", - org.eclipse.etrice.ui.common;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", + org.eclipse.etrice.ui.common;bundle-version="1.1.2", org.eclipse.graphiti;bundle-version="0.8.0", org.eclipse.graphiti.ui;bundle-version="0.8.0", org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100", diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/DiagramAccess.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/DiagramAccess.java index 041549189..e0c593c15 100644 --- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/DiagramAccess.java +++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/DiagramAccess.java @@ -53,7 +53,7 @@ public class DiagramAccess extends DiagramAccessBase { return StructureEditor.STRUCTURE_EDITOR_ID; } - protected String getDigramFileName(EObject rootObject) { + public String getDigramFileName(EObject rootObject) { if (rootObject instanceof StructureClass) { StructureClass sc = (StructureClass) rootObject; String modelName = ((RoomModel) sc.eContainer()).getName(); diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/link/ExecutableExtensionFactory.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/link/ExecutableExtensionFactory.java index 2a643ed66..d0ae6b8f0 100644 --- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/link/ExecutableExtensionFactory.java +++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/link/ExecutableExtensionFactory.java @@ -11,8 +11,7 @@ import org.osgi.framework.Bundle; import com.google.inject.Injector; -public class ExecutableExtensionFactory extends - AbstractGuiceAwareExecutableExtensionFactory { +public class ExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory { @Override protected Bundle getBundle() { @@ -21,9 +20,8 @@ public class ExecutableExtensionFactory extends @Override protected Injector getInjector() { - return createInjector(override( - override(new ResourceModule()).with(new SharedStateModule())) - .with(new EmfUiModule(Activator.getDefault()))); + return createInjector(override(override(new SharedStateModule()).with(new EmfUiModule(Activator.getDefault()))) + .with(new ResourceModule())); } } diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/link/ResourceModule.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/link/ResourceModule.java index ca1d64b75..662de5ee3 100644 --- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/link/ResourceModule.java +++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/link/ResourceModule.java @@ -8,14 +8,18 @@ package org.eclipse.etrice.ui.structure.link; + +import org.eclipse.etrice.ui.common.base.refactoring.DiagramReferenceUpdater; +import org.eclipse.etrice.ui.common.base.support.DiagramAccessBase; +import org.eclipse.etrice.ui.structure.DiagramAccess; import org.eclipse.xtext.resource.generic.AbstractGenericResourceRuntimeModule; +import org.eclipse.xtext.ui.refactoring.IReferenceUpdater; /** * @author Henrik Rentz-Reichert - initial contribution and API * */ -public class ResourceModule extends - AbstractGenericResourceRuntimeModule { +public class ResourceModule extends AbstractGenericResourceRuntimeModule { /* (non-Javadoc) * @see org.eclipse.xtext.resource.generic.AbstractGenericResourceRuntimeModule#getLanguageName() @@ -32,5 +36,13 @@ public class ResourceModule extends protected String getFileExtensions() { return "structure"; } + + public Class<? extends IReferenceUpdater> bindIReferenceUpdater() { + return DiagramReferenceUpdater.class; + } + + public Class<? extends DiagramAccessBase> bindDiagramAccess() { + return DiagramAccess.class; + } } diff --git a/plugins/pom.xml b/plugins/pom.xml index c76bced7b..3e3458d10 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.parent</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> <relativePath>../releng/org.eclipse.etrice.parent</relativePath> </parent> <groupId>org.eclipse.etrice</groupId> @@ -6,7 +6,7 @@ <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml index 209632eb9..46d4c9d46 100644 --- a/releng/org.eclipse.etrice.parent/pom.xml +++ b/releng/org.eclipse.etrice.parent/pom.xml @@ -5,14 +5,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.parent</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> <packaging>pom</packaging> <properties> <project.build.sourceEncoding>Cp1252</project.build.sourceEncoding> - - <xtext.version>2.13.0</xtext.version> - <tycho.version>1.0.0</tycho.version> + <xtext.version>2.12.0</xtext.version> + <tycho.version>1.1.0</tycho.version> <cbi.version>1.1.4</cbi.version> <eclipse.url>http://download.eclipse.org/releases/oxygen</eclipse.url> @@ -20,7 +19,9 @@ <license.url>http://download.eclipse.org/cbi/updates/license</license.url> <orbit.url>http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository</orbit.url> <cbi.url>https://repo.eclipse.org/content/repositories/cbi-releases</cbi.url> + <etrice.url>http://download.eclipse.org/etrice/updates/nightly</etrice.url> + <build.alias></build.alias> <build.type>N</build.type> </properties> @@ -90,8 +91,29 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-packaging-plugin</artifactId> <version>${tycho.version}</version> + <dependencies> + <dependency> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-buildtimestamp-jgit</artifactId> + <version>${tycho.version}</version> + </dependency> + </dependencies> <configuration> - <format>'${build.type}'yyyyMMddHHmm</format> + <format>'${build.alias}${build.type}'yyyyMMddHHmm</format> + <timestampProvider>jgit</timestampProvider> + <jgit.dirtyWorkingTree>warning</jgit.dirtyWorkingTree> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <baselineRepositories> + <repository> + <url>${etrice.url}</url> + </repository> + </baselineRepositories> </configuration> </plugin> <plugin> @@ -114,7 +136,7 @@ <outputDirectory>xtend-gen</outputDirectory> </configuration> </plugin> - <!-- plugin> + <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <version>${tycho.version}</version> @@ -147,7 +169,7 @@ </environment> </environments> </configuration> - </plugin --> + </plugin> </plugins> </build> </project> diff --git a/releng/org.eclipse.etrice.site/category.xml b/releng/org.eclipse.etrice.site/category.xml index 134e911aa..e1c064804 100644 --- a/releng/org.eclipse.etrice.site/category.xml +++ b/releng/org.eclipse.etrice.site/category.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <site> - <feature id="org.eclipse.etrice.feature" version="1.1.1.qualifier"> + <feature id="org.eclipse.etrice.feature" version="1.1.2.qualifier"> <category name="org.eclipse.etrice"/> </feature> - <feature id="org.eclipse.etrice.cdt-integration.feature" version="1.1.1.qualifier"> + <feature id="org.eclipse.etrice.cdt-integration.feature" version="1.1.2.qualifier"> <category name="org.eclipse.etrice"/> </feature> <category-def name="org.eclipse.etrice" label="eTrice"> diff --git a/releng/org.eclipse.etrice.site/pom.xml b/releng/org.eclipse.etrice.site/pom.xml index 078dc6cb5..22c89886a 100644 --- a/releng/org.eclipse.etrice.site/pom.xml +++ b/releng/org.eclipse.etrice.site/pom.xml @@ -2,13 +2,28 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.parent</artifactId> - <version>1.1.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath> + <version>1.1.2-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.etrice.parent</relativePath> </parent> + <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.site</artifactId> <packaging>eclipse-repository</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-repository-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <finalName>${project.name}-${qualifiedVersion}</finalName> + </configuration> + </plugin> + </plugins> + </build> </project> 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 3a8c00d71..4c281c9e2 100644 --- a/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF +++ b/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF @@ -2,6 +2,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Java ModelLib Bundle-SymbolicName: org.eclipse.etrice.modellib.java -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.c b/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.c index 763185dee..7c08cc716 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.c +++ b/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.c @@ -14,11 +14,11 @@ #include <string.h> -void etStaticDeque_construct(etStaticDeque* const self, void* memory, int size, int objectSize) { +void etStaticDeque_construct(etStaticDeque* const self, void* memory, int memorySize, int objectSize) { self->size = 0; self->first = 0; self->memory = memory; - self->maxSize = size; + self->maxSize = memorySize / objectSize; self->objectSize = objectSize; etStaticDeque_clear(self); diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.h b/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.h index 2333bb0dc..4ec186fd9 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.h +++ b/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.h @@ -26,78 +26,78 @@ typedef struct etStaticDeque { int first; /* index of the first object */ int size; /* current size of the queue */ int maxSize; /* the maximum size of the queue */ - int objectSize; /* the maximum size of the objects contained in this queue */ + int objectSize; /* the size of the objects contained in this queue in bytes */ } etStaticDeque; /** * Constructs the Deque on the given memory with specified size and objectSize. * - * \param self the pointer to the StaticDeque - * \param memory a pointer to the memory for the objects of the StaticDeque - * \param size the maximum count of objects that fit into the specified memory - * \param objectSize the size of the objects stored in the StaticDeque + * \param self The pointer to the StaticDeque + * \param memory A pointer to the memory for the objects of the StaticDeque + * \param memorySize The size of the memory in bytes + * \param objectSize The size of the objects stored in the StaticDeque in bytes */ -void etStaticDeque_construct(etStaticDeque* self, void* memory, int size, int objectSize); +void etStaticDeque_construct(etStaticDeque* self, void* memory, int memorySize, int objectSize); /** * Clears the Deque, removes all objects. * - * \param self the pointer to the StaticDeque + * \param self The pointer to the StaticDeque */ void etStaticDeque_clear(etStaticDeque* self); /** * Returns a reference to an arbitrary object at the specified position. * - * \param self the pointer to the StaticDeque - * \param position the position of the object to be returned - * \return the object at the specified position + * \param self The pointer to the StaticDeque + * \param position The position of the object to be returned + * \return The object at the specified position */ void* etStaticDeque_get(const etStaticDeque* self, int position); /** * Copies the object and stores it at the front * - * \param self the pointer to the StaticDeque - * \param object the object to push to the front of the queue + * \param self The pointer to the StaticDeque + * \param object The object to push to the front of the queue */ void etStaticDeque_push_front(etStaticDeque* self, void* object); /** * Copies the object and stores it at the end * - * \param self the pointer to the StaticDeque - * \param object the object to push to the end of the queue + * \param self The pointer to the StaticDeque + * \param object The object to push to the end of the queue */ void etStaticDeque_push_back(etStaticDeque* self, void* object); /** * Removes the first object * - * \param self the pointer to the StaticDeque + * \param self The pointer to the StaticDeque */ void etStaticDeque_pop_front(etStaticDeque* self); /** * Removes the last element * - * \param self the pointer to the StaticDeque + * \param self The pointer to the StaticDeque */ void etStaticDeque_pop_back(etStaticDeque* self); /** * Returns a reference to the first object * - * \param self the pointer to the StaticDeque - * \return the object at the front of the queue + * \param self The pointer to the StaticDeque + * \return The object at the front of the queue */ void* etStaticDeque_front(const etStaticDeque* self); /** * Returns a reference to the last object * - * \param self the pointer to the StaticDeque - * \return the object at the end of the queue + * \param self The pointer to the StaticDeque + * \return The object at the end of the queue */ void* etStaticDeque_back(const etStaticDeque* self); 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 51bd67dc3..8274e7993 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 @@ -2,6 +2,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Java Runtime Aspects Bundle-SymbolicName: org.eclipse.etrice.runtime.java.aspects -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Export-Package: org.eclipse.etrice.runtime.java.aspects Bundle-RequiredExecutionEnvironment: JavaSE-1.6 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 162424d23..dc613744f 100644 --- a/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF +++ b/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Java Runtime Bundle-SymbolicName: org.eclipse.etrice.runtime.java -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Export-Package: org.eclipse.etrice.runtime.java.config, org.eclipse.etrice.runtime.java.debugging, org.eclipse.etrice.runtime.java.etunit, 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 9df90ecd8..94311030a 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 @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Abstract Execution for Behavior Tests Bundle-SymbolicName: org.eclipse.etrice.abstractexec.behavior.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.abstractexec.behavior.tests.Activator Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.2", org.eclipse.core.runtime, org.eclipse.emf.ecore;bundle-version="2.7.0", com.google.inject;bundle-version="3.0.0", 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 f9f2bcc31..bce22359d 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests for common eTrice grammar fragments and classes Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.common.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.etrice.core.common, 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 084f11a02..104c3c37c 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 @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Config DSL Tests Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.config.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.config;bundle-version="1.1.1", - org.eclipse.etrice.core.config.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.config;bundle-version="1.1.2", + org.eclipse.etrice.core.config.ui;bundle-version="1.1.2", org.eclipse.core.runtime, org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.xtext.junit4;bundle-version="2.6.0", 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 f086a87d4..7eaadbdaa 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 @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.etrice.core.etmap.tests Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.etmap.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.2", org.eclipse.core.runtime, org.eclipse.xtext.junit4;bundle-version="2.6.0", org.eclipse.ui.workbench;resolution:=optional, 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 4bc3f4084..424d80168 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 @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.etrice.core.etphys.tests Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.etphys.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.etphys;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.etphys;bundle-version="1.1.2", org.eclipse.etrice.core.etphys.ui, org.eclipse.core.runtime, org.eclipse.xtext.junit4;bundle-version="2.6.0", 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 596021e5b..068c6f68a 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: FSM DSL Tests Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.fsm.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.etrice.core.common, 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 15be3c948..69d1adcc5 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 @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", org.junit;bundle-version="4.8.1", org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.core.runtime;bundle-version="3.7.0" 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 936985085..feb8469e7 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 @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Room Core Tests Bundle-SymbolicName: org.eclipse.etrice.core.room.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.common;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.common;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", org.junit;bundle-version="4.8.1", org.eclipse.xtext.junit4, org.eclipse.xtext.xbase.junit, 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 ca57051da..04a4ece99 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 @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: etUnit Converter Tests Bundle-SymbolicName: org.eclipse.etrice.etunit.converter.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.etunit.converter.tests.Activator Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.etunit.converter;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.etunit.converter;bundle-version="1.1.2", org.eclipse.core.runtime, org.junit;bundle-version="4.8.2" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/org.eclipse.etrice.generator.c.tests/.gitignore b/tests/org.eclipse.etrice.generator.c.tests/.gitignore index 57f15dea9..ac261cd82 100644 --- a/tests/org.eclipse.etrice.generator.c.tests/.gitignore +++ b/tests/org.eclipse.etrice.generator.c.tests/.gitignore @@ -1,7 +1,5 @@ src-gen/ bin -models +models/* output results -src-gen -log diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/.gitignore b/tests/org.eclipse.etrice.generator.cpp.tests/.gitignore index 57f15dea9..ac261cd82 100644 --- a/tests/org.eclipse.etrice.generator.cpp.tests/.gitignore +++ b/tests/org.eclipse.etrice.generator.cpp.tests/.gitignore @@ -1,7 +1,5 @@ src-gen/ bin -models +models/* output results -src-gen -log 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 ca35ad64f..9a005c243 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 @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.etrice.generator.fsmtest.tests Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.generator.fsmtest;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsmtest.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.generator.fsmtest;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsmtest.ui;bundle-version="1.1.2", org.eclipse.core.runtime, org.eclipse.xtext.junit4;bundle-version="2.6.0", org.eclipse.ui.workbench;resolution:=optional diff --git a/tests/org.eclipse.etrice.generator.java.tests/.gitignore b/tests/org.eclipse.etrice.generator.java.tests/.gitignore index 04ab4331e..e13c0a3a4 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/.gitignore +++ b/tests/org.eclipse.etrice.generator.java.tests/.gitignore @@ -1,10 +1,6 @@ src-gen/ bin -models +models/* output results -src-gen -log -/tmp/ -/firstOpt.obj -/secondOpt.obj +*.obj 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 745edf6b5..e84d5fe72 100644 --- a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Generator Model Tests Bundle-SymbolicName: org.eclipse.etrice.generator.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", org.junit;bundle-version="4.8.1", org.eclipse.osgi;bundle-version="3.6.0", org.eclipse.xtext;bundle-version="2.6.0", diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/container/TestEtStaticDeque.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/container/TestEtStaticDeque.c index 67d4a5a8f..e795cf5aa 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/container/TestEtStaticDeque.c +++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/container/TestEtStaticDeque.c @@ -34,7 +34,7 @@ void TestEtStaticDeque_testConstruct(etInt16 caseId) { // Test constructor StaticDeque(void) etStaticDeque deque; int memory[10]; - etStaticDeque_construct(&deque, memory, 10, sizeof(int)); + etStaticDeque_construct(&deque, memory, sizeof(memory), sizeof(int)); EXPECT_EQUAL_INT32(caseId, failMsg, 0, deque.size); EXPECT_TRUE(caseId, failMsg, deque.size == 0); } @@ -45,7 +45,7 @@ void TestEtStaticDeque_testPushPop(etInt16 caseId) { // Test push_back and push_front with 6 objects of type DataClass etStaticDeque deque; DataClass memory[6]; - etStaticDeque_construct(&deque, memory, 6, sizeof(DataClass)); + etStaticDeque_construct(&deque, memory, sizeof(memory), sizeof(DataClass)); DataClass d1 = { 1, 1.5, "Data 1" }; DataClass d2 = { 2, 2.5, "Data 2" }; DataClass d3 = { 3, 3.5, "Data 3" }; 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 edc780d96..725c9a083 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 @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Diagram Test Base Classes Bundle-SymbolicName: org.eclipse.etrice.ui.base.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Require-Bundle: org.junit;bundle-version="4.8.1", org.eclipse.core.runtime, - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.ui.structure;bundle-version="1.1.1", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.ui.structure;bundle-version="1.1.2", org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.graphiti;bundle-version="0.8.0", org.eclipse.etrice.ui.common.base, 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 4d200de66..47e934ce5 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 @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Behavior Diagram Tests Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.behavior.BehaviorTestActivator Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.ui.behavior;bundle-version="1.1.1", - org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.1", - org.eclipse.etrice.ui.common;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", - org.eclipse.etrice.ui.base.tests;bundle-version="1.1.1", - org.eclipse.etrice.generator.launch;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.ui.behavior;bundle-version="1.1.2", + org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.2", + org.eclipse.etrice.ui.common;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", + org.eclipse.etrice.ui.base.tests;bundle-version="1.1.2", + org.eclipse.etrice.generator.launch;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.core.runtime, org.junit;bundle-version="4.8.1", 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 6ab01c2a4..ecd975682 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 @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Structure Diagram Tests Bundle-SymbolicName: org.eclipse.etrice.ui.structure.tests -Bundle-Version: 1.1.1.qualifier -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.ui.structure;bundle-version="1.1.1", - org.eclipse.etrice.ui.common;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", - org.eclipse.etrice.ui.base.tests;bundle-version="1.1.1", +Bundle-Version: 1.1.2.qualifier +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.ui.structure;bundle-version="1.1.2", + org.eclipse.etrice.ui.common;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", + org.eclipse.etrice.ui.base.tests;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.core.runtime, org.junit;bundle-version="4.8.1", diff --git a/tests/pom.xml b/tests/pom.xml index 4376835cb..e1284f505 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.parent</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> <relativePath>../releng/org.eclipse.etrice.parent</relativePath> </parent> <groupId>org.eclipse.etrice</groupId> |