diff --git a/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java
index 8cc4463..41b6090 100644
--- a/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java
@@ -58,7 +58,7 @@
                         System.out.println(t);
                     }
                 });
-                 */
+                */
                 ((Iris) getApplication()).setRid("drawtest");
                 ((Iris) getApplication()).setNickname("owner");
                 Intent intent = new Intent(TestDrawingActivity.this,DrawingActivity.class);
diff --git a/app/src/main/java/org/ntlab/irisclient/entities/GameJson.java b/app/src/main/java/org/ntlab/irisclient/entities/GameJson.java
index 580fd99..0a3bd58 100644
--- a/app/src/main/java/org/ntlab/irisclient/entities/GameJson.java
+++ b/app/src/main/java/org/ntlab/irisclient/entities/GameJson.java
@@ -1,4 +1,28 @@
 package org.ntlab.irisclient.entities;
 
+import org.ntlab.irisclient.models.Cell;
+import org.ntlab.irisclient.models.Drawing;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class GameJson {
+
+    private Map<Integer, Drawing> drawingList = new HashMap<>();//<dno, drawingのURL>
+    private List<Integer> map = new ArrayList<>();//cno順にdnoを管理
+    private List<String> colorList = new ArrayList<>();//cno順にr,g,b,dを管理
+
+    //ゲッター
+
+    public Map<Integer, Drawing> getDrawingList() {return drawingList;}
+    public List<Integer> getMap() {return map;}
+    public List<String> getColorList() {return colorList;}
+
+    //セッター
+    public void setDrawingList(Map<Integer, Drawing> dlist) {drawingList = dlist;}
+    public void setMap(List<Integer> map) {this.map = map;}
+    public void setColorList(List<String> color) {this.colorList = color;}
+
 }
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 7a769a1..3ae4a2d 100644
--- a/app/src/main/java/org/ntlab/irisclient/models/Game.java
+++ b/app/src/main/java/org/ntlab/irisclient/models/Game.java
@@ -11,13 +11,21 @@
     private Map<Integer, String> keywordList = new HashMap<>();//<cno, keyword>
     private Map<Integer, Cell> cellList = new HashMap<>();//<cno, Cell>
     private List<Integer> map = new ArrayList<>();//cno順にdnoを管理
-    private List<String> color = new ArrayList<>();//cno順にr,g,b,dを管理
+    private List<String> colorList = new ArrayList<>();//cno順にr,g,b,dを管理
+
+    //ゲッター
+
+    public Map<Integer, Drawing> getDrawingList() {return drawingList;}
+    public Map<Integer, String> getKeywordList() {return keywordList;}
+    public Map<Integer, Cell> getCellList() {return cellList;}
+    public List<Integer> getMap() {return map;}
+    public List<String> getColorList() {return colorList;}
 
     //セッター
-    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;}
+    public void setDrawingList(Map<Integer, Drawing> dlist) {drawingList = dlist;}
+    public void setKeywordList(Map<Integer, String> klist) {keywordList = klist;}
+    public void setCellList(Map<Integer, Cell> clist) {cellList = clist;}
+    public void setMap(List<Integer> map) {this.map = map;}
+    public void setColorList(List<String> color) {this.colorList = color;}
 
 }