update enum name, BOTH_TARGET -> BOTH_TARGETS, ONE_OF_TARGET -> ONE_OF_TARGETS

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

diff --git a/src/main/java/jp/naist/se/stigmata/BirthmarkContext.java b/src/main/java/jp/naist/se/stigmata/BirthmarkContext.java
index d8382c8..747e4f3 100755 (executable)
--- a/src/main/java/jp/naist/se/stigmata/BirthmarkContext.java
+++ b/src/main/java/jp/naist/se/stigmata/BirthmarkContext.java
@@ -19,13 +19,15 @@ import java.util.Map;
  */\r
 public class BirthmarkContext{\r
     private BirthmarkEnvironment environment;\r
-    private List<String> birthmarkTypes = new ArrayList<String>();\r
+\r
     private ComparisonMethod method = ComparisonMethod.ROUND_ROBIN_SAME_PAIR;\r
-    private List<String> filterTypes = new ArrayList<String>();\r
-    private Map<String, String> nameMappings = new HashMap<String, String>();\r
     private ExtractionUnit unit = ExtractionUnit.CLASS;\r
     private BirthmarkStoreTarget store = BirthmarkStoreTarget.MEMORY;\r
 \r
+    private List<String> birthmarkTypes = new ArrayList<String>();\r
+    private List<String> filterTypes = new ArrayList<String>();\r
+    private Map<String, String> nameMappings = new HashMap<String, String>();\r
+\r
     /**\r
      * self constructor.\r
      */\r

diff --git a/src/main/java/jp/naist/se/stigmata/filter/BirthmarkElementCountComparisonPairFilter.java b/src/main/java/jp/naist/se/stigmata/filter/BirthmarkElementCountComparisonPairFilter.java
index 0fe20b2..119fab9 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/filter/BirthmarkElementCountComparisonPairFilter.java
+++ b/src/main/java/jp/naist/se/stigmata/filter/BirthmarkElementCountComparisonPairFilter.java
@@ -61,28 +61,28 @@ public class BirthmarkElementCountComparisonPairFilter extends AbstractCompariso
 \r
             switch(getCriterion()){\r
             case GREATER_EQUALS:\r
-                flag = (target == FilterTarget.BOTH_TARGET && elem1 >= threshold && elem2 >= threshold) ||\r
-                (target == FilterTarget.ONE_OF_TARGET && (elem1 >= threshold || elem2 >= threshold));\r
+                flag = (target == FilterTarget.BOTH_TARGETS && elem1 >= threshold && elem2 >= threshold) ||\r
+                (target == FilterTarget.ONE_OF_TARGETS && (elem1 >= threshold || elem2 >= threshold));\r
                 break;\r
             case GREATER_THAN:\r
-                flag = (target == FilterTarget.BOTH_TARGET && elem1 > threshold && elem2 > threshold) ||\r
-                    (target == FilterTarget.ONE_OF_TARGET && (elem1 > threshold || elem2 > threshold));\r
+                flag = (target == FilterTarget.BOTH_TARGETS && elem1 > threshold && elem2 > threshold) ||\r
+                    (target == FilterTarget.ONE_OF_TARGETS && (elem1 > threshold || elem2 > threshold));\r
                 break;\r
             case LESS_EQUALS:\r
-                flag = (target == FilterTarget.BOTH_TARGET && elem1 <= threshold && elem2 <= threshold) ||\r
-                (target == FilterTarget.ONE_OF_TARGET && (elem1 <= threshold || elem2 <= threshold));\r
+                flag = (target == FilterTarget.BOTH_TARGETS && elem1 <= threshold && elem2 <= threshold) ||\r
+                (target == FilterTarget.ONE_OF_TARGETS && (elem1 <= threshold || elem2 <= threshold));\r
                 break;\r
             case LESS_THAN:\r
-                flag = (target == FilterTarget.BOTH_TARGET && elem1 < threshold && elem2 < threshold) ||\r
-                    (target == FilterTarget.ONE_OF_TARGET && (elem1 < threshold || elem2 < threshold));\r
+                flag = (target == FilterTarget.BOTH_TARGETS && elem1 < threshold && elem2 < threshold) ||\r
+                    (target == FilterTarget.ONE_OF_TARGETS && (elem1 < threshold || elem2 < threshold));\r
                 break;\r
             case EQUALS_AS:\r
-                flag = (target == FilterTarget.BOTH_TARGET && elem1 == threshold && elem2 == threshold) ||\r
-                (target == FilterTarget.ONE_OF_TARGET && (elem1 == threshold || elem2 == threshold));\r
+                flag = (target == FilterTarget.BOTH_TARGETS && elem1 == threshold && elem2 == threshold) ||\r
+                (target == FilterTarget.ONE_OF_TARGETS && (elem1 == threshold || elem2 == threshold));\r
                 break;\r
             case NOT_EQUALS_AS:\r
-                flag = (target == FilterTarget.BOTH_TARGET && elem1 != threshold && elem2 != threshold) ||\r
-                    (target == FilterTarget.ONE_OF_TARGET && (elem1 != threshold || elem2 != threshold));\r
+                flag = (target == FilterTarget.BOTH_TARGETS && elem1 != threshold && elem2 != threshold) ||\r
+                    (target == FilterTarget.ONE_OF_TARGETS && (elem1 != threshold || elem2 != threshold));\r
                 break;\r
             default:\r
                 flag = false;\r
@@ -93,7 +93,7 @@ public class BirthmarkElementCountComparisonPairFilter extends AbstractCompariso
     }\r
 \r
     public boolean isFiltered(ComparisonPair pair){\r
-        if(target == FilterTarget.BOTH_TARGET || target == FilterTarget.ONE_OF_TARGET){\r
+        if(target == FilterTarget.BOTH_TARGETS || target == FilterTarget.ONE_OF_TARGETS){\r
             return isFilteredTwo(pair);\r
         }\r
         boolean flag = false;\r
@@ -156,10 +156,10 @@ public class BirthmarkElementCountComparisonPairFilter extends AbstractCompariso
     public String toString(){\r
         StringBuilder sb = new StringBuilder();\r
         switch(getTarget()){\r
-        case TARGET_1:      sb.append("target1"); break;\r
-        case TARGET_2:      sb.append("target2"); break;\r
-        case BOTH_TARGET:   sb.append("(target1&target2)");    break;\r
-        case ONE_OF_TARGET: sb.append("(target1|target2)");\r
+        case TARGET_1:       sb.append("target1"); break;\r
+        case TARGET_2:       sb.append("target2"); break;\r
+        case BOTH_TARGETS:   sb.append("(target1&target2)");    break;\r
+        case ONE_OF_TARGETS: sb.append("(target1|target2)");\r
         }\r
         sb.append(".").append(birthmarkType);\r
         sb.append(".size");\r

diff --git a/src/main/java/jp/naist/se/stigmata/filter/FilterTarget.java b/src/main/java/jp/naist/se/stigmata/filter/FilterTarget.java
index a2246df..5a3f477 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/filter/FilterTarget.java
+++ b/src/main/java/jp/naist/se/stigmata/filter/FilterTarget.java
@@ -11,5 +11,5 @@ package jp.naist.se.stigmata.filter;
  * @version $Revision$ $Date$\r
  */\r
 public enum FilterTarget{\r
-    TARGET_1, TARGET_2, BOTH_TARGET, ONE_OF_TARGET,\r
+    TARGET_1, TARGET_2, BOTH_TARGETS, ONE_OF_TARGETS,\r
 }
\ No newline at end of file

diff --git a/src/main/java/jp/naist/se/stigmata/filter/TargetNameComparisonPairFilter.java b/src/main/java/jp/naist/se/stigmata/filter/TargetNameComparisonPairFilter.java
index d2a9ff4..ce45936 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/filter/TargetNameComparisonPairFilter.java
+++ b/src/main/java/jp/naist/se/stigmata/filter/TargetNameComparisonPairFilter.java
@@ -28,7 +28,7 @@ public class TargetNameComparisonPairFilter extends AbstractComparisonPairFilter
         CRITERIA.add(Criterion.MATCH);\r
         CRITERIA.add(Criterion.NOT_MATCH);\r
     };\r
-    private FilterTarget target = FilterTarget.BOTH_TARGET;\r
+    private FilterTarget target = FilterTarget.BOTH_TARGETS;\r
     private String value;\r
 \r
     public TargetNameComparisonPairFilter(ComparisonPairFilterSpi service){\r
@@ -110,7 +110,7 @@ public class TargetNameComparisonPairFilter extends AbstractComparisonPairFilter
         }\r
         \r
         boolean flag;\r
-        if(getTarget() == FilterTarget.BOTH_TARGET){\r
+        if(getTarget() == FilterTarget.BOTH_TARGETS){\r
             flag = flag1 && flag2;\r
         }\r
         else{\r
@@ -149,10 +149,10 @@ public class TargetNameComparisonPairFilter extends AbstractComparisonPairFilter
         }\r
         StringBuilder sb = new StringBuilder();\r
         switch(getTarget()){\r
-        case TARGET_1:      sb.append("target1.name");           break;\r
-        case TARGET_2:      sb.append("target2.name");           break;\r
-        case BOTH_TARGET:   sb.append("(target1&target2).name"); break;\r
-        case ONE_OF_TARGET: sb.append("(target1|target2).name"); break; \r
+        case TARGET_1:       sb.append("target1.name");           break;\r
+        case TARGET_2:       sb.append("target2.name");           break;\r
+        case BOTH_TARGETS:   sb.append("(target1&target2).name"); break;\r
+        case ONE_OF_TARGETS: sb.append("(target1|target2).name"); break; \r
         }\r
         switch(getCriterion()){\r
         case STARTS_WITH:     sb.append(" starts with ");     break;\r

diff --git a/src/main/java/jp/naist/se/stigmata/filter/TotalElementCountComparisonPairFilter.java b/src/main/java/jp/naist/se/stigmata/filter/TotalElementCountComparisonPairFilter.java
index ff12a74..b40f7da 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/filter/TotalElementCountComparisonPairFilter.java
+++ b/src/main/java/jp/naist/se/stigmata/filter/TotalElementCountComparisonPairFilter.java
@@ -91,8 +91,8 @@ public class TotalElementCountComparisonPairFilter extends AbstractComparisonPai
             flag2 = false;\r
             break;\r
         }\r
-        return (getTarget() == FilterTarget.BOTH_TARGET && flag1 && flag2) ||\r
-            (getTarget() == FilterTarget.ONE_OF_TARGET && (flag1 || flag2));\r
+        return (getTarget() == FilterTarget.BOTH_TARGETS && flag1 && flag2) ||\r
+            (getTarget() == FilterTarget.ONE_OF_TARGETS && (flag1 || flag2));\r
     }\r
 \r
     private boolean checkFiltered(int total){\r
@@ -145,10 +145,10 @@ public class TotalElementCountComparisonPairFilter extends AbstractComparisonPai
     public String toString(){\r
         StringBuilder sb = new StringBuilder();\r
         switch(getTarget()){\r
-        case TARGET_1:      sb.append("target1"); break;\r
-        case TARGET_2:      sb.append("target2"); break;\r
-        case BOTH_TARGET:   sb.append("(target1&target2)"); break;\r
-        case ONE_OF_TARGET: sb.append("(target1|target2)"); break;\r
+        case TARGET_1:       sb.append("target1"); break;\r
+        case TARGET_2:       sb.append("target2"); break;\r
+        case BOTH_TARGETS:   sb.append("(target1&target2)"); break;\r
+        case ONE_OF_TARGETS: sb.append("(target1|target2)"); break;\r
         }\r
         sb.append(".element");\r
         switch(getCriterion()){\r

diff --git a/src/main/java/jp/naist/se/stigmata/result/XmlFileExtractionResultSet.java b/src/main/java/jp/naist/se/stigmata/result/XmlFileExtractionResultSet.java
index 670c41a..e8bcc93 100755 (executable)
--- a/src/main/java/jp/naist/se/stigmata/result/XmlFileExtractionResultSet.java
+++ b/src/main/java/jp/naist/se/stigmata/result/XmlFileExtractionResultSet.java
@@ -284,24 +284,26 @@ public class XmlFileExtractionResultSet extends AbstractExtractionResultSet{
                 
             while(reader.hasNext()){
                 XMLEvent event = reader.peek();
+                // XMLEvent event = reader.nextEvent();
                 if(event.isStartElement()){
                     StartElement se = event.asStartElement();
-                    if(se.getName().getLocalPart().equals("unit")){
+                    String part = se.getName().getLocalPart();
+                    if(part.equals("unit")){
                         ExtractionUnit unit = ExtractionUnit.valueOf(reader.getElementText());
                         if(unit != null){
                             context.setExtractionUnit(unit);
                         }                        
                     }
-                    if(se.getName().getLocalPart().equals("birthmark-type")){
+                    else if(part.equals("birthmark-type")){
                         String type = reader.getElementText();
                         if(env.getService(type) != null){
                             context.addBirthmarkType(type);
                         }                        
                     }
-                    else if(se.getName().getLocalPart().equals("name")){
+                    else if(part.equals("name")){
                         className = reader.getElementText();
                     }
-                    else if(se.getName().getLocalPart().equals("location")){
+                    else if(part.equals("location")){
                         String location = reader.getElementText();
                         if(className == null || location == null){
                             throw new XMLStreamException("incompatible with definition");
@@ -313,13 +315,13 @@ public class XmlFileExtractionResultSet extends AbstractExtractionResultSet{
                             e.printStackTrace();
                         }
                     }
-                    else if(se.getName().getLocalPart().equals("element")){
+                    else if(part.equals("element")){
                         if(service != null){
                             BirthmarkElement be = service.buildBirthmarkElement(reader.getElementText());
                             birthmark.addElement(be);
                         }
                     }
-                    else if(se.getName().getLocalPart().equals("birthmark")){
+                    else if(part.equals("birthmark")){
                         String type = se.getAttributeByName(new QName("type")).getValue();
                         service = env.getService(type);
                         if(service != null){

diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/filter/BirthmarkElementCountComparisonPairFilterComponentService.java b/src/main/java/jp/naist/se/stigmata/ui/swing/filter/BirthmarkElementCountComparisonPairFilterComponentService.java
index eb84a69..ec2a68f 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/filter/BirthmarkElementCountComparisonPairFilterComponentService.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/filter/BirthmarkElementCountComparisonPairFilterComponentService.java
@@ -111,7 +111,7 @@ public class BirthmarkElementCountComparisonPairFilterComponentService extends A
         public void resetComponents(){\r
             threshold.setText("");\r
             criterionType.setSelectedIndex(0);\r
-            targetType.setSelectedItem(getDisplayTarget(FilterTarget.BOTH_TARGET));\r
+            targetType.setSelectedItem(getDisplayTarget(FilterTarget.BOTH_TARGETS));\r
         }\r
 \r
         @Override\r

diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/filter/TargetNameComparisonPairFilterComponentService.java b/src/main/java/jp/naist/se/stigmata/ui/swing/filter/TargetNameComparisonPairFilterComponentService.java
index 240ebcb..a1383dd 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/filter/TargetNameComparisonPairFilterComponentService.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/filter/TargetNameComparisonPairFilterComponentService.java
@@ -77,7 +77,7 @@ public class TargetNameComparisonPairFilterComponentService extends AbstractComp
         public void resetComponents(){\r
             value.setText("");\r
             criterionType.setSelectedIndex(0);\r
-            targetType.setSelectedItem(getDisplayTarget(FilterTarget.BOTH_TARGET));\r
+            targetType.setSelectedItem(getDisplayTarget(FilterTarget.BOTH_TARGETS));\r
         }\r
 \r
         @Override\r

diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/filter/TotalElementCountComparisonPairFilterComponentService.java b/src/main/java/jp/naist/se/stigmata/ui/swing/filter/TotalElementCountComparisonPairFilterComponentService.java
index ce6328f..0f65dac 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/filter/TotalElementCountComparisonPairFilterComponentService.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/filter/TotalElementCountComparisonPairFilterComponentService.java
@@ -84,7 +84,7 @@ public class TotalElementCountComparisonPairFilterComponentService extends Abstr
         public void resetComponents(){\r
             threshold.setText("");\r
             criterionType.setSelectedIndex(0);\r
-            targetType.setSelectedItem(getDisplayTarget(FilterTarget.BOTH_TARGET));\r
+            targetType.setSelectedItem(getDisplayTarget(FilterTarget.BOTH_TARGETS));\r
         }\r
 \r
         @Override\r

diff --git a/src/main/resources/resources/stigmata.xml b/src/main/resources/resources/stigmata.xml
index 959c43a..57e1e9b 100755 (executable)
--- a/src/main/resources/resources/stigmata.xml
+++ b/src/main/resources/resources/stigmata.xml
@@ -120,7 +120,7 @@ $Id$
           <attributes>
             <attribute>
               <name>target</name>
-              <value>ONE_OF_TARGET</value>
+              <value>ONE_OF_TARGETS</value>
             </attribute>
             <attribute>
               <name>birthmarkType</name>