Skip to content

Commit ce53674

Browse files
tkutztkutz
committed
Adapt to changes in naming
1 parent 1a51b21 commit ce53674

File tree

41 files changed

+2112
-2241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2112
-2241
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,10 @@ GeneratorModel for yakindu::java {
1212
targetProject = "com.yakindu.sct.examples.musicplayer.java"
1313
targetFolder = "src-gen"
1414
}
15+
16+
feature Naming {
17+
basePackage = "com.yakindu.sct.examples.musicplayer.java"
18+
typeName = "Player"
19+
}
1520
}
1621
}

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

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.yakindu.sct.examples.musicplayer.java;
22

3-
import com.yakindu.sct.examples.musicplayer.java.player.IPlayerStatemachine;
4-
import com.yakindu.sct.examples.musicplayer.java.player.IPlayerStatemachine.SCInterfaceListener;
5-
import com.yakindu.sct.examples.musicplayer.java.player.PlayerStatemachine;
63

74
import javafx.application.Application;
85
import javafx.geometry.Insets;
@@ -60,56 +57,41 @@ public void start(Stage stage) throws Exception {
6057
}
6158

6259
private void setupBehaviour() {
63-
IPlayerStatemachine statemachine = new PlayerStatemachine();
60+
IPlayer statemachine = new Player();
6461

6562
statemachine.init();
6663

6764
// hook up in-events
6865
playBtn.setOnAction((e) -> {
69-
statemachine.getSCInterface().raisePlayPressed();
66+
statemachine.getInterface().raisePlayPressed();
7067
});
7168

7269
pauseBtn.setOnAction((e) -> {
73-
statemachine.getSCInterface().raisePausePressed();
70+
statemachine.getInterface().raisePausePressed();
7471
});
7572

7673
stopBtn.setOnAction((e) -> {
77-
statemachine.getSCInterface().raiseStopPressed();
74+
statemachine.getInterface().raiseStopPressed();
7875
});
7976

8077
prevBtn.setOnAction((e) -> {
81-
statemachine.getSCInterface().raisePrevPressed();
82-
infoLbl.setText(statemachine.getSCInterface().getCurrentSong().getName());
78+
statemachine.getInterface().raisePrevPressed();
79+
infoLbl.setText(statemachine.getInterface().getCurrentSong().getName());
8380
});
8481

8582
nextBtn.setOnAction((e) -> {
86-
statemachine.getSCInterface().raiseNextPressed();
87-
infoLbl.setText(statemachine.getSCInterface().getCurrentSong().getName());
83+
statemachine.getInterface().raiseNextPressed();
84+
infoLbl.setText(statemachine.getInterface().getCurrentSong().getName());
8885
});
8986

9087
// hook up out-events
91-
statemachine.getSCInterface().getListeners().add(new SCInterfaceListener() {
92-
93-
@Override
94-
public void onPlayBtnEnabledRaised(boolean value) {
95-
playBtn.setDisable(!value);
96-
}
97-
98-
@Override
99-
public void onPauseBtnEnabledRaised(boolean value) {
100-
pauseBtn.setDisable(!value);
101-
}
102-
103-
@Override
104-
public void onStopBtnEnabledRaised(boolean value) {
105-
stopBtn.setDisable(!value);
106-
}
107-
108-
});
88+
statemachine.getInterface().getPlayBtnEnabled().subscribe(value -> playBtn.setDisable(!value));
89+
statemachine.getInterface().getPauseBtnEnabled().subscribe(value -> pauseBtn.setDisable(!value));
90+
statemachine.getInterface().getStopBtnEnabled().subscribe(value -> stopBtn.setDisable(!value));
10991

11092
statemachine.enter();
11193

112-
infoLbl.setText(statemachine.getSCInterface().getCurrentSong().getName());
94+
infoLbl.setText(statemachine.getInterface().getCurrentSong().getName());
11395
}
11496

11597
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,9 @@ GeneratorModel for yakindu::java {
77
targetFolder = "src-gen"
88
libraryTargetFolder = "src"
99
}
10+
11+
feature Naming {
12+
basePackage = "org.yakindu.sct.examples.basic.tutorial"
13+
}
1014
}
1115
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,9 @@ GeneratorModel for yakindu::java {
77
targetFolder = "src-gen"
88
libraryTargetFolder = "src"
99
}
10+
11+
feature Naming {
12+
basePackage = "org.yakindu.sct.examples.basic.tutorial"
13+
}
1014
}
1115
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,9 @@ GeneratorModel for yakindu::java {
1111
feature GeneralFeatures {
1212
TimerService = true
1313
}
14+
15+
feature Naming {
16+
basePackage = "org.yakindu.sct.examples.basic.tutorial"
17+
}
1418
}
1519
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,9 @@ GeneratorModel for yakindu::java {
77
targetFolder = "src-gen"
88
libraryTargetFolder = "src"
99
}
10+
11+
feature Naming {
12+
basePackage = "org.yakindu.sct.examples.basic.tutorial"
13+
}
1014
}
1115
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package org.yakindu.sct.examples.lightswitch;
22

3-
import org.yakindu.sct.examples.basic.tutorial._02_lightswitch._02_LightSwitchStatemachine;
3+
import org.yakindu.sct.examples.basic.tutorial._02_LightSwitch;
44

55
public class LightSwitch_02 {
66

77
public static void main(String[] args) throws InterruptedException {
8-
_02_LightSwitchStatemachine sm = new _02_LightSwitchStatemachine();
8+
_02_LightSwitch sm = new _02_LightSwitch();
99

1010
sm.init();
1111

1212
sm.enter();
1313

1414
for (int i = 0; i < 10; i++) {
15-
sm.getSCIUser().raiseOperate();
15+
sm.getInterfaceUser().raiseOperate();
1616
sm.runCycle();
1717

18-
if (sm.isStateActive(_02_LightSwitchStatemachine.State.main_region_On)) {
18+
if (sm.isStateActive(_02_LightSwitch.State.MAIN_REGION_ON)) {
1919
System.out.println("Light is On");
20-
} else if (sm.isStateActive(_02_LightSwitchStatemachine.State.main_region_Off)) {
20+
} else if (sm.isStateActive(_02_LightSwitch.State.MAIN_REGION_OFF)) {
2121
System.out.println("Light is Off");
2222
}
2323

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
import java.io.IOException;
55
import java.io.InputStreamReader;
66

7-
import org.yakindu.sct.examples.basic.tutorial._03_lightswitch._03_LightSwitchStatemachine;
7+
import org.yakindu.sct.examples.basic.tutorial._03_LightSwitch;
88

99
public class LightSwitch_03 {
1010

1111
public static void main(String[] args) throws InterruptedException, IOException {
1212
BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
1313

14-
_03_LightSwitchStatemachine sm = new _03_LightSwitchStatemachine();
14+
_03_LightSwitch sm = new _03_LightSwitch();
1515

1616
sm.init();
1717
sm.enter();
@@ -21,16 +21,16 @@ public static void main(String[] args) throws InterruptedException, IOException
2121
String input = br.readLine();
2222

2323
if (input.equals("On")) {
24-
sm.getSCIUser().raiseOn_button();
24+
sm.getInterfaceUser().raiseOn_button();
2525
} else if (input.equals("Off")) {
26-
sm.getSCIUser().raiseOff_button();
26+
sm.getInterfaceUser().raiseOff_button();
2727
} else if (input.equals("Exit")) {
2828
break;
2929
} else {
3030
System.out.println("Incorrect input: " + input);
3131
}
3232
sm.runCycle();
33-
System.out.printf("Brightness: %d\n", sm.getSCIUser().getBrightness());
33+
System.out.printf("Brightness: %d\n", sm.getInterfaceUser().getBrightness());
3434
}
3535
}
3636
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
import java.io.IOException;
55
import java.io.InputStreamReader;
66

7-
import org.yakindu.sct.examples.basic.tutorial.TimerService;
8-
import org.yakindu.sct.examples.basic.tutorial._04_lightswitch._04_LightSwitchStatemachine;
7+
import org.yakindu.sct.TimerService;
8+
import org.yakindu.sct.examples.basic.tutorial._04_LightSwitch;
99

1010
public class LightSwitch_04 {
1111

1212
public static void main(String[] args) throws IOException {
1313
// Instantiate statemachine
14-
_04_LightSwitchStatemachine sm = new _04_LightSwitchStatemachine();
14+
_04_LightSwitch sm = new _04_LightSwitch();
1515

1616
// Instantiate BufferedReader for command line reading inside of IDE
1717
BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
@@ -33,19 +33,19 @@ public static void main(String[] args) throws IOException {
3333
}
3434

3535
if (input.equals("On")) {
36-
sm.getSCIUser().raiseOn_button();
36+
sm.getInterfaceUser().raiseOn_button();
3737
} else if (input.equals("Off")) {
38-
sm.getSCIUser().raiseOff_button();
38+
sm.getInterfaceUser().raiseOff_button();
3939
} else if (input.equals("Exit")) {
4040
break;
4141
} else if (!input.equals("")) {
42-
sm.getSCISensor().raiseMotion();
42+
sm.getInterfaceSensor().raiseMotion();
4343
System.out.println("Motion detected");
4444
}
4545

4646
sm.runCycle();
47-
if (sm.getSCIUser().getBrightness() != brightness) {
48-
brightness = sm.getSCIUser().getBrightness();
47+
if (sm.getInterfaceUser().getBrightness() != brightness) {
48+
brightness = sm.getInterfaceUser().getBrightness();
4949
System.out.printf("Brightness %d\n", brightness);
5050
}
5151

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
import java.io.IOException;
55
import java.io.InputStreamReader;
66

7-
import org.yakindu.sct.examples.basic.tutorial.TimerService;
8-
import org.yakindu.sct.examples.basic.tutorial._06_lightswitch_simulation._06_LightSwitch_simulationStatemachine;
7+
import org.yakindu.sct.TimerService;
8+
import org.yakindu.sct.examples.basic.tutorial._06_LightSwitch_simulation;
9+
import org.yakindu.sct.examples.basic.tutorial._06_LightSwitch_simulation.State;
910

1011
public class LightSwitch_06 {
1112

1213
public static void main(String[] args) throws IOException {
1314
// Instantiate statemachine
14-
_06_LightSwitch_simulationStatemachine sm = new _06_LightSwitch_simulationStatemachine();
15+
_06_LightSwitch_simulation sm = new _06_LightSwitch_simulation();
1516

1617
// Instantiate BufferedReader for command line reading inside of IDE
1718
BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
@@ -37,23 +38,23 @@ public static void main(String[] args) throws IOException {
3738
}
3839

3940
if (input.equals("On")) {
40-
sm.getSCIUser().raiseOn_button();
41+
sm.getInterfaceUser().raiseOn_button();
4142
} else if (input.equals("Off")) {
42-
sm.getSCIUser().raiseOff_button();
43+
sm.getInterfaceUser().raiseOff_button();
4344
} else if (input.equals("Exit")) {
4445
break;
4546
}
4647

4748
sm.runCycle();
4849

4950
// Output section
50-
if (sm.getSCIUser().getBrightness() != brightness) {
51-
brightness = sm.getSCIUser().getBrightness();
51+
if (sm.getInterfaceUser().getBrightness() != brightness) {
52+
brightness = sm.getInterfaceUser().getBrightness();
5253
System.out.printf("Brightness %d\n", brightness);
5354
}
5455

55-
if (sm.isStateActive(_06_LightSwitch_simulationStatemachine.State.main_region_Manual) != isManual) {
56-
isManual = sm.isStateActive(_06_LightSwitch_simulationStatemachine.State.main_region_Manual);
56+
if (sm.isStateActive(State.MAIN_REGION_MANUAL) != isManual) {
57+
isManual = sm.isStateActive(State.MAIN_REGION_MANUAL);
5758
if (isManual) {
5859
System.out.println("Manual mode activated");
5960
} else {

0 commit comments

Comments
 (0)