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..fdd70c4 --- /dev/null +++ b/src/main/java/org/ntlab/amaryllis/server/entities/Category.java @@ -0,0 +1,41 @@ +package org.ntlab.amaryllis.server.entities; + +import java.awt.*; + +public class Category { + private String cid; + private String name; + /** + * 文字列表現された色情報 + */ + private String color; + public Category(String cid,String name,String color){ + this.cid=cid; + this.name=name; + this.color=color; + } + + public String getcId() { + return cid; + } + + public String getName() { + return name; + } + public String getColor(){ + return color; + } + public void setCid(String cid) { + this.cid = cid; + } + + public void setName(String name) { + this.name = name; + } + + public void setColor(String 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..db70806 --- /dev/null +++ b/src/main/java/org/ntlab/amaryllis/server/models/Categories.java @@ -0,0 +1,77 @@ +package org.ntlab.amaryllis.server.models; + +import org.ntlab.amaryllis.server.entities.Category; +import org.ntlab.amaryllis.server.entities.Voicememo; + +import java.awt.*; +import java.util.ArrayList; +import java.util.Collection; +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 Categories(){ + categoryHashMap =new HashMap(); + { + addCategory("c01","Music","#0000FF"); + addCategory("c02","Travel","#FF0000"); + } + + /** + *テスト用コード + */ + { + + } + + } + + /** + * カテゴリを追加するメソッド。 + * @param cid カテゴリのcid + * @param name カテゴリの名前 + * @param color カテゴリの色 + */ + private void addCategory(String cid, String name, String color){ + categoryHashMap.put(cid,new Category(cid,name,color)); + } + + /** + * 持っているカテゴリを全て取得するメソッド + * @return 持っているカテゴリのリスト + */ + public ArrayList getCategoryList() { + return new ArrayList<>(categoryHashMap.keySet()); + } + + /** + * 持っているカテゴリを全て取得するメソッド + * @return 持っているカテゴリのハッシュマップ + */ + public HashMap getHashMap(){return categoryHashMap;} + + /** + * cidからカテゴリを返すメソッド + * @param cid カテゴリのcid + * @return cidと対応したカテゴリ + */ + public Category getCategory(String cid){ + return categoryHashMap.get(cid); + } + + +} \ No newline at end of file diff --git a/src/main/java/org/ntlab/amaryllis/server/tests/ModelsInterface.java b/src/main/java/org/ntlab/amaryllis/server/tests/ModelsInterface.java new file mode 100644 index 0000000..b60be9a --- /dev/null +++ b/src/main/java/org/ntlab/amaryllis/server/tests/ModelsInterface.java @@ -0,0 +1,8 @@ +package org.ntlab.amaryllis.server.tests; + +import java.util.HashMap; + +public interface ModelsInterface { + public HashMap getHashMap(); + +}