diff --git a/src/main/java/org/ntlab/amaryllis/server/entities/Category.java b/src/main/java/org/ntlab/amaryllis/server/entities/Category.java index 6c9997f..fdd70c4 100644 --- a/src/main/java/org/ntlab/amaryllis/server/entities/Category.java +++ b/src/main/java/org/ntlab/amaryllis/server/entities/Category.java @@ -5,8 +5,11 @@ public class Category { private String cid; private String name; - private Color color; - public Category(String cid,String name,Color color){ + /** + * 文字列表現された色情報 + */ + private String color; + public Category(String cid,String name,String color){ this.cid=cid; this.name=name; this.color=color; @@ -19,7 +22,7 @@ public String getName() { return name; } - public Color getColor(){ + public String getColor(){ return color; } public void setCid(String cid) { @@ -30,7 +33,7 @@ this.name = name; } - public void setColor(Color color) { + public void setColor(String color) { this.color = color; } diff --git a/src/main/java/org/ntlab/amaryllis/server/models/Categories.java b/src/main/java/org/ntlab/amaryllis/server/models/Categories.java index fa35513..db70806 100644 --- a/src/main/java/org/ntlab/amaryllis/server/models/Categories.java +++ b/src/main/java/org/ntlab/amaryllis/server/models/Categories.java @@ -1,9 +1,11 @@ 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; @@ -19,17 +21,33 @@ } 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)); + 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)); } /** @@ -41,6 +59,12 @@ } /** + * 持っているカテゴリを全て取得するメソッド + * @return 持っているカテゴリのハッシュマップ + */ + public HashMap getHashMap(){return categoryHashMap;} + + /** * cidからカテゴリを返すメソッド * @param cid カテゴリのcid * @return cidと対応したカテゴリ @@ -49,4 +73,5 @@ 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(); + +}