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 109b7d4..8d03f97 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Animation.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Animation.java @@ -2,23 +2,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.ntlab.acanthus_server.models.Accounts; -import org.ntlab.acanthus_server.models.Gallery; -import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; -import org.ntlab.acanthus_server.resources.gallery.StrokesRest; -import org.ntlab.acanthus_server.entities.Page; -import org.ntlab.acanthus_server.entities.Layer; -import org.ntlab.acanthus_server.entities.Position; -import org.ntlab.acanthus_server.entities.Stroke; - -import java.lang.reflect.Array; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Collection; import java.util.Date; -import java.util.HashMap; public class Animation { @JsonProperty("aid") @@ -38,8 +27,8 @@ private Integer views; @JsonProperty("hashTag") private ArrayList hashTag = new ArrayList<>(); - @JsonProperty("pageMap") - private ArrayList pageMap = new ArrayList<>(); + @JsonProperty("pages") + private ArrayList pages = new ArrayList<>(); @JsonIgnore private Account owner; @JsonIgnore @@ -63,7 +52,7 @@ this.isPublic = false; this.owner = owner; this.editors.add(new Editor(owner, true)); - this.pageMap.add(new Page(0, 1)); + this.pages.add(new Page(0, 1)); this.lastUpdate = date.format(dateTimeFormatter); } @@ -149,7 +138,7 @@ } public ArrayList getPages() { - return this.pageMap; + return this.pages; } //----------------------------------------------------------------- @@ -214,7 +203,7 @@ this.isPublic = false; this.owner = ownerAccount; this.editors.add(new Editor(owner, true)); - this.pageMap.add(new Page(0, 1)); + this.pages.add(new Page(0, 1)); LocalDateTime date = LocalDateTime.now(); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");