Merge 4de8d3c629 into 737927da26

src/main/java/rife/bld/operations/JavacOptions.java

@@ -154,8 +154,11 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions addExports(Collection<String> modules) {
+        if (isNotEmpty(modules)) {
             return addCommaSeparatedOption("--add-exports", modules);
         }
+        return this;
+    }
 
     /**
      * Specifies additional modules to be considered as required by a given module
@@ -177,8 +180,11 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions addReads(Collection<String> modules) {
+        if (isNotEmpty(modules)) {
             return addCommaSeparatedOption("--add-reads", modules);
         }
+        return this;
+    }
 
     /**
      * Root modules to resolve in addition to the initial modules,
@@ -202,8 +208,11 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.5.18
      */
     public JavacOptions addModules(Collection<String> modules) {
+        if (isNotEmpty(modules)) {
             return addCommaSeparatedOption("--add-modules", modules);
         }
+        return this;
+    }
 
     /**
      * Specify character encoding used by source files
@@ -539,8 +548,11 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.5.18
      */
     public JavacOptions limitModules(Collection<String> modules) {
+        if (isNotEmpty(modules)) {
             return addCommaSeparatedOption("--limit-modules", modules);
         }
+        return this;
+    }
 
     /**
      * Compile only the specified module(s), check timestamps
@@ -562,8 +574,11 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.5.18
      */
     public JavacOptions module(Collection<String> modules) {
+        if (isNotEmpty(modules)) {
             return addCommaSeparatedOption("--module", modules);
         }
+        return this;
+    }
 
     /**
      * /**
@@ -638,8 +653,11 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.1
      */
     public JavacOptions modulePathStrings(Collection<String> paths) {
+        if (isNotEmpty(paths)) {
             return addPathOption(COMPILE_OPTION_MODULE_PATH, paths);
         }
+        return this;
+    }
 
     /**
      * Specify where to find input source files for multiple modules
@@ -648,8 +666,11 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions moduleSourcePathStrings(Collection<String> paths) {
+        if (isNotEmpty(paths)) {
             return addPathOption("--module-source-path", paths);
         }
+        return this;
+    }
 
     /**
      * Specify where to find input source files for multiple modules
@@ -781,8 +802,11 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.5.18
      */
     public JavacOptions processors(Collection<String> classnames) {
+        if (isNotEmpty(classnames)) {
             return addCommaSeparatedOption("-processor", classnames);
         }
+        return this;
+    }
 
     /**
      * Specify a module path where to find annotation processors
@@ -843,8 +867,11 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions processorModulePathStrings(Collection<String> paths) {
+        if (isNotEmpty(paths)) {
             return addPathOption("--processor-module-path", paths);
         }
+        return this;
+    }
 
     /**
      * Specify a module path where to find annotation processors
@@ -905,8 +932,11 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions processorPathStrings(Collection<String> paths) {
+        if (isNotEmpty(paths)) {
             return addPathOption("--processor-path", paths);
         }
+        return this;
+    }
 
     /**
      * Specify where to find annotation processors
@@ -1039,8 +1069,11 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions upgradeModulePathStrings(Collection<String> paths) {
+        if (isNotEmpty(paths)) {
             return addPathOption("--upgrade-module-path", paths);
         }
+        return this;
+    }
 
     /**
      * Override location of upgradeable modules