update format

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

diff --git a/src/main/java/jp/naist/se/stigmata/Main.java b/src/main/java/jp/naist/se/stigmata/Main.java
index 2e6559f..1d98496 100755 (executable)
--- a/src/main/java/jp/naist/se/stigmata/Main.java
+++ b/src/main/java/jp/naist/se/stigmata/Main.java
@@ -76,8 +76,7 @@ public class Main{
         boolean exitFlag = executeOption(commandLine, options);\r
 \r
         if(!exitFlag){\r
-            if(!("gui".equals(mode) || "list".equals(mode))\r
-                && (arguments == null || arguments.length == 0)){\r
+            if(!("gui".equals(mode) || "list".equals(mode)) && (arguments == null || arguments.length == 0)){\r
 \r
                 printHelp(options);\r
                 return;\r
@@ -107,13 +106,13 @@ public class Main{
      * extract birthmarks.\r
      */\r
     private void extractBirthmarks(Stigmata stigmata, String[] birthmarks,\r
-            String[] args, String format){\r
+                                     String[] args, String format){\r
         try{\r
-            BirthmarkSet[] holders = stigmata.extract(birthmarks, args, context);\r
+            BirthmarkSet[] sets = stigmata.extract(birthmarks, args, context);\r
 \r
             ResultFormatSpi spi = manager.getService(format);\r
             BirthmarkExtractionResultFormat formatter = spi.getExtractionResultFormat();\r
-            formatter.printResult(new PrintWriter(System.out), holders);\r
+            formatter.printResult(new PrintWriter(System.out), sets);\r
         }catch(Exception ex){\r
             ex.printStackTrace();\r
         }\r
@@ -123,11 +122,10 @@ public class Main{
      * \r
      */\r
     private void compareBirthmarks(Stigmata stigmata, String[] birthmarks,\r
-            String[] filters, String[] args, String format){\r
+                                     String[] filters, String[] args, String format){\r
         try{\r
-            BirthmarkSet[] holders = stigmata\r
-                    .extract(birthmarks, args, context);\r
-            ComparisonResultSet resultset = stigmata.compare(holders, context);\r
+            BirthmarkSet[] sets = stigmata.extract(birthmarks, args, context);\r
+            ComparisonResultSet resultset = stigmata.compare(sets, context);\r
             if(filters != null){\r
                 resultset = stigmata.filter(resultset, filters);\r
             }\r
@@ -271,7 +269,7 @@ public class Main{
         }\r
         System.out.println();\r
         System.out.println("Copyright (C) by Haruaki Tamada, Ph.D.");\r
-        System.out.println("Please notify us some bugs and requests to <birthmark-analysis@se.aist-nara.ac.jp>");\r
+        System.out.println("Please notify us some bugs and requests to <birthmark-analysis[ at ]se.aist-nara.ac.jp>");\r
     }\r
 \r
     private void printLicense(){\r