diff --git a/src/main/java/com/ntlab/irisserver/entities/Turn.java b/src/main/java/com/ntlab/irisserver/entities/Turn.java index b6bae7b..344ac28 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Turn.java +++ b/src/main/java/com/ntlab/irisserver/entities/Turn.java @@ -19,7 +19,7 @@ private List questions[] = new ArrayList[16]; //> - private List openlist = new ArrayList<>(); + private List openlist = new ArrayList<>(); //コンストラクタ @@ -43,7 +43,7 @@ public int getMax() {return max;} - public List getOpenListAll() {return openlist;} //リストそのものを返す。 + public List getOpenListAll() {return openlist;} //リストそのものを返す。 public List[] getQuestionsList() {return questions;} @@ -70,9 +70,9 @@ //openlist操作 - public Cell getOpenListSolo(int num){return openlist.get(num);} + public Integer getOpenListSolo(int num){return openlist.get(num);} - public void addOpenList(Cell card){openlist.add(card);} + public void addOpenList(Integer cno){openlist.add(cno);} public void delieteOpenList(int num){openlist.remove(num);} diff --git a/src/main/java/com/ntlab/irisserver/entities/TurnJson.java b/src/main/java/com/ntlab/irisserver/entities/TurnJson.java index 03d23ab..3f0bc91 100644 --- a/src/main/java/com/ntlab/irisserver/entities/TurnJson.java +++ b/src/main/java/com/ntlab/irisserver/entities/TurnJson.java @@ -16,7 +16,7 @@ @JsonProperty("max") private int max; - private List openlist = new ArrayList<>(); + private List openlist = new ArrayList<>(); //コンストラクタ @@ -36,7 +36,7 @@ public int getMax() {return max;} - public List getOpenListAll() {return openlist;} //リストそのものを返す。 + public List getOpenListAll() {return openlist;} //リストそのものを返す。 //--------------------------------------------------------- //セッター @@ -50,9 +50,9 @@ //--------------------------------------------------------- //openlist操作 - public Cell getOpenListSolo(int num){return openlist.get(num);} + public Integer getOpenListSolo(int num){return openlist.get(num);} - public void addOpenList(Cell card){openlist.add(card);} + public void addOpenList(Integer cno){openlist.add(cno);} public void delieteOpenList(int num){openlist.remove(num);} diff --git a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java index 1a5d546..f2ad491 100644 --- a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java @@ -154,7 +154,7 @@ @GET @Path("/{rid}/game/turns/{tno}/openlist") @Produces(MediaType.APPLICATION_JSON) - public List getOpenList(@PathParam("rid") String rid, @PathParam("tno") int tno){ + public List getOpenList(@PathParam("rid") String rid, @PathParam("tno") int tno){ RoomManager rm = RoomManager.getInstance(); Room room = rm.getRoom(rid); @@ -174,7 +174,7 @@ Turn t = game.getTurn(tno); Cell card = game.getCell(cno); - t.addOpenList(card); + t.addOpenList(cno); card.setIsOpen(true); }