update class name Target class in filter package to FilterTarget

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

diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/FrequencyBirthmarkElement.java b/src/main/java/jp/naist/se/stigmata/birthmarks/FrequencyBirthmarkElement.java
index c360acc..f128726 100755 (executable)
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/FrequencyBirthmarkElement.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/FrequencyBirthmarkElement.java
@@ -1,7 +1,16 @@
 package jp.naist.se.stigmata.birthmarks;\r
 \r
+/*\r
+ * $Id$\r
+ */\r
+\r
 import jp.naist.se.stigmata.BirthmarkElement;\r
 \r
+/**\r
+ * \r
+ * @author Haruaki Tamada\r
+ * @version $Revision$ $Date$\r
+ */\r
 public class FrequencyBirthmarkElement extends BirthmarkElement implements ValueCountable{\r
     private static final long serialVersionUID = 4454345943098520436L;\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 c53cbe1..0fe20b2 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/filter/BirthmarkElementCountComparisonPairFilter.java
+++ b/src/main/java/jp/naist/se/stigmata/filter/BirthmarkElementCountComparisonPairFilter.java
@@ -19,7 +19,7 @@ public class BirthmarkElementCountComparisonPairFilter extends AbstractCompariso
     private static final List<Criterion> CRITERIA = new ArrayList<Criterion>();\r
 \r
     private int threshold = 0;\r
-    private Target target;\r
+    private FilterTarget target;\r
     private String birthmarkType;\r
 \r
     static{\r
@@ -61,28 +61,28 @@ public class BirthmarkElementCountComparisonPairFilter extends AbstractCompariso
 \r
             switch(getCriterion()){\r
             case GREATER_EQUALS:\r
-                flag = (target == Target.BOTH_TARGET && elem1 >= threshold && elem2 >= threshold) ||\r
-                (target == Target.ONE_OF_TARGET && (elem1 >= threshold || elem2 >= threshold));\r
+                flag = (target == FilterTarget.BOTH_TARGET && elem1 >= threshold && elem2 >= threshold) ||\r
+                (target == FilterTarget.ONE_OF_TARGET && (elem1 >= threshold || elem2 >= threshold));\r
                 break;\r
             case GREATER_THAN:\r
-                flag = (target == Target.BOTH_TARGET && elem1 > threshold && elem2 > threshold) ||\r
-                    (target == Target.ONE_OF_TARGET && (elem1 > threshold || elem2 > threshold));\r
+                flag = (target == FilterTarget.BOTH_TARGET && elem1 > threshold && elem2 > threshold) ||\r
+                    (target == FilterTarget.ONE_OF_TARGET && (elem1 > threshold || elem2 > threshold));\r
                 break;\r
             case LESS_EQUALS:\r
-                flag = (target == Target.BOTH_TARGET && elem1 <= threshold && elem2 <= threshold) ||\r
-                (target == Target.ONE_OF_TARGET && (elem1 <= threshold || elem2 <= threshold));\r
+                flag = (target == FilterTarget.BOTH_TARGET && elem1 <= threshold && elem2 <= threshold) ||\r
+                (target == FilterTarget.ONE_OF_TARGET && (elem1 <= threshold || elem2 <= threshold));\r
                 break;\r
             case LESS_THAN:\r
-                flag = (target == Target.BOTH_TARGET && elem1 < threshold && elem2 < threshold) ||\r
-                    (target == Target.ONE_OF_TARGET && (elem1 < threshold || elem2 < threshold));\r
+                flag = (target == FilterTarget.BOTH_TARGET && elem1 < threshold && elem2 < threshold) ||\r
+                    (target == FilterTarget.ONE_OF_TARGET && (elem1 < threshold || elem2 < threshold));\r
                 break;\r
             case EQUALS_AS:\r
-                flag = (target == Target.BOTH_TARGET && elem1 == threshold && elem2 == threshold) ||\r
-                (target == Target.ONE_OF_TARGET && (elem1 == threshold || elem2 == threshold));\r
+                flag = (target == FilterTarget.BOTH_TARGET && elem1 == threshold && elem2 == threshold) ||\r
+                (target == FilterTarget.ONE_OF_TARGET && (elem1 == threshold || elem2 == threshold));\r
                 break;\r
             case NOT_EQUALS_AS:\r
-                flag = (target == Target.BOTH_TARGET && elem1 != threshold && elem2 != threshold) ||\r
-                    (target == Target.ONE_OF_TARGET && (elem1 != threshold || elem2 != threshold));\r
+                flag = (target == FilterTarget.BOTH_TARGET && elem1 != threshold && elem2 != threshold) ||\r
+                    (target == FilterTarget.ONE_OF_TARGET && (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 == Target.BOTH_TARGET || target == Target.ONE_OF_TARGET){\r
+        if(target == FilterTarget.BOTH_TARGET || target == FilterTarget.ONE_OF_TARGET){\r
             return isFilteredTwo(pair);\r
         }\r
         boolean flag = false;\r
@@ -101,10 +101,10 @@ public class BirthmarkElementCountComparisonPairFilter extends AbstractCompariso
         if(pair.getTarget1().hasBirthmark(type) && pair.getTarget2().hasBirthmark(type)){\r
             int total = 0;\r
             int threshold = getThreshold();\r
-            if(target == Target.TARGET_1){\r
+            if(target == FilterTarget.TARGET_1){\r
                 total = pair.getTarget1().getBirthmark(type).getElementCount();\r
             }\r
-            if(target == Target.TARGET_2){\r
+            if(target == FilterTarget.TARGET_2){\r
                 total = pair.getTarget2().getBirthmark(type).getElementCount();\r
             }\r
             switch(getCriterion()){\r
@@ -145,11 +145,11 @@ public class BirthmarkElementCountComparisonPairFilter extends AbstractCompariso
         this.threshold = threshold;\r
     }\r
 \r
-    public Target getTarget(){\r
+    public FilterTarget getTarget(){\r
         return target;\r
     }\r
 \r
-    public void setTarget(Target target){\r
+    public void setTarget(FilterTarget target){\r
         this.target = target;\r
     }\r
 \r

diff --git a/src/main/java/jp/naist/se/stigmata/filter/ComparisonPairFilterManager.java b/src/main/java/jp/naist/se/stigmata/filter/ComparisonPairFilterManager.java
index 316ca90..8be8464 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/filter/ComparisonPairFilterManager.java
+++ b/src/main/java/jp/naist/se/stigmata/filter/ComparisonPairFilterManager.java
@@ -105,7 +105,7 @@ public class ComparisonPairFilterManager{
                 try{\r
                     Object value = entry.getValue();\r
                     if(entry.getKey().equals("target")){\r
-                        value = Target.valueOf(String.valueOf(value));\r
+                        value = FilterTarget.valueOf(String.valueOf(value));\r
                     }\r
                     BeanUtils.setProperty(filter, entry.getKey(), value);\r
                 }catch(IllegalAccessException e){\r

diff --git a/src/main/java/jp/naist/se/stigmata/filter/Target.java b/src/main/java/jp/naist/se/stigmata/filter/FilterTarget.java
similarity index 66%
rename from src/main/java/jp/naist/se/stigmata/filter/Target.java
rename to src/main/java/jp/naist/se/stigmata/filter/FilterTarget.java
index 5b4d3a8..a2246df 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/filter/Target.java
+++ b/src/main/java/jp/naist/se/stigmata/filter/FilterTarget.java
@@ -5,9 +5,11 @@ package jp.naist.se.stigmata.filter;
  */\r
 \r
 /**\r
+ * This enum represents filter target.\r
+ * \r
  * @author Haruaki TAMADA\r
  * @version $Revision$ $Date$\r
  */\r
-public enum Target{\r
+public enum FilterTarget{\r
     TARGET_1, TARGET_2, BOTH_TARGET, ONE_OF_TARGET,\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 5909f8c..d2a9ff4 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 Target target = Target.BOTH_TARGET;\r
+    private FilterTarget target = FilterTarget.BOTH_TARGET;\r
     private String value;\r
 \r
     public TargetNameComparisonPairFilter(ComparisonPairFilterSpi service){\r
@@ -47,10 +47,10 @@ public class TargetNameComparisonPairFilter extends AbstractComparisonPairFilter
         String v = value;\r
         if(v == null) v = "";\r
         boolean flag;\r
-        if(getTarget() == Target.TARGET_1){\r
+        if(getTarget() == FilterTarget.TARGET_1){\r
             flag = checkMatch(pair.getTarget1().getName(), v);\r
         }\r
-        else if(getTarget() == Target.TARGET_2){\r
+        else if(getTarget() == FilterTarget.TARGET_2){\r
             flag = checkMatch(pair.getTarget2().getName(), v);\r
         }\r
         else{\r
@@ -67,11 +67,11 @@ public class TargetNameComparisonPairFilter extends AbstractComparisonPairFilter
         this.value = value;\r
     }\r
 \r
-    public Target getTarget(){\r
+    public FilterTarget getTarget(){\r
         return target;\r
     }\r
 \r
-    public void setTarget(Target target){\r
+    public void setTarget(FilterTarget target){\r
         this.target = target;\r
     }\r
 \r
@@ -110,7 +110,7 @@ public class TargetNameComparisonPairFilter extends AbstractComparisonPairFilter
         }\r
         \r
         boolean flag;\r
-        if(getTarget() == Target.BOTH_TARGET){\r
+        if(getTarget() == FilterTarget.BOTH_TARGET){\r
             flag = flag1 && flag2;\r
         }\r
         else{\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 362bfca..ff12a74 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/filter/TotalElementCountComparisonPairFilter.java
+++ b/src/main/java/jp/naist/se/stigmata/filter/TotalElementCountComparisonPairFilter.java
@@ -29,7 +29,7 @@ public class TotalElementCountComparisonPairFilter extends AbstractComparisonPai
     };\r
 \r
     private int threshold = 0;\r
-    private Target target;\r
+    private FilterTarget target;\r
 \r
     public TotalElementCountComparisonPairFilter(ComparisonPairFilterSpi service){\r
         super(service);\r
@@ -45,10 +45,10 @@ public class TotalElementCountComparisonPairFilter extends AbstractComparisonPai
 \r
     public boolean isFiltered(ComparisonPair pair){\r
         boolean flag;\r
-        if(getTarget() == Target.TARGET_1){\r
+        if(getTarget() == FilterTarget.TARGET_1){\r
             flag = checkFiltered(pair.getTarget1().getSumOfElementCount());\r
         }\r
-        else if(getTarget() == Target.TARGET_2){\r
+        else if(getTarget() == FilterTarget.TARGET_2){\r
             flag = checkFiltered(pair.getTarget2().getSumOfElementCount());\r
         }\r
         else{\r
@@ -91,8 +91,8 @@ public class TotalElementCountComparisonPairFilter extends AbstractComparisonPai
             flag2 = false;\r
             break;\r
         }\r
-        return (getTarget() == Target.BOTH_TARGET && flag1 && flag2) ||\r
-            (getTarget() == Target.ONE_OF_TARGET && (flag1 || flag2));\r
+        return (getTarget() == FilterTarget.BOTH_TARGET && flag1 && flag2) ||\r
+            (getTarget() == FilterTarget.ONE_OF_TARGET && (flag1 || flag2));\r
     }\r
 \r
     private boolean checkFiltered(int total){\r
@@ -134,11 +134,11 @@ public class TotalElementCountComparisonPairFilter extends AbstractComparisonPai
         this.threshold = threshold;\r
     }\r
 \r
-    public Target getTarget(){\r
+    public FilterTarget getTarget(){\r
         return target;\r
     }\r
 \r
-    public void setTarget(Target target){\r
+    public void setTarget(FilterTarget target){\r
         this.target = target;\r
     }\r
 \r

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 116a2c2..eb84a69 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
@@ -16,7 +16,7 @@ import javax.swing.JTextField;
 import jp.naist.se.stigmata.ComparisonPairFilter;\r
 import jp.naist.se.stigmata.filter.BirthmarkElementCountComparisonPairFilter;\r
 import jp.naist.se.stigmata.filter.BirthmarkElementCountComparisonPairFilterService;\r
-import jp.naist.se.stigmata.filter.Target;\r
+import jp.naist.se.stigmata.filter.FilterTarget;\r
 import jp.naist.se.stigmata.spi.BirthmarkSpi;\r
 import jp.naist.se.stigmata.spi.ComparisonPairFilterSpi;\r
 import jp.naist.se.stigmata.ui.swing.BirthmarkServiceListCellRenderer;\r
@@ -111,7 +111,7 @@ public class BirthmarkElementCountComparisonPairFilterComponentService extends A
         public void resetComponents(){\r
             threshold.setText("");\r
             criterionType.setSelectedIndex(0);\r
-            targetType.setSelectedItem(getDisplayTarget(Target.BOTH_TARGET));\r
+            targetType.setSelectedItem(getDisplayTarget(FilterTarget.BOTH_TARGET));\r
         }\r
 \r
         @Override\r

diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/filter/ComparisonPairFilterPane.java b/src/main/java/jp/naist/se/stigmata/ui/swing/filter/ComparisonPairFilterPane.java
index 52b4cbd..62e4732 100644 (file)
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/filter/ComparisonPairFilterPane.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/filter/ComparisonPairFilterPane.java
@@ -12,7 +12,7 @@ import javax.swing.JPanel;
 \r
 import jp.naist.se.stigmata.ComparisonPairFilter;\r
 import jp.naist.se.stigmata.filter.Criterion;\r
-import jp.naist.se.stigmata.filter.Target;\r
+import jp.naist.se.stigmata.filter.FilterTarget;\r
 import jp.naist.se.stigmata.ui.swing.Messages;\r
 \r
 /**\r
@@ -22,7 +22,7 @@ import jp.naist.se.stigmata.ui.swing.Messages;
  */\r
 public abstract class ComparisonPairFilterPane extends JPanel{\r
     private Map<String, Criterion> criterionMap = new HashMap<String, Criterion>();\r
-    private Map<String, Target> targetMap = new HashMap<String, Target>();\r
+    private Map<String, FilterTarget> targetMap = new HashMap<String, FilterTarget>();\r
     \r
     public abstract String[] getErrors();\r
 \r
@@ -35,7 +35,7 @@ public abstract class ComparisonPairFilterPane extends JPanel{
     public JComboBox createTargetBox(){\r
         JComboBox combo = new JComboBox();\r
         combo.setEditable(false);\r
-        for(Target target: Target.values()){\r
+        for(FilterTarget target: FilterTarget.values()){\r
             String value = Messages.getString("target." + target.name());\r
             combo.addItem(value);\r
             targetMap.put(value, target);\r
@@ -43,11 +43,11 @@ public abstract class ComparisonPairFilterPane extends JPanel{
         return combo;\r
     }\r
 \r
-    public Target getTarget(String value){\r
+    public FilterTarget getTarget(String value){\r
         return targetMap.get(value);\r
     }\r
 \r
-    public String getDisplayTarget(Target target){\r
+    public String getDisplayTarget(FilterTarget target){\r
         return Messages.getString("target." + target.name());\r
     }\r
 \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 2d1cc9b..240ebcb 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
@@ -13,7 +13,7 @@ import javax.swing.JLabel;
 import javax.swing.JTextField;\r
 \r
 import jp.naist.se.stigmata.ComparisonPairFilter;\r
-import jp.naist.se.stigmata.filter.Target;\r
+import jp.naist.se.stigmata.filter.FilterTarget;\r
 import jp.naist.se.stigmata.filter.TargetNameComparisonPairFilter;\r
 import jp.naist.se.stigmata.filter.TargetNameComparisonPairFilterService;\r
 import jp.naist.se.stigmata.spi.ComparisonPairFilterSpi;\r
@@ -77,7 +77,7 @@ public class TargetNameComparisonPairFilterComponentService extends AbstractComp
         public void resetComponents(){\r
             value.setText("");\r
             criterionType.setSelectedIndex(0);\r
-            targetType.setSelectedItem(getDisplayTarget(Target.BOTH_TARGET));\r
+            targetType.setSelectedItem(getDisplayTarget(FilterTarget.BOTH_TARGET));\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 35e4541..ce6328f 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
@@ -13,7 +13,7 @@ import javax.swing.JLabel;
 import javax.swing.JTextField;\r
 \r
 import jp.naist.se.stigmata.ComparisonPairFilter;\r
-import jp.naist.se.stigmata.filter.Target;\r
+import jp.naist.se.stigmata.filter.FilterTarget;\r
 import jp.naist.se.stigmata.filter.TotalElementCountComparisonPairFilter;\r
 import jp.naist.se.stigmata.filter.TotalElementCountComparisonPairFilterService;\r
 import jp.naist.se.stigmata.spi.ComparisonPairFilterSpi;\r
@@ -84,7 +84,7 @@ public class TotalElementCountComparisonPairFilterComponentService extends Abstr
         public void resetComponents(){\r
             threshold.setText("");\r
             criterionType.setSelectedIndex(0);\r
-            targetType.setSelectedItem(getDisplayTarget(Target.BOTH_TARGET));\r
+            targetType.setSelectedItem(getDisplayTarget(FilterTarget.BOTH_TARGET));\r
         }\r
 \r
         @Override\r