shemnon avatar shemnon committed 2f287e8

RT-30792 - restore empty/all means all processing

Comments (0)

Files changed (5)

deploy/packager/src/com/sun/javafx/tools/packager/bundlers/LinuxDebBundler.java

     @Override
     boolean validate(BundleParams p) throws Bundler.UnsupportedPlatformException, Bundler.ConfigException {
         if (!(p.type == Bundler.BundleType.ALL || p.type == Bundler.BundleType.INSTALLER)
-                 || !(p.bundleFormat.contains("deb"))) {
+                 || !(p.bundleFormat.isEmpty() || p.bundleFormat.contains("deb"))) {
             return false;
         }
         //run basic validation to ensure requirements are met

deploy/packager/src/com/sun/javafx/tools/packager/bundlers/LinuxRPMBundler.java

     @Override
     boolean validate(BundleParams p) throws Bundler.UnsupportedPlatformException, Bundler.ConfigException {
         if (!(p.type == Bundler.BundleType.ALL || p.type == Bundler.BundleType.INSTALLER)
-                 || !(p.bundleFormat.contains("rpm"))) {
+                 || !(p.bundleFormat.isEmpty() || p.bundleFormat.contains("rpm"))) {
             return false;
         }
         //run basic validation to ensure requirements are met

deploy/packager/src/com/sun/javafx/tools/packager/bundlers/MacDMGBundler.java

     boolean validate(BundleParams p)
             throws UnsupportedPlatformException, ConfigException {
         if (!(p.type == Bundler.BundleType.ALL || p.type == Bundler.BundleType.INSTALLER)
-                 || !(p.bundleFormat.contains("dmg"))) {
+                 || !(p.bundleFormat.isEmpty() || p.bundleFormat.contains("dmg"))) {
             return false;
         }
         //run basic validation to ensure requirements are met

deploy/packager/src/com/sun/javafx/tools/packager/bundlers/WinExeBundler.java

     @Override
     boolean validate(BundleParams p) throws Bundler.UnsupportedPlatformException, Bundler.ConfigException {
         if (!(p.type == Bundler.BundleType.ALL || p.type == Bundler.BundleType.INSTALLER)
-                 || !(p.bundleFormat.contains("exe"))) {
+                 || !(p.bundleFormat.isEmpty() || p.bundleFormat.contains("exe"))) {
             return false;
         }
         //run basic validation to ensure requirements are met

deploy/packager/src/com/sun/javafx/tools/packager/bundlers/WinMsiBundler.java

     @Override
     boolean validate(BundleParams p) throws UnsupportedPlatformException, ConfigException {
         if (!(p.type == Bundler.BundleType.ALL || p.type == Bundler.BundleType.INSTALLER)
-                 || !(p.bundleFormat.contains("msi"))) {
+                 || !(p.bundleFormat.isEmpty() || p.bundleFormat.contains("msi"))) {
             return false;
         }
         //run basic validation to ensure requirements are met
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.