update

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

diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java b/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
index 1b16d72..fbba814 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
@@ -29,6 +29,7 @@ import javax.swing.border.TitledBorder;
 \r
 import jp.naist.se.stigmata.BirthmarkContext;\r
 import jp.naist.se.stigmata.ExtractionUnit;\r
+import jp.naist.se.stigmata.filter.ComparisonPairFilterManager;\r
 import jp.naist.se.stigmata.reader.ClasspathContext;\r
 import jp.naist.se.stigmata.utils.ConfigFileExporter;\r
 import jp.naist.se.stigmata.utils.WellknownClassManager;\r
@@ -65,7 +66,7 @@ public class ControlPane extends JPanel{
 \r
     void inititalize(){\r
         definition = new BirthmarkDefinitionPane(stigmata);\r
-        birthmarks = new BirthmarkSelectionListPane(stigmata);\r
+        birthmarks = new BirthmarkSelectionCheckSetPane(stigmata);\r
         properties = new PropertyEditPane(stigmata);\r
         JComponent control = createControlPane();\r
         wellknownClassses = new WellknownClassesSettingsPane(stigmata);\r
@@ -293,13 +294,14 @@ public class ControlPane extends JPanel{
         BirthmarkContext context = stigmata.getStigmata().createContext();\r
         ClasspathContext bytecode = context.getClasspathContext();\r
         WellknownClassManager manager = context.getWellknownClassManager();\r
+        ComparisonPairFilterManager filterManager = context.getFilterManager();\r
 \r
         context.setExtractionUnit(parseExtractionUnit());\r
         classpath.updateClasspathContext(bytecode);\r
         wellknownClassses.setWellknownClasses(manager);\r
+        filters.updateFilterManager(filterManager);\r
         definition.updateContext(context);\r
         properties.updateContext(context);\r
-        filters.updateFilterManager(context.getFilterManager());\r
 \r
         return context;\r
     }\r

diff --git a/src/site/apt/survey.apt b/src/site/apt/survey.apt
index c17780f..f3d1be6 100755 (executable)
--- a/src/site/apt/survey.apt
+++ b/src/site/apt/survey.apt
@@ -12,6 +12,8 @@ Implemented Birthmarks
 \r
  [Proposers] H. Tamada, et al.\r
 \r
+ [Description] Constant values of field variables and its field type\r
+\r
  [Paper] Haruaki Tamada, Masahide Nakamura, Akito Monden, and Ken-ichi\r
  Matsumoto, "Java Birthmarks --Detecting the Software Theft--," IEICE\r
  Transactions on Information and Systems, Vol. E88-D, No. 9, September\r
@@ -21,6 +23,8 @@ Implemented Birthmarks
 \r
  [Proposers] H. Tamada, et al.\r
 \r
+ [Description] Sequence of method calls in definition order (not execution order).\r
+\r
  [Paper] Haruaki Tamada, Masahide Nakamura, Akito Monden, and Ken-ichi\r
  Matsumoto, "Java Birthmarks --Detecting the Software Theft--," IEICE\r
  Transactions on Information and Systems, Vol. E88-D, No. 9, September\r
@@ -30,6 +34,9 @@ Implemented Birthmarks
 \r
  [Proposers] H. Tamada, et al.\r
 \r
+ [Description] Inheritance structure of target class.  If a class in\r
+ this birthmark elements is not wellknown-class, replace it to <null>.\r
+\r
  [Paper] Haruaki Tamada, Masahide Nakamura, Akito Monden, and Ken-ichi\r
  Matsumoto, "Java Birthmarks --Detecting the Software Theft--," IEICE\r
  Transactions on Information and Systems, Vol. E88-D, No. 9, September\r
@@ -39,6 +46,10 @@ Implemented Birthmarks
 \r
  [Proposers] H. Tamada, et al.\r
 \r
+ [Description] A set of used classes.  Elements of this birthmark is\r
+ appeared in field type, method argument types, return type and used\r
+ in methods.\r
+\r
  [Paper] Haruaki Tamada, Masahide Nakamura, Akito Monden, and Ken-ichi\r
  Matsumoto, "Java Birthmarks --Detecting the Software Theft--," IEICE\r
  Transactions on Information and Systems, Vol. E88-D, No. 9, September\r
@@ -48,10 +59,40 @@ Implemented Birthmarks
 \r
  [Proposers] G. Myles and C. Collberg\r
 \r
+ [Description] Construct k-gram from instructions.\r
+\r
  [Paper] Ginger Myles, Christian Collberg, ``K-gram based software\r
  birthmarks,'' In Proc. of the 2005 ACM symposium on Applied\r
  computing, 2005.\r
 \r
+*FMC birthmark\r
+\r
+ [Proposers] H. Tamada\r
+\r
+ [Description] Frequency of method calls.\r
+\r
+ [Papers] No\r
+\r
+ [Related Papers] Haruaki Tamada, Keiji Okamoto, Masahide Nakamura,\r
+   Akito Monden, and Ken-ichi Matsumoto, ``Dynamic Software Birthmarks\r
+   to Detect the Theft of Windows Applications,'' In\r
+   Proc. International Symposium on Future Software Technology 2004\r
+   (ISFST 2004), CD-ROM, Xi'an, China, 20-22 October 2004.\r
+\r
+*FUC birthmark\r
+\r
+ [Proposers] H. Tamada\r
+\r
+ [Description] Frequency of used classes.\r
+\r
+ [Papers] No\r
+\r
+ [Related Papers] Haruaki Tamada, Keiji Okamoto, Masahide Nakamura,\r
+   Akito Monden, and Ken-ichi Matsumoto, ``Dynamic Software Birthmarks\r
+   to Detect the Theft of Windows Applications,'' In\r
+   Proc. International Symposium on Future Software Technology 2004\r
+   (ISFST 2004), CD-ROM, Xi'an, China, 20-22 October 2004.\r
+\r
 \r
 Related Publications\r
 \r