diff --git a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java index 4d22daf..bfb972f 100644 --- a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java +++ b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java @@ -10,7 +10,7 @@ public class HelloWorld { @GET public String getHello() { - return "12/22-09:59 ログ出力3"; + return "12/22-11:00 ログ出力4"; } } diff --git a/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java b/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java index 3893d7d..76d3f2a 100644 --- a/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java +++ b/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java @@ -45,7 +45,7 @@ // "nickname,state"がメッセージで渡される String[] splitMessage = message.split(","); String nickname = splitMessage[0]; - Integer state = Integer.parseInt(splitMessage[1]); + int state = Integer.parseInt(splitMessage[1]); // stateやnicknameが正常でなければ、何もしない if(state!=2||nickname==null) { @@ -53,25 +53,24 @@ } else { //stateを変更して、全体の画面を変更させるように導く処理 session.getBasicRemote().sendText(nickname+state+"が正常に渡された!"); - session.getBasicRemote().sendText(rid); - session.getBasicRemote().sendText(nickname); - session.getBasicRemote().sendText(String.valueOf(state)); RoomManager rm = RoomManager.getInstance(); - session.getBasicRemote().sendText(rm.toString()); - session.getBasicRemote().sendText(String.valueOf(rm)); - Room room = rm.getRoom(rid); - session.getBasicRemote().sendText(String.valueOf(room)); + session.getBasicRemote().sendText(room.rid); session.getBasicRemote().sendText(room.getOwnerName()); session.getBasicRemote().sendText(room.ownerName); // ここまで、room.ownerができていない。room.owner=nullになってる + // ここまではいけてました if(nickname.equals(room.ownerName)){ //nicknameがownerだった場合 + // setStateが出来ないのか?? + session.getBasicRemote().sendText("1"); room.setState(state); //部屋の情報を変更 + session.getBasicRemote().sendText("2"); String path; path = applicationContext.getResource("file:").getFile().getAbsolutePath()+"/apache-tomcat-9.0.10/webapps/irisdata/keywords.txt"; + session.getBasicRemote().sendText("3"); KeywordManager km = KeywordManager.getInstance(); String[] keywords = km.getKeywords(path); Game game = new Game(room, keywords);