[*] manually merged DynamicActors, new ui.structure and physical model aware Java generator

13 files changed, 54 insertions, 5 deletions

diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.dynamicactors1.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.dynamicactors1.zip
new file mode 100644
index 000000000..be64184ca
--- /dev/null
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.dynamicactors1.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.dynamicactors2.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.dynamicactors2.zip
new file mode 100644
index 000000000..05e34970c
--- /dev/null
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.dynamicactors2.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
index 1d95b46db..5e1cd47aa 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip
index e3a031752..bc3fe9980 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
index 23ef13e8a..06ca8d1b1 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
index 10f7481cb..e2e566945 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip
index 99e17e7aa..4faaf2b6e 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
index be489ca8c..738d7fba1 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
index a1c9470a0..4d8f4081b 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
index eb33a9c6c..84cb988d6 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.simulators.trafficlight.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.simulators.trafficlight.zip
index f87601eb7..7a44aabcd 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.simulators.trafficlight.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.simulators.trafficlight.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/create_contents.xml b/plugins/org.eclipse.etrice.ui.runtime/create_contents.xml
index 91719ee54..99017c4f3 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/create_contents.xml
+++ b/plugins/org.eclipse.etrice.ui.runtime/create_contents.xml
@@ -24,11 +24,14 @@
 		<zip_project source="../../runtime" name="org.eclipse.etrice.modellib.java" />
 		<zip_project source="../../runtime" name="org.eclipse.etrice.runtime.c" />
 		<zip_project source="../../runtime" name="org.eclipse.etrice.modellib.c" />
-		<zip_project source="../../examples" name="org.eclipse.etrice.tutorials.java" />
-		<zip_project source="../../examples" name="org.eclipse.etrice.tutorials.c" />
 		<zip_project source="../../runtime" name="org.eclipse.etrice.runtime.cpp" />
 		<zip_project source="../../runtime" name="org.eclipse.etrice.modellib.cpp" />
+		
+		<zip_project source="../../examples" name="org.eclipse.etrice.tutorials.java" />
+		<zip_project source="../../examples" name="org.eclipse.etrice.tutorials.c" />
 		<zip_project source="../../examples" name="org.eclipse.etrice.tutorials.simulators.trafficlight" />
+		<zip_project source="../../examples" name="org.eclipse.etrice.examples.dynamicactors1" />
+		<zip_project source="../../examples" name="org.eclipse.etrice.examples.dynamicactors2" />
 	</target>
 
 </project>
diff --git a/plugins/org.eclipse.etrice.ui.runtime/plugin.xml b/plugins/org.eclipse.etrice.ui.runtime/plugin.xml
index 21183c6eb..8e6b3f851 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/plugin.xml
+++ b/plugins/org.eclipse.etrice.ui.runtime/plugin.xml
@@ -2,6 +2,12 @@
 <?eclipse version="3.4"?>
 <plugin>
 
+   <extension point="org.eclipse.ui.newWizards">
+      <category
+            id="org.eclipse.etrice.core.ui.wizardCategory"
+            name="eTrice"/>
+   </extension>
+
 	<!-- ========= org.eclipse.etrice.runtime.c ========= -->
 	<extension point="org.eclipse.ui.newWizards">
 		<wizard	id="org.eclipse.etrice.ui.runtime.NewCRuntimeWizard" 
@@ -104,12 +110,18 @@
 	  </example>
 	</extension>   
 
+	<extension point="org.eclipse.ui.newWizards">
+      <category
+            id="org.eclipse.etrice.core.ui.exampleWizardCategory"
+            name="eTrice Examples and Tutorials"/>
+	</extension>
+
 	<!-- ========= org.eclipse.etrice.tutorials.java ========= -->
 	<extension point="org.eclipse.ui.newWizards">
 		<wizard	id="org.eclipse.etrice.ui.runtime.NewJavaTutorialWizard" 
 			name="eTrice Java Tutorials" 
 			class="org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard" 
-			category="org.eclipse.etrice.core.ui.wizardCategory"
+			category="org.eclipse.etrice.core.ui.exampleWizardCategory"
 			icon="icons/genproject.gif" 
 			project="true">
 			<description>eTrice Java tutorials accompanying the online help</description>
@@ -126,7 +138,7 @@
 		<wizard	id="org.eclipse.etrice.ui.runtime.NewCTutorialWizard" 
 			name="eTrice C Tutorials" 
 			class="org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard" 
-			category="org.eclipse.etrice.core.ui.wizardCategory"
+			category="org.eclipse.etrice.core.ui.exampleWizardCategory"
 			icon="icons/genproject.gif" 
 			project="true">
 			<description>eTrice C tutorials accompanying the online help</description>
@@ -143,7 +155,7 @@
 		<wizard	id="org.eclipse.etrice.ui.runtime.NewTrafficlightlWizard" 
 			name="eTrice Trafficlight for Tutorials" 
 			class="org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard" 
-			category="org.eclipse.etrice.core.ui.wizardCategory"
+			category="org.eclipse.etrice.core.ui.exampleWizardCategory"
 			icon="icons/genproject.gif" 
 			project="true">
 			<description>eTrice traffic light GUI used in tutorials</description>
@@ -155,4 +167,38 @@
 	  </example>
 	</extension>   
 
+	<!-- ========= org.eclipse.etrice.examples.dynamicactors1 ========= -->
+	<extension point="org.eclipse.ui.newWizards">
+		<wizard	id="org.eclipse.etrice.ui.runtime.Example_DynamicActors1" 
+			name="eTrice Dynamic Actors Example 1" 
+			class="org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard" 
+			category="org.eclipse.etrice.core.ui.exampleWizardCategory"
+			icon="icons/genproject.gif" 
+			project="true">
+			<description>eTrice introductory example for dynamic actors</description>
+		</wizard>
+	</extension>
+	<extension point="org.eclipse.emf.common.ui.examples">
+	   <example wizardID="org.eclipse.etrice.ui.runtime.Example_DynamicActors1" pageImage="icons/genproject.gif">
+		 <projectDescriptor name="org.eclipse.etrice.examples.dynamicactors1" contentURI="contents/org.eclipse.etrice.examples.dynamicactors1.zip" description="Exmaple Dynamic Actors 1"/>
+	  </example>
+	</extension>   
+
+	<!-- ========= org.eclipse.etrice.examples.dynamicactors2 ========= -->
+	<extension point="org.eclipse.ui.newWizards">
+		<wizard	id="org.eclipse.etrice.ui.runtime.Example_dynamicactors2" 
+			name="eTrice Dynamic Actors Example 2" 
+			class="org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard" 
+			category="org.eclipse.etrice.core.ui.exampleWizardCategory"
+			icon="icons/genproject.gif" 
+			project="true">
+			<description>eTrice introductory example for dynamic actors</description>
+		</wizard>
+	</extension>
+	<extension point="org.eclipse.emf.common.ui.examples">
+	   <example wizardID="org.eclipse.etrice.ui.runtime.Example_dynamicactors2" pageImage="icons/genproject.gif">
+		 <projectDescriptor name="org.eclipse.etrice.examples.dynamicactors2" contentURI="contents/org.eclipse.etrice.examples.dynamicactors2.zip" description="Exmaple Dynamic Actors 2"/>
+	  </example>
+	</extension>   
+
 </plugin>