change internal process method, which introducing ExtractionResultSet

[stigmata/stigmata.git] / src / main / java / jp / naist / se / stigmata / format / csv / BirthmarkExtractionResultCsvFormat.java

diff --git a/src/main/java/jp/naist/se/stigmata/format/csv/BirthmarkExtractionResultCsvFormat.java b/src/main/java/jp/naist/se/stigmata/format/csv/BirthmarkExtractionResultCsvFormat.java
index 56064be..f5c3635 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/format/csv/BirthmarkExtractionResultCsvFormat.java
+++ b/src/main/java/jp/naist/se/stigmata/format/csv/BirthmarkExtractionResultCsvFormat.java
@@ -10,6 +10,8 @@ import java.util.Iterator;
 import jp.naist.se.stigmata.Birthmark;\r
 import jp.naist.se.stigmata.BirthmarkElement;\r
 import jp.naist.se.stigmata.BirthmarkSet;\r
+import jp.naist.se.stigmata.ExtractionResultSet;\r
+import jp.naist.se.stigmata.ExtractionTarget;\r
 import jp.naist.se.stigmata.format.AbstractBirthmarkExtractionResultFormat;\r
 \r
 /**\r
@@ -20,14 +22,14 @@ import jp.naist.se.stigmata.format.AbstractBirthmarkExtractionResultFormat;
  * @version $Revision$ $Date$\r
  */\r
 public class BirthmarkExtractionResultCsvFormat extends AbstractBirthmarkExtractionResultFormat{\r
-    public void printResult(PrintWriter out, BirthmarkSet[] holders){\r
-        for(int i = 0; i < holders.length; i++){\r
-            printBirthmarkHolder(out, holders[i]);\r
+    public void printResult(PrintWriter out, ExtractionResultSet ers){\r
+        for(Iterator<BirthmarkSet> i = ers.birthmarkSets(ExtractionTarget.TARGET_BOTH); i.hasNext(); ){\r
+            printBirthmarkSet(out, i.next());\r
         }\r
         out.flush();\r
     }\r
 \r
-    protected void printBirthmarkHolder(PrintWriter out, BirthmarkSet holder){\r
+    protected void printBirthmarkSet(PrintWriter out, BirthmarkSet holder){\r
         for(String type: holder.getBirthmarkTypes()){\r
             out.print(holder.getName());\r
             out.print(",");\r