modules/fxpackager/src/main/java/com/oracle/tools/packager/AbstractBundler.java

rev 6889 : RT-36724 - JavaFX Packager Renaming
Summary: Move java code around to new packages.

@@ -21,39 +21,33 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
-package com.oracle.bundlers;

+package com.oracle.tools.packager;

 
-import com.oracle.bundlers.windows.WindowsBundlerParam;

-import com.sun.javafx.tools.packager.Log;

-import com.sun.javafx.tools.packager.bundlers.ConfigException;

-import com.sun.javafx.tools.packager.bundlers.IOUtils;

-import com.sun.javafx.tools.packager.bundlers.RelativeFileSet;

+import com.oracle.tools.packager.windows.WindowsBundlerParam;

 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.text.MessageFormat;
 import java.util.*;
 
-import static com.oracle.bundlers.StandardBundlerParam.*;

-

 public abstract class AbstractBundler implements Bundler {
 
     private static final ResourceBundle I18N =
-            ResourceBundle.getBundle("com.oracle.bundlers.AbstractBundler");

+            ResourceBundle.getBundle(AbstractBundler.class.getName());

 
     public static final BundlerParamInfo<File> IMAGES_ROOT = new WindowsBundlerParam<>(
             I18N.getString("param.images-root.name"),
             I18N.getString("param.images-root.description"),
             "imagesRoot",
             File.class,
-            params -> new File(BUILD_ROOT.fetchFrom(params), "images"),

+            params -> new File(StandardBundlerParam.BUILD_ROOT.fetchFrom(params), "images"),

             (s, p) -> null);
 
     //do not use file separator -
     // we use it for classpath lookup and there / are not platform specific
     public final static String BUNDLER_PREFIX = "package/";

@@ -62,11 +56,11 @@
 
     protected Class baseResourceLoader = null;
     
     //helper method to test if required files are present in the runtime
     public void testRuntime(Map<String, ? super Object> p, String[] file) throws ConfigException {
-        RelativeFileSet runtime = RUNTIME.fetchFrom(p);

+        RelativeFileSet runtime = StandardBundlerParam.RUNTIME.fetchFrom(p);

         if (runtime == null) {
             return; //null runtime is ok (request to use system)
         }
         Set<String> rfiles = runtime.getIncludedFiles();
         for (String aFile : file) {