commit failed for adding previous commit

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

diff --git a/src/main/java/jp/naist/se/stigmata/BirthmarkEngine.java b/src/main/java/jp/naist/se/stigmata/BirthmarkEngine.java
index 3ef2644..bf5295c 100755 (executable)
--- a/src/main/java/jp/naist/se/stigmata/BirthmarkEngine.java
+++ b/src/main/java/jp/naist/se/stigmata/BirthmarkEngine.java
@@ -24,6 +24,8 @@ import jp.naist.se.stigmata.event.OperationType;
 import jp.naist.se.stigmata.event.WarningMessages;\r
 import jp.naist.se.stigmata.filter.ComparisonPairFilterManager;\r
 import jp.naist.se.stigmata.filter.FilteredComparisonResultSet;\r
+import jp.naist.se.stigmata.hook.Phase;\r
+import jp.naist.se.stigmata.hook.StigmataHookManager;\r
 import jp.naist.se.stigmata.reader.ClassFileArchive;\r
 import jp.naist.se.stigmata.reader.ClassFileEntry;\r
 import jp.naist.se.stigmata.reader.ClasspathContext;\r
@@ -103,7 +105,7 @@ public class BirthmarkEngine{
 \r
         ComparisonResultSet crs = compare(targetX, targetY, context);\r
         crs = filter(crs);\r
-        \r
+\r
         operationDone(OperationType.FILTER_BIRTHMARKS);\r
 \r
         return crs;\r
@@ -121,7 +123,7 @@ public class BirthmarkEngine{
 \r
         ComparisonResultSet crs = compare(er);\r
         crs = filter(crs);\r
-        \r
+\r
         operationDone(OperationType.FILTER_BIRTHMARKS);\r
 \r
         return crs;\r
@@ -134,6 +136,7 @@ public class BirthmarkEngine{
      */\r
     public synchronized ComparisonResultSet filter(ComparisonResultSet crs) throws BirthmarkExtractionFailedException, BirthmarkComparisonFailedException{\r
         operationStart(OperationType.FILTER_BIRTHMARKS);\r
+        StigmataHookManager.getInstance().runHook(Phase.BEFORE_FILTERING, crs.getContext());\r
 \r
         String[] filterTypes = crs.getContext().getFilterTypes();\r
 \r
@@ -153,8 +156,10 @@ public class BirthmarkEngine{
 \r
             crs = new FilteredComparisonResultSet(crs, cpfs);\r
         }\r
-        \r
+\r
+        StigmataHookManager.getInstance().runHook(Phase.AFTER_FILTERING, crs.getContext());\r
         operationDone(OperationType.FILTER_BIRTHMARKS);\r
+\r
         return crs;\r
     }\r
 \r
@@ -191,6 +196,7 @@ public class BirthmarkEngine{
         operationStart(OperationType.COMPARE_BIRTHMARKS);\r
         BirthmarkContext context = er.getContext();\r
 \r
+        StigmataHookManager.getInstance().runHook(Phase.BEFORE_COMPARISON, context);\r
         ComparisonResultSet crs = null;\r
         switch(context.getComparisonMethod()){\r
         case ROUND_ROBIN_SAME_PAIR:\r
@@ -209,7 +215,9 @@ public class BirthmarkEngine{
             break;\r
         }\r
 \r
+        StigmataHookManager.getInstance().runHook(Phase.AFTER_COMPARISON, context);\r
         operationDone(OperationType.COMPARE_BIRTHMARKS);\r
+\r
         return crs;\r
     }\r
 \r
@@ -225,6 +233,8 @@ public class BirthmarkEngine{
         ExtractionResultSet er = context.getEnvironment().getHistoryManager().createDefaultResultSet(context);\r
 \r
         try{\r
+            StigmataHookManager.getInstance().runHook(Phase.BEFORE_EXTRACTION, context);\r
+\r
             switch(context.getComparisonMethod()){\r
             case ROUND_ROBIN_SAME_PAIR:\r
             case ROUND_ROBIN_WITHOUT_SAME_PAIR:\r
@@ -248,6 +258,7 @@ public class BirthmarkEngine{
         } catch(IOException e){\r
             throw new BirthmarkExtractionFailedException(e);\r
         } finally{\r
+            StigmataHookManager.getInstance().runHook(Phase.AFTER_EXTRACTION, context);\r
             operationDone(OperationType.EXTRACT_BIRTHMARKS);\r
         }\r
     }\r
@@ -363,7 +374,7 @@ public class BirthmarkEngine{
                 try{\r
                     BirthmarkSet birthmarkset = new BirthmarkSet(entry.getClassName(), entry.getLocation());\r
                     byte[] data = inputStreamToByteArray(entry.getLocation().openStream());\r
-                    \r
+\r
                     for(String birthmarkType: context.getBirthmarkTypes()){\r
                         try{\r
                             BirthmarkExtractor extractor = factory.getExtractor(birthmarkType);\r