From 577754731a0dd253e33d5e89f5af57d3bd13a630 Mon Sep 17 00:00:00 2001 From: JacopoWolf Date: Tue, 3 Dec 2019 18:08:10 +0100 Subject: [PATCH] Fixed compilation error --- PCP/src/main/java/PCP/Min/logic/PCPMinCore.java | 6 +++--- PCP/src/main/java/PCP/Min/logic/PCPMinUserInfo.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PCP/src/main/java/PCP/Min/logic/PCPMinCore.java b/PCP/src/main/java/PCP/Min/logic/PCPMinCore.java index 207aa03..09e00a3 100644 --- a/PCP/src/main/java/PCP/Min/logic/PCPMinCore.java +++ b/PCP/src/main/java/PCP/Min/logic/PCPMinCore.java @@ -5,7 +5,6 @@ import PCP.Min.data.*; import PCP.*; -import PCP.Min.data.*; import PCP.PCPException.ErrorCode; import PCP.data.*; import PCP.logic.*; @@ -72,8 +71,9 @@ public void accept( IPCPData data, IPCPUserInfo from ) throws PCPException { MsgUserToGroup msg = (MsgUserToGroup) data; MsgRecieved msg_tosend = new MsgRecieved - ( + ( from.getAlias(), + msg.getOpCode(), msg.getMessage() ); @@ -172,7 +172,7 @@ public void accept( IPCPData data, IPCPUserInfo from ) throws PCPException // control messages case GroupUsersListRrq: { - GroupUserListRrq gulr = (GroupUserListRrq) data; + GroupUsersListRrq gulr = (GroupUsersListRrq) data; GroupUsersList gul = new GroupUsersList ( diff --git a/PCP/src/main/java/PCP/Min/logic/PCPMinUserInfo.java b/PCP/src/main/java/PCP/Min/logic/PCPMinUserInfo.java index 081d39e..717dc92 100644 --- a/PCP/src/main/java/PCP/Min/logic/PCPMinUserInfo.java +++ b/PCP/src/main/java/PCP/Min/logic/PCPMinUserInfo.java @@ -60,7 +60,7 @@ public void setRoom( String room ) @Override public String toString() { - return "User: " + getAlias() + " - Room: " + getRoom() + " - Version of the protocol: " + getVersion().FULL_NAME(); + return "User: " + getAlias() + " - Room: " + getRoom() + " - Version of the protocol: " + getVersion().FULL_NAME; } }