diff --git a/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java b/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java index a36eb5b..10f2116 100644 --- a/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java +++ b/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java @@ -17,51 +17,4 @@ public TurnJson() { } - //--------------------------------------------------------- - //ゲッター - - public String getHint() { - return hint; - } - - public String getTeam() { - return team; - } - - public int getMax() { - return max; - } - - public int getTurnstate() {return turnstate;} - - public List getOpenListAll() {return openlist;} //リストそのものを返す。 - - //--------------------------------------------------------- - //セッター - - public void setHint(String hint) { - this.hint = hint; - } - - public void setTeam(String team) { - this.team = team; - } - - public void setMax(int max) { - this.max = max; - } - - public void setTurnstate(int turnstate) {this.turnstate = turnstate;} - - //--------------------------------------------------------- - //openlist操作 - - public Integer getOpenListSolo(int num){return openlist.get(num);} - - public void addOpenList(Integer cno){openlist.add(cno);} - - public void delieteOpenList(int num){openlist.remove(num);} - - public int sizeOpenList(){return openlist.size();} - } diff --git a/app/src/main/java/org/ntlab/irisclient/models/Game.java b/app/src/main/java/org/ntlab/irisclient/models/Game.java index 99c4f35..7a769a1 100644 --- a/app/src/main/java/org/ntlab/irisclient/models/Game.java +++ b/app/src/main/java/org/ntlab/irisclient/models/Game.java @@ -13,4 +13,11 @@ private List map = new ArrayList<>();//cno順にdnoを管理 private List color = new ArrayList<>();//cno順にr,g,b,dを管理 + //セッター + public void setDrawingList(Map dlist) {drawingList = dlist;} + public void setKeywordList(Map klist) {keywordList = klist;} + public void setCellList(Map clist) {cellList = clist;} + public void setMap(List map) {this.map = map;} + public void setColor(List color) {this.color = color;} + } diff --git a/app/src/main/java/org/ntlab/irisclient/models/Turn.java b/app/src/main/java/org/ntlab/irisclient/models/Turn.java new file mode 100644 index 0000000..7995657 --- /dev/null +++ b/app/src/main/java/org/ntlab/irisclient/models/Turn.java @@ -0,0 +1,61 @@ +package org.ntlab.irisclient.models; + +import java.util.ArrayList; +import java.util.List; + +public class Turn { + + private String hint; + private String team; + private int max; + private int turnstate; //turn内でスパイマスターと諜報員の操作の切り替えに使用(0:スパイマスター, 1:諜報員) + private List openlist = new ArrayList<>(); + + //--------------------------------------------------------- + //ゲッター + + public String getHint() { + return hint; + } + + public String getTeam() { + return team; + } + + public int getMax() { + return max; + } + + public int getTurnstate() {return turnstate;} + + public List getOpenListAll() {return openlist;} //リストそのものを返す。 + + //--------------------------------------------------------- + //セッター + + public void setHint(String hint) { + this.hint = hint; + } + + public void setTeam(String team) { + this.team = team; + } + + public void setMax(int max) { + this.max = max; + } + + public void setTurnstate(int turnstate) {this.turnstate = turnstate;} + + //--------------------------------------------------------- + //openlist操作 + + public Integer getOpenListSolo(int num){return openlist.get(num);} + + public void addOpenList(Integer cno){openlist.add(cno);} + + public void delieteOpenList(int num){openlist.remove(num);} + + public int sizeOpenList(){return openlist.size();} + +}