remove ExtractionResultSetFactory, use ExtractedBirthmarkServiceManager

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/stigmata/trunk@253 acee48c3-7b26-0410-bdac-b3d0e5314bbc

diff --git a/src/main/java/jp/naist/se/stigmata/result/CertainPairComparisonResultSet.java b/src/main/java/jp/naist/se/stigmata/result/CertainPairComparisonResultSet.java
index dea62bb..0f16882 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/result/CertainPairComparisonResultSet.java
+++ b/src/main/java/jp/naist/se/stigmata/result/CertainPairComparisonResultSet.java
@@ -16,6 +16,7 @@ import jp.naist.se.stigmata.BirthmarkStoreException;
 import jp.naist.se.stigmata.ComparisonPair;\r
 import jp.naist.se.stigmata.ExtractionResultSet;\r
 import jp.naist.se.stigmata.ExtractionTarget;\r
+import jp.naist.se.stigmata.result.history.ExtractedBirthmarkServiceManager;\r
 \r
 /**\r
  * Concrete class for ComparisonResultSet. This instance compare class files by\r
@@ -133,7 +134,8 @@ public class CertainPairComparisonResultSet extends AbstractComparisonResultSet{
     }\r
 \r
     private static ExtractionResultSet createExtractionResultSet(ComparisonPair[] pairs, BirthmarkContext context){\r
-        ExtractionResultSet ers = ExtractionResultSetFactory.getInstance().createResultSet(context);\r
+        ExtractedBirthmarkServiceManager historyManager = context.getEnvironment().getHistoryManager();\r
+        ExtractionResultSet ers = historyManager.createDefaultResultSet(context);\r
         ers.setTableType(false);\r
         try{\r
             for(int i = 0; i < pairs.length; i++){\r
@@ -147,7 +149,7 @@ public class CertainPairComparisonResultSet extends AbstractComparisonResultSet{
     }\r
 \r
     private static ExtractionResultSet createExtractionResultSet(BirthmarkSet[] targetX, BirthmarkSet[] targetY, BirthmarkContext context){\r
-        ExtractionResultSet ers = ExtractionResultSetFactory.getInstance().createResultSet(context);\r
+        ExtractionResultSet ers = context.getEnvironment().getHistoryManager().createDefaultResultSet(context);\r
         ers.setTableType(true);\r
         try{\r
             ers.setBirthmarkSets(ExtractionTarget.TARGET_X, targetX);\r

diff --git a/src/main/java/jp/naist/se/stigmata/result/ExtractionResultSetFactory.java b/src/main/java/jp/naist/se/stigmata/result/ExtractionResultSetFactory.java
deleted file mode 100755 (executable)
index f2b83f1..0000000
--- a/src/main/java/jp/naist/se/stigmata/result/ExtractionResultSetFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package jp.naist.se.stigmata.result;\r
-\r
-/*\r
- * $Id$\r
- */\r
-\r
-import java.lang.reflect.Constructor;\r
-import java.lang.reflect.InvocationTargetException;\r
-import java.util.HashMap;\r
-import java.util.Map;\r
-\r
-import jp.naist.se.stigmata.BirthmarkContext;\r
-import jp.naist.se.stigmata.BirthmarkStoreTarget;\r
-import jp.naist.se.stigmata.ExtractionResultSet;\r
-\r
-/**\r
- * \r
- * @author Haruaki Tamada\r
- * @version $Revision$ $Date$\r
- */\r
-public class ExtractionResultSetFactory{\r
-    private static ExtractionResultSetFactory instance = new ExtractionResultSetFactory();\r
-    private Map<String, Class<? extends ExtractionResultSet>> map = new HashMap<String, Class<? extends ExtractionResultSet>>();\r
-\r
-    private ExtractionResultSetFactory(){\r
-        map.put(BirthmarkStoreTarget.MEMORY.name(),        MemoryExtractionResultSet.class);\r
-        map.put(BirthmarkStoreTarget.XMLFILE.name(),       XmlFileExtractionResultSet.class);\r
-        map.put(BirthmarkStoreTarget.MEMORY_SINGLE.name(), SingleExtractionResultSet.class);\r
-    }\r
-\r
-    public static ExtractionResultSetFactory getInstance(){\r
-        return instance;\r
-    }\r
-\r
-    public ExtractionResultSet createResultSet(BirthmarkContext context){\r
-        return createResultSet(context.getStoreTarget(), context);\r
-    }\r
-\r
-    public ExtractionResultSet createResultSet(BirthmarkStoreTarget store, BirthmarkContext context){\r
-        try{\r
-            Class<? extends ExtractionResultSet> clazz = map.get(store.name());\r
-            Constructor<? extends ExtractionResultSet> constructor = clazz.getConstructor(BirthmarkContext.class);\r
-            return constructor.newInstance(context);\r
-\r
-        }catch(NoSuchMethodException e){\r
-        }catch(IllegalArgumentException e){\r
-        }catch(InstantiationException e){\r
-        }catch(IllegalAccessException e){\r
-        }catch(InvocationTargetException e){\r
-        }\r
-        return null;\r
-    }\r
-}\r

diff --git a/src/main/java/jp/naist/se/stigmata/result/history/ExtractedBirthmarkServiceManager.java b/src/main/java/jp/naist/se/stigmata/result/history/ExtractedBirthmarkServiceManager.java
index 0cb39bf..a98f559 100755 (executable)
--- a/src/main/java/jp/naist/se/stigmata/result/history/ExtractedBirthmarkServiceManager.java
+++ b/src/main/java/jp/naist/se/stigmata/result/history/ExtractedBirthmarkServiceManager.java
@@ -41,14 +41,18 @@ public class ExtractedBirthmarkServiceManager{
     }
 
     public ExtractionResultSet createDefaultResultSet(BirthmarkContext context){
-        String type = env.getProperty("birthmark.store.target");
-        if(type == null){
-            type = "XMLFILE";
+        BirthmarkStoreTarget bst = context.getStoreTarget();
+        if(bst == null){
+            String type = env.getProperty("birthmark.store.target");
+            if(type == null){
+                type = "XMLFILE";
+            }
+            bst = BirthmarkStoreTarget.valueOf(type);
         }
-        BirthmarkStoreTarget bst = BirthmarkStoreTarget.valueOf(type);
         if(bst == null){
             bst = BirthmarkStoreTarget.XMLFILE;
         }
+
         ExtractedBirthmarkSpi service = findService(bst);
 
         return service.createResultSet(context);

diff --git a/src/test/java/jp/naist/se/stigmata/birthmarks/cvfv/CVFVBirthmarkExtractorTest.java b/src/test/java/jp/naist/se/stigmata/birthmarks/cvfv/CVFVBirthmarkExtractorTest.java
index 7943f2c..46872e0 100755 (executable)
--- a/src/test/java/jp/naist/se/stigmata/birthmarks/cvfv/CVFVBirthmarkExtractorTest.java
+++ b/src/test/java/jp/naist/se/stigmata/birthmarks/cvfv/CVFVBirthmarkExtractorTest.java
@@ -93,9 +93,11 @@ public class CVFVBirthmarkExtractorTest{
 \r
         Assert.assertEquals("I",   ((TypeAndValueBirthmarkElement)elements[0]).getSignature());\r
         Assert.assertEquals(-1,    ((TypeAndValueBirthmarkElement)elements[0]).getValue());\r
+\r
         Assert.assertEquals("Z",   ((TypeAndValueBirthmarkElement)elements[1]).getSignature());\r
         Assert.assertEquals(null,  ((TypeAndValueBirthmarkElement)elements[1]).getValue());\r
+\r
         Assert.assertEquals("Z",   ((TypeAndValueBirthmarkElement)elements[2]).getSignature());\r
-        Assert.assertEquals(false, ((TypeAndValueBirthmarkElement)elements[2]).getValue());\r
+        Assert.assertEquals(0,     ((TypeAndValueBirthmarkElement)elements[2]).getValue());\r
     }\r
 }\r