diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java index 60336d4..b0a2b7d 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java @@ -15,21 +15,21 @@ //----------------------------------------------------------------- // 作品 public class Animation { - private Integer aid; - private Integer likes; - private Integer views; + private int aid; private String name; private String description; - private Account owner; - private Boolean isPublic; - private String createdDate; - private String lastUpdate; +// private Boolean isPublic; + private String createdDate = new String(); + private String lastUpdate = new String(); + private Integer likes; + private Integer views; private ArrayList hashTag = new ArrayList<>(); - private ArrayList editors = new ArrayList<>(); - private ArrayList invites = new ArrayList<>(); private HashMap pageMap = new HashMap<>(); +// private Account owner; +// private ArrayList editors = new ArrayList<>(); +// private ArrayList invites = new ArrayList<>(); private ArrayList pages = new ArrayList<>(); - private boolean isDummy; +// private boolean isDummy; //----------------------------------------------------------------- public Animation() { @@ -38,7 +38,7 @@ public Animation(Integer aid, String name, Account owner) { this.aid = aid; this.name = name; - this.owner = owner; +// this.owner = owner; } //----------------------------------------------------------------- @@ -63,17 +63,15 @@ return this.description; } - public Account getOwner() { - return this.owner; - } +// public Account getOwner() { +// return this.owner; +// } - public Boolean getPublic() { - return this.isPublic; - } +// public Boolean getPublic() { +// return this.isPublic; +// } - public String getCreatedDate() { - return this.createdDate; - } + public String getCreatedDate() { return this.createdDate; } public String getLastUpdate() { return this.lastUpdate; @@ -83,18 +81,22 @@ return this.hashTag; } - public ArrayList getInvites() { - return this.invites; - } - - public ArrayList getEditors() { - return this.editors; - } +// public ArrayList getInvites() { +// return this.invites; +// } +// +// public ArrayList getEditors() { +// return this.editors; +// } public HashMap getPageMap() { return this.pageMap; } + public ArrayList getPages() { + return (this.pages); + } + //----------------------------------------------------------------- // setter public void setAid(Integer aid) { @@ -117,22 +119,22 @@ this.description = description; } - public void setPublic(Boolean aPublic) { - this.isPublic = aPublic; - } +// public void setPublic(Boolean aPublic) { +// this.isPublic = aPublic; +// } //----------------------------------------------------------------- //----------------------------------------------------------------- // 招待するアカウントの追加 - public void addInviteAccount(Account account){ - this.invites.add(account); - } - //----------------------------------------------------------------- - // 編集者の追加 - public void addEditor(Editor editor){ - this.editors.add(editor); - } - //----------------------------------------------------------------- +// public void addInviteAccount(Account account){ +// this.invites.add(account); +// } +// //----------------------------------------------------------------- +// // 編集者の追加 +// public void addEditor(Editor editor){ +// this.editors.add(editor); +// } +// //----------------------------------------------------------------- // 新規ページの追加 public void addPage(Integer page){