Merge pull request #199 from Yakindu/java-naming-adaptation

Adapt to changes in naming (Java code generator)

com.yakindu.sct.examples.musicplayer.java/model/player-java.sgen

@@ -12,5 +12,10 @@ GeneratorModel for yakindu::java {
 			targetProject = "com.yakindu.sct.examples.musicplayer.java"
 			targetFolder = "src-gen"
 		}
+
+		feature Naming {
+			basePackage = "com.yakindu.sct.examples.musicplayer.java"
+			typeName = "Player"
+		}
 	}
 }

com.yakindu.sct.examples.musicplayer.java/src/com/yakindu/sct/examples/musicplayer/java/MusicPlayerApp.java

@@ -1,8 +1,5 @@
 package com.yakindu.sct.examples.musicplayer.java;
 
-import com.yakindu.sct.examples.musicplayer.java.player.IPlayerStatemachine;
-import com.yakindu.sct.examples.musicplayer.java.player.IPlayerStatemachine.SCInterfaceListener;
-import com.yakindu.sct.examples.musicplayer.java.player.PlayerStatemachine;
 
 import javafx.application.Application;
 import javafx.geometry.Insets;
@@ -60,56 +57,41 @@ public void start(Stage stage) throws Exception {
 	}
 
 	private void setupBehaviour() {
-		IPlayerStatemachine statemachine = new PlayerStatemachine();
+		IPlayer statemachine = new Player();
 
 		statemachine.init();
 
 		// hook up in-events
 		playBtn.setOnAction((e) -> {
-			statemachine.getSCInterface().raisePlayPressed();
+			statemachine.getInterface().raisePlayPressed();
 		});
 
 		pauseBtn.setOnAction((e) -> {
-			statemachine.getSCInterface().raisePausePressed();
+			statemachine.getInterface().raisePausePressed();
 		});
 
 		stopBtn.setOnAction((e) -> {
-			statemachine.getSCInterface().raiseStopPressed();
+			statemachine.getInterface().raiseStopPressed();
 		});
 
 		prevBtn.setOnAction((e) -> {
-			statemachine.getSCInterface().raisePrevPressed();
-			infoLbl.setText(statemachine.getSCInterface().getCurrentSong().getName());
+			statemachine.getInterface().raisePrevPressed();
+			infoLbl.setText(statemachine.getInterface().getCurrentSong().getName());
 		});
 
 		nextBtn.setOnAction((e) -> {
-			statemachine.getSCInterface().raiseNextPressed();
-			infoLbl.setText(statemachine.getSCInterface().getCurrentSong().getName());
+			statemachine.getInterface().raiseNextPressed();
+			infoLbl.setText(statemachine.getInterface().getCurrentSong().getName());
 		});
 
 		// hook up out-events
-		statemachine.getSCInterface().getListeners().add(new SCInterfaceListener() {
-
-			@Override
-			public void onPlayBtnEnabledRaised(boolean value) {
-				playBtn.setDisable(!value);
-			}
-
-			@Override
-			public void onPauseBtnEnabledRaised(boolean value) {
-				pauseBtn.setDisable(!value);
-			}
-
-			@Override
-			public void onStopBtnEnabledRaised(boolean value) {
-				stopBtn.setDisable(!value);
-			}
-
-		});
+		statemachine.getInterface().getPlayBtnEnabled().subscribe(value -> playBtn.setDisable(!value));
+		statemachine.getInterface().getPauseBtnEnabled().subscribe(value -> pauseBtn.setDisable(!value));
+		statemachine.getInterface().getStopBtnEnabled().subscribe(value -> stopBtn.setDisable(!value));
 
 		statemachine.enter();
 
-		infoLbl.setText(statemachine.getSCInterface().getCurrentSong().getName());
+		infoLbl.setText(statemachine.getInterface().getCurrentSong().getName());
 	}
 
 }

org.yakindu.sct.examples.basic.tutorial/model/02_interface/02.sgen

@@ -7,5 +7,9 @@ GeneratorModel for yakindu::java {
 			targetFolder = "src-gen"
 			libraryTargetFolder = "src"
 		}
+
+		feature Naming {
+			basePackage = "org.yakindu.sct.examples.basic.tutorial"
+		}
 	}
 }

org.yakindu.sct.examples.basic.tutorial/model/03_dimmer/03.sgen

@@ -7,5 +7,9 @@ GeneratorModel for yakindu::java {
 			targetFolder = "src-gen"
 			libraryTargetFolder = "src"
 		}
+
+		feature Naming {
+			basePackage = "org.yakindu.sct.examples.basic.tutorial"
+		}
 	}
 }

org.yakindu.sct.examples.basic.tutorial/model/04_motionsense/04.sgen

@@ -11,5 +11,9 @@ GeneratorModel for yakindu::java {
 		feature GeneralFeatures {
 			TimerService = true
 		}
+
+		feature Naming {
+			basePackage = "org.yakindu.sct.examples.basic.tutorial"
+		}
 	}
 }

org.yakindu.sct.examples.basic.tutorial/model/06_presencesimulation/06.sgen

@@ -7,5 +7,9 @@ GeneratorModel for yakindu::java {
 			targetFolder = "src-gen"
 			libraryTargetFolder = "src"
 		}
+
+		feature Naming {
+			basePackage = "org.yakindu.sct.examples.basic.tutorial"
+		}
 	}
 }

org.yakindu.sct.examples.basic.tutorial/src/org/yakindu/sct/examples/lightswitch/LightSwitch_02.java

@@ -1,23 +1,23 @@
 package org.yakindu.sct.examples.lightswitch;
 
-import org.yakindu.sct.examples.basic.tutorial._02_lightswitch._02_LightSwitchStatemachine;
+import org.yakindu.sct.examples.basic.tutorial._02_LightSwitch;
 
 public class LightSwitch_02 {
 
 	public static void main(String[] args) throws InterruptedException {
-		_02_LightSwitchStatemachine sm = new _02_LightSwitchStatemachine();
+		_02_LightSwitch sm = new _02_LightSwitch();
 
 		sm.init();
 
 		sm.enter();
 
 		for (int i = 0; i < 10; i++) {
-			sm.getSCIUser().raiseOperate();
+			sm.getInterfaceUser().raiseOperate();
 			sm.runCycle();
 
-			if (sm.isStateActive(_02_LightSwitchStatemachine.State.main_region_On)) {
+			if (sm.isStateActive(_02_LightSwitch.State.MAIN_REGION_ON)) {
 				System.out.println("Light is On");
-			} else if (sm.isStateActive(_02_LightSwitchStatemachine.State.main_region_Off)) {
+			} else if (sm.isStateActive(_02_LightSwitch.State.MAIN_REGION_OFF)) {
 				System.out.println("Light is Off");
 			}
 

org.yakindu.sct.examples.basic.tutorial/src/org/yakindu/sct/examples/lightswitch/LightSwitch_03.java

@@ -4,14 +4,14 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-import org.yakindu.sct.examples.basic.tutorial._03_lightswitch._03_LightSwitchStatemachine;
+import org.yakindu.sct.examples.basic.tutorial._03_LightSwitch;
 
 public class LightSwitch_03 {
 
 	public static void main(String[] args) throws InterruptedException, IOException {
 		BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
 
-		_03_LightSwitchStatemachine sm = new _03_LightSwitchStatemachine();
+		_03_LightSwitch sm = new _03_LightSwitch();
 
 		sm.init();
 		sm.enter();
@@ -21,16 +21,16 @@ public static void main(String[] args) throws InterruptedException, IOException
 			String input = br.readLine();
 
 			if (input.equals("On")) {
-				sm.getSCIUser().raiseOn_button();
+				sm.getInterfaceUser().raiseOn_button();
 			} else if (input.equals("Off")) {
-				sm.getSCIUser().raiseOff_button();
+				sm.getInterfaceUser().raiseOff_button();
 			} else if (input.equals("Exit")) {
 				break;
 			} else {
 				System.out.println("Incorrect input: " + input);
 			}
 			sm.runCycle();
-			System.out.printf("Brightness: %d\n", sm.getSCIUser().getBrightness());
+			System.out.printf("Brightness: %d\n", sm.getInterfaceUser().getBrightness());
 		}
 	}
 }

org.yakindu.sct.examples.basic.tutorial/src/org/yakindu/sct/examples/lightswitch/LightSwitch_04.java

@@ -4,14 +4,14 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-import org.yakindu.sct.examples.basic.tutorial.TimerService;
-import org.yakindu.sct.examples.basic.tutorial._04_lightswitch._04_LightSwitchStatemachine;
+import org.yakindu.sct.TimerService;
+import org.yakindu.sct.examples.basic.tutorial._04_LightSwitch;
 
 public class LightSwitch_04 {
 
 	public static void main(String[] args) throws IOException {
 		// Instantiate statemachine
-		_04_LightSwitchStatemachine sm = new _04_LightSwitchStatemachine();
+		_04_LightSwitch sm = new _04_LightSwitch();
 
 		// Instantiate BufferedReader for command line reading inside of IDE
 		BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
@@ -33,19 +33,19 @@ public static void main(String[] args) throws IOException {
 			}
 
 			if (input.equals("On")) {
-				sm.getSCIUser().raiseOn_button();
+				sm.getInterfaceUser().raiseOn_button();
 			} else if (input.equals("Off")) {
-				sm.getSCIUser().raiseOff_button();
+				sm.getInterfaceUser().raiseOff_button();
 			} else if (input.equals("Exit")) {
 				break;
 			} else if (!input.equals("")) {
-				sm.getSCISensor().raiseMotion();
+				sm.getInterfaceSensor().raiseMotion();
 				System.out.println("Motion detected");
 			}
 
 			sm.runCycle();
-			if (sm.getSCIUser().getBrightness() != brightness) {
-				brightness = sm.getSCIUser().getBrightness();
+			if (sm.getInterfaceUser().getBrightness() != brightness) {
+				brightness = sm.getInterfaceUser().getBrightness();
 				System.out.printf("Brightness %d\n", brightness);
 			}
 

org.yakindu.sct.examples.basic.tutorial/src/org/yakindu/sct/examples/lightswitch/LightSwitch_06.java

@@ -4,14 +4,15 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-import org.yakindu.sct.examples.basic.tutorial.TimerService;
-import org.yakindu.sct.examples.basic.tutorial._06_lightswitch_simulation._06_LightSwitch_simulationStatemachine;
+import org.yakindu.sct.TimerService;
+import org.yakindu.sct.examples.basic.tutorial._06_LightSwitch_simulation;
+import org.yakindu.sct.examples.basic.tutorial._06_LightSwitch_simulation.State;
 
 public class LightSwitch_06 {
 
 	public static void main(String[] args) throws IOException {
 		// Instantiate statemachine
-		_06_LightSwitch_simulationStatemachine sm = new _06_LightSwitch_simulationStatemachine();
+		_06_LightSwitch_simulation sm = new _06_LightSwitch_simulation();
 
 		// Instantiate BufferedReader for command line reading inside of IDE
 		BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
@@ -37,23 +38,23 @@ public static void main(String[] args) throws IOException {
 			}
 
 			if (input.equals("On")) {
-				sm.getSCIUser().raiseOn_button();
+				sm.getInterfaceUser().raiseOn_button();
 			} else if (input.equals("Off")) {
-				sm.getSCIUser().raiseOff_button();
+				sm.getInterfaceUser().raiseOff_button();
 			} else if (input.equals("Exit")) {
 				break;
 			}
 
 			sm.runCycle();
 
 			// Output section
-			if (sm.getSCIUser().getBrightness() != brightness) {
-				brightness = sm.getSCIUser().getBrightness();
+			if (sm.getInterfaceUser().getBrightness() != brightness) {
+				brightness = sm.getInterfaceUser().getBrightness();
 				System.out.printf("Brightness %d\n", brightness);
 			}
 
-			if (sm.isStateActive(_06_LightSwitch_simulationStatemachine.State.main_region_Manual) != isManual) {
-				isManual = sm.isStateActive(_06_LightSwitch_simulationStatemachine.State.main_region_Manual);
+			if (sm.isStateActive(State.MAIN_REGION_MANUAL) != isManual) {
+				isManual = sm.isStateActive(State.MAIN_REGION_MANUAL);
 				if (isManual) {
 					System.out.println("Manual mode activated");
 				} else {

org.yakindu.sct.examples.basic.tutorial/src/org/yakindu/sct/examples/lightswitch/LightSwitch_06_Callback.java

@@ -3,7 +3,8 @@
 import java.time.LocalDateTime;
 import java.util.Random;
 
-import org.yakindu.sct.examples.basic.tutorial._06_lightswitch_simulation.I_06_LightSwitch_simulationStatemachine.InternalOperationCallback;
+import org.yakindu.sct.examples.basic.tutorial.I_06_LightSwitch_simulation.InternalOperationCallback;
+
 
 public class LightSwitch_06_Callback implements InternalOperationCallback {
 

org.yakindu.sct.examples.codegen.java/models/java.sgen

@@ -7,6 +7,10 @@ GeneratorModel for yakindu::java {
 			targetFolder = "src-gen"
 		}
 
+		feature Naming {
+			basePackage = "org.yakindu.sct.examples.codegen.java"
+		}
+
 	}
 }
 

org.yakindu.sct.examples.trafficlight.java/src-gen/traffic/light/IStatemachine.java → org.yakindu.sct.examples.codegen.java/src-gen/org/yakindu/sct/IStatemachine.java

@@ -1,5 +1,5 @@
 /** Generated by YAKINDU Statechart Tools code generator. */
-package traffic.light;
+package org.yakindu.sct;
 
 /**
  * Basic interface for state machines.

org.yakindu.sct.examples.codegen.java/src-gen/org/yakindu/sct/examples/codegen/java/ILightSwitch.java

@@ -0,0 +1,22 @@
+/** Generated by YAKINDU Statechart Tools code generator. */
+package org.yakindu.sct.examples.codegen.java;
+
+import org.yakindu.sct.IStatemachine;
+
+public interface ILightSwitch extends IStatemachine {
+
+	public interface InterfaceUser {
+
+		public void raiseOn_button();
+
+		public void raiseOff_button();
+
+		public long getBrightness();
+
+		public void setBrightness(long value);
+
+	}
+
+	public InterfaceUser getInterfaceUser();
+
+}