Merge pull request #248 from Yakindu/issue_239

Renamed examples

examples/org.yakindu.sct.examples.coffeemachine/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.yakindu.sct.examples.coffeemachine</name>
+	<name>coffee_machine</name>
 	<comment></comment>
 	<projects>
 	</projects>

examples/org.yakindu.sct.examples.coffeemachine/pom.xml

@@ -10,7 +10,7 @@
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	<groupId>org.yakindu.sct.examples</groupId>
-	<artifactId>org.yakindu.sct.examples.lightswitch</artifactId>
+	<artifactId>coffee_machine</artifactId>
 	<packaging>pom</packaging>
 
 	<properties>

examples/org.yakindu.sct.examples.lightswitch/.project

@@ -1,28 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.yakindu.sct.examples.lightswitch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</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.xtext.ui.shared.xtextNature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>digital_watch</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.yakindu.sct.builder.SCTBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.yakindu.sct.builder.SCTNature</nature>
+	</natures>
+</projectDescription>

examples/org.yakindu.sct.examples.clock/.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-encoding//model/clock.sct=UTF-8
 encoding/<project>=UTF-8
+encoding/DigitalWatch.sct=UTF-8

examples/digital_watch/DigitalWatch.sct.launch

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.yakindu.sct.simulation.core.launch.statechart">
+<booleanAttribute key="cycleBased" value="true"/>
+<intAttribute key="cyclePeriod" value="100"/>
+<booleanAttribute key="eventDriven" value="false"/>
+<stringAttribute key="filename" value="/digital_watch/DigitalWatch.sct"/>
+<stringAttribute key="operationClass" value=""/>
+</launchConfiguration>

examples/org.yakindu.sct.examples.clock/pom.xml

@@ -10,7 +10,7 @@
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	<groupId>org.yakindu.sct.examples</groupId>
-	<artifactId>org.yakindu.sct.examples.clock</artifactId>
+	<artifactId>digital_watch</artifactId>
 	<packaging>pom</packaging>
 
 	<properties>

examples/light_switch/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>light_switch</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+	</natures>
+</projectDescription>

examples/org.yakindu.sct.examples.lightswitch/pom.xml

@@ -10,7 +10,7 @@
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	<groupId>org.yakindu.sct.examples</groupId>
-	<artifactId>org.yakindu.sct.examples.lightswitch</artifactId>
+	<artifactId>light_switch</artifactId>
 	<packaging>pom</packaging>
 
 	<properties>

examples/org.yakindu.sct.examples.trafficlight/.project

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.yakindu.sct.examples.trafficlight</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>
-		<buildCommand>
-			<name>org.yakindu.sct.builder.SCTBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.yakindu.sct.builder.SCTNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>

examples/org.yakindu.sct.examples.trafficlight/src-gen/org/yakindu/sct/examples/trafficlight/cyclebased/IStatemachine.java

@@ -1,37 +0,0 @@
-/**
-Copyright (c) 2012 committers of YAKINDU and others.
-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:
-    committers of YAKINDU - initial API and implementation
-�*/
-package org.yakindu.sct.examples.trafficlight.cyclebased;
-
-/**
- * Basic interface for statemachines.
- */
-public interface IStatemachine {
-
-	/**
-	* Initializes the statemachine. Use to init internal variables etc.
-	*/
-	public void init();
-
-	/**
-	* Enters the statemachine. Sets the statemachine in a defined state.
-	*/
-	public void enter();
-
-	/**
-	* Exits the statemachine. Leaves the statemachine with a defined state.
-	*/
-	public void exit();
-
-	/**
-	* Start a run-to-completion cycle.
-	*/
-	public void runCycle();
-}

examples/org.yakindu.sct.ui.examples/plugin.xml

@@ -10,7 +10,7 @@
 
 	<extension point="org.eclipse.ui.newWizards">
 		<wizard	id="org.yakindu.sct.examples" 
-			name="SCT Examples" 
+			name="Statechart Examples" 
 			class="org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard" 
 			category="org.eclipse.ui.Examples/org.yakindu.sct.ui.Examples"
 			icon="icons/logo-16.png" 
@@ -18,11 +18,14 @@
 			<description>YAKINDU Statechart Tools examples</description>
 		</wizard>
 	</extension>
+	
+   <!-- org.yakindu.sct.example.lightswitch -->
 	<extension point="org.eclipse.emf.common.ui.examples">
 	  <example wizardID="org.yakindu.sct.examples" pageImage="icons/logo-16.png">
-		 <projectDescriptor name="org.yakindu.sct.examples.lightswitch" contentURI="contents/org.yakindu.sct.examples.lightswitch.zip" description="Lightswitch example from the tutorial section"/>
-		 <projectDescriptor name="org.yakindu.sct.examples.trafficlight" contentURI="contents/org.yakindu.sct.examples.trafficlight.zip" description="Trafficlight example with java generated source code"/>
-		 <projectDescriptor name="org.yakindu.sct.examples.clock" contentURI="contents/org.yakindu.sct.examples.clock.zip" description="Clock example Model without generated source code"/>
+	  	 <projectDescriptor name="light_switch" contentURI="contents/light_switch.zip" description="Light switch example from the tutorial section"/>
+		 <projectDescriptor name="traffic_light" contentURI="contents/traffic_light.zip" description="Traffic light example with java generated source code"/>
+		 <projectDescriptor name="digital_watch" contentURI="contents/digital_watch.zip" description="Digital watch hierarchies parallel regions, etc..."/>
 	  </example>
    </extension>
+   
 </plugin>

examples/org.yakindu.sct.ui.examples/pom.xml

@@ -29,11 +29,11 @@
 							<artifactItems>
 								<artifactItem>
 									<groupId>org.yakindu.sct.examples</groupId>
-									<artifactId>org.yakindu.sct.examples.trafficlight</artifactId>
+									<artifactId>traffic_light</artifactId>
 									<version>${project.version}</version>
 									<type>zip</type>
 									<classifier>content</classifier>
-									<destFileName>org.yakindu.sct.examples.trafficlight.zip</destFileName>
+									<destFileName>traffic_light.zip</destFileName>
 								</artifactItem>
 							</artifactItems>
 							<overWriteIfNewer>true</overWriteIfNewer>
@@ -50,11 +50,11 @@
 							<artifactItems>
 								<artifactItem>
 									<groupId>org.yakindu.sct.examples</groupId>
-									<artifactId>org.yakindu.sct.examples.clock</artifactId>
+									<artifactId>digital_watch</artifactId>
 									<version>${project.version}</version>
 									<type>zip</type>
 									<classifier>content</classifier>
-									<destFileName>org.yakindu.sct.examples.clock.zip</destFileName>
+									<destFileName>digital_watch.zip</destFileName>
 								</artifactItem>
 							</artifactItems>
 							<overWriteIfNewer>true</overWriteIfNewer>
@@ -71,11 +71,11 @@
 							<artifactItems>
 								<artifactItem>
 									<groupId>org.yakindu.sct.examples</groupId>
-									<artifactId>org.yakindu.sct.examples.lightswitch</artifactId>
+									<artifactId>light_switch</artifactId>
 									<version>${project.version}</version>
 									<type>zip</type>
 									<classifier>content</classifier>
-									<destFileName>org.yakindu.sct.examples.lightswitch.zip</destFileName>
+									<destFileName>light_switch.zip</destFileName>
 								</artifactItem>
 							</artifactItems>
 							<overWriteIfNewer>true</overWriteIfNewer>

examples/org.yakindu.sct.examples.clock/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.yakindu.sct.examples.clock</name>
+	<name>traffic_light</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -11,30 +11,30 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.yakindu.sct.builder.SCTBuilder</name>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
+			<name>org.yakindu.sct.builder.SCTBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-		<nature>org.yakindu.sct.builder.SCTNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.yakindu.sct.builder.SCTNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
 </projectDescription>

examples/org.yakindu.sct.examples.trafficlight/model/GenModelJava.sgen

@@ -3,12 +3,12 @@ GeneratorModel for yakindu::java {
 	statechart TrafficLightWaiting {
 	 	
 		feature Outlet {
-			targetProject = "org.yakindu.sct.examples.trafficlight"
+			targetProject = "traffic_light"
 			targetFolder = "src-gen"
 		}
 
 		feature Naming {
-			basePackage = "org.yakindu.sct.examples.trafficlight.cyclebased"
+			basePackage = "traffic.light"
 		}
 
 		feature GeneralFeatures {
@@ -18,7 +18,7 @@ GeneratorModel for yakindu::java {
 		
 		feature LicenseHeader {
 			licenseText = "
-Copyright (c) 2012 committers of YAKINDU and others.
+Copyright (c) 2012-2015 committers of YAKINDU and others.
 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

examples/org.yakindu.sct.examples.trafficlight/pom.xml

@@ -10,7 +10,7 @@
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	<groupId>org.yakindu.sct.examples</groupId>
-	<artifactId>org.yakindu.sct.examples.trafficlight</artifactId>
+	<artifactId>traffic_light</artifactId>
 	<packaging>pom</packaging>
 
 	<properties>

examples/traffic_light/src-gen/traffic/light/IStatemachine.java

@@ -0,0 +1,49 @@
+/**
+Copyright (c) 2012-2015 committers of YAKINDU and others.
+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:
+    committers of YAKINDU - initial API and implementation
+�*/
+package traffic.light;
+
+/**
+ * Basic interface for statemachines.
+ */
+public interface IStatemachine {
+
+	/**
+	 * Initializes the statemachine. Use to init internal variables etc.
+	 */
+	public void init();
+
+	/**
+	 * Enters the statemachine. Sets the statemachine in a defined state.
+	 */
+	public void enter();
+
+	/**
+	 * Exits the statemachine. Leaves the statemachine with a defined state.
+	 */
+	public void exit();
+
+	/**
+	 * Checks if the statemachine is active. 
+	 * A statemachine is active if it was entered. It is inactive if it has not been entered at all or if it was exited.
+	 */
+	public boolean isActive();
+
+	/**
+	 * Checks if all active states are final. 
+	 * If there are no active states then the statemachine is considered as incative and this method returns false.
+	 */
+	public boolean isFinal();
+
+	/**
+	* Start a run-to-completion cycle.
+	*/
+	public void runCycle();
+}

examples/org.yakindu.sct.examples.trafficlight/src-gen/org/yakindu/sct/examples/trafficlight/cyclebased/ITimer.java

@@ -1,5 +1,5 @@
 /**
-Copyright (c) 2012 committers of YAKINDU and others.
+Copyright (c) 2012-2015 committers of YAKINDU and others.
 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
@@ -8,7 +8,7 @@ http://www.eclipse.org/legal/epl-v10.html
 Contributors:
     committers of YAKINDU - initial API and implementation
 �*/
-package org.yakindu.sct.examples.trafficlight.cyclebased;
+package traffic.light;
 
 /**
  * Interface a timer has to implement. Use to implement your own timer

examples/org.yakindu.sct.examples.trafficlight/src-gen/org/yakindu/sct/examples/trafficlight/cyclebased/ITimerCallback.java

@@ -1,5 +1,5 @@
 /**
-Copyright (c) 2012 committers of YAKINDU and others.
+Copyright (c) 2012-2015 committers of YAKINDU and others.
 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
@@ -8,7 +8,7 @@ http://www.eclipse.org/legal/epl-v10.html
 Contributors:
     committers of YAKINDU - initial API and implementation
 �*/
-package org.yakindu.sct.examples.trafficlight.cyclebased;
+package traffic.light;
 
 /**
 * Interface for state machines which use timed event triggers.

examples/org.yakindu.sct.examples.trafficlight/src-gen/org/yakindu/sct/examples/trafficlight/cyclebased/RuntimeService.java

@@ -1,5 +1,5 @@
 /**
-Copyright (c) 2012 committers of YAKINDU and others.
+Copyright (c) 2012-2015 committers of YAKINDU and others.
 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
@@ -8,7 +8,7 @@ http://www.eclipse.org/legal/epl-v10.html
 Contributors:
     committers of YAKINDU - initial API and implementation
 �*/
-package org.yakindu.sct.examples.trafficlight.cyclebased;
+package traffic.light;
 
 import java.util.HashMap;
 import java.util.LinkedList;

examples/org.yakindu.sct.examples.trafficlight/src-gen/org/yakindu/sct/examples/trafficlight/cyclebased/TimerService.java

@@ -1,5 +1,5 @@
 /**
-Copyright (c) 2012 committers of YAKINDU and others.
+Copyright (c) 2012-2015 committers of YAKINDU and others.
 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
@@ -8,7 +8,7 @@ http://www.eclipse.org/legal/epl-v10.html
 Contributors:
     committers of YAKINDU - initial API and implementation
 �*/
-package org.yakindu.sct.examples.trafficlight.cyclebased;
+package traffic.light;
 
 import java.util.ArrayList;
 import java.util.List;

examples/org.yakindu.sct.examples.trafficlight/src-gen/org/yakindu/sct/examples/trafficlight/cyclebased/trafficlightwaiting/ITrafficLightWaitingStatemachine.java

@@ -1,5 +1,5 @@
 /**
-Copyright (c) 2012 committers of YAKINDU and others.
+Copyright (c) 2012-2015 committers of YAKINDU and others.
 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
@@ -8,15 +8,11 @@ http://www.eclipse.org/legal/epl-v10.html
 Contributors:
     committers of YAKINDU - initial API and implementation
 �*/
-package org.yakindu.sct.examples.trafficlight.cyclebased.trafficlightwaiting;
-import org.yakindu.sct.examples.trafficlight.cyclebased.IStatemachine;
-import org.yakindu.sct.examples.trafficlight.cyclebased.ITimerCallback;
-
-public interface ITrafficLightWaitingStatemachine
-		extends
-			ITimerCallback,
-			IStatemachine {
+package traffic.light.trafficlightwaiting;
+import traffic.light.IStatemachine;
+import traffic.light.ITimerCallback;
 
+public interface ITrafficLightWaitingStatemachine extends ITimerCallback, IStatemachine {
 	public interface SCITrafficLight {
 		public boolean getRed();
 		public void setRed(boolean value);

releng/org.yakindu.sct.releng/pom.xml

@@ -384,10 +384,10 @@
 	</profiles>
 	<modules>
 		<!-- Examples -->
-		<module>../../examples/org.yakindu.sct.examples.trafficlight</module>
-		<module>../../examples/org.yakindu.sct.examples.clock</module>
-		<module>../../examples/org.yakindu.sct.examples.lightswitch</module>
-		<module>../../examples/org.yakindu.sct.ui.examples</module>
+		<module>../../examples/traffic_light</module>
+		<module>../../examples/digital_watch</module>
+		<module>../../examples/light_switch</module>
+		<module>../../examples/org.yakindu.sct.examples</module>
 		<!-- Releng -->
 		<module>../org.yakindu.base.target</module>
 		<module>../org.yakindu.base.repository</module>