130128版スキーマ対応

[mikutoga/Pmd2XML.git] / src / main / java / jp / sfjp / mikutoga / pmd2xml / Pmd2Xml.java

diff --git a/src/main/java/jp/sourceforge/mikutoga/pmd2xml/Pmd2Xml.java b/src/main/java/jp/sfjp/mikutoga/pmd2xml/Pmd2Xml.java
similarity index 97%
rename from src/main/java/jp/sourceforge/mikutoga/pmd2xml/Pmd2Xml.java
rename to src/main/java/jp/sfjp/mikutoga/pmd2xml/Pmd2Xml.java
index 8e0b3c4..c4c4c07 100644 (file)
--- a/src/main/java/jp/sourceforge/mikutoga/pmd2xml/Pmd2Xml.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd2xml/Pmd2Xml.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2010 MikuToga Partners
  */
 
-package jp.sourceforge.mikutoga.pmd2xml;
+package jp.sfjp.mikutoga.pmd2xml;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -203,7 +203,7 @@ public final class Pmd2Xml {
                .append('\n');
 
         ERROUT.println(appInfo.toString());
-        ERROUT.println(OptInfo.getConsoleHelp());
+        ERROUT.println(OptSwitch.getConsoleHelp());
 
         return;
     }
@@ -307,14 +307,19 @@ public final class Pmd2Xml {
 
         Pmd2XmlConv converter = new Pmd2XmlConv();
 
-        OptInfo optInfo = OptInfo.parseOption(args);
+        OptInfo optInfo;
+        try{
+            optInfo = OptInfo.parseOption(args);
+        }catch(CmdLineException e){
+            String optErrMsg = e.getLocalizedMessage();
+            errMsg(optErrMsg);
+            exit(EXIT_OPT);
+            return;
+        }
+
         if(optInfo.needHelp()){
             putHelp();
             exit(EXIT_OK);
-        }else if(optInfo.hasError()){
-            String optErrMsg = optInfo.getErrorMessage();
-            errMsg(optErrMsg);
-            exit(EXIT_OPT);
         }
 
         String inputFile = optInfo.getInFilename();