update method name extractionType -> birthmarkType in BirthmarkContext

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

diff --git a/src/main/java/jp/naist/se/stigmata/BirthmarkContext.java b/src/main/java/jp/naist/se/stigmata/BirthmarkContext.java
index d5d1b82..ab14399 100755 (executable)
--- a/src/main/java/jp/naist/se/stigmata/BirthmarkContext.java
+++ b/src/main/java/jp/naist/se/stigmata/BirthmarkContext.java
@@ -82,26 +82,26 @@ public class BirthmarkContext{
         }\r
     }\r
 \r
-    public void setExtractionTypes(String[] types){\r
+    public void setBirthmarkTypes(String[] types){\r
         birthmarkTypes.clear();\r
         for(int i = 0; i < types.length; i++){\r
-            addExtractionType(types[i]);\r
+            addBirthmarkType(types[i]);\r
         }\r
     }\r
 \r
-    public void addExtractionType(String type){\r
+    public void addBirthmarkType(String type){\r
         birthmarkTypes.add(type);\r
     }\r
 \r
-    public void removeExtractionType(String type){\r
+    public void removeBirthmarkType(String type){\r
         birthmarkTypes.remove(type);\r
     }\r
 \r
-    public synchronized String[] getExtractionTypes(){\r
-        return birthmarkTypes.toArray(new String[getExtractionTypeCount()]);\r
+    public synchronized String[] getBirthmarkTypes(){\r
+        return birthmarkTypes.toArray(new String[getBirthmarkTypeSize()]);\r
     }\r
 \r
-    public int getExtractionTypeCount(){\r
+    public int getBirthmarkTypeSize(){\r
         return birthmarkTypes.size();\r
     }\r
 \r

diff --git a/src/main/java/jp/naist/se/stigmata/BirthmarkEngine.java b/src/main/java/jp/naist/se/stigmata/BirthmarkEngine.java
index 72b0d84..62e6850 100755 (executable)
--- a/src/main/java/jp/naist/se/stigmata/BirthmarkEngine.java
+++ b/src/main/java/jp/naist/se/stigmata/BirthmarkEngine.java
@@ -318,7 +318,7 @@ public class BirthmarkEngine{
                     }\r
 \r
                     byte[] data = inputStreamToByteArray(entry.getLocation().openStream());\r
-                    for(String birthmarkType: context.getExtractionTypes()){\r
+                    for(String birthmarkType: context.getBirthmarkTypes()){\r
                         try{\r
                             BirthmarkExtractor extractor = factory.getExtractor(birthmarkType);\r
                             if(extractor.isAcceptable(ExtractionUnit.PACKAGE)){\r
@@ -363,7 +363,7 @@ public class BirthmarkEngine{
                     BirthmarkSet birthmarkset = new BirthmarkSet(entry.getClassName(), entry.getLocation());\r
                     byte[] data = inputStreamToByteArray(entry.getLocation().openStream());\r
                     \r
-                    for(String birthmarkType: context.getExtractionTypes()){\r
+                    for(String birthmarkType: context.getBirthmarkTypes()){\r
                         try{\r
                             BirthmarkExtractor extractor = factory.getExtractor(birthmarkType);\r
                             if(extractor.isAcceptable(ExtractionUnit.CLASS)){\r
@@ -391,7 +391,7 @@ public class BirthmarkEngine{
             for(ClassFileEntry entry: archive){\r
                 try{\r
                     byte[] data = inputStreamToByteArray(entry.getLocation().openStream());\r
-                    for(String birthmarkType: context.getExtractionTypes()){\r
+                    for(String birthmarkType: context.getBirthmarkTypes()){\r
                         try{\r
                             BirthmarkExtractor extractor = factory.getExtractor(birthmarkType);\r
                             if(extractor.isAcceptable(ExtractionUnit.ARCHIVE)){\r

diff --git a/src/main/java/jp/naist/se/stigmata/Main.java b/src/main/java/jp/naist/se/stigmata/Main.java
index a03825e..4fb7971 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/Main.java
+++ b/src/main/java/jp/naist/se/stigmata/Main.java
@@ -175,7 +175,7 @@ public final class Main{
 \r
         String[] birthmarks = getTargetBirthmarks(env, cl);\r
         for(int i = 0; i < birthmarks.length; i++){\r
-            context.addExtractionType(birthmarks[i]);\r
+            context.addBirthmarkType(birthmarks[i]);\r
         }\r
         if(cl.hasOption("filter")){\r
             String[] filters = cl.getOptionValues("filter");\r

diff --git a/src/main/java/jp/naist/se/stigmata/result/AbstractExtractionResultSet.java b/src/main/java/jp/naist/se/stigmata/result/AbstractExtractionResultSet.java
index 2c13b7f..72a8de1 100755 (executable)
--- a/src/main/java/jp/naist/se/stigmata/result/AbstractExtractionResultSet.java
+++ b/src/main/java/jp/naist/se/stigmata/result/AbstractExtractionResultSet.java
@@ -83,7 +83,7 @@ public abstract class AbstractExtractionResultSet implements ExtractionResultSet
     }\r
 \r
     public String[] getBirthmarkTypes(){\r
-        return context.getExtractionTypes();\r
+        return context.getBirthmarkTypes();\r
     }\r
 \r
     public BirthmarkSet getBirthmarkSet(ExtractionTarget target, int index){\r

diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java b/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
index d7697d2..e21db11 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
@@ -293,7 +293,7 @@ public class ControlPane extends JPanel{
 \r
     private BirthmarkContext generateContext(){\r
         BirthmarkContext context = new BirthmarkContext(generateEnvironment());\r
-        context.setExtractionTypes(birthmarks.getSelectedServiceTypes());\r
+        context.setBirthmarkTypes(birthmarks.getSelectedServiceTypes());\r
         context.setExtractionUnit(parseExtractionUnit());\r
         \r
         return context;\r

diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java b/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java
index 69f164f..d6b9a5e 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java
@@ -186,7 +186,7 @@ public class StigmataFrame extends JFrame{
                 "compare", tabPane, compare,\r
                 new Object[] { new Integer(compareCount), },\r
                 new Object[] {\r
-                    Utility.array2String(context.getExtractionTypes()),\r
+                    Utility.array2String(context.getBirthmarkTypes()),\r
                     Utility.array2String(targetX),\r
                     Utility.array2String(targetY),\r
                 }\r
@@ -212,7 +212,7 @@ public class StigmataFrame extends JFrame{
                 "compare", tabPane, new PairComparisonResultSetPane(this, resultset),\r
                 new Object[] { new Integer(compareCount), },\r
                 new Object[] {\r
-                    Utility.array2String(context.getExtractionTypes()),\r
+                    Utility.array2String(context.getBirthmarkTypes()),\r
                     Utility.array2String(targetX),\r
                     Utility.array2String(targetY),\r
                 }\r
@@ -234,7 +234,7 @@ public class StigmataFrame extends JFrame{
                 new PairComparisonResultSetPane(this, resultset),\r
                 new Object[] { new Integer(comparePair), },\r
                 new Object[] {\r
-                    Utility.array2String(context.getExtractionTypes()),\r
+                    Utility.array2String(context.getBirthmarkTypes()),\r
                     Utility.array2String(targetX),\r
                     Utility.array2String(targetY),\r
                 }\r
@@ -263,7 +263,7 @@ public class StigmataFrame extends JFrame{
                     new PairComparisonResultSetPane(this, crs),\r
                     new Object[] { new Integer(comparePair), },\r
                     new Object[] {\r
-                        Utility.array2String(context.getExtractionTypes()),\r
+                        Utility.array2String(context.getBirthmarkTypes()),\r
                         Utility.array2String(targetX),\r
                         Utility.array2String(targetY),\r
                     }\r

diff --git a/src/test/java/jp/naist/se/stigmata/birthmarks/BirthmarkCompareTest.java b/src/test/java/jp/naist/se/stigmata/birthmarks/BirthmarkCompareTest.java
index 79fb58c..ac34ca0 100755 (executable)
--- a/src/test/java/jp/naist/se/stigmata/birthmarks/BirthmarkCompareTest.java
+++ b/src/test/java/jp/naist/se/stigmata/birthmarks/BirthmarkCompareTest.java
@@ -28,7 +28,7 @@ public class BirthmarkCompareTest{
     @Before\r
     public void readBirthmarks() throws Exception{\r
         context = Stigmata.getInstance().createContext();\r
-        context.setExtractionTypes(new String[] { "cvfv", "smc", "uc", "is", "kgram", });\r
+        context.setBirthmarkTypes(new String[] { "cvfv", "smc", "uc", "is", "kgram", });\r
         engine = new BirthmarkEngine(context.getEnvironment());\r
 \r
         ExtractionResultSet ers = engine.extract(\r

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 dae216e..d0b5198 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
@@ -28,7 +28,7 @@ public class CVFVBirthmarkExtractorTest{
     public void setup(){\r
         stigmata = Stigmata.getInstance();\r
         context = stigmata.createContext();\r
-        context.addExtractionType("cvfv");\r
+        context.addBirthmarkType("cvfv");\r
     }\r
 \r
     @Test\r

diff --git a/src/test/java/jp/naist/se/stigmata/birthmarks/is/ISBirthmarkExtractorTest.java b/src/test/java/jp/naist/se/stigmata/birthmarks/is/ISBirthmarkExtractorTest.java
index 5bce15b..d0fedea 100755 (executable)
--- a/src/test/java/jp/naist/se/stigmata/birthmarks/is/ISBirthmarkExtractorTest.java
+++ b/src/test/java/jp/naist/se/stigmata/birthmarks/is/ISBirthmarkExtractorTest.java
@@ -29,7 +29,7 @@ public class ISBirthmarkExtractorTest{
     public void setup(){\r
         engine = Stigmata.getInstance().createEngine();\r
         context = Stigmata.getInstance().createContext();\r
-        context.addExtractionType("is");\r
+        context.addBirthmarkType("is");\r
     }\r
 \r
     @Test\r

diff --git a/src/test/java/jp/naist/se/stigmata/birthmarks/smc/SmcBirthmarkExtractorTest.java b/src/test/java/jp/naist/se/stigmata/birthmarks/smc/SmcBirthmarkExtractorTest.java
index ca6dab5..40dfee4 100755 (executable)
--- a/src/test/java/jp/naist/se/stigmata/birthmarks/smc/SmcBirthmarkExtractorTest.java
+++ b/src/test/java/jp/naist/se/stigmata/birthmarks/smc/SmcBirthmarkExtractorTest.java
@@ -28,7 +28,7 @@ public class SmcBirthmarkExtractorTest{
     public void setup(){\r
         stigmata = Stigmata.getInstance();\r
         context = stigmata.createContext();\r
-        context.addExtractionType("smc");\r
+        context.addBirthmarkType("smc");\r
     }\r
 \r
     @Test\r

diff --git a/src/test/java/jp/naist/se/stigmata/birthmarks/uc/UCBirthmarkExtractorTest.java b/src/test/java/jp/naist/se/stigmata/birthmarks/uc/UCBirthmarkExtractorTest.java
index c642b2f..e41f373 100755 (executable)
--- a/src/test/java/jp/naist/se/stigmata/birthmarks/uc/UCBirthmarkExtractorTest.java
+++ b/src/test/java/jp/naist/se/stigmata/birthmarks/uc/UCBirthmarkExtractorTest.java
@@ -28,7 +28,7 @@ public class UCBirthmarkExtractorTest{
     public void setup(){\r
         stigmata = Stigmata.getInstance();\r
         context = stigmata.createContext();\r
-        context.addExtractionType("uc");\r
+        context.addBirthmarkType("uc");\r
     }\r
 \r
     @Test\r