diff --git a/src/main/java/com/ntlab/irisserver/entities/Room.java b/src/main/java/com/ntlab/irisserver/entities/Room.java index b0c6d02..d0b44f9 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Room.java +++ b/src/main/java/com/ntlab/irisserver/entities/Room.java @@ -48,8 +48,7 @@ public List getMembers() { - List memberslist = new ArrayList(members.values()) ; - return memberslist; + return new ArrayList(members.values()); } @@ -58,8 +57,7 @@ } public Member getMember(String nick) { - Member m = members.get(nick); - return m; + return members.get(nick); } public void addMember(String nick){ @@ -71,15 +69,13 @@ return 0; } - public Room(){ - drawingTimer = false; - drawingTimerTimes = 0; - gameTimer = true; - gameTimerTimes = 30; - gameTimerFirstThinkingTimes = 10; - } public Room(String rid, String owner) { + drawingTimer = false; + drawingTimerTimes = 0; + gameTimer = true; + gameTimerTimes = 30; + gameTimerFirstThinkingTimes = 10; this.rid=rid; ownerName=owner; } diff --git a/src/main/java/com/ntlab/irisserver/resources/MemberRest.java b/src/main/java/com/ntlab/irisserver/resources/MemberRest.java index 94157dd..a910a8c 100644 --- a/src/main/java/com/ntlab/irisserver/resources/MemberRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/MemberRest.java @@ -30,7 +30,7 @@ @PUT public String putMember(@PathParam("rid") String rid, @FormParam("nickname") String nickname) { RoomManager rm = RoomManager.getInstance(); - Room room = rm.getRoom("rid"); + Room room = rm.getRoom(rid); List m = room.getMembers(); return "変更しました"; } @@ -40,7 +40,7 @@ @DELETE public String deleteMember(@PathParam("rid") String rid, @FormParam("nickname") String nickname) { RoomManager rm = RoomManager.getInstance(); - Room room = rm.getRoom("rid"); + Room room = rm.getRoom(rid); List m = room.getMembers(); for( i = 0; i < 10; i++ ) { Member name = m.get(i);