diff options
30 files changed, 162 insertions, 1 deletions
diff --git a/features/org.eclipse.etrice.core.feature/feature.xml b/features/org.eclipse.etrice.core.feature/feature.xml index 9ed551f38..c39a713a1 100644 --- a/features/org.eclipse.etrice.core.feature/feature.xml +++ b/features/org.eclipse.etrice.core.feature/feature.xml @@ -148,4 +148,11 @@ http://www.eclipse.org/legal/epl-v10.html Description here. version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.etrice.ui.runtime"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/newwizard/EmptyProjectWizard.java b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/newwizard/EmptyProjectWizard.java index 3359f3d38..03483c9e6 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/newwizard/EmptyProjectWizard.java +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/newwizard/EmptyProjectWizard.java @@ -83,7 +83,7 @@ public class EmptyProjectWizard extends Wizard implements INewWizard { newProjectCreationPage.setInitialProjectName(initialProjectName);
newProjectCreationPage.setTitle("Empty eTrice Project");
newProjectCreationPage
- .setDescription("Create an empty Java plug-in project with eTrice dependencies");
+ .setDescription("Create an empty Java project with eTrice dependencies");
addPage(newProjectCreationPage);
}
diff --git a/plugins/org.eclipse.etrice.ui.runtime/.classpath b/plugins/org.eclipse.etrice.ui.runtime/.classpath new file mode 100644 index 000000000..78d5ded0f --- /dev/null +++ b/plugins/org.eclipse.etrice.ui.runtime/.classpath @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.eclipse.etrice.ui.runtime/.project b/plugins/org.eclipse.etrice.ui.runtime/.project new file mode 100644 index 000000000..139dbbb58 --- /dev/null +++ b/plugins/org.eclipse.etrice.ui.runtime/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.etrice.ui.runtime</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.etrice.ui.runtime/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.ui.runtime/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..cdbbe68b6 --- /dev/null +++ b/plugins/org.eclipse.etrice.ui.runtime/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +#Fri Oct 07 11:53:16 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF new file mode 100644 index 000000000..6718e7ca9 --- /dev/null +++ b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: New Wizards for Runtime +Bundle-SymbolicName: org.eclipse.etrice.ui.runtime;singleton:=true +Bundle-Version: 0.1.0.qualifier +Bundle-Vendor: eTrice (Incubation) +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.emf.common.ui;bundle-version="2.7.0" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy diff --git a/modellib/org.eclipse.etrice.modellib/about.html b/plugins/org.eclipse.etrice.ui.runtime/about.html index f47dbddbb..f47dbddbb 100644 --- a/modellib/org.eclipse.etrice.modellib/about.html +++ b/plugins/org.eclipse.etrice.ui.runtime/about.html diff --git a/plugins/org.eclipse.etrice.ui.runtime/build.properties b/plugins/org.eclipse.etrice.ui.runtime/build.properties new file mode 100644 index 000000000..ff977639f --- /dev/null +++ b/plugins/org.eclipse.etrice.ui.runtime/build.properties @@ -0,0 +1,7 @@ +bin.includes = META-INF/,\
+ .,\
+ about.html,\
+ plugin.xml,\
+ contents/,\
+ icons/,\
+ plugin.properties
diff --git a/plugins/org.eclipse.etrice.ui.runtime/build.xml b/plugins/org.eclipse.etrice.ui.runtime/build.xml new file mode 100644 index 000000000..1d0be2a5c --- /dev/null +++ b/plugins/org.eclipse.etrice.ui.runtime/build.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!-- ======================================================================
+ This ant script creates a zip file for each of eTrice's runtime projects.
+ If the projects would not be zipped the resulting file namens would be too long to be
+ handled my MS Windows. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=301858
+
+ Henrik Rentz-Reichert (original by Moritz Eysholdt)
+ ====================================================================== -->
+<project name="project" default="zip_all_projects">
+
+ <property name="source" location="../../runtime" />
+ <property name="target" location="contents" />
+
+ <macrodef name="zip_project">
+ <attribute name="name" default="default" />
+ <sequential>
+ <delete file="${target}/@{name}.zip" />
+ <zip destfile="${target}/@{name}.zip" basedir="${source}/@{name}" excludes="bin,bin/**" />
+ </sequential>
+ </macrodef>
+
+ <target name="zip_all_projects">
+ <zip_project name="org.eclipse.etrice.runtime.java" />
+ <zip_project name="org.eclipse.etrice.modellib" />
+ </target>
+
+</project>
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.zip Binary files differnew file mode 100644 index 000000000..22d7d270e --- /dev/null +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip Binary files differnew file mode 100644 index 000000000..4b862c563 --- /dev/null +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/icons/genproject.gif b/plugins/org.eclipse.etrice.ui.runtime/icons/genproject.gif Binary files differnew file mode 100644 index 000000000..2f087aafb --- /dev/null +++ b/plugins/org.eclipse.etrice.ui.runtime/icons/genproject.gif diff --git a/plugins/org.eclipse.etrice.ui.runtime/plugin.xml b/plugins/org.eclipse.etrice.ui.runtime/plugin.xml new file mode 100644 index 000000000..38e2f91d6 --- /dev/null +++ b/plugins/org.eclipse.etrice.ui.runtime/plugin.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+ <!-- ========= org.eclipse.etrice.runtime.java ========= -->
+ <extension point="org.eclipse.ui.newWizards">
+ <wizard id="org.eclipse.etrice.ui.runtime.NewRuntimeWizard"
+ name="eTrice Java Runtime"
+ class="org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard"
+ category="org.eclipse.etrice.core.ui.wizardCategory"
+ icon="icons/genproject.gif"
+ project="true">
+ <description>The Java Runtime required by eTrice Java projects</description>
+ </wizard>
+ </extension>
+ <extension point="org.eclipse.emf.common.ui.examples">
+ <example wizardID="org.eclipse.etrice.ui.runtime.NewRuntimeWizard" pageImage="icons/genproject.gif">
+ <projectDescriptor name="org.eclipse.etrice.runtime.java" contentURI="contents/org.eclipse.etrice.runtime.java.zip" description="eTrice Runtime for Java"/>
+ </example>
+ </extension>
+
+ <!-- ========= org.eclipse.etrice.modellib ========= -->
+ <extension point="org.eclipse.ui.newWizards">
+ <wizard id="org.eclipse.etrice.ui.runtime.NewModelLibWizard"
+ name="eTrice Java ModelLib"
+ class="org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard"
+ category="org.eclipse.etrice.core.ui.wizardCategory"
+ icon="icons/genproject.gif"
+ project="true">
+ <description>A ROOM Model Library for Java with useful services</description>
+ </wizard>
+ </extension>
+ <extension point="org.eclipse.emf.common.ui.examples">
+ <example wizardID="org.eclipse.etrice.ui.runtime.NewModelLibWizard" pageImage="icons/genproject.gif">
+ <projectDescriptor name="org.eclipse.etrice.modellib" contentURI="contents/org.eclipse.etrice.modellib.zip" description="eTrice ModelLib for Java"/>
+ </example>
+ </extension>
+
+</plugin>
diff --git a/modellib/org.eclipse.etrice.modellib/.classpath b/runtime/org.eclipse.etrice.modellib/.classpath index 328066fad..328066fad 100644 --- a/modellib/org.eclipse.etrice.modellib/.classpath +++ b/runtime/org.eclipse.etrice.modellib/.classpath diff --git a/modellib/org.eclipse.etrice.modellib/.gitignore b/runtime/org.eclipse.etrice.modellib/.gitignore index f68b3dddc..f68b3dddc 100644 --- a/modellib/org.eclipse.etrice.modellib/.gitignore +++ b/runtime/org.eclipse.etrice.modellib/.gitignore diff --git a/modellib/org.eclipse.etrice.modellib/.project b/runtime/org.eclipse.etrice.modellib/.project index bed032a1f..bed032a1f 100644 --- a/modellib/org.eclipse.etrice.modellib/.project +++ b/runtime/org.eclipse.etrice.modellib/.project diff --git a/modellib/org.eclipse.etrice.modellib/.settings/org.eclipse.jdt.core.prefs b/runtime/org.eclipse.etrice.modellib/.settings/org.eclipse.jdt.core.prefs index 6a5ce29df..6a5ce29df 100644 --- a/modellib/org.eclipse.etrice.modellib/.settings/org.eclipse.jdt.core.prefs +++ b/runtime/org.eclipse.etrice.modellib/.settings/org.eclipse.jdt.core.prefs diff --git a/modellib/org.eclipse.etrice.modellib/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.modellib/META-INF/MANIFEST.MF index 60c0dc3cb..60c0dc3cb 100644 --- a/modellib/org.eclipse.etrice.modellib/META-INF/MANIFEST.MF +++ b/runtime/org.eclipse.etrice.modellib/META-INF/MANIFEST.MF diff --git a/runtime/org.eclipse.etrice.modellib/about.html b/runtime/org.eclipse.etrice.modellib/about.html new file mode 100644 index 000000000..f47dbddbb --- /dev/null +++ b/runtime/org.eclipse.etrice.modellib/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2006</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file diff --git a/modellib/org.eclipse.etrice.modellib/build.properties b/runtime/org.eclipse.etrice.modellib/build.properties index ef9db09a9..ef9db09a9 100644 --- a/modellib/org.eclipse.etrice.modellib/build.properties +++ b/runtime/org.eclipse.etrice.modellib/build.properties diff --git a/modellib/org.eclipse.etrice.modellib/models/Socket.room b/runtime/org.eclipse.etrice.modellib/models/Socket.room index 829d21180..829d21180 100644 --- a/modellib/org.eclipse.etrice.modellib/models/Socket.room +++ b/runtime/org.eclipse.etrice.modellib/models/Socket.room diff --git a/modellib/org.eclipse.etrice.modellib/models/SocketTest.room b/runtime/org.eclipse.etrice.modellib/models/SocketTest.room index 673ec380b..673ec380b 100644 --- a/modellib/org.eclipse.etrice.modellib/models/SocketTest.room +++ b/runtime/org.eclipse.etrice.modellib/models/SocketTest.room diff --git a/modellib/org.eclipse.etrice.modellib/models/TimingService.room b/runtime/org.eclipse.etrice.modellib/models/TimingService.room index 73d5dcea3..73d5dcea3 100644 --- a/modellib/org.eclipse.etrice.modellib/models/TimingService.room +++ b/runtime/org.eclipse.etrice.modellib/models/TimingService.room diff --git a/modellib/org.eclipse.etrice.modellib/models/diagrams/org.eclipse.etrice.modellib.Socket.SocketClient.structure b/runtime/org.eclipse.etrice.modellib/models/diagrams/org.eclipse.etrice.modellib.Socket.SocketClient.structure index 1d399f13c..1d399f13c 100644 --- a/modellib/org.eclipse.etrice.modellib/models/diagrams/org.eclipse.etrice.modellib.Socket.SocketClient.structure +++ b/runtime/org.eclipse.etrice.modellib/models/diagrams/org.eclipse.etrice.modellib.Socket.SocketClient.structure diff --git a/modellib/org.eclipse.etrice.modellib/models/diagrams/org.eclipse.etrice.modellib.Socket.test.SocketTest.structure b/runtime/org.eclipse.etrice.modellib/models/diagrams/org.eclipse.etrice.modellib.Socket.test.SocketTest.structure index f6d6a587a..f6d6a587a 100644 --- a/modellib/org.eclipse.etrice.modellib/models/diagrams/org.eclipse.etrice.modellib.Socket.test.SocketTest.structure +++ b/runtime/org.eclipse.etrice.modellib/models/diagrams/org.eclipse.etrice.modellib.Socket.test.SocketTest.structure diff --git a/modellib/org.eclipse.etrice.modellib/models/diagrams/room.basic.service.timing.ATimingService.structure b/runtime/org.eclipse.etrice.modellib/models/diagrams/room.basic.service.timing.ATimingService.structure index cb50244e9..cb50244e9 100644 --- a/modellib/org.eclipse.etrice.modellib/models/diagrams/room.basic.service.timing.ATimingService.structure +++ b/runtime/org.eclipse.etrice.modellib/models/diagrams/room.basic.service.timing.ATimingService.structure diff --git a/modellib/org.eclipse.etrice.modellib/src-gen/readme.txt b/runtime/org.eclipse.etrice.modellib/src-gen/readme.txt index c3b99d458..c3b99d458 100644 --- a/modellib/org.eclipse.etrice.modellib/src-gen/readme.txt +++ b/runtime/org.eclipse.etrice.modellib/src-gen/readme.txt diff --git a/modellib/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java index 61036b823..61036b823 100644 --- a/modellib/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java +++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java diff --git a/modellib/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimeout.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimeout.java index 81cb8ec53..81cb8ec53 100644 --- a/modellib/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimeout.java +++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimeout.java diff --git a/modellib/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimer.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimer.java index ad38c6340..ad38c6340 100644 --- a/modellib/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimer.java +++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimer.java |
