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

merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
pull from: development2
merge into: peet:dev/test
Conversation 1 Commits 431 Files Changed 269 +10 -1
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1214d3c87c - Show all commits

2
Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java
View File

@@ -413,7 +413,7 @@ public void received(ShutdownMessage msg) {
*/ */
@Override @Override
public void received(IncorrectRequestMessage msg) { public void received(IncorrectRequestMessage msg) {
state.received(msg); addNotification(new InfoNotification(Resources.stringLookup("incorrect.request." + msg.getId())));
} }
/** /**

9
Projekte/mdga/model/src/main/java/pp/mdga/message/server/IncorrectRequestMessage.java
View File

@@ -27,6 +27,15 @@ public IncorrectRequestMessage() {
this.id = 0; this.id = 0;
} }
/**
* Returns the id of the incorrect request message
*
* @return the id of the error message
*/
public int getId(){
return id;
}
/** /**
* Accepts a visitor to process this message. * Accepts a visitor to process this message.
* *