OSDN Git Service

update variable names based on changing class name BirthmarkContext to BirthmarkEnvir...
authortama3 <tama3@acee48c3-7b26-0410-bdac-b3d0e5314bbc>
Mon, 16 Jul 2007 02:20:34 +0000 (02:20 +0000)
committertama3 <tama3@acee48c3-7b26-0410-bdac-b3d0e5314bbc>
Mon, 16 Jul 2007 02:20:34 +0000 (02:20 +0000)
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/stigmata/trunk@172 acee48c3-7b26-0410-bdac-b3d0e5314bbc

44 files changed:
src/main/java/jp/naist/se/stigmata/BirthmarkEnvironment.java
src/main/java/jp/naist/se/stigmata/BirthmarkExtractor.java
src/main/java/jp/naist/se/stigmata/CertainPairComparisonResultSet.java
src/main/java/jp/naist/se/stigmata/ComparisonPair.java
src/main/java/jp/naist/se/stigmata/ComparisonResultSet.java
src/main/java/jp/naist/se/stigmata/Main.java
src/main/java/jp/naist/se/stigmata/RoundRobinComparisonResultSet.java
src/main/java/jp/naist/se/stigmata/Stigmata.java
src/main/java/jp/naist/se/stigmata/birthmarks/ASMBirthmarkExtractor.java
src/main/java/jp/naist/se/stigmata/birthmarks/AbstractBirthmarkExtractor.java
src/main/java/jp/naist/se/stigmata/birthmarks/BirthmarkExtractVisitor.java
src/main/java/jp/naist/se/stigmata/birthmarks/BirthmarkService.java
src/main/java/jp/naist/se/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractVisitor.java
src/main/java/jp/naist/se/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractor.java
src/main/java/jp/naist/se/stigmata/birthmarks/fmc/FrequencyMethodCallBirthmarkExtractor.java
src/main/java/jp/naist/se/stigmata/birthmarks/fuc/FrequencyUsedClassesBirthmarkExtractor.java
src/main/java/jp/naist/se/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractVisitor.java
src/main/java/jp/naist/se/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractor.java
src/main/java/jp/naist/se/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractVisitor.java
src/main/java/jp/naist/se/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractor.java
src/main/java/jp/naist/se/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractVisitor.java
src/main/java/jp/naist/se/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractor.java
src/main/java/jp/naist/se/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractVisitor.java
src/main/java/jp/naist/se/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractor.java
src/main/java/jp/naist/se/stigmata/event/OperationType.java
src/main/java/jp/naist/se/stigmata/filter/FilteredComparisonResultSet.java
src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkDefinitionPane.java
src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkExtractionResultPane.java
src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkSelectablePane.java
src/main/java/jp/naist/se/stigmata/ui/swing/ClasspathSettingsPane.java
src/main/java/jp/naist/se/stigmata/ui/swing/CompareTableCellRenderer.java
src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
src/main/java/jp/naist/se/stigmata/ui/swing/FilterManagementPane.java
src/main/java/jp/naist/se/stigmata/ui/swing/PairComparisonResultSetPane.java
src/main/java/jp/naist/se/stigmata/ui/swing/PropertyEditPane.java
src/main/java/jp/naist/se/stigmata/ui/swing/RoundRobinComparisonResultPane.java
src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java
src/main/java/jp/naist/se/stigmata/ui/swing/WellknownClassesSettingsPane.java
src/main/java/jp/naist/se/stigmata/ui/swing/actions/UpdateBirthmarkCellColorAction.java
src/main/java/jp/naist/se/stigmata/ui/swing/filter/FilterEditingPane.java
src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphPanel.java
src/main/java/jp/naist/se/stigmata/utils/ConfigFileExporter.java
src/main/java/jp/naist/se/stigmata/utils/ConfigFileImporter.java
src/test/java/jp/naist/se/stigmata/StigmataTest.java

index 2ca399d..b70d494 100644 (file)
@@ -29,12 +29,12 @@ import jp.naist.se.stigmata.utils.WellknownClassManager;
  */\r
 public class BirthmarkEnvironment{\r
     /**\r
-     * Default context. All instance of this class is based on default context.\r
+     * Default environment. All instance of this class is based on default environment.\r
      */\r
-    private static BirthmarkEnvironment DEFAULT_CONTEXT = new BirthmarkEnvironment(true);\r
+    private static BirthmarkEnvironment DEFAULT_ENVIRONMENT = new BirthmarkEnvironment(true);\r
 \r
     /**\r
-     * parent of this context.\r
+     * parent of this environment.\r
      */\r
     private BirthmarkEnvironment parent;\r
 \r
@@ -70,12 +70,12 @@ public class BirthmarkEnvironment{
     private ComparisonPairFilterManager filterManager;\r
 \r
     /**\r
-     * birthmark extraction unit.\r
+     * @deprecated moved to BirthmarkContext\r
      */\r
-    private ExtractionUnit unit = ExtractionUnit.CLASS;\r
+    private ExtractionUnit unit;\r
 \r
     /**\r
-     * constructor for root context\r
+     * constructor for root environment\r
      */\r
     private BirthmarkEnvironment(boolean flag){\r
         manager = new WellknownClassManager();\r
@@ -85,14 +85,14 @@ public class BirthmarkEnvironment{
 \r
     /**\r
      * default constructor. The instance constructed by this constructor has\r
-     * default context as the parent.\r
+     * default environment as the parent.\r
      */\r
     public BirthmarkEnvironment(){\r
-        this(getDefaultContext());\r
+        this(getDefaultEnvironment());\r
     }\r
 \r
     /**\r
-     * constructor for specifying parent context.\r
+     * constructor for specifying parent environment.\r
      */\r
     public BirthmarkEnvironment(BirthmarkEnvironment parent){\r
         this.parent = parent;\r
@@ -102,10 +102,10 @@ public class BirthmarkEnvironment{
     }\r
 \r
     /**\r
-     * returns the default birthmark context.\r
+     * returns the default birthmark environment.\r
      */\r
-    public static final BirthmarkEnvironment getDefaultContext(){\r
-        return DEFAULT_CONTEXT;\r
+    public static final BirthmarkEnvironment getDefaultEnvironment(){\r
+        return DEFAULT_ENVIRONMENT;\r
     }\r
 \r
     public BirthmarkEnvironment getParent(){\r
@@ -188,7 +188,7 @@ public class BirthmarkEnvironment{
     }\r
 \r
     /**\r
-     * add given birthmark service to this context.\r
+     * add given birthmark service to this environment.\r
      */\r
     public synchronized void addService(BirthmarkSpi service){\r
         if(parent == null || parent.getService(service.getType()) == null){\r
@@ -197,7 +197,7 @@ public class BirthmarkEnvironment{
     }\r
 \r
     /**\r
-     * remove given birthmark service from this context.\r
+     * remove given birthmark service from this environment.\r
      */\r
     public void removeService(String type){\r
         services.remove(type);\r
@@ -215,7 +215,7 @@ public class BirthmarkEnvironment{
     }\r
 \r
     /**\r
-     * return all birthmark services searching traverse to root context.\r
+     * return all birthmark services searching traverse to root environment.\r
      */\r
     public synchronized BirthmarkSpi[] getServices(){\r
         List<BirthmarkSpi> list = getServiceList();\r
@@ -251,7 +251,7 @@ public class BirthmarkEnvironment{
     }\r
 \r
     /**\r
-     * find the all birthmark services searching to root context.\r
+     * find the all birthmark services searching to root environment.\r
      */\r
     private List<BirthmarkSpi> getServiceList(){\r
         List<BirthmarkSpi> list = new ArrayList<BirthmarkSpi>();\r
@@ -270,11 +270,11 @@ public class BirthmarkEnvironment{
         return filterManager;\r
     }\r
 \r
-    public ExtractionUnit getExtractionUnit(){\r
-        return unit;\r
-    }\r
-\r
     public void setExtractionUnit(ExtractionUnit unit){\r
         this.unit = unit;\r
     }\r
+\r
+    public ExtractionUnit getExtractionUnit(){\r
+        return unit;\r
+    }\r
 }\r
index ae45269..76c5f85 100644 (file)
@@ -46,14 +46,14 @@ public interface BirthmarkExtractor{
     public Birthmark extract(byte[] bytecode) throws BirthmarkExtractionFailedException;\r
 \r
     /**\r
-     * extract birthmark from given stream with given context.\r
+     * extract birthmark from given stream with given environment.\r
      */\r
-    public Birthmark extract(InputStream in, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException;\r
+    public Birthmark extract(InputStream in, BirthmarkEnvironment environment) throws BirthmarkExtractionFailedException;\r
 \r
     /**\r
-     * extract birthmark from given byte array with given context.\r
+     * extract birthmark from given byte array with given environment.\r
      */\r
-    public Birthmark extract(byte[] bytecode, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException;\r
+    public Birthmark extract(byte[] bytecode, BirthmarkEnvironment environment) throws BirthmarkExtractionFailedException;\r
 \r
     /**\r
      * extract birthmark from given stream and add element to given birthmark object.\r
@@ -66,12 +66,12 @@ public interface BirthmarkExtractor{
     public Birthmark extract(Birthmark birthmark, byte[] bytecode) throws BirthmarkExtractionFailedException;\r
 \r
     /**\r
-     * extract birthmark from given stream with given context and add element to given birthmark object.\r
+     * extract birthmark from given stream with given environment and add element to given birthmark object.\r
      */\r
-    public Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException;\r
+    public Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkEnvironment environment) throws BirthmarkExtractionFailedException;\r
 \r
     /**\r
-     * extract birthmark from given byte array with given context and add element to given birthmark object.\r
+     * extract birthmark from given byte array with given environment and add element to given birthmark object.\r
      */\r
-    public Birthmark extract(Birthmark birthmark, byte[] bytecode, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException;\r
+    public Birthmark extract(Birthmark birthmark, byte[] bytecode, BirthmarkEnvironment environment) throws BirthmarkExtractionFailedException;\r
 }\r
index f9a448f..9207816 100644 (file)
@@ -20,15 +20,15 @@ import java.util.Map;
  * @version  $Revision$ $Date$\r
  */\r
 public class CertainPairComparisonResultSet implements ComparisonResultSet{\r
-    private BirthmarkEnvironment context;\r
+    private BirthmarkEnvironment environment;\r
     private List<ComparisonPair> pairList = new ArrayList<ComparisonPair>();\r
     private Map<URL, BirthmarkSet> sources = new HashMap<URL, BirthmarkSet>();\r
 \r
     /**\r
      * This constructor is the comparison pair list is specified.\r
      */\r
-    public CertainPairComparisonResultSet(ComparisonPair[] pairs, BirthmarkEnvironment context){\r
-        this.context = context;\r
+    public CertainPairComparisonResultSet(ComparisonPair[] pairs, BirthmarkEnvironment environment){\r
+        this.environment = environment;\r
         for(int i = 0; i < pairs.length; i++){\r
             pairList.add(pairs[i]);\r
             sources.put(pairs[i].getTarget1().getLocation(), pairs[i].getTarget1());\r
@@ -39,13 +39,13 @@ public class CertainPairComparisonResultSet implements ComparisonResultSet{
     /**\r
      * This constructor is the comparison pair was guessed with class name.\r
      */\r
-    public CertainPairComparisonResultSet(BirthmarkSet[] targetX, BirthmarkSet[] targetY, BirthmarkEnvironment context){\r
-        this.context = context;\r
+    public CertainPairComparisonResultSet(BirthmarkSet[] targetX, BirthmarkSet[] targetY, BirthmarkEnvironment environment){\r
+        this.environment = environment;\r
         for(int i = 0; i < targetX.length; i++){\r
             BirthmarkSet target2 = findTarget(targetX[i].getName(), targetY);\r
 \r
             if(target2 != null){\r
-                pairList.add(new ComparisonPair(targetX[i], target2, context));\r
+                pairList.add(new ComparisonPair(targetX[i], target2, environment));\r
             }\r
         }\r
         addSources(targetX);\r
@@ -55,8 +55,8 @@ public class CertainPairComparisonResultSet implements ComparisonResultSet{
     /**\r
      * This constructor is the comparison pair was specified as mapping.\r
      */\r
-    public CertainPairComparisonResultSet(BirthmarkSet[] targetX, BirthmarkSet[] targetY, Map<String, String> mapping, BirthmarkEnvironment context){\r
-        this.context = context;\r
+    public CertainPairComparisonResultSet(BirthmarkSet[] targetX, BirthmarkSet[] targetY, Map<String, String> mapping, BirthmarkEnvironment environment){\r
+        this.environment = environment;\r
         for(Map.Entry<String, String> entry: mapping.entrySet()){\r
             BirthmarkSet target1 = findTarget(entry.getKey(), targetX);\r
             BirthmarkSet target2 = findTarget(entry.getValue(), targetY);\r
@@ -71,7 +71,7 @@ public class CertainPairComparisonResultSet implements ComparisonResultSet{
                 }\r
             }\r
             if(target1 != null && target2 != null){\r
-                pairList.add(new ComparisonPair(target1, target2, context));\r
+                pairList.add(new ComparisonPair(target1, target2, environment));\r
             }\r
         }\r
         addSources(targetX);\r
@@ -79,10 +79,10 @@ public class CertainPairComparisonResultSet implements ComparisonResultSet{
     }\r
 \r
     /**\r
-     * return the context.\r
+     * return the environment.\r
      */\r
-    public BirthmarkEnvironment getContext(){\r
-        return context;\r
+    public BirthmarkEnvironment getEnvironment(){\r
+        return environment;\r
     }\r
 \r
     /**\r
index 4e69414..091a6d8 100644 (file)
@@ -16,15 +16,15 @@ import java.util.List;
 public class ComparisonPair implements Iterable<ComparisonPairElement>{\r
     private BirthmarkSet target1;\r
     private BirthmarkSet target2;\r
-    private BirthmarkEnvironment context;\r
+    private BirthmarkEnvironment environment;\r
 \r
     /**\r
      * constructor.\r
      */\r
-    public ComparisonPair(BirthmarkSet target1, BirthmarkSet target2, BirthmarkEnvironment context){\r
+    public ComparisonPair(BirthmarkSet target1, BirthmarkSet target2, BirthmarkEnvironment environment){\r
         this.target1 = target1;\r
         this.target2 = target2;\r
-        this.context = context;\r
+        this.environment = environment;\r
 \r
         if(target1.getBirthmarksCount() != target2.getBirthmarksCount()){\r
             throw new IllegalArgumentException("birthmark count is not matched");\r
@@ -82,7 +82,7 @@ public class ComparisonPair implements Iterable<ComparisonPairElement>{
             Birthmark b1 = target1.getBirthmark(type);\r
             Birthmark b2 = target2.getBirthmark(type);\r
             if(b1 != null && b2 != null){\r
-                list.add(new ComparisonPairElement(b1, b2, context.getService(type).getComparator()));\r
+                list.add(new ComparisonPairElement(b1, b2, environment.getService(type).getComparator()));\r
             }\r
         }\r
         return list.iterator();\r
index 2d45f3f..3893454 100644 (file)
@@ -14,9 +14,9 @@ import java.util.Iterator;
  */\r
 public interface ComparisonResultSet extends Iterable<ComparisonPair>{\r
     /**\r
-     * returns the birthmark context.\r
+     * returns the birthmark environment.\r
      */\r
-    public BirthmarkEnvironment getContext();\r
+    public BirthmarkEnvironment getEnvironment();\r
 \r
     /**\r
      * returns a iterator for {@link ComparisonPair <code>ComparisonPair</code>}.\r
index 75101eb..e058466 100644 (file)
@@ -46,7 +46,7 @@ import org.xml.sax.SAXException;
  */\r
 public final class Main{\r
     private FormatManager manager = FormatManager.getInstance();\r
-    private BirthmarkEnvironment context;\r
+    private BirthmarkEnvironment environment;\r
 \r
     /**\r
      * main process.\r
@@ -58,9 +58,9 @@ public final class Main{
 \r
         Stigmata stigmata = Stigmata.getInstance();\r
         stigmata.configuration(commandLine.getOptionValue("config-file"));\r
-        context = stigmata.createContext();\r
+        environment = stigmata.createEnvironment();\r
 \r
-        addClasspath(context.getClasspathContext(), commandLine);\r
+        addClasspath(environment.getClasspathContext(), commandLine);\r
 \r
         String[] birthmarks = getTargetBirthmarks(commandLine);\r
         String[] arguments = commandLine.getArgs();\r
@@ -98,7 +98,7 @@ public final class Main{
                 compareBirthmarks(stigmata, birthmarks, filters, arguments, format);\r
             }\r
             else if(mode.equals("gui")){\r
-                StigmataFrame frame = new StigmataFrame(stigmata, context);\r
+                StigmataFrame frame = new StigmataFrame(stigmata, environment);\r
                 frame.setVisible(true);\r
             }\r
         }\r
@@ -110,7 +110,7 @@ public final class Main{
     private void extractBirthmarks(Stigmata stigmata, String[] birthmarks,\r
                                      String[] args, String format){\r
         try{\r
-            BirthmarkSet[] sets = stigmata.extract(birthmarks, args, context);\r
+            BirthmarkSet[] sets = stigmata.extract(birthmarks, args, environment);\r
 \r
             ResultFormatSpi spi = manager.getService(format);\r
             BirthmarkExtractionResultFormat formatter = spi.getExtractionResultFormat();\r
@@ -126,8 +126,8 @@ public final class Main{
     private void compareBirthmarks(Stigmata stigmata, String[] birthmarks,\r
                                      String[] filters, String[] args, String format){\r
         try{\r
-            BirthmarkSet[] sets = stigmata.extract(birthmarks, args, context);\r
-            ComparisonResultSet resultset = stigmata.compare(sets, context);\r
+            BirthmarkSet[] sets = stigmata.extract(birthmarks, args, environment);\r
+            ComparisonResultSet resultset = stigmata.compare(sets, environment);\r
             if(filters != null){\r
                 resultset = stigmata.filter(resultset, filters);\r
             }\r
@@ -142,7 +142,7 @@ public final class Main{
 \r
     private void listBirthmarks(Stigmata stigmata, String format){\r
         try{\r
-            BirthmarkSpi[] spis = stigmata.createContext().findServices();\r
+            BirthmarkSpi[] spis = stigmata.createEnvironment().findServices();\r
             ResultFormatSpi spi = manager.getService(format);\r
             BirthmarkServiceListFormat formatter = spi.getBirthmarkServiceListFormat();\r
 \r
@@ -156,7 +156,7 @@ public final class Main{
         String[] birthmarks = cl.getOptionValues("birthmark");\r
         if(birthmarks == null || birthmarks.length == 0){\r
             List<String> birthmarkList = new ArrayList<String>();\r
-            for(BirthmarkSpi service: context.getServices()){\r
+            for(BirthmarkSpi service: environment.getServices()){\r
                 if(!service.isExpert()){\r
                     birthmarkList.add(service.getType());\r
                 }\r
@@ -234,7 +234,7 @@ public final class Main{
                 out = new PrintWriter(new FileWriter(file));\r
             }\r
 \r
-            new ConfigFileExporter(context).export(out);\r
+            new ConfigFileExporter(environment).export(out);\r
             out.close();\r
         }catch(IOException e){\r
         }\r
@@ -254,7 +254,7 @@ public final class Main{
         );\r
         System.out.println();\r
         System.out.println("Available birthmarks:");\r
-        for(BirthmarkSpi service: context.getServices()){\r
+        for(BirthmarkSpi service: environment.getServices()){\r
             if(!service.isExpert()){\r
                 System.out.printf("    %-5s (%s): %s%n", service.getType(),\r
                         service.getDisplayType(), service.getDescription());\r
@@ -262,7 +262,7 @@ public final class Main{
         }\r
         System.out.println();\r
         System.out.println("Available filers:");\r
-        for(ComparisonPairFilterSet filterset: context.getFilterManager()\r
+        for(ComparisonPairFilterSet filterset: environment.getFilterManager()\r
                 .getFilterSets()){\r
             System.out.printf("    %s (%s)%n", filterset.getName(), filterset.isMatchAll()? "match all": "match any");\r
             for(ComparisonPairFilter filter: filterset){\r
index d45c314..9429915 100644 (file)
@@ -20,7 +20,7 @@ import java.util.Map;
 public class RoundRobinComparisonResultSet implements ComparisonResultSet{\r
     private List<BirthmarkSet> holders1;\r
     private List<BirthmarkSet> holders2;\r
-    private BirthmarkEnvironment context;\r
+    private BirthmarkEnvironment environment;\r
 \r
     private int compareCount;\r
     private boolean tablePair = true;\r
@@ -31,8 +31,8 @@ public class RoundRobinComparisonResultSet implements ComparisonResultSet{
      * the instance (created by this constructor) compares { a<->b, a<->c,\r
      * b<->c, }.\r
      */\r
-    public RoundRobinComparisonResultSet(BirthmarkSet[] holders1, BirthmarkEnvironment context){\r
-        this(holders1, context, false);\r
+    public RoundRobinComparisonResultSet(BirthmarkSet[] holders1, BirthmarkEnvironment environment){\r
+        this(holders1, environment, false);\r
     }\r
 \r
     /**\r
@@ -42,11 +42,11 @@ public class RoundRobinComparisonResultSet implements ComparisonResultSet{
      * Otherwise, the instance compares { a<->b, a<->c, b<->c, } when\r
      * samePair is false.\r
      */\r
-    public RoundRobinComparisonResultSet(BirthmarkSet[] holders1, BirthmarkEnvironment context,\r
+    public RoundRobinComparisonResultSet(BirthmarkSet[] holders1, BirthmarkEnvironment environment,\r
                                           boolean samePair){\r
         this.holders1 = Arrays.asList(holders1);\r
         this.holders2 = Arrays.asList(holders1);\r
-        this.context = context;\r
+        this.environment = environment;\r
 \r
         tablePair = false;\r
         setCompareSamePair(samePair);\r
@@ -58,20 +58,20 @@ public class RoundRobinComparisonResultSet implements ComparisonResultSet{
      * a<->z, b<->x, b<->y, b<->z, c<->x, c<->y, c<->z, }.\r
      */\r
     public RoundRobinComparisonResultSet(final BirthmarkSet[] holders1, final BirthmarkSet[] holders2,\r
-                                          BirthmarkEnvironment context){\r
+                                          BirthmarkEnvironment environment){\r
         this.holders1 = Arrays.asList(holders1);\r
         this.holders2 = Arrays.asList(holders2);\r
-        this.context = context;\r
+        this.environment = environment;\r
         tablePair = true;\r
 \r
         this.compareCount = holders1.length * holders2.length;\r
     }\r
 \r
     /**\r
-     * @return  context\r
+     * @return  environment\r
      */\r
-    public BirthmarkEnvironment getContext(){\r
-        return context;\r
+    public BirthmarkEnvironment getEnvironment(){\r
+        return environment;\r
     }\r
 \r
     /**\r
@@ -143,7 +143,7 @@ public class RoundRobinComparisonResultSet implements ComparisonResultSet{
                 i = 0;\r
                 j++;\r
             }\r
-            ComparisonPair pair = new ComparisonPair(holders1.get(i), holders2.get(j), context);\r
+            ComparisonPair pair = new ComparisonPair(holders1.get(i), holders2.get(j), environment);\r
             count++;\r
             i++;\r
             return pair;\r
index 9e7fa04..acf565c 100644 (file)
@@ -118,9 +118,9 @@ public final class Stigmata{
      * create a new {@link BirthmarkEnvironment <code>BirthmarkEnvironment</code>}.\r
      */\r
     public BirthmarkEnvironment createEnvironment(){\r
-        operationStart(OperationType.CREATE_CONTEXT);\r
+        operationStart(OperationType.CREATE_ENVIRONMENT);\r
         BirthmarkEnvironment environment = new BirthmarkEnvironment();\r
-        operationDone(OperationType.CREATE_CONTEXT);\r
+        operationDone(OperationType.CREATE_ENVIRONMENT);\r
         return environment;\r
     }\r
 \r
index e3bd3ed..3bbbc92 100644 (file)
@@ -32,17 +32,17 @@ public abstract class ASMBirthmarkExtractor extends AbstractBirthmarkExtractor{
     }\r
 \r
     public abstract BirthmarkExtractVisitor\r
-        createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment context);\r
+        createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment environment);\r
 \r
     @Override\r
     public Birthmark extract(Birthmark birthmark, InputStream in,\r
-                             BirthmarkEnvironment context) throws BirthmarkExtractionFailedException{\r
+                             BirthmarkEnvironment environment) throws BirthmarkExtractionFailedException{\r
         BirthmarkExtractionFailedException bee = new BirthmarkExtractionFailedException();\r
 \r
         try{\r
             ClassReader reader = new ClassReader(in);\r
             ClassWriter writer = new ClassWriter(false);\r
-            BirthmarkExtractVisitor visitor = createExtractVisitor(writer, birthmark, context);\r
+            BirthmarkExtractVisitor visitor = createExtractVisitor(writer, birthmark, environment);\r
             reader.accept(visitor, false);\r
 \r
             if(!visitor.isSuccess()){\r
index 276cd27..fa5f78b 100644 (file)
@@ -51,55 +51,55 @@ public abstract class AbstractBirthmarkExtractor implements BirthmarkExtractor{
      * extract birthmark given stream.\r
      */\r
     public final Birthmark extract(InputStream in) throws BirthmarkExtractionFailedException{\r
-        return extract(in, BirthmarkEnvironment.getDefaultContext());\r
+        return extract(in, BirthmarkEnvironment.getDefaultEnvironment());\r
     }\r
 \r
     /**\r
      * extract birthmark given byte array.\r
      */\r
     public final Birthmark extract(byte[] bytecode) throws BirthmarkExtractionFailedException{\r
-        return extract(bytecode, BirthmarkEnvironment.getDefaultContext());\r
+        return extract(bytecode, BirthmarkEnvironment.getDefaultEnvironment());\r
     }\r
 \r
     /**\r
      * extract birthmark given stream.\r
      */\r
     public final Birthmark extract(Birthmark birthmark, InputStream in) throws BirthmarkExtractionFailedException{\r
-        return extract(birthmark, in, BirthmarkEnvironment.getDefaultContext());\r
+        return extract(birthmark, in, BirthmarkEnvironment.getDefaultEnvironment());\r
     }\r
 \r
     /**\r
      * extract birthmark given byte array.\r
      */\r
     public final Birthmark extract(Birthmark birthmark, byte[] bytecode) throws BirthmarkExtractionFailedException{\r
-        return extract(birthmark, bytecode, BirthmarkEnvironment.getDefaultContext());\r
+        return extract(birthmark, bytecode, BirthmarkEnvironment.getDefaultEnvironment());\r
     }\r
 \r
     /**\r
-     * extract birthmark given stream with given context.\r
+     * extract birthmark given stream with given environment.\r
      */\r
-    public final Birthmark extract(InputStream in, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException{\r
-        return extract(createBirthmark(), in, context);\r
+    public final Birthmark extract(InputStream in, BirthmarkEnvironment environment) throws BirthmarkExtractionFailedException{\r
+        return extract(createBirthmark(), in, environment);\r
     }\r
 \r
     /**\r
-     * extract birthmark given byte array with given context.\r
+     * extract birthmark given byte array with given environment.\r
      */\r
-    public final Birthmark extract(Birthmark birthmark, byte[] bytecode, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException{\r
-        return extract(birthmark, new ByteArrayInputStream(bytecode), context);\r
+    public final Birthmark extract(Birthmark birthmark, byte[] bytecode, BirthmarkEnvironment environment) throws BirthmarkExtractionFailedException{\r
+        return extract(birthmark, new ByteArrayInputStream(bytecode), environment);\r
     }\r
 \r
     /**\r
-     * extract birthmark given byte array with given context.\r
+     * extract birthmark given byte array with given environment.\r
      */\r
-    public final Birthmark extract(byte[] bytecode, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException{\r
-        return extract(createBirthmark(), new ByteArrayInputStream(bytecode), context);\r
+    public final Birthmark extract(byte[] bytecode, BirthmarkEnvironment environment) throws BirthmarkExtractionFailedException{\r
+        return extract(createBirthmark(), new ByteArrayInputStream(bytecode), environment);\r
     }\r
 \r
     /**\r
-     * extract birthmark given stream with given context.\r
+     * extract birthmark given stream with given environment.\r
      */\r
-    public abstract Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException;\r
+    public abstract Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkEnvironment environment) throws BirthmarkExtractionFailedException;\r
 \r
     /**\r
      * create birthmark.\r
index 80bdddd..54ec6f8 100644 (file)
@@ -22,17 +22,17 @@ import org.objectweb.asm.ClassVisitor;
  */\r
 public abstract class BirthmarkExtractVisitor extends ClassAdapter{\r
     private Birthmark birthmark;\r
-    private BirthmarkEnvironment context;\r
+    private BirthmarkEnvironment environment;\r
     private List<Throwable> causes = new ArrayList<Throwable>();\r
 \r
-    public BirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment context){\r
+    public BirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment environment){\r
         super(visitor);\r
         this.birthmark = birthmark;\r
-        this.context = context;\r
+        this.environment = environment;\r
     }\r
 \r
-    protected BirthmarkEnvironment getContext(){\r
-        return context;\r
+    protected BirthmarkEnvironment getEnvironment(){\r
+        return environment;\r
     }\r
 \r
     protected void addElement(BirthmarkElement element){\r
index a3958ed..40d01e7 100644 (file)
@@ -27,27 +27,27 @@ public class BirthmarkService extends AbstractBirthmarkService implements Birthm
     private BirthmarkExtractor extractorObject;\r
     private BirthmarkComparator comparatorObject;\r
     private boolean userDefined = true;\r
-    private BirthmarkEnvironment context;\r
+    private BirthmarkEnvironment environment;\r
 \r
-    public BirthmarkService(BirthmarkEnvironment context){\r
-        this.context = context;\r
+    public BirthmarkService(BirthmarkEnvironment environment){\r
+        this.environment = environment;\r
     }\r
 \r
     public BirthmarkService(){\r
     }\r
 \r
-    public void setBirthmarkContext(BirthmarkEnvironment context){\r
-        this.context = context;\r
+    public void setBirthmarkEnvironment(BirthmarkEnvironment environment){\r
+        this.environment = environment;\r
     }\r
 \r
     public void setExtractorClassName(String extractor){\r
         try{\r
             Class<?> c;\r
-            if(context == null){\r
+            if(environment == null){\r
                 c = Class.forName(extractor);\r
             }\r
             else{\r
-                c = context.getClasspathContext().findClass(extractor);\r
+                c = environment.getClasspathContext().findClass(extractor);\r
             }\r
             extractorClass = c.asSubclass(BirthmarkExtractor.class);\r
             extractorObject = null;\r
@@ -59,11 +59,11 @@ public class BirthmarkService extends AbstractBirthmarkService implements Birthm
     public void setComparatorClassName(String comparator){\r
         try{\r
             Class<?> c;\r
-            if(context == null){\r
+            if(environment == null){\r
                 c = Class.forName(comparator);\r
             }\r
             else{\r
-                c = context.getClasspathContext().findClass(comparator);\r
+                c = environment.getClasspathContext().findClass(comparator);\r
             }\r
             comparatorClass = c.asSubclass(BirthmarkComparator.class);\r
             comparatorObject = null;\r
index 30883a6..5a4b866 100644 (file)
@@ -29,8 +29,8 @@ public class ConstantValueOfFieldVariableBirthmarkExtractVisitor extends Birthma
     private Map<String, TypeAndValueBirthmarkElement> elements = new LinkedHashMap<String, TypeAndValueBirthmarkElement>();\r
     private String className;\r
 \r
-    public ConstantValueOfFieldVariableBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment context){\r
-        super(visitor, birthmark, context);\r
+    public ConstantValueOfFieldVariableBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment environment){\r
+        super(visitor, birthmark, environment);\r
     }\r
 \r
     public void visitEnd(){\r
index 0328f5e..3cd5c5d 100644 (file)
@@ -28,8 +28,8 @@ public class ConstantValueOfFieldVariableBirthmarkExtractor extends ASMBirthmark
     }
 
     @Override
-    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment context) {
-        return new ConstantValueOfFieldVariableBirthmarkExtractVisitor(writer, birthmark, context);
+    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment environment) {
+        return new ConstantValueOfFieldVariableBirthmarkExtractVisitor(writer, birthmark, environment);
     }
 
     public ExtractionUnit[] getAcceptableUnits(){
index f0ece27..bad43a6 100755 (executable)
@@ -30,8 +30,8 @@ public class FrequencyMethodCallBirthmarkExtractor extends ASMBirthmarkExtractor
     }
 
     @Override
-    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment context){
-        return new SequentialMethodCallBirthmarkExtractVisitor(writer, birthmark, context){
+    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment environment){
+        return new SequentialMethodCallBirthmarkExtractVisitor(writer, birthmark, environment){
             @Override
             protected void addElement(String className, String methodName, String description){
                 addElement(new FrequencyBirthmarkElement(className + "#" + methodName + description));
index 0b58158..f246e57 100755 (executable)
@@ -30,8 +30,8 @@ public class FrequencyUsedClassesBirthmarkExtractor extends ASMBirthmarkExtracto
     }
 
     @Override
-    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment context){
-        return new UsedClassesBirthmarkExtractVisitor(writer, birthmark, context);
+    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment environment){
+        return new UsedClassesBirthmarkExtractVisitor(writer, birthmark, environment);
     }
 
     public ExtractionUnit[] getAcceptableUnits(){
index 7cd774a..83932b8 100644 (file)
@@ -21,14 +21,14 @@ import org.objectweb.asm.ClassVisitor;
  * @version $Revision$ $Date$\r
  */\r
 public class InheritanceStructureBirthmarkExtractVisitor extends BirthmarkExtractVisitor{\r
-    public InheritanceStructureBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment context){\r
-        super(visitor, birthmark, context);\r
+    public InheritanceStructureBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment environment){\r
+        super(visitor, birthmark, environment);\r
     }\r
 \r
     public void visit(int version, int access, String name, String signature,\r
                       String superName, String[] interfaces){\r
         try {\r
-            Class c = getContext().getClasspathContext().findClass(name.replace('/', '.'));\r
+            Class c = getEnvironment().getClasspathContext().findClass(name.replace('/', '.'));\r
             if(c != null && !c.isInterface()){\r
                 addISBirthmark(c);\r
             }\r
@@ -38,7 +38,7 @@ public class InheritanceStructureBirthmarkExtractVisitor extends BirthmarkExtrac
     }\r
 \r
     private void addISBirthmark(Class c){\r
-        WellknownClassManager wcm = getContext().getWellknownClassManager();\r
+        WellknownClassManager wcm = getEnvironment().getWellknownClassManager();\r
         do{\r
             String className = c.getName();\r
 \r
index c79d691..d291662 100644 (file)
@@ -36,13 +36,13 @@ public class InheritanceStructureBirthmarkExtractor extends AbstractBirthmarkExt
     }
 
     @Override
-    public Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException{
+    public Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkEnvironment environment) throws BirthmarkExtractionFailedException{
         BirthmarkElementClassNotFoundException e = new BirthmarkElementClassNotFoundException();
 
         try{
             ClassReader reader = new ClassReader(in);
             ClassWriter writer = new ClassWriter(false);
-            BirthmarkExtractVisitor visitor = new InheritanceStructureBirthmarkExtractVisitor(writer, birthmark, context);
+            BirthmarkExtractVisitor visitor = new InheritanceStructureBirthmarkExtractVisitor(writer, birthmark, environment);
             reader.accept(visitor, false);
 
             if(!visitor.isSuccess()){
index 7ce5524..e7219c2 100644 (file)
@@ -25,8 +25,8 @@ public class KGramBasedBirthmarkExtractVisitor extends BirthmarkExtractVisitor{
     private int kvalue;\r
     private List<Integer> opcodes = new ArrayList<Integer>();\r
 \r
-    public KGramBasedBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment context){\r
-        super(visitor, birthmark, context);\r
+    public KGramBasedBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment environment){\r
+        super(visitor, birthmark, environment);\r
     }\r
 \r
     public int getKValue(){\r
index 0415296..9febe80 100644 (file)
@@ -37,8 +37,8 @@ public class KGramBasedBirthmarkExtractor extends ASMBirthmarkExtractor{
     }
 
     @Override
-    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment context){
-        KGramBasedBirthmarkExtractVisitor extractor = new KGramBasedBirthmarkExtractVisitor(writer, birthmark, context);
+    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment environment){
+        KGramBasedBirthmarkExtractVisitor extractor = new KGramBasedBirthmarkExtractVisitor(writer, birthmark, environment);
         extractor.setKValue(getKValue());
         return extractor;
     }
index e6874da..13cafc1 100644 (file)
@@ -20,8 +20,8 @@ import org.objectweb.asm.MethodVisitor;
  * @version $Revision$ $Date$\r
  */\r
 public class SequentialMethodCallBirthmarkExtractVisitor extends BirthmarkExtractVisitor{\r
-    public SequentialMethodCallBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment context){\r
-        super(visitor, birthmark, context);\r
+    public SequentialMethodCallBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment environment){\r
+        super(visitor, birthmark, environment);\r
     }\r
 \r
     public MethodVisitor visitMethod(int access, String name, String desc,\r
@@ -32,7 +32,7 @@ public class SequentialMethodCallBirthmarkExtractVisitor extends BirthmarkExtrac
         return new MethodAdapter(visitor){\r
             public void visitMethodInsn(int opcode, String owner, String name, String desc){\r
                 String className = owner.replace('/', '.');\r
-                if(getContext().getWellknownClassManager().isWellKnownClass(className)){\r
+                if(getEnvironment().getWellknownClassManager().isWellKnownClass(className)){\r
                     addElement(className, name, desc);\r
                 }\r
                 super.visitMethodInsn(opcode, owner, name, desc);\r
index df196ab..b756099 100644 (file)
@@ -27,8 +27,8 @@ public class SequentialMethodCallBirthmarkExtractor extends ASMBirthmarkExtracto
     }
 
     @Override
-    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment context){
-        return new SequentialMethodCallBirthmarkExtractVisitor(writer, birthmark, context);
+    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment environment){
+        return new SequentialMethodCallBirthmarkExtractVisitor(writer, birthmark, environment);
     }
 
     @Override
index 80ccd40..3210c95 100644 (file)
@@ -25,19 +25,19 @@ import org.objectweb.asm.signature.SignatureWriter;
  */\r
 public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{\r
     public UsedClassesBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark,\r
-                                              BirthmarkEnvironment context){\r
-        super(visitor, birthmark, context);\r
+                                              BirthmarkEnvironment environment){\r
+        super(visitor, birthmark, environment);\r
     }\r
 \r
     public void visit(int version, int access, String name, String signature,\r
             String superName, String[] interfaces){\r
         addSignatureClass(signature);\r
 \r
-        if(getContext().getWellknownClassManager().isWellKnownClass(superName)){\r
+        if(getEnvironment().getWellknownClassManager().isWellKnownClass(superName)){\r
             add(superName);\r
         }\r
         for(String i: interfaces){\r
-            if(getContext().getWellknownClassManager().isWellKnownClass(i)){\r
+            if(getEnvironment().getWellknownClassManager().isWellKnownClass(i)){\r
                 add(i);\r
             }\r
         }\r
@@ -57,7 +57,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{
                                      String signature, String[] exceptions){\r
         if(exceptions != null){\r
             for(String exception: exceptions){\r
-                if(getContext().getWellknownClassManager().isWellKnownClass(exception)){\r
+                if(getEnvironment().getWellknownClassManager().isWellKnownClass(exception)){\r
                     add(exception);\r
                 }\r
             }\r
@@ -103,7 +103,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{
             }\r
 \r
             public void visitFieldInsn(int opcode, String owner, String name, String desc){\r
-                if(getContext().getWellknownClassManager().isWellKnownClass(owner)){\r
+                if(getEnvironment().getWellknownClassManager().isWellKnownClass(owner)){\r
                     add(normalize(owner));\r
                 }\r
                 addDescriptor(desc);\r
@@ -111,7 +111,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{
             }\r
             public void visitMethodInsn(int opcode, String owner, String name, String desc){\r
                 String className = normalize(owner);\r
-                if(getContext().getWellknownClassManager().isWellKnownClass(className)){\r
+                if(getEnvironment().getWellknownClassManager().isWellKnownClass(className)){\r
                     add(className);\r
                 }\r
                 addMethodDescriptor(desc);\r
@@ -125,7 +125,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{
             SignatureReader in = new SignatureReader(signature);\r
             SignatureWriter writer = new SignatureWriter(){\r
                 public void visitClassType(String classType){\r
-                    if(getContext().getWellknownClassManager().isWellKnownClass(classType)){\r
+                    if(getEnvironment().getWellknownClassManager().isWellKnownClass(classType)){\r
                         add(normalize(classType));\r
                     }\r
                 }\r
@@ -177,7 +177,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{
 \r
         if(type.getSort() == Type.OBJECT){\r
             String className = type.getClassName();\r
-            if(getContext().getWellknownClassManager().isWellKnownClass(className)){\r
+            if(getEnvironment().getWellknownClassManager().isWellKnownClass(className)){\r
                 return true;\r
             }\r
         }\r
index 4c8cb2e..f9700b3 100644 (file)
@@ -28,8 +28,8 @@ public class UsedClassesBirthmarkExtractor extends ASMBirthmarkExtractor{
     }
 
     @Override
-    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment context){
-        return new UsedClassesBirthmarkExtractVisitor(writer, birthmark, context);
+    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment environment){
+        return new UsedClassesBirthmarkExtractVisitor(writer, birthmark, environment);
     }
 
     public ExtractionUnit[] getAcceptableUnits(){
index afdfb90..aba112c 100755 (executable)
@@ -15,5 +15,5 @@ public enum OperationType{
     COMPARE_BIRTHMARKS,\r
     COMPARE_DETAIL_BIRTHMARKS,\r
     FILTER_BIRTHMARKS,\r
-    CREATE_CONTEXT,\r
+    CREATE_ENVIRONMENT,\r
 }\r
index 4a04802..55c7a2f 100644 (file)
@@ -57,8 +57,8 @@ public class FilteredComparisonResultSet implements ComparisonResultSet{
         return resultset.getComparisonCount();\r
     }\r
 \r
-    public BirthmarkEnvironment getContext(){\r
-        return resultset.getContext();\r
+    public BirthmarkEnvironment getEnvironment(){\r
+        return resultset.getEnvironment();\r
     }\r
 \r
     public Iterator<ComparisonPair> iterator(){\r
index 3197511..e9d0ed9 100644 (file)
@@ -80,13 +80,13 @@ public class BirthmarkDefinitionPane extends JPanel{
         }\r
     }\r
 \r
-    public void updateContext(BirthmarkEnvironment context){\r
+    public void updateEnvironment(BirthmarkEnvironment environment){\r
         for(BirthmarkSpi service: addedService){\r
-            if(context.getService(service.getType()) == null){\r
+            if(environment.getService(service.getType()) == null){\r
                 if(service instanceof BirthmarkService){\r
-                    ((BirthmarkService)service).setBirthmarkContext(context);\r
+                    ((BirthmarkService)service).setBirthmarkEnvironment(environment);\r
                 }\r
-                context.addService(service);\r
+                environment.addService(service);\r
             }\r
         }\r
     }\r
@@ -95,7 +95,7 @@ public class BirthmarkDefinitionPane extends JPanel{
         information.initData();\r
         model.addElement(Messages.getString("newservice.definition.label"));\r
 \r
-        for(BirthmarkSpi service: stigmata.getContext().findServices()){\r
+        for(BirthmarkSpi service: stigmata.getEnvironment().findServices()){\r
             model.addElement(service);\r
         }\r
     }\r
@@ -282,7 +282,7 @@ public class BirthmarkDefinitionPane extends JPanel{
             if(selectedComparator != null){\r
                 comparatorClass = selectedComparator.toString();\r
             }\r
-            BirthmarkEnvironment context = stigmata.getContext();\r
+            BirthmarkEnvironment environment = stigmata.getEnvironment();\r
 \r
             boolean flag = newType.length() > 0\r
                     && displayType.getText().length() > 0\r
@@ -290,13 +290,13 @@ public class BirthmarkDefinitionPane extends JPanel{
                     && comparatorClass.length() > 0;\r
 \r
             // check inputed type is free\r
-            flag = flag && context.getService(newType) == null;\r
+            flag = flag && environment.getService(newType) == null;\r
 \r
             // check extractor/comparator classes are available\r
             try{\r
                 flag = flag\r
-                    && context.getClasspathContext().find(extractorClass) != null\r
-                    && context.getClasspathContext().find(comparatorClass) != null;\r
+                    && environment.getClasspathContext().find(extractorClass) != null\r
+                    && environment.getClasspathContext().find(comparatorClass) != null;\r
             } catch(ClassNotFoundException e){\r
                 flag = false;\r
             }\r
index 56b244a..379109e 100644 (file)
@@ -33,7 +33,7 @@ public class BirthmarkExtractionResultPane extends JPanel{
     private List<BirthmarkSet> birthmarks;\r
     private StigmataFrame frame;\r
 \r
-    public BirthmarkExtractionResultPane(StigmataFrame stigmataFrame, BirthmarkEnvironment context, BirthmarkSet[] sets){\r
+    public BirthmarkExtractionResultPane(StigmataFrame stigmataFrame, BirthmarkEnvironment environment, BirthmarkSet[] sets){\r
         this.frame = stigmataFrame;\r
         this.birthmarks = Arrays.asList(sets);\r
 \r
index deb6434..4ff347f 100644 (file)
@@ -138,7 +138,7 @@ public abstract class BirthmarkSelectablePane extends JPanel implements Birthmar
     }\r
 \r
     private void initServices(){\r
-        BirthmarkSpi[] serviceArray = stigmata.getContext().getServices();\r
+        BirthmarkSpi[] serviceArray = stigmata.getEnvironment().getServices();\r
 \r
         services = new LinkedHashMap<String, BirthmarkSelection>();\r
         for(BirthmarkSpi service: serviceArray){\r
index 60462ba..42896df 100644 (file)
@@ -74,7 +74,7 @@ public class ClasspathSettingsPane extends JPanel{
 \r
     private boolean findClass(String className){\r
         try{\r
-            ClasspathContext b = stigmata.getStigmata().createContext().getClasspathContext();\r
+            ClasspathContext b = stigmata.getStigmata().createEnvironment().getClasspathContext();\r
             ClasspathContext bytecode = new ClasspathContext(b);\r
             String[] path = classpath.getValues();\r
             for(String cp: path){\r
index 5e4d62b..04e3cf6 100644 (file)
@@ -21,10 +21,10 @@ public class CompareTableCellRenderer extends DefaultTableCellRenderer{
     private static final long serialVersionUID = 234557758658567345L;\r
     private static final double EPSILON = 1E-8d;\r
 \r
-    private BirthmarkEnvironment context;\r
+    private BirthmarkEnvironment environment;\r
 \r
-    public CompareTableCellRenderer(BirthmarkEnvironment context){\r
-        this.context = context;\r
+    public CompareTableCellRenderer(BirthmarkEnvironment environment){\r
+        this.environment = environment;\r
     }\r
 \r
     public Component getTableCellRendererComponent(JTable table, Object obj, boolean isSelected,\r
@@ -43,8 +43,8 @@ public class CompareTableCellRenderer extends DefaultTableCellRenderer{
             else if((d - 0.8d) < EPSILON) rank = 4;\r
             else if((d - 1.0d) < EPSILON) rank = 5;\r
 \r
-            c.setBackground(getBackgroundColor(rank, context));\r
-            c.setForeground(getForegroundColor(rank, context));\r
+            c.setBackground(getBackgroundColor(rank, environment));\r
+            c.setForeground(getForegroundColor(rank, environment));\r
         }\r
 \r
         return c;\r
@@ -69,24 +69,24 @@ public class CompareTableCellRenderer extends DefaultTableCellRenderer{
         return c;\r
     }\r
 \r
-    public static Color getBackgroundColor(int rank, BirthmarkEnvironment context){\r
-        Color c = getColor("backcolor_" + rank, context);\r
+    public static Color getBackgroundColor(int rank, BirthmarkEnvironment environment){\r
+        Color c = getColor("backcolor_" + rank, environment);\r
         if(c == null){\r
             return getDefaultBackgroundColor(rank);\r
         }\r
         return c;\r
     }\r
 \r
-    public static Color getForegroundColor(int rank, BirthmarkEnvironment context){\r
-        Color c = getColor("forecolor_" + rank, context);\r
+    public static Color getForegroundColor(int rank, BirthmarkEnvironment environment){\r
+        Color c = getColor("forecolor_" + rank, environment);\r
         if(c == null){\r
             c = getDefaultForegroundColor(rank);\r
         }\r
         return c;\r
     }\r
 \r
-    private static Color getColor(String key, BirthmarkEnvironment context){\r
-        String v = context.getProperty(key);\r
+    private static Color getColor(String key, BirthmarkEnvironment environment){\r
+        String v = environment.getProperty(key);\r
         try{\r
             int color = Integer.parseInt(v, 16);\r
 \r
index ade9c1f..d8d208f 100644 (file)
@@ -118,12 +118,12 @@ public class ControlPane extends JPanel{
         );\r
 \r
         if(file != null){\r
-            BirthmarkEnvironment context = generateContext();\r
+            BirthmarkEnvironment environment = generateEnvironment();\r
             if(!file.getName().endsWith(".xml")){\r
                 file = new File(file.getParent(), file.getName() + ".xml");\r
             }\r
 \r
-            ConfigFileExporter bce = new ConfigFileExporter(context);\r
+            ConfigFileExporter bce = new ConfigFileExporter(environment);\r
             try{\r
                 PrintWriter out = new PrintWriter(new FileWriter(file));\r
                 bce.export(out);\r
@@ -223,7 +223,7 @@ public class ControlPane extends JPanel{
     }\r
 \r
     private void extractButtonActionPerformed(ActionEvent e){\r
-        BirthmarkEnvironment context = generateContext();\r
+        BirthmarkEnvironment environment = generateEnvironment();\r
         String[] fileX = targetX.getValues();\r
         String[] fileY = targetY.getValues();\r
         Set<String> targets = new HashSet<String>();\r
@@ -240,14 +240,14 @@ public class ControlPane extends JPanel{
 \r
         stigmata.extract(\r
             birthmarks.getSelectedServiceTypes(), \r
-            targets.toArray(new String[targets.size()]), context\r
+            targets.toArray(new String[targets.size()]), environment\r
         );\r
     }\r
 \r
     private void compareRoundRobinWithFiltering(){\r
-        BirthmarkEnvironment context = generateContext();\r
+        BirthmarkEnvironment environment = generateEnvironment();\r
         FilterSelectionPane pane = new FilterSelectionPane(\r
-            context.getFilterManager()\r
+            environment.getFilterManager()\r
         );\r
         int returnValue = JOptionPane.showConfirmDialog(\r
             stigmata, pane, Messages.getString("filterselection.dialog.title"),\r
@@ -259,51 +259,51 @@ public class ControlPane extends JPanel{
 \r
             stigmata.compareRoundRobin(\r
                 birthmarks.getSelectedServiceTypes(), targetX.getValues(),\r
-                targetY.getValues(), filterSetList, context\r
+                targetY.getValues(), filterSetList, environment\r
             );\r
         }\r
     }\r
 \r
     private void compareRoundRobin(){\r
-        BirthmarkEnvironment context = generateContext();\r
+        BirthmarkEnvironment environment = generateEnvironment();\r
 \r
         stigmata.compareRoundRobin(\r
             birthmarks.getSelectedServiceTypes(), targetX.getValues(), \r
-            targetY.getValues(), context\r
+            targetY.getValues(), environment\r
         );\r
     }\r
 \r
     private void compareSpecifiedPair(){\r
-        BirthmarkEnvironment context = generateContext();\r
+        BirthmarkEnvironment environment = generateEnvironment();\r
         String[] fileX = targetX.getValues();\r
         String[] fileY = targetY.getValues();\r
         stigmata.compareSpecifiedPair(birthmarks.getSelectedServiceTypes(), fileX,\r
-                fileY, context);\r
+                fileY, environment);\r
     }\r
 \r
     private void compareGuessedPair(){\r
-        BirthmarkEnvironment context = generateContext();\r
+        BirthmarkEnvironment environment = generateEnvironment();\r
         String[] fileX = targetX.getValues();\r
         String[] fileY = targetY.getValues();\r
 \r
         stigmata.compareGuessedPair(birthmarks.getSelectedServiceTypes(), fileX,\r
-                fileY, context);\r
+                fileY, environment);\r
     }\r
 \r
-    private BirthmarkEnvironment generateContext(){\r
-        BirthmarkEnvironment context = stigmata.getStigmata().createContext();\r
-        ClasspathContext bytecode = context.getClasspathContext();\r
-        WellknownClassManager manager = context.getWellknownClassManager();\r
-        ComparisonPairFilterManager filterManager = context.getFilterManager();\r
+    private BirthmarkEnvironment generateEnvironment(){\r
+        BirthmarkEnvironment environment = stigmata.getStigmata().createEnvironment();\r
+        ClasspathContext bytecode = environment.getClasspathContext();\r
+        WellknownClassManager manager = environment.getWellknownClassManager();\r
+        ComparisonPairFilterManager filterManager = environment.getFilterManager();\r
 \r
-        context.setExtractionUnit(parseExtractionUnit());\r
+        environment.setExtractionUnit(parseExtractionUnit());\r
         classpath.updateClasspathContext(bytecode);\r
         wellknownClassses.setWellknownClasses(manager);\r
         filters.updateFilterManager(filterManager);\r
-        definition.updateContext(context);\r
-        properties.updateContext(context);\r
+        definition.updateEnvironment(environment);\r
+        properties.updateEnvironment(environment);\r
 \r
-        return context;\r
+        return environment;\r
     }\r
 \r
     private ExtractionUnit parseExtractionUnit(){\r
index 29db3bc..7f6ecc7 100644 (file)
@@ -55,7 +55,7 @@ public class FilterManagementPane extends JPanel implements ComparisonPairFilter
         filterPane.reset();\r
         model.removeAllElements();\r
         \r
-        ComparisonPairFilterManager manager = stigmata.getContext().getFilterManager();\r
+        ComparisonPairFilterManager manager = stigmata.getEnvironment().getFilterManager();\r
         for(ComparisonPairFilterSet filterset: manager.getFilterSets()){\r
             addFilterSet(filterset);\r
         }\r
index e891a54..ed29c08 100644 (file)
@@ -48,7 +48,7 @@ public class PairComparisonResultSetPane extends JPanel{
     private static final long serialVersionUID = 3298346465652354302L;\r
 \r
     private StigmataFrame frame;\r
-    private BirthmarkEnvironment context;\r
+    private BirthmarkEnvironment environment;\r
     private DefaultTableModel model = new PairComparisonResultSetTableModel();\r
     private JTable table = new JTable(model);\r
     private JLabel averageLabel, maximumLabel, minimumLabel;\r
@@ -57,7 +57,7 @@ public class PairComparisonResultSetPane extends JPanel{
 \r
     public PairComparisonResultSetPane(StigmataFrame frame, ComparisonResultSet resultset){\r
         this.frame = frame;\r
-        this.context = resultset.getContext();\r
+        this.environment = resultset.getEnvironment();\r
 \r
         for(ComparisonPair pair: resultset){\r
             list.add(pair);\r
@@ -74,7 +74,7 @@ public class PairComparisonResultSetPane extends JPanel{
             BirthmarkSet set1 = obfuscator.obfuscateClassName(pair.getTarget1());\r
             BirthmarkSet set2 = obfuscator.obfuscateClassName(pair.getTarget2());\r
 \r
-            newList.add(new ComparisonPair(set1, set2, context));\r
+            newList.add(new ComparisonPair(set1, set2, environment));\r
         }\r
 \r
         try{\r
@@ -134,14 +134,14 @@ public class PairComparisonResultSetPane extends JPanel{
                     }\r
                     service.getComparisonResultFormat().printResult(\r
                         out, new CertainPairComparisonResultSet(\r
-                            list.toArray(new ComparisonPair[list.size()]), context\r
+                            list.toArray(new ComparisonPair[list.size()]), environment\r
                         )\r
                     );\r
                 }\r
             })\r
         );\r
         JButton updateColorButton = Utility.createButton(\r
-            "updatecellcolor", new UpdateBirthmarkCellColorAction(this, context)\r
+            "updatecellcolor", new UpdateBirthmarkCellColorAction(this, environment)\r
         );\r
         JButton obfuscateButton = Utility.createButton("obfuscate");\r
         JScrollPane scroll = new JScrollPane();\r
@@ -150,7 +150,7 @@ public class PairComparisonResultSetPane extends JPanel{
         minimumLabel = new JLabel(Double.toString(minimum), JLabel.RIGHT);\r
 \r
         scroll.setViewportView(table);\r
-        table.setDefaultRenderer(Double.class, new CompareTableCellRenderer(context));\r
+        table.setDefaultRenderer(Double.class, new CompareTableCellRenderer(environment));\r
         similarityPane.setBorder(new TitledBorder(Messages.getString("similarity.border")));\r
         averageLabel.setBorder(new TitledBorder(Messages.getString("average.border")));\r
         maximumLabel.setBorder(new TitledBorder(Messages.getString("maximum.border")));\r
@@ -181,7 +181,7 @@ public class PairComparisonResultSetPane extends JPanel{
                             && row < table.getRowCount()){\r
                         ComparisonPair pair = list.get(row);\r
 \r
-                        frame.compareDetails(pair.getTarget1(), pair.getTarget2(), context);\r
+                        frame.compareDetails(pair.getTarget1(), pair.getTarget2(), environment);\r
                     }\r
                 }\r
             }\r
index d768ee5..ee0582c 100644 (file)
@@ -48,10 +48,10 @@ public class PropertyEditPane extends JPanel{
         initData();\r
     }\r
 \r
-    public void updateContext(BirthmarkEnvironment context){\r
-        context.clearProperties();\r
+    public void updateEnvironment(BirthmarkEnvironment environment){\r
+        environment.clearProperties();\r
         for(int i = 0; i < model.getRowCount(); i++){\r
-            context.addProperty(\r
+            environment.addProperty(\r
                 (String)model.getValueAt(i, 0),\r
                 (String)model.getValueAt(i, 1)\r
             );\r
@@ -59,8 +59,8 @@ public class PropertyEditPane extends JPanel{
     }\r
 \r
     private void initData(){\r
-        BirthmarkEnvironment context = stigmata.getContext();\r
-        context.addPropertyListener(new PropertyChangeListener(){\r
+        BirthmarkEnvironment environment = stigmata.getEnvironment();\r
+        environment.addPropertyListener(new PropertyChangeListener(){\r
             public void propertyChange(PropertyChangeEvent evt){\r
                 String name = evt.getPropertyName();\r
                 String value = (String)evt.getNewValue();\r
@@ -72,9 +72,9 @@ public class PropertyEditPane extends JPanel{
                 }\r
             }\r
         });\r
-        for(Iterator<String> i = context.propertyKeys(); i.hasNext(); ){\r
+        for(Iterator<String> i = environment.propertyKeys(); i.hasNext(); ){\r
             String key = i.next();\r
-            model.addRow(new Object[] { key, context.getProperty(key), });\r
+            model.addRow(new Object[] { key, environment.getProperty(key), });\r
         }\r
     }\r
 \r
index e2b5e92..d427df4 100644 (file)
@@ -61,12 +61,12 @@ public class RoundRobinComparisonResultPane extends JPanel{
     private JLabel classCount, comparisonCount, distinctionRatio;\r
     private JLabel average, minimum, maximum;\r
     private StigmataFrame stigmataFrame;\r
-    private BirthmarkEnvironment context;\r
+    private BirthmarkEnvironment environment;\r
 \r
-    public RoundRobinComparisonResultPane(StigmataFrame stigmata, BirthmarkEnvironment context,\r
+    public RoundRobinComparisonResultPane(StigmataFrame stigmata, BirthmarkEnvironment environment,\r
                                           BirthmarkSet[] birthmarksX, BirthmarkSet[] birthmarksY){\r
         this.stigmataFrame = stigmata;\r
-        this.context = context;\r
+        this.environment = environment;\r
         this.birthmarksX = Arrays.asList(birthmarksX);\r
         this.birthmarksY = Arrays.asList(birthmarksY);\r
 \r
@@ -92,7 +92,7 @@ public class RoundRobinComparisonResultPane extends JPanel{
             rows[0] = birthmarksY.get(j).getName();\r
 \r
             for(int i = 0; i < birthmarksX.size(); i++){\r
-                double similarity = compare(context, birthmarksX.get(i), birthmarksY.get(j));\r
+                double similarity = compare(environment, birthmarksX.get(i), birthmarksY.get(j));\r
                 rows[i + 1] = new Double(similarity);\r
 \r
                 if(Math.abs(similarity - 1) < 1E-8){\r
@@ -113,7 +113,7 @@ public class RoundRobinComparisonResultPane extends JPanel{
         maximum.setText(Double.toString(max));\r
     }\r
 \r
-    private double compare(BirthmarkEnvironment context, BirthmarkSet x, BirthmarkSet y){\r
+    private double compare(BirthmarkEnvironment environment, BirthmarkSet x, BirthmarkSet y){\r
         double similarity = 0d;\r
         int count = 0;\r
 \r
@@ -121,7 +121,7 @@ public class RoundRobinComparisonResultPane extends JPanel{
             Birthmark b1 = x.getBirthmark(type);\r
             Birthmark b2 = y.getBirthmark(type);\r
             if(b1 != null && b2 != null){\r
-                BirthmarkComparator comparator = context.getService(type).getComparator();\r
+                BirthmarkComparator comparator = environment.getService(type).getComparator();\r
                 double result = comparator.compare(b1, b2);\r
                 if(result != Double.NaN){\r
                     similarity += result;\r
@@ -138,7 +138,7 @@ public class RoundRobinComparisonResultPane extends JPanel{
 \r
         model = new RoundRobinComparisonResultSetTableModel();\r
         table = new JTable(model);\r
-        table.setDefaultRenderer(Double.class, new CompareTableCellRenderer(context));\r
+        table.setDefaultRenderer(Double.class, new CompareTableCellRenderer(environment));\r
         table.addMouseListener(new MouseAdapter(){\r
             public void mouseClicked(MouseEvent e){\r
                 if(e.getClickCount() == 2){\r
@@ -149,7 +149,7 @@ public class RoundRobinComparisonResultPane extends JPanel{
                         BirthmarkSet b1 = birthmarksX.get(col - 1);\r
                         BirthmarkSet b2 = birthmarksY.get(row);\r
 \r
-                        stigmataFrame.compareDetails(b1, b2, context);\r
+                        stigmataFrame.compareDetails(b1, b2, environment);\r
                     }\r
                 }\r
             }\r
@@ -232,7 +232,7 @@ public class RoundRobinComparisonResultPane extends JPanel{
                     service.getComparisonResultFormat().printResult(out,\r
                         new RoundRobinComparisonResultSet(\r
                             birthmarksX.toArray(new BirthmarkSet[birthmarksX.size()]), \r
-                            birthmarksY.toArray(new BirthmarkSet[birthmarksY.size()]), context\r
+                            birthmarksY.toArray(new BirthmarkSet[birthmarksY.size()]), environment\r
                         )\r
                     );\r
                 }\r
@@ -242,7 +242,7 @@ public class RoundRobinComparisonResultPane extends JPanel{
         JButton obfuscate = Utility.createButton("obfuscate");\r
         JButton compare = Utility.createButton("guessedpair");\r
         JButton updateColor = Utility.createButton(\r
-            "updatecellcolor", new UpdateBirthmarkCellColorAction(this, context)\r
+            "updatecellcolor", new UpdateBirthmarkCellColorAction(this, environment)\r
         );\r
         JMenuItem mdsMenu = Utility.createJMenuItem("mdsmap");\r
 \r
@@ -310,7 +310,7 @@ public class RoundRobinComparisonResultPane extends JPanel{
 \r
     private void compareRoundRobinWithFiltering(){\r
         FilterSelectionPane pane = new FilterSelectionPane(\r
-            context.getFilterManager()\r
+            environment.getFilterManager()\r
         );\r
         int returnValue = JOptionPane.showConfirmDialog(\r
             stigmataFrame, pane, Messages.getString("filterselection.dialog.title"),\r
@@ -323,12 +323,12 @@ public class RoundRobinComparisonResultPane extends JPanel{
             ComparisonResultSet resultset = new RoundRobinComparisonResultSet(\r
                 birthmarksX.toArray(new BirthmarkSet[birthmarksX.size()]),\r
                 birthmarksY.toArray(new BirthmarkSet[birthmarksY.size()]),\r
-                context\r
+                environment\r
             );\r
             \r
             ComparisonResultSet filterResultSet = new FilteredComparisonResultSet(\r
                 resultset,\r
-                context.getFilterManager().getFilterSets(filterSetList)\r
+                environment.getFilterManager().getFilterSets(filterSetList)\r
             );\r
             stigmataFrame.showComparisonResultSet(filterResultSet);\r
         }\r
@@ -338,7 +338,7 @@ public class RoundRobinComparisonResultPane extends JPanel{
         ComparisonResultSet resultset = new CertainPairComparisonResultSet(\r
             birthmarksX.toArray(new BirthmarkSet[birthmarksX.size()]),\r
             birthmarksY.toArray(new BirthmarkSet[birthmarksY.size()]),\r
-            context\r
+            environment\r
         );\r
         stigmataFrame.showComparisonResultSet(resultset);\r
     }\r
@@ -354,7 +354,7 @@ public class RoundRobinComparisonResultPane extends JPanel{
             ComparisonResultSet resultset = new CertainPairComparisonResultSet(\r
                 birthmarksX.toArray(new BirthmarkSet[birthmarksX.size()]),\r
                 birthmarksY.toArray(new BirthmarkSet[birthmarksY.size()]),\r
-                mapping, context\r
+                mapping, environment\r
             );\r
             stigmataFrame.showComparisonResultSet(resultset);\r
         }\r
index ae19265..0d8acd2 100644 (file)
@@ -70,7 +70,7 @@ public class StigmataFrame extends JFrame{
     private JMenuItem closeTabMenu;\r
     private JCheckBoxMenuItem expertmodeMenu;\r
     private Stigmata stigmata;\r
-    private BirthmarkEnvironment context;\r
+    private BirthmarkEnvironment environment;\r
     private ControlPane control;\r
     private FileIOManager fileio;\r
     private Map<String, Integer> countmap = new HashMap<String, Integer>();\r
@@ -80,15 +80,15 @@ public class StigmataFrame extends JFrame{
     }\r
 \r
     public StigmataFrame(Stigmata stigmata){\r
-        this(stigmata, stigmata.createContext());\r
+        this(stigmata, stigmata.createEnvironment());\r
     }\r
 \r
-    public StigmataFrame(Stigmata stigmata, BirthmarkEnvironment context){\r
+    public StigmataFrame(Stigmata stigmata, BirthmarkEnvironment environment){\r
         this.stigmata = stigmata;\r
-        this.context = context;\r
+        this.environment = environment;\r
         this.fileio = new FileIOManager(this);\r
 \r
-        stigmata.addOperationListener(new BirthmarkEngineAdapter(){\r
+        stigmata.addBirthmarkEngineListener(new BirthmarkEngineAdapter(){\r
             @Override\r
             public void operationDone(BirthmarkEngineEvent e){\r
                 showWarnings(e.getMessage());\r
@@ -102,8 +102,8 @@ public class StigmataFrame extends JFrame{
         return stigmata;\r
     }\r
 \r
-    public BirthmarkEnvironment getContext(){\r
-        return context;\r
+    public BirthmarkEnvironment getEnvironment(){\r
+        return environment;\r
     }\r
 \r
     public File getCurrentDirectory(){\r
@@ -152,9 +152,9 @@ public class StigmataFrame extends JFrame{
         control.removeBirthmarkServiceListener(listener);\r
     }\r
 \r
-    public void compareDetails(BirthmarkSet target1, BirthmarkSet target2, BirthmarkEnvironment context){\r
+    public void compareDetails(BirthmarkSet target1, BirthmarkSet target2, BirthmarkEnvironment environment){\r
         PairComparisonPane detail = new PairComparisonPane(\r
-            this, new ComparisonPair(target1, target2, context)\r
+            this, new ComparisonPair(target1, target2, environment)\r
         );\r
         int compareDetail = getNextCount("compare_detail");\r
 \r
@@ -170,12 +170,12 @@ public class StigmataFrame extends JFrame{
     }\r
 \r
     public void compareRoundRobin(String[] birthmarks, String[] targetX, String[] targetY, \r
-                                   BirthmarkEnvironment context){\r
+                                   BirthmarkEnvironment environment){\r
         try{\r
-            BirthmarkSet[] x = stigmata.extract(birthmarks, targetX, context);\r
-            BirthmarkSet[] y = stigmata.extract(birthmarks, targetY, context);\r
+            BirthmarkSet[] x = stigmata.extract(birthmarks, targetX, environment);\r
+            BirthmarkSet[] y = stigmata.extract(birthmarks, targetY, environment);\r
 \r
-            RoundRobinComparisonResultPane compare = new RoundRobinComparisonResultPane(this, context, x, y);\r
+            RoundRobinComparisonResultPane compare = new RoundRobinComparisonResultPane(this, environment, x, y);\r
             int compareCount = getNextCount("compare");\r
             Utility.addNewTab(\r
                 "compare", tabPane, compare,\r
@@ -193,13 +193,13 @@ public class StigmataFrame extends JFrame{
     }\r
 \r
     public void compareRoundRobin(String[] birthmarks, String[] targetX, String[] targetY, \r
-                                   String[] filterNames, BirthmarkEnvironment context){\r
+                                   String[] filterNames, BirthmarkEnvironment environment){\r
         try{\r
-            BirthmarkSet[] x = stigmata.extract(birthmarks, targetX, context);\r
-            BirthmarkSet[] y = stigmata.extract(birthmarks, targetY, context);\r
-            ComparisonPairFilterSet[] filters = context.getFilterManager().getFilterSets(filterNames);\r
+            BirthmarkSet[] x = stigmata.extract(birthmarks, targetX, environment);\r
+            BirthmarkSet[] y = stigmata.extract(birthmarks, targetY, environment);\r
+            ComparisonPairFilterSet[] filters = environment.getFilterManager().getFilterSets(filterNames);\r
 \r
-            ComparisonResultSet resultset = stigmata.compare(x, y, context);\r
+            ComparisonResultSet resultset = stigmata.compare(x, y, environment);\r
             FilteredComparisonResultSet fcrs = new FilteredComparisonResultSet(resultset, filters);\r
             int compareCount = getNextCount("compare");\r
             Utility.addNewTab(\r
@@ -218,13 +218,13 @@ public class StigmataFrame extends JFrame{
     }\r
 \r
     public void compareGuessedPair(String[] birthmarks, String[] targetX, String[] targetY,\r
-                                   BirthmarkEnvironment context){\r
+                                   BirthmarkEnvironment environment){\r
         try{\r
-            BirthmarkSet[] x = stigmata.extract(birthmarks, targetX, context);\r
-            BirthmarkSet[] y = stigmata.extract(birthmarks, targetY, context);\r
+            BirthmarkSet[] x = stigmata.extract(birthmarks, targetX, environment);\r
+            BirthmarkSet[] y = stigmata.extract(birthmarks, targetY, environment);\r
             int comparePair = getNextCount("compare_pair");\r
 \r
-            ComparisonResultSet resultset = new CertainPairComparisonResultSet(x, y, context);\r
+            ComparisonResultSet resultset = new CertainPairComparisonResultSet(x, y, environment);\r
             Utility.addNewTab("comparepair", tabPane,\r
                 new PairComparisonResultSetPane(this, resultset),\r
                 new Object[] { new Integer(comparePair), },\r
@@ -241,7 +241,7 @@ public class StigmataFrame extends JFrame{
     }\r
 \r
     public void compareSpecifiedPair(String[] birthmarks, String[] targetX, String[] targetY,\r
-                                     BirthmarkEnvironment context){\r
+                                     BirthmarkEnvironment environment){\r
         File file = getOpenFile(Messages.getStringArray("comparemapping.extension"),\r
                                 Messages.getString("comparemapping.description"));\r
 \r
@@ -249,10 +249,10 @@ public class StigmataFrame extends JFrame{
             Map<String, String> mapping = constructMapping(file);\r
 \r
             try{\r
-                BirthmarkSet[] x = stigmata.extract(birthmarks, targetX, context);\r
-                BirthmarkSet[] y = stigmata.extract(birthmarks, targetY, context);\r
+                BirthmarkSet[] x = stigmata.extract(birthmarks, targetX, environment);\r
+                BirthmarkSet[] y = stigmata.extract(birthmarks, targetY, environment);\r
                 int comparePair = getNextCount("compare_pair");\r
-                ComparisonResultSet resultset = new CertainPairComparisonResultSet(x, y, mapping, context);\r
+                ComparisonResultSet resultset = new CertainPairComparisonResultSet(x, y, mapping, environment);\r
 \r
                 Utility.addNewTab(\r
                     "comparepair", tabPane,\r
@@ -283,7 +283,7 @@ public class StigmataFrame extends JFrame{
 \r
     public void showMDSGraph(BirthmarkSet[] set){\r
         try{\r
-            MDSGraphPanel panel = new MDSGraphPanel(this, set, context);\r
+            MDSGraphPanel panel = new MDSGraphPanel(this, set, environment);\r
             int mappingGraphCount = getNextCount("mds_graph");\r
             Utility.addNewTab("mappinggraph", tabPane, panel, new Object[] { new Integer(mappingGraphCount), }, null);\r
             tabPane.setSelectedIndex(tabPane.getTabCount() - 1);\r
@@ -300,9 +300,9 @@ public class StigmataFrame extends JFrame{
         tabPane.setSelectedIndex(tabPane.getTabCount() - 1);\r
     }\r
 \r
-    public void showExtractionResult(BirthmarkSet[] set, BirthmarkEnvironment context){\r
+    public void showExtractionResult(BirthmarkSet[] set, BirthmarkEnvironment environment){\r
         int extractCount = getNextCount("extract");\r
-        BirthmarkExtractionResultPane viewer = new BirthmarkExtractionResultPane(this, context, set);\r
+        BirthmarkExtractionResultPane viewer = new BirthmarkExtractionResultPane(this, environment, set);\r
         Utility.addNewTab(\r
             "extract", tabPane, viewer,\r
             new Object[] { new Integer(extractCount), },\r
@@ -312,10 +312,10 @@ public class StigmataFrame extends JFrame{
         \r
     }\r
 \r
-    public void extract(String[] birthmarks, String[] targets, BirthmarkEnvironment context){\r
+    public void extract(String[] birthmarks, String[] targets, BirthmarkEnvironment environment){\r
         try{\r
-            BirthmarkSet[] holders = stigmata.extract(birthmarks, targets, context);\r
-            showExtractionResult(holders, context);\r
+            BirthmarkSet[] holders = stigmata.extract(birthmarks, targets, environment);\r
+            showExtractionResult(holders, environment);\r
         }catch(Exception e){\r
             showExceptionMessage(e);\r
         }\r
@@ -420,7 +420,7 @@ public class StigmataFrame extends JFrame{
 \r
         newFrameMenu.addActionListener(new ActionListener(){\r
             public void actionPerformed(ActionEvent evt){\r
-                StigmataFrame frame = new StigmataFrame(stigmata, context);\r
+                StigmataFrame frame = new StigmataFrame(stigmata, environment);\r
                 frame.setVisible(true);\r
             }\r
         });\r
index fdd49a4..af09182 100644 (file)
@@ -54,7 +54,7 @@ public class WellknownClassesSettingsPane extends JPanel{
 \r
     public WellknownClassesSettingsPane(StigmataFrame stigmata){\r
         this.stigmata = stigmata;\r
-        this.manager = stigmata.getContext().getWellknownClassManager();\r
+        this.manager = stigmata.getEnvironment().getWellknownClassManager();\r
 \r
         initLayouts();\r
         initializeData();\r
index f77c8c9..73496b8 100755 (executable)
@@ -24,16 +24,16 @@ public class UpdateBirthmarkCellColorAction extends AbstractAction{
     private static final long serialVersionUID = 2390797591047570440L;\r
 \r
     private Component parent;\r
-    private BirthmarkEnvironment context;\r
+    private BirthmarkEnvironment environment;\r
     private JColorChooser chooser;\r
 \r
-    public UpdateBirthmarkCellColorAction(Component parent, BirthmarkEnvironment context){\r
+    public UpdateBirthmarkCellColorAction(Component parent, BirthmarkEnvironment environment){\r
         this.parent = parent;\r
-        this.context = context;\r
+        this.environment = environment;\r
     }\r
 \r
     public UpdateBirthmarkCellColorAction(Component parent){\r
-        this(parent, BirthmarkEnvironment.getDefaultContext());\r
+        this(parent, BirthmarkEnvironment.getDefaultEnvironment());\r
     }\r
 \r
     public void actionPerformed(ActionEvent e){\r
@@ -47,8 +47,8 @@ public class UpdateBirthmarkCellColorAction extends AbstractAction{
     private JComponent createPanel(){\r
         Box panel = Box.createVerticalBox();\r
         for(int i = 0; i <= 5; i++){\r
-            Color fore = CompareTableCellRenderer.getForegroundColor(i, context);\r
-            Color back = CompareTableCellRenderer.getBackgroundColor(i, context);\r
+            Color fore = CompareTableCellRenderer.getForegroundColor(i, environment);\r
+            Color back = CompareTableCellRenderer.getBackgroundColor(i, environment);\r
 \r
             UpdateColorPane pane = new UpdateColorPane(i, fore, back);\r
             panel.add(pane);\r
@@ -110,13 +110,13 @@ public class UpdateBirthmarkCellColorAction extends AbstractAction{
                     c = updateColor(c, getRank(), foreground);\r
                     if(foreground){\r
                         label.setForeground(c);\r
-                        context.addProperty(\r
+                        environment.addProperty(\r
                             "forecolor_" + getRank(), String.format("%06x", c.getRGB() & 0xffffff)\r
                         );\r
                     }\r
                     else{\r
                         label.setBackground(c);\r
-                        context.addProperty(\r
+                        environment.addProperty(\r
                             "backcolor_" + getRank(), String.format("%06x", c.getRGB() & 0xffffff)\r
                         );\r
                     }\r
index 76bc476..86ef544 100644 (file)
@@ -115,7 +115,7 @@ public class FilterEditingPane extends JPanel{
 \r
             ComparisonPairFilterPane pane = service.createComponent(service.getComparisonPairFilterService());\r
             if(pane instanceof BirthmarkServiceListener){\r
-                for(BirthmarkSpi bs: stigmata.getContext().getServices()){\r
+                for(BirthmarkSpi bs: stigmata.getEnvironment().getServices()){\r
                     ((BirthmarkServiceListener)pane).serviceAdded(bs);\r
                 }\r
                 stigmata.addBirthmarkServiceListener((BirthmarkServiceListener)pane);\r
index 7ba6db6..a6306e7 100644 (file)
@@ -49,24 +49,24 @@ public class MDSGraphPanel extends JPanel{
     private MDSGraphViewer viewer;\r
 \r
     public MDSGraphPanel(StigmataFrame stigmata, BirthmarkSet[] set){\r
-        this(stigmata, set, stigmata.getContext());\r
+        this(stigmata, set, stigmata.getEnvironment());\r
     }\r
 \r
-    public MDSGraphPanel(StigmataFrame stigmata, BirthmarkSet[] set, BirthmarkEnvironment context){\r
+    public MDSGraphPanel(StigmataFrame stigmata, BirthmarkSet[] set, BirthmarkEnvironment environment){\r
         this.stigmata = stigmata;\r
         this.set = set;\r
 \r
-        double[][] matrix = initData(set, context);\r
+        double[][] matrix = initData(set, environment);\r
         initLayouts(matrix);\r
     }\r
 \r
-    private double[][] initData(BirthmarkSet[] set, BirthmarkEnvironment context){\r
+    private double[][] initData(BirthmarkSet[] set, BirthmarkEnvironment environment){\r
         labels = new LabelMap();\r
         double[][] matrix = new double[set.length][set.length];\r
 \r
         for(int i = 0; i < set.length; i++){\r
             for(int j = 0; j <= i; j++){\r
-                ComparisonPair pair = new ComparisonPair(set[i], set[j], context);\r
+                ComparisonPair pair = new ComparisonPair(set[i], set[j], environment);\r
                 matrix[i][j] = 1d - pair.calculateSimilarity();\r
                 if(i != j){\r
                     matrix[j][i] = matrix[i][j];\r
@@ -103,7 +103,7 @@ public class MDSGraphPanel extends JPanel{
                 for(int i = 0; i < set.length; i++){\r
                     if(c.equals(set[i].getName())){\r
                         stigmata.showExtractionResult(\r
-                            new BirthmarkSet[]{ set[i], }, stigmata.getContext()\r
+                            new BirthmarkSet[]{ set[i], }, stigmata.getEnvironment()\r
                         );\r
                     }\r
                 }\r
index bc532ae..620b521 100644 (file)
@@ -18,20 +18,20 @@ import jp.naist.se.stigmata.spi.BirthmarkSpi;
 import org.apache.commons.beanutils.BeanUtils;\r
 \r
 /**\r
- * Export birthmark context to xml file.\r
+ * Export birthmark environment to xml file.\r
  * \r
  * @author Haruaki TAMADA\r
  * @version $Revision$ $Date$\r
  */\r
 public class ConfigFileExporter{\r
-    private BirthmarkEnvironment context;\r
+    private BirthmarkEnvironment environment;\r
 \r
-    public ConfigFileExporter(BirthmarkEnvironment context){\r
-        this.context = context;\r
+    public ConfigFileExporter(BirthmarkEnvironment environment){\r
+        this.environment = environment;\r
     }\r
 \r
-    public void export(BirthmarkEnvironment context, PrintWriter out) throws IOException{\r
-        new ConfigFileExporter(context).export(out);\r
+    public void export(BirthmarkEnvironment environment, PrintWriter out) throws IOException{\r
+        new ConfigFileExporter(environment).export(out);\r
     }\r
 \r
     public void export(PrintWriter out) throws IOException{\r
@@ -50,9 +50,9 @@ public class ConfigFileExporter{
 \r
     private void exportProperties(PrintWriter out) throws IOException{\r
         out.println("  <properties>");\r
-        for(Iterator<String> i = context.propertyKeys(); i.hasNext(); ){\r
+        for(Iterator<String> i = environment.propertyKeys(); i.hasNext(); ){\r
             String key = i.next();\r
-            String value = context.getProperty(key);\r
+            String value = environment.getProperty(key);\r
             out.println("    <property>");\r
             out.printf("      <name>%s</name>%n", key);\r
             out.printf("      <value>%s</value>%n", value);\r
@@ -63,7 +63,7 @@ public class ConfigFileExporter{
 \r
     private void exportClasspath(PrintWriter out) throws IOException{\r
         out.println("  <classpath-list>");\r
-        for(URL location: context.getClasspathContext()){\r
+        for(URL location: environment.getClasspathContext()){\r
             out.printf("    <classpath>%s</classpath>%n", location.toString());\r
         }\r
         out.println("  </classpath-list>");\r
@@ -71,7 +71,7 @@ public class ConfigFileExporter{
 \r
     private void exportWellknownClasses(PrintWriter out) throws IOException{\r
         out.println("  <wellknown-classes>");\r
-        for(WellknownClassJudgeRule rule: context.getWellknownClassManager().getSections()){\r
+        for(WellknownClassJudgeRule rule: environment.getWellknownClassManager().getSections()){\r
             int partType = rule.getMatchPartType();\r
             int match = rule.getMatchType();\r
             String value = rule.getName();\r
@@ -95,7 +95,7 @@ public class ConfigFileExporter{
 \r
     private void exportFilters(PrintWriter out) throws IOException{\r
         out.println("  <filterset-list>");\r
-        for(ComparisonPairFilterSet filterset: context.getFilterManager().getFilterSets()){\r
+        for(ComparisonPairFilterSet filterset: environment.getFilterManager().getFilterSets()){\r
             out.println("    <filterset>");\r
             out.printf("      <name>%s</name>%n", filterset.getName());\r
             out.printf("      <match>%s</match>%n", filterset.isMatchAll()? "all": "any");\r
@@ -132,7 +132,7 @@ public class ConfigFileExporter{
 \r
     private void exportServices(PrintWriter out) throws IOException{\r
         out.println("  <birthmark-services>");\r
-        for(BirthmarkSpi service: context.getServices()){\r
+        for(BirthmarkSpi service: environment.getServices()){\r
             if(service.isExpert() && service instanceof BirthmarkService){\r
                 out.println("    <birthmark-service>");\r
                 out.printf("      <type>%s</type>%n", service.getType());\r
index 912f6a7..c1dafb3 100644 (file)
@@ -31,25 +31,25 @@ import org.xml.sax.helpers.DefaultHandler;
  * @version $Revision$ $Date$\r
  */\r
 public class ConfigFileImporter{\r
-    private BirthmarkEnvironment context;\r
+    private BirthmarkEnvironment environment;\r
 \r
-    public ConfigFileImporter(BirthmarkEnvironment context){\r
-        this.context = context;\r
+    public ConfigFileImporter(BirthmarkEnvironment environment){\r
+        this.environment = environment;\r
     }\r
 \r
     public ConfigFileImporter(){\r
-        // generate context.\r
+        // generate environment.\r
     }\r
 \r
     public BirthmarkEnvironment parse(InputStream in) throws IOException{\r
         try{\r
             SAXParserFactory factory = SAXParserFactory.newInstance();\r
             SAXParser parser = factory.newSAXParser();\r
-            Handler handler = new Handler(getContext());\r
+            Handler handler = new Handler(getEnvironment());\r
             parser.parse(in, handler);\r
-            this.context = handler.getContext();\r
+            this.environment = handler.getEnvironment();\r
 \r
-            return context;\r
+            return environment;\r
         }catch(ParserConfigurationException e){\r
             throw new IOException(e.getMessage());\r
         }catch(SAXException e){\r
@@ -57,12 +57,8 @@ public class ConfigFileImporter{
         }\r
     }\r
 \r
-    public BirthmarkEnvironment getContext(){\r
-        return context;\r
-    }\r
-\r
-    public void setContext(BirthmarkEnvironment context){\r
-        this.context = context;\r
+    public BirthmarkEnvironment getEnvironment(){\r
+        return environment;\r
     }\r
 \r
     private static enum Part{\r
@@ -70,7 +66,7 @@ public class ConfigFileImporter{
     }\r
 \r
     private static class Handler extends DefaultHandler{\r
-        private BirthmarkEnvironment context;\r
+        private BirthmarkEnvironment environment;\r
         private WellknownClassManager manager;\r
         private BirthmarkService service;\r
         private ComparisonPairFilterSet filter;\r
@@ -82,16 +78,16 @@ public class ConfigFileImporter{
         private String filterType, filterCriterion, attributeName;\r
         private Map<String, String> filterAttributes = new HashMap<String, String>();\r
 \r
-        public Handler(BirthmarkEnvironment context){\r
-            if(context == null){\r
-                context = new BirthmarkEnvironment();\r
+        public Handler(BirthmarkEnvironment environment){\r
+            if(environment == null){\r
+                environment = new BirthmarkEnvironment();\r
             }\r
-            this.context = context;\r
-            this.manager = context.getWellknownClassManager();\r
+            this.environment = environment;\r
+            this.manager = environment.getWellknownClassManager();\r
         }\r
 \r
-        public BirthmarkEnvironment getContext(){\r
-            return context;\r
+        public BirthmarkEnvironment getEnvironment(){\r
+            return environment;\r
         }\r
 \r
         @Override\r
@@ -162,7 +158,7 @@ public class ConfigFileImporter{
                         key = value;\r
                     }\r
                     else if(qname.equals("value")){\r
-                        context.addProperty(key, value);\r
+                        environment.addProperty(key, value);\r
                     }\r
                 }\r
                 else if(part == Part.WELLKNOWN_CLASSES\r
@@ -173,7 +169,7 @@ public class ConfigFileImporter{
                 }\r
                 else if(part == Part.CLASSPATH && qname.equals("classpath")){\r
                     try{\r
-                        context.getClasspathContext().addClasspath(\r
+                        environment.getClasspathContext().addClasspath(\r
                                 new URL(value));\r
                     }catch(MalformedURLException e){\r
                         throw new SAXException(e);\r
@@ -224,18 +220,18 @@ public class ConfigFileImporter{
         @Override\r
         public void endElement(String uri, String localname, String qname){\r
             if(part == Part.SERVICES && qname.equals("birthmark-service")){\r
-                context.addService(service);\r
+                environment.addService(service);\r
                 service = null;\r
             }\r
             else if(part == Part.FILTER_DEFINITION && qname.equals("filter")){\r
-                ComparisonPairFilter f = context.getFilterManager().buildFilter(\r
+                ComparisonPairFilter f = environment.getFilterManager().buildFilter(\r
                     filterType, filterCriterion, filterAttributes\r
                 );\r
                 filter.addFilter(f);\r
                 part = Part.FILTER_SET;\r
             }\r
             else if(part == Part.FILTER_SET && qname.equals("filterset")){\r
-                context.getFilterManager().addFilterSet(filter);\r
+                environment.getFilterManager().addFilterSet(filter);\r
             }\r
         }\r
     }\r
index e05a3f8..c38d0f0 100755 (executable)
@@ -20,7 +20,7 @@ public class StigmataTest{
 \r
     @Before\r
     public void prepare(){\r
-        context = Stigmata.getInstance().createContext();\r
+        context = Stigmata.getInstance().createEnvironment();\r
     }\r
 \r
     @Test\r