improved base folder detection if started through CLI

Author: raydac

jcp/src/main/java/com/igormaznitsa/jcp/JcpPreprocessor.java

@@ -77,9 +77,12 @@
  * The main class implements the Java Comment Preprocessor, it has the main
  * method and can be started from a command string
  * Base directory for preprocessing can be provided through System property 'jcp.base.dir'
+ * if it is not provided then current work directory will be recognized as base one.
  */
 public final class JcpPreprocessor {
 
+  private static final String PROPERTY_JCP_BASE_DIR = "jcp.base.dir";
+
   static final CommandLineHandler[] COMMAND_LINE_HANDLERS = new CommandLineHandler[] {
       new HelpHandler(),
       new InCharsetHandler(),
@@ -147,20 +150,11 @@ public static void main(final String... args) {
 
 
   private static File getBaseDir() {
-    String baseDirInProperties = System.getProperty("jcp.base.dir");
-    if (baseDirInProperties == null) {
-      File result;
-      try {
-        final File jarFile = new File(
-            JcpPreprocessor.class.getProtectionDomain().getCodeSource().getLocation().toURI());
-        result = jarFile.isDirectory() ? jarFile : jarFile.getParentFile();
-      } catch (Exception ex) {
-        result = new File("");
-      }
-      return result;
-    } else {
-      return new File(baseDirInProperties);
-    }
+    final String baseDirInProperties = System
+        .getProperty(PROPERTY_JCP_BASE_DIR,
+            System.getProperty("user.dir", new File("").getAbsolutePath())
+        );
+    return new File(baseDirInProperties);
   }