diff --git a/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java b/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java
index c4c8977..ebe0dd6 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java
@@ -22,7 +22,7 @@
     //-----------------------------------------------------------------
     private Integer aid;
     private Animation currentAnimation;
-    private ArrayList<AnimationJson> animationJsonList;
+    private Collection<AnimationJson> animationJsonList;
 
     //-----------------------------------------------------------------
     // getter
@@ -75,7 +75,7 @@
         return currentAnimation;
     }
 
-    public ArrayList<AnimationJson> getAnimationJsonList(){
+    public Collection<AnimationJson> getAnimationJsonList(){
         return animationJsonList;
     }
 
@@ -136,4 +136,12 @@
         this.animationJsonList.add(animationJson);
     }
     //-----------------------------------------------------------------
+
+//    public void setDummyAnimationJsonList(Integer aid,String name) {
+//        Collection<AnimationJson> animationJsonList = new Collection<AnimationJson>();
+//        AnimationJson dummyAnimationJson = new AnimationJson();
+//        dummyAnimationJson.setAid(aid);
+//        dummyAnimationJson.setName(name);
+//        this.animationJsonList.add(dummyAnimationJson);
+//    }
 }
diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java
index 5da450d..dd430df 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java
@@ -21,6 +21,11 @@
 
     public ArrayList<Editor> getEditor(){return this.editors;}
 
+    public void setAid(Integer aid) {
+        this.aid = aid;
+    }
 
-
+    public void setName(String name) {
+        this.animationName = name;
+    }
 }
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java
index 3651236..575535d 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java
@@ -70,17 +70,21 @@
         aidList = new ArrayList<>();
         nameList = new ArrayList<>();
         AnimationJsonList = new ArrayList<>();
+        //dummuのAnimationJsonListをさくせい
+        //acanthus.setDummyAnimationJsonList(1111, "dummyName");
         ListView listView = (ListView) getActivity().findViewById(R.id.list_view);
 
         editViewModel.getWorkJson().observe(getViewLifecycleOwner(), new Observer<WorkJson>() {
             @Override
             public void onChanged(@Nullable WorkJson workJson) {
                 aidList = (ArrayList<Integer>) editViewModel.getWorkJson().getValue().getAid();
-                AnimationJsonList = acanthus.getAnimationJsonList();
-                for(int i=0; i<AnimationJsonList.size(); i++){
-                    if(aidList.contains(AnimationJsonList.get(i).getAid())){
-                        AnimationName = AnimationJsonList.get(i).getAnimationName();
-                        nameList.add(AnimationName);
+                AnimationJsonList = (ArrayList<AnimationJson>) acanthus.getAnimationJsonList();
+                if(AnimationJsonList != null){
+                    for(int i=0; i<AnimationJsonList.size(); i++){
+                        if(aidList.contains(AnimationJsonList.get(i).getAid())){
+                            AnimationName = AnimationJsonList.get(i).getAnimationName();
+                            nameList.add(AnimationName);
+                        }
                     }
                 }