fixed bug which is do not cancel when cancel button is selected in window closing...

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

diff --git a/src/main/java/jp/sourceforge/stigmata/BirthmarkEnvironment.java b/src/main/java/jp/sourceforge/stigmata/BirthmarkEnvironment.java
index 7c39ab1..2144cda 100644 (file)
--- a/src/main/java/jp/sourceforge/stigmata/BirthmarkEnvironment.java
+++ b/src/main/java/jp/sourceforge/stigmata/BirthmarkEnvironment.java
@@ -28,7 +28,7 @@ import jp.sourceforge.stigmata.utils.WellknownClassManager;
  * This class represents the context for extracting/comparing birthmarks.
  * 
  * @author  Haruaki TAMADA
- * @version  $Revision$ $Date$
+ * @version  $Revision$
  */
 public class BirthmarkEnvironment{
     /**

diff --git a/src/main/java/jp/sourceforge/stigmata/ui/swing/StigmataFrame.java b/src/main/java/jp/sourceforge/stigmata/ui/swing/StigmataFrame.java
index e86e5fe..30bd945 100644 (file)
--- a/src/main/java/jp/sourceforge/stigmata/ui/swing/StigmataFrame.java
+++ b/src/main/java/jp/sourceforge/stigmata/ui/swing/StigmataFrame.java
@@ -70,7 +70,7 @@ import org.apache.commons.cli.ParseException;
 /**
  *
  * @author Haruaki TAMADA
- * @version $Revision$ $Date$
+ * @version $Revision$
  */
 public class StigmataFrame extends JFrame{
     private static final long serialVersionUID = 92345543665342134L;
@@ -490,7 +490,7 @@ public class StigmataFrame extends JFrame{
                 }
             }
         });
-        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
     }
 
     private JMenu createFileMenu(){

diff --git a/src/main/resources/resources/stigmata.xml b/src/main/resources/resources/stigmata.xml
index d025465..55fecb5 100755 (executable)
--- a/src/main/resources/resources/stigmata.xml
+++ b/src/main/resources/resources/stigmata.xml
@@ -10,72 +10,108 @@ $Id$
       <type>uc_seq</type>
       <display-name>Used Classes (compare as sequence)</display-name>
       <description></description>
-      <extractor>jp.sourceforge.stigmata.birthmarks.uc.UsedClassesBirthmarkExtractor</extractor>
-      <comparator>jp.sourceforge.stigmata.birthmarks.comparators.PlainBirthmarkComparator</comparator>
+      <extractor>
+        jp.sourceforge.stigmata.birthmarks.uc.UsedClassesBirthmarkExtractor
+      </extractor>
+      <comparator>
+        jp.sourceforge.stigmata.birthmarks.comparators.PlainBirthmarkComparator
+      </comparator>
     </birthmark-service>
 
     <birthmark-service>
       <type>uc_dp</type>
       <display-name>Used Classes (DP matching)</display-name>
       <description></description>
-      <extractor>jp.sourceforge.stigmata.birthmarks.uc.UsedClassesBirthmarkExtractor</extractor>
-      <comparator>jp.sourceforge.stigmata.birthmarks.comparators.DPMatchingBirthmarkComparator</comparator>
+      <extractor>
+        jp.sourceforge.stigmata.birthmarks.uc.UsedClassesBirthmarkExtractor
+      </extractor>
+      <comparator>
+        jp.sourceforge.stigmata.birthmarks.comparators.DPMatchingBirthmarkComparator
+      </comparator>
     </birthmark-service>
 
     <birthmark-service>
       <type>uc_ed</type>
       <display-name>Used Classes (Edit distance)</display-name>
       <description></description>
-      <extractor>jp.sourceforge.stigmata.birthmarks.uc.UsedClassesBirthmarkExtractor</extractor>
-      <comparator>jp.sourceforge.stigmata.birthmarks.comparators.EditDistanceBirthmarkComparator</comparator>
+      <extractor>
+        jp.sourceforge.stigmata.birthmarks.uc.UsedClassesBirthmarkExtractor
+      </extractor>
+      <comparator>
+        jp.sourceforge.stigmata.birthmarks.comparators.EditDistanceBirthmarkComparator
+      </comparator>
     </birthmark-service>
 
     <birthmark-service>
       <type>is_ed</type>
       <display-name>Inheritance Structure (Edit distance)</display-name>
       <description></description>
-      <extractor>jp.sourceforge.stigmata.birthmarks.is.InheritanceStructureBirthmarkExtractor</extractor>
-      <comparator>jp.sourceforge.stigmata.birthmarks.comparators.EditDistanceBirthmarkComparator</comparator>
+      <extractor>
+        jp.sourceforge.stigmata.birthmarks.is.InheritanceStructureBirthmarkExtractor
+      </extractor>
+      <comparator>
+        jp.sourceforge.stigmata.birthmarks.comparators.EditDistanceBirthmarkComparator
+      </comparator>
     </birthmark-service>
 
     <birthmark-service>
       <type>is_dp</type>
       <display-name>Inheritance Structure (DP matching)</display-name>
       <description></description>
-      <extractor>jp.sourceforge.stigmata.birthmarks.is.InheritanceStructureBirthmarkExtractor</extractor>
-      <comparator>jp.sourceforge.stigmata.birthmarks.comparators.DPMatchingBirthmarkComparator</comparator>
+      <extractor>
+        jp.sourceforge.stigmata.birthmarks.is.InheritanceStructureBirthmarkExtractor
+      </extractor>
+      <comparator>
+        jp.sourceforge.stigmata.birthmarks.comparators.DPMatchingBirthmarkComparator
+      </comparator>
     </birthmark-service>
 
     <birthmark-service>
-      <type>smc_ed</type>
-      <display-name>Sequence of Method Calls (Edit distance)</display-name>
+      <type>smc_dp</type>
+      <display-name>Sequence of Method Calls (DP matching)</display-name>
       <description></description>
-      <extractor>jp.sourceforge.stigmata.birthmarks.smc.SequentialMethodCallBirthmarkExtractor</extractor>
-      <comparator>jp.sourceforge.stigmata.birthmarks.comparators.EditDistanceBirthmarkComparator</comparator>
+      <extractor>
+        jp.sourceforge.stigmata.birthmarks.smc.SequentialMethodCallBirthmarkExtractor
+      </extractor>
+      <comparator>
+        jp.sourceforge.stigmata.birthmarks.comparators.DPMatchingBirthmarkComparator
+      </comparator>
     </birthmark-service>
 
     <birthmark-service>
-      <type>smc_dp</type>
-      <display-name>Sequence of Method Calls (DP matching)</display-name>
+      <type>smc_ed</type>
+      <display-name>Sequence of Method Calls (Edit distance)</display-name>
       <description></description>
-      <extractor>jp.sourceforge.stigmata.birthmarks.smc.SequentialMethodCallBirthmarkExtractor</extractor>
-      <comparator>jp.sourceforge.stigmata.birthmarks.comparators.DPMatchingBirthmarkComparator</comparator>
+      <extractor>
+        jp.sourceforge.stigmata.birthmarks.smc.SequentialMethodCallBirthmarkExtractor
+      </extractor>
+      <comparator>
+        jp.sourceforge.stigmata.birthmarks.comparators.EditDistanceBirthmarkComparator
+      </comparator>
     </birthmark-service>
 
     <birthmark-service>
       <type>cvfv_ed</type>
       <display-name>Constant Value of Field Variable (Edit distance)</display-name>
       <description></description>
-      <extractor>jp.sourceforge.stigmata.birthmarks.cvfv.ConstantValueOfFieldVariableBirthmarkExtractor</extractor>
-      <comparator>jp.sourceforge.stigmata.birthmarks.comparators.EditDistanceBirthmarkComparator</comparator>
+      <extractor>
+        jp.sourceforge.stigmata.birthmarks.cvfv.ConstantValueOfFieldVariableBirthmarkExtractor
+      </extractor>
+      <comparator>
+        jp.sourceforge.stigmata.birthmarks.comparators.EditDistanceBirthmarkComparator
+      </comparator>
     </birthmark-service>
 
     <birthmark-service>
       <type>cvfv_dp</type>
       <display-name>Constant Value of Field Variable (DP matching)</display-name>
       <description></description>
-      <extractor>jp.sourceforge.stigmata.birthmarks.cvfv.ConstantValueOfFieldVariableBirthmarkExtractor</extractor>
-      <comparator>jp.sourceforge.stigmata.birthmarks.comparators.DPMatchingBirthmarkComparator</comparator>
+      <extractor>
+        jp.sourceforge.stigmata.birthmarks.cvfv.ConstantValueOfFieldVariableBirthmarkExtractor
+      </extractor>
+      <comparator>
+        jp.sourceforge.stigmata.birthmarks.comparators.DPMatchingBirthmarkComparator
+      </comparator>
     </birthmark-service>
   </birthmark-services>