update

diff --git a/pom.xml b/pom.xml
index c1cba67..6bd3eee 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,6 @@
 
   <groupId>jp.sourceforge.stigmata</groupId>
   <artifactId>stigmata-core</artifactId>
-  <version>4.0</version>
   <packaging>jar</packaging>
 
   <name>Stigmata: Java Birthmark Toolkit Core Library</name>

diff --git a/src/main/java/jp/sourceforge/stigmata/Main.java b/src/main/java/jp/sourceforge/stigmata/Main.java
index fdf6a3c..d0553ab 100644 (file)
--- a/src/main/java/jp/sourceforge/stigmata/Main.java
+++ b/src/main/java/jp/sourceforge/stigmata/Main.java
@@ -5,7 +5,6 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import jp.sourceforge.stigmata.command.HelpCommand;
@@ -54,7 +53,6 @@ public final class Main{
 
         BirthmarkContext context = stigmata.createContext();
         updateContext(context, commandLine);
-        BirthmarkEnvironment env = context.getEnvironment();
 
         StigmataCommandFactory factory = StigmataCommandFactory.getInstance();
         factory.registerCommand(new HelpCommand(options));

diff --git a/src/main/java/jp/sourceforge/stigmata/filter/BirthmarkElementCountComparisonPairFilter.java b/src/main/java/jp/sourceforge/stigmata/filter/BirthmarkElementCountComparisonPairFilter.java
index c7a22f2..6760928 100644 (file)
--- a/src/main/java/jp/sourceforge/stigmata/filter/BirthmarkElementCountComparisonPairFilter.java
+++ b/src/main/java/jp/sourceforge/stigmata/filter/BirthmarkElementCountComparisonPairFilter.java
@@ -168,6 +168,15 @@ public class BirthmarkElementCountComparisonPairFilter extends AbstractCompariso
         case LESS_THAN:      sb.append(" <  "); break;
         case EQUALS_AS:      sb.append(" == "); break;
         case NOT_EQUALS_AS:  sb.append(" != "); break;
+        // The followings are not used.
+        case ENDS_WITH:
+        case MATCH:
+        case NOT_ENDS_WITH:
+        case NOT_MATCH:
+        case NOT_STARTS_WITH:
+        case STARTS_WITH:
+        default:
+            break;
         }
         sb.append(Integer.toString(getThreshold()));
 

diff --git a/src/main/java/jp/sourceforge/stigmata/filter/SimilarityComparisonPairFilter.java b/src/main/java/jp/sourceforge/stigmata/filter/SimilarityComparisonPairFilter.java
index 5729992..94f9ff6 100644 (file)
--- a/src/main/java/jp/sourceforge/stigmata/filter/SimilarityComparisonPairFilter.java
+++ b/src/main/java/jp/sourceforge/stigmata/filter/SimilarityComparisonPairFilter.java
@@ -91,6 +91,15 @@ public class SimilarityComparisonPairFilter extends AbstractComparisonPairFilter
         case LESS_THAN:      sb.append(" <  "); break;
         case EQUALS_AS:      sb.append(" == "); break;
         case NOT_EQUALS_AS:  sb.append(" != "); break;
+        // The followings are not used.
+        case ENDS_WITH:
+        case MATCH:
+        case NOT_ENDS_WITH:
+        case NOT_MATCH:
+        case NOT_STARTS_WITH:
+        case STARTS_WITH:
+        default:
+            break;
         }
         sb.append(getThreshold());
         return new String(sb);

diff --git a/src/main/java/jp/sourceforge/stigmata/filter/TargetNameComparisonPairFilter.java b/src/main/java/jp/sourceforge/stigmata/filter/TargetNameComparisonPairFilter.java
index 293c738..efe7bd7 100644 (file)
--- a/src/main/java/jp/sourceforge/stigmata/filter/TargetNameComparisonPairFilter.java
+++ b/src/main/java/jp/sourceforge/stigmata/filter/TargetNameComparisonPairFilter.java
@@ -153,12 +153,20 @@ public class TargetNameComparisonPairFilter extends AbstractComparisonPairFilter
         case ONE_OF_TARGETS: sb.append("(target1|target2).name"); break; 
         }
         switch(getCriterion()){
-        case STARTS_WITH:     sb.append(" starts with ");     break;
-        case NOT_STARTS_WITH: sb.append(" not starts with "); break;
-        case ENDS_WITH:       sb.append(" ends with ");       break;
-        case NOT_ENDS_WITH:   sb.append(" not ends with ");   break;
-        case EQUALS_AS:       sb.append(" equals as ");       break;
-        case NOT_EQUALS_AS:   sb.append(" not equals as ");   break;
+        case STARTS_WITH:     sb.append(" starts with ");        break;
+        case NOT_STARTS_WITH: sb.append(" not starts with ");    break;
+        case ENDS_WITH:       sb.append(" ends with ");          break;
+        case NOT_ENDS_WITH:   sb.append(" not ends with ");      break;
+        case EQUALS_AS:       sb.append(" equals as ");          break;
+        case NOT_EQUALS_AS:   sb.append(" not equals as ");      break;
+        case GREATER_EQUALS:  sb.append(" greater equals than"); break;
+        case GREATER_THAN:    sb.append(" greater than ");       break;
+        case LESS_EQUALS:     sb.append(" less equals than ");   break;
+        case LESS_THAN:       sb.append(" less than ");          break;
+        case MATCH:           sb.append(" match ");              break;
+        case NOT_MATCH:       sb.append(" not match ");          break;
+        default:
+            break;
         }
         sb.append(getValue());
 

diff --git a/src/main/java/jp/sourceforge/stigmata/filter/TotalElementCountComparisonPairFilter.java b/src/main/java/jp/sourceforge/stigmata/filter/TotalElementCountComparisonPairFilter.java
index a62a3d5..573da4d 100644 (file)
--- a/src/main/java/jp/sourceforge/stigmata/filter/TotalElementCountComparisonPairFilter.java
+++ b/src/main/java/jp/sourceforge/stigmata/filter/TotalElementCountComparisonPairFilter.java
@@ -156,6 +156,15 @@ public class TotalElementCountComparisonPairFilter extends AbstractComparisonPai
         case LESS_THAN:      sb.append(" <  "); break;
         case EQUALS_AS:      sb.append(" == "); break;
         case NOT_EQUALS_AS:  sb.append(" != "); break;
+        // The followings are not used.
+        case ENDS_WITH:
+        case MATCH:
+        case NOT_ENDS_WITH:
+        case NOT_MATCH:
+        case NOT_STARTS_WITH:
+        case STARTS_WITH:
+        default:
+            break;
         }
         sb.append(Integer.toString(getThreshold()));
 

diff --git a/src/main/java/jp/sourceforge/stigmata/result/history/ExtractedBirthmarkServiceManager.java b/src/main/java/jp/sourceforge/stigmata/result/history/ExtractedBirthmarkServiceManager.java
index 694f1da..5be03a1 100644 (file)
--- a/src/main/java/jp/sourceforge/stigmata/result/history/ExtractedBirthmarkServiceManager.java
+++ b/src/main/java/jp/sourceforge/stigmata/result/history/ExtractedBirthmarkServiceManager.java
@@ -110,13 +110,21 @@ public class ExtractedBirthmarkServiceManager{
     private void addValuesFromSystemFile(Set<String> values){
         File file = new File(BirthmarkEnvironment.getStigmataHome(), "storelocations.txt");
         if(file.exists()){
+            BufferedReader in = null;
             try{
-                BufferedReader in = new BufferedReader(new FileReader(file));
+                in = new BufferedReader(new FileReader(file));
                 String line;
                 while((line = in.readLine()) != null){
                     values.add(line);
                 }
             } catch(IOException e){
+            } finally{
+                if(in != null){
+                    try{
+                        in.close();
+                    } catch(IOException e){
+                    }
+                }
             }
         }
     }