Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2011-10-17 09:27:12 +0000
committerHenrik Rentz-Reichert2011-10-17 09:27:12 +0000
commit6af5c7f18c078e42157f7d4db685f09e94208d7d (patch)
treec1250d05efb1b5b7eab95a310adc629083d34b41
parentdb08f9ab5ac4d2cb0af9701b807f7837b6c7b248 (diff)
downloadorg.eclipse.etrice-6af5c7f18c078e42157f7d4db685f09e94208d7d.tar.gz
org.eclipse.etrice-6af5c7f18c078e42157f7d4db685f09e94208d7d.tar.xz
org.eclipse.etrice-6af5c7f18c078e42157f7d4db685f09e94208d7d.zip
[tutorials] fixed import statements, converted project to plain Java
-rw-r--r--examples/org.eclipse.etrice.tutorials/.classpath1
-rw-r--r--examples/org.eclipse.etrice.tutorials/.project11
-rw-r--r--examples/org.eclipse.etrice.tutorials/META-INF/MANIFEST.MF15
-rw-r--r--examples/org.eclipse.etrice.tutorials/gen_org.eclipse.etrice.tutorials.launch22
-rw-r--r--examples/org.eclipse.etrice.tutorials/model/Blinky/Blinky.room8
-rw-r--r--examples/org.eclipse.etrice.tutorials/model/scratch/PingPong.room2
6 files changed, 17 insertions, 42 deletions
diff --git a/examples/org.eclipse.etrice.tutorials/.classpath b/examples/org.eclipse.etrice.tutorials/.classpath
index 18304f00e..f690d2878 100644
--- a/examples/org.eclipse.etrice.tutorials/.classpath
+++ b/examples/org.eclipse.etrice.tutorials/.classpath
@@ -1,7 +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="src" path="src"/>
<classpathentry kind="src" path="src-gen"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.modellib"/>
diff --git a/examples/org.eclipse.etrice.tutorials/.project b/examples/org.eclipse.etrice.tutorials/.project
index 7c0da6ca3..ebf1994f5 100644
--- a/examples/org.eclipse.etrice.tutorials/.project
+++ b/examples/org.eclipse.etrice.tutorials/.project
@@ -11,16 +11,6 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
@@ -32,7 +22,6 @@
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
<nature>org.eclipse.xtend.shared.ui.xtendXPandNature</nature>
diff --git a/examples/org.eclipse.etrice.tutorials/META-INF/MANIFEST.MF b/examples/org.eclipse.etrice.tutorials/META-INF/MANIFEST.MF
deleted file mode 100644
index f92677694..000000000
--- a/examples/org.eclipse.etrice.tutorials/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tutorials
-Bundle-SymbolicName: org.eclipse.etrice.tutorials
-Bundle-Version: 0.1.0.qualifier
-Require-Bundle: org.eclipse.etrice.generator.java;bundle-version="0.1.0",
- org.eclipse.etrice.generator;bundle-version="0.1.0",
- org.eclipse.etrice.modellib;bundle-version="0.1.0",
- org.eclipse.jface.text;bundle-version="3.6.0",
- org.eclipse.jdt.core;bundle-version="3.6.0",
- org.eclipse.xtend.util.stdlib;bundle-version="1.0.0",
- org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.xtext.generator;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Vendor: eTrice (Incubation)
diff --git a/examples/org.eclipse.etrice.tutorials/gen_org.eclipse.etrice.tutorials.launch b/examples/org.eclipse.etrice.tutorials/gen_org.eclipse.etrice.tutorials.launch
index 6d27fa40c..70aa84691 100644
--- a/examples/org.eclipse.etrice.tutorials/gen_org.eclipse.etrice.tutorials.launch
+++ b/examples/org.eclipse.etrice.tutorials/gen_org.eclipse.etrice.tutorials.launch
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/Main.java"/>
+<launchConfiguration type="org.eclipse.etrice.generator.launch.java.launchConfigurationType">
+<booleanAttribute key="GenInstanceDiagram" value="false"/>
+<stringAttribute key="GenModelPath" value=""/>
+<listAttribute key="ModelFiles">
+<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials/model/scratch/PingPong.room}"/>
+<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials/model/Blinky/Blinky.room}"/>
+<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials/model/PedLightsController/PedLightsController.room}"/>
+<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials/model/SendingData/SendingData.room}"/>
+<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials/model/HelloWorld/HelloWorld.room}"/>
</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.etrice.generator.java.Main"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="${workspace_loc:org.eclipse.etrice.tutorials}\model\HelloWorld\HelloWorld.room&#13;&#10;${workspace_loc:org.eclipse.etrice.tutorials}\model\Blinky\Blinky.room&#13;&#10;${workspace_loc:org.eclipse.etrice.tutorials}\model\PedLightsController\PedLightsController.room&#13;&#10;${workspace_loc:org.eclipse.etrice.tutorials}\model\SendingData\SendingData.room&#13;&#10;${workspace_loc:org.eclipse.etrice.modellib}\models\TimingService.room"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.generator.java"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:org.eclipse.etrice.tutorials}"/>
+<booleanAttribute key="SaveGenModel" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
</launchConfiguration>
diff --git a/examples/org.eclipse.etrice.tutorials/model/Blinky/Blinky.room b/examples/org.eclipse.etrice.tutorials/model/Blinky/Blinky.room
index 6a1c77b71..dec2906db 100644
--- a/examples/org.eclipse.etrice.tutorials/model/Blinky/Blinky.room
+++ b/examples/org.eclipse.etrice.tutorials/model/Blinky/Blinky.room
@@ -1,12 +1,14 @@
RoomModel Blinky {
+ import room.basic.service.timing.* from "../../../org.eclipse.etrice.modellib/models/TimingService.room"
+
LogicalSystem System_Blinky {
SubSystemRef subsystem: SubSystem_Blinky
}
SubSystemClass SubSystem_Blinky {
ActorRef application: BlinkyTop
- ActorRef timingService: room.basic.service.timing.ATimingService
+ ActorRef timingService: ATimingService
LayerConnection ref application satisfied_by timingService.timer
LayerConnection ref application satisfied_by timingService.timeout
}
@@ -34,7 +36,7 @@ RoomModel Blinky {
"private TrafficLight2 pedLights;"
}
external Port ControlPort
- SAP timer: room.basic.service.timing.PTimeout
+ SAP timer: PTimeout
}
Behavior {
Operation destroyUser() {
@@ -103,7 +105,7 @@ RoomModel Blinky {
}
Structure {
external Port ControlPort
- SAP timer: room.basic.service.timing.PTimeout
+ SAP timer: PTimeout
}
Behavior {
StateMachine {
diff --git a/examples/org.eclipse.etrice.tutorials/model/scratch/PingPong.room b/examples/org.eclipse.etrice.tutorials/model/scratch/PingPong.room
index bdd82520e..ec42cc43e 100644
--- a/examples/org.eclipse.etrice.tutorials/model/scratch/PingPong.room
+++ b/examples/org.eclipse.etrice.tutorials/model/scratch/PingPong.room
@@ -1,6 +1,6 @@
RoomModel PingPong {
- import room.basic.service.timing.*
+ import room.basic.service.timing.* from "../../../org.eclipse.etrice.modellib/models/TimingService.room"
LogicalSystem System_PingPong {
SubSystemRef subsystem: SubSystem_PingPong

Back to the top