Merge 4de8d3c629 into 737927da26

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

@@ -154,7 +154,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions addExports(Collection<String> modules) {
-        return addCommaSeparatedOption("--add-exports", modules);
+        if (isNotEmpty(modules)) {
+            return addCommaSeparatedOption("--add-exports", modules);
+        }
+        return this;
     }
 
     /**
@@ -177,7 +180,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions addReads(Collection<String> modules) {
-        return addCommaSeparatedOption("--add-reads", modules);
+        if (isNotEmpty(modules)) {
+            return addCommaSeparatedOption("--add-reads", modules);
+        }
+        return this;
     }
 
     /**
@@ -202,7 +208,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.5.18
      */
     public JavacOptions addModules(Collection<String> modules) {
-        return addCommaSeparatedOption("--add-modules", modules);
+        if (isNotEmpty(modules)) {
+            return addCommaSeparatedOption("--add-modules", modules);
+        }
+        return this;
     }
 
     /**
@@ -539,7 +548,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.5.18
      */
     public JavacOptions limitModules(Collection<String> modules) {
-        return addCommaSeparatedOption("--limit-modules", modules);
+        if (isNotEmpty(modules)) {
+            return addCommaSeparatedOption("--limit-modules", modules);
+        }
+        return this;
     }
 
     /**
@@ -562,7 +574,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.5.18
      */
     public JavacOptions module(Collection<String> modules) {
-        return addCommaSeparatedOption("--module", modules);
+        if (isNotEmpty(modules)) {
+            return addCommaSeparatedOption("--module", modules);
+        }
+        return this;
     }
 
     /**
@@ -638,7 +653,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.1
      */
     public JavacOptions modulePathStrings(Collection<String> paths) {
-        return addPathOption(COMPILE_OPTION_MODULE_PATH, paths);
+        if (isNotEmpty(paths)) {
+            return addPathOption(COMPILE_OPTION_MODULE_PATH, paths);
+        }
+        return this;
     }
 
     /**
@@ -648,7 +666,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions moduleSourcePathStrings(Collection<String> paths) {
-        return addPathOption("--module-source-path", paths);
+        if (isNotEmpty(paths)) {
+            return addPathOption("--module-source-path", paths);
+        }
+        return this;
     }
 
     /**
@@ -781,7 +802,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.5.18
      */
     public JavacOptions processors(Collection<String> classnames) {
-        return addCommaSeparatedOption("-processor", classnames);
+        if (isNotEmpty(classnames)) {
+            return addCommaSeparatedOption("-processor", classnames);
+        }
+        return this;
     }
 
     /**
@@ -843,7 +867,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions processorModulePathStrings(Collection<String> paths) {
-        return addPathOption("--processor-module-path", paths);
+        if (isNotEmpty(paths)) {
+            return addPathOption("--processor-module-path", paths);
+        }
+        return this;
     }
 
     /**
@@ -905,7 +932,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions processorPathStrings(Collection<String> paths) {
-        return addPathOption("--processor-path", paths);
+        if (isNotEmpty(paths)) {
+            return addPathOption("--processor-path", paths);
+        }
+        return this;
     }
 
     /**
@@ -1039,7 +1069,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions upgradeModulePathStrings(Collection<String> paths) {
-        return addPathOption("--upgrade-module-path", paths);
+        if (isNotEmpty(paths)) {
+            return addPathOption("--upgrade-module-path", paths);
+        }
+        return this;
     }
 
     /**