diff --git a/src/main/java/com/ntlab/irisserver/entities/Turn.java b/src/main/java/com/ntlab/irisserver/entities/Turn.java index e34d5db..aad634e 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Turn.java +++ b/src/main/java/com/ntlab/irisserver/entities/Turn.java @@ -3,9 +3,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; +import java.util.Iterator; public class Turn { @@ -24,6 +23,8 @@ //コンストラクタ + public Turn(){max = -1;} + //--------------------------------------------------------- //セッター @@ -54,8 +55,16 @@ public void addQuestions(int cno, Member m){questions.get(cno).add(m);} public void delieteQuestions(int cno, Member m){ + List list = questions.get(cno); + for(Iterator it = list.iterator(); it.hasNext();){ + Member member = (Member) it.next(); + if(member.getNickname() == m.getNickname()){ + it.remove(); + break; + } + } - } //Listのキーが分からない状態での削除どうやんの? + } public int sizeQuestions(){return questions.size();} diff --git a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java index ae441f7..3ca89b2 100644 --- a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java @@ -116,7 +116,6 @@ on = false; break; } - } Member member = room.getMember(nickname); if(on == true){ @@ -132,6 +131,7 @@ @GET @Path("/{rid}/game/turns/{tno}/openlist") + @Produces(MediaType.APPLICATION_JSON) public List getOpenList(@PathParam("rid") String rid, @PathParam("tno") int tno){ RoomManager rm = RoomManager.getInstance(); @@ -142,4 +142,15 @@ return t.getOpenListAll(); } + @PUT //オープンリストの追加 + @Path("/{rid}/game/turns/{tno}/openlist") + public void setOpenList(@PathParam("rid") String rid, @PathParam("tno") int tno, @FormParam("cno")int cno){ + + RoomManager rm = RoomManager.getInstance(); + Room room = rm.getRoom(rid); + Game game = room.getGame(); + Turn t = game.getTurn(tno); + + } + }