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 070c0b1..42f0cd6 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Animation.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Animation.java @@ -62,8 +62,7 @@ this.isPublic = false; this.owner = owner; this.editors.add(new Editor(owner, true)); - this.pageMap.put(0, new Page()); - this.pages.add(this.pageMap.get(0)); + this.pageMap.put(0, new Page(1)); this.lastUpdate = date.format(dateTimeFormatter); } @@ -74,13 +73,6 @@ //private Gallery gallery = Gallery.getInstance(); //private Accounts accounts = Accounts.getInstance(); - // page情報 - private ArrayList pages = new ArrayList<>(); - - public ArrayList getPages() { - return (this.pages); - } - //----------------------------------------------------------------- // setter @@ -159,6 +151,10 @@ return lastUpdate; } + public HashMap getPageMap() { + return pageMap; + } + //----------------------------------------------------------------- // remover @@ -221,7 +217,7 @@ this.isPublic = false; this.owner = ownerAccount; this.editors.add(new Editor(owner, true)); - this.pageMap.put(0, new Page()); + this.pageMap.put(0, new Page(1)); LocalDateTime date = LocalDateTime.now(); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss"); @@ -231,9 +227,6 @@ //this.lastAccess = LocalDateTime.of(2015, 12, 15, 0, 0); - // pageとlayerを1枚ずつ追加 - this.pages.add(this.pageMap.get(0)); - var newWork = new Work(); //ユーザーの制作作品の作成 newWork.setWork();