diff --git a/src/main/java/org/ntlab/amaryllis/server/entities/Category.java b/src/main/java/org/ntlab/amaryllis/server/entities/Category.java new file mode 100644 index 0000000..6c9997f --- /dev/null +++ b/src/main/java/org/ntlab/amaryllis/server/entities/Category.java @@ -0,0 +1,38 @@ +package org.ntlab.amaryllis.server.entities; + +import java.awt.*; + +public class Category { + private String cid; + private String name; + private Color color; + public Category(String cid,String name,Color color){ + this.cid=cid; + this.name=name; + this.color=color; + } + + public String getcId() { + return cid; + } + + public String getName() { + return name; + } + public Color getColor(){ + return color; + } + public void setCid(String cid) { + this.cid = cid; + } + + public void setName(String name) { + this.name = name; + } + + public void setColor(Color color) { + this.color = color; + } + + +} diff --git a/src/main/java/org/ntlab/amaryllis/server/models/Accounts.java b/src/main/java/org/ntlab/amaryllis/server/models/Accounts.java index bd1cb7a..1ccacc8 100644 --- a/src/main/java/org/ntlab/amaryllis/server/models/Accounts.java +++ b/src/main/java/org/ntlab/amaryllis/server/models/Accounts.java @@ -8,6 +8,10 @@ public class Accounts { private static Accounts theInstance = null; + /** + * @param String アカウントのuid + * @param Account アカウント + */ private HashMap accountHashMap=new HashMap<>(); public static Accounts getInstance() { if (theInstance == null) { diff --git a/src/main/java/org/ntlab/amaryllis/server/models/Categories.java b/src/main/java/org/ntlab/amaryllis/server/models/Categories.java new file mode 100644 index 0000000..fa35513 --- /dev/null +++ b/src/main/java/org/ntlab/amaryllis/server/models/Categories.java @@ -0,0 +1,52 @@ +package org.ntlab.amaryllis.server.models; + +import org.ntlab.amaryllis.server.entities.Category; + +import java.awt.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Set; + +public class Categories { + private static Categories theInstance=null; + /** + * cidでひも付けされたカテゴリのハッシュマップ + */ + private HashMap categoryHashMap; + public static Categories getInstance(){ + if(theInstance==null){ + theInstance=new Categories(); + } + return theInstance; + } + private void addCategory(String cid, String name, Color color){ + categoryHashMap.put(cid,new Category(cid,name,color)); + } + /** + * インスタンス生成を禁止するコンストラクタ + */ + private Categories(){ + categoryHashMap =new HashMap(); + { + addCategory("","",new Color(1,1,1)); + } + } + + /** + * 持っているカテゴリを全て取得するメソッド + * @return 持っているカテゴリのリスト + */ + public ArrayList getCategoryList() { + return new ArrayList<>(categoryHashMap.keySet()); + } + + /** + * cidからカテゴリを返すメソッド + * @param cid カテゴリのcid + * @return cidと対応したカテゴリ + */ + public Category getCategory(String cid){ + return categoryHashMap.get(cid); + } + +}