diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Animation.java b/src/main/java/org/ntlab/acanthus_server/entities/Animation.java index a0beb6a..296bedb 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Animation.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Animation.java @@ -38,6 +38,10 @@ this.pageMap.put(0, 0); } + public Animation(Account account) { + createDummyAnimation(account); + } + //private Gallery gallery = Gallery.getInstance(); //private Accounts accounts = Accounts.getInstance(); diff --git a/src/main/java/org/ntlab/acanthus_server/models/Gallery.java b/src/main/java/org/ntlab/acanthus_server/models/Gallery.java index c18b3f2..d91f92d 100644 --- a/src/main/java/org/ntlab/acanthus_server/models/Gallery.java +++ b/src/main/java/org/ntlab/acanthus_server/models/Gallery.java @@ -29,7 +29,7 @@ /*インスタンス生成を禁止するコンストラクタ*/ private Gallery(){ - + createDummyAnimation(); } //----------------------------------------------------------------- @@ -39,10 +39,13 @@ public Collection getAllAnimation(){return animationHashMap.values();} //----------------------------------------------------------------- - // 1つの作品の全ての情報を返す. + // 1つの作品の全ての情報を返す.この二つのメソッドは同じです。どっちを使っても public Animation getAnimationInformation( Integer aid){return animationHashMap.get(aid);} + public Animation getAnimationByAid(Integer aid) { + return animationHashMap.get(aid); + } //----------------------------------------------------------------- @@ -56,7 +59,15 @@ return aid; } - public Animation getAnimationByAid(Integer aid) { - return animationHashMap.get(aid); + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // ダミー作品生成 + private void createDummyAnimation(){ + var dummyAnimation = new Animation(Accounts.getInstance().getAccountByUid(1)); + animationHashMap.put(dummyAnimation.getAid(), dummyAnimation); } + //----------------------------------------------------------------- + + }