diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java index 39f465e..1db1401 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Game.java +++ b/src/main/java/com/ntlab/irisserver/entities/Game.java @@ -96,8 +96,22 @@ return keyword; } - public Map getKeywords() { - return keywordList; + public List getKeywords() { + List keywords = new ArrayList<>(); + for(int i=0; i<16; i++){ + keywords.add(keywordList.get(map.get(i))); + } + return keywords; + } + + public List getOpens(){ + List opens= new ArrayList<>(); + for(int i=0; i<16; i++){ + Cell cell = cellList.get(i); + boolean isOpen = cell.getIsOpen(); + opens.add(isOpen); + } + return opens; } public Map> getAssignments(){ diff --git a/src/main/java/com/ntlab/irisserver/resources/GameRest.java b/src/main/java/com/ntlab/irisserver/resources/GameRest.java index 734c312..228aeb0 100644 --- a/src/main/java/com/ntlab/irisserver/resources/GameRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/GameRest.java @@ -46,12 +46,7 @@ RoomManager rm = RoomManager.getInstance(); Room room = rm.getRoom(rid); Game game = room.getGame(); - Map keywordList = game.getKeywords(); - List map = game.getMap(); - List keywords = new ArrayList<>(); - for(int i=0; i<16; i++){ - keywords.add(keywordList.get(map.get(i))); - } + List keywords = game.getKeywords(); return keywords; } diff --git a/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java b/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java index ceb84a3..c5b0966 100644 --- a/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java @@ -20,15 +20,10 @@ @GET @Produces(MediaType.APPLICATION_JSON) public List getOpens(@PathParam("rid") String rid){ - List opens= new ArrayList<>(); RoomManager rm = RoomManager.getInstance(); Room room = rm.getRoom(rid); Game game = room.getGame(); - for(int i=0; i<16; i++){ - Cell cell = game.getCell(i); - boolean isOpen = cell.getIsOpen(); - opens.add(isOpen); - } + List opens = game.getOpens(); return opens; }