peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Testmerge #12

Merged
j23f0712 merged 45 commits from development into dev/test 2024-11-24 16:09:08 +01:00
Conversation 2 Commits 45 Files Changed 151 +6 -2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a79a315f83 - Show all commits

4
Projekte/mdga/client/src/main/java/pp/mdga/client/ModelSyncronizer.java
View File

@@ -37,9 +37,9 @@ public void rolledDice() {
System.out.println("rolledDice");
}
public void setName() {
public void setName(String name) {
//TODO call from somewhere
System.out.println("setName");
System.out.println("setName:" + name);
}
public void setReady() {

4
Projekte/mdga/client/src/main/java/pp/mdga/client/view/MainView.java
View File

@@ -45,6 +45,8 @@ public void onLeave() {
}
private void enterJoin() {
app.getModelSyncronizer().setName(dialog.getName());
subDialog = new JoinDialog(app, node, () -> leaveJoin());
dialog.hide();
@@ -59,6 +61,8 @@ private void leaveJoin() {
}
private void enterHost() {
app.getModelSyncronizer().setName(dialog.getName());
subDialog = new HostDialog(app, node, () -> leaveHost());
dialog.hide();