modules/fxpackager/src/main/java/com/sun/javafx/tools/ant/Application.java

rev 9619 : imported patch 9-jake-fxpackager.patch

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -59,10 +59,15 @@
     String id = null;
     boolean embeddedIntoSwing = false;
     String version = null;
     Boolean daemon = null;
 
+    public List<Argument> addModule = new LinkedList<Argument>();
+    public List<Argument> limitModule = new LinkedList<Argument>();
+    String jdkModulePath;
+    boolean detectModules;
+
     public void setVersion(String v) {
         version = v;
     }
 
     public void setToolkit(String v) {

@@ -178,10 +183,98 @@
      */
     public void setDaemon(boolean b) {
         daemon = b;
     }
 
+
+    /**
+     * "addModule" declaration for the application's runtime.
+     *
+     * Modules can be specified per-element, or comma/colon/semi-colon/space separated
+     *
+     * @ant.not-required Default is to bundle the whole platform
+     */
+    public Argument createAddModule() {
+        Argument a = new Argument();
+        addModule.add(a);
+        return a;
+    }
+
+    /**
+     * "addModule" declaration for the application's runtime
+     *
+     * @ant.not-required Default is to bundle the whole platform
+     */
+    List<String> getAddModule() {
+        List<String> lst = new LinkedList();
+        for(Argument a: arguments) {
+            for (String s : a.value.split("[:;,\\s]+")) {
+                lst.add(s);
+            }
+        }
+        return lst;
+    }
+
+    /**
+     * "limitModule" declaration for the application's runtime.
+     *
+     * Modules can be specified per-element, or comma/colon/semi-colon/space separated
+     *
+     * @ant.not-required Default is to bundle the whole platform
+     */
+    public Argument createLimitModule() {
+        Argument a = new Argument();
+        addModule.add(a);
+        return a;
+    }
+
+    /**
+     * "limitModule" declaration for the application's runtime
+     *
+     * @ant.not-required Default is to bundle the whole platform
+     */
+    List<String> getLimitModule() {
+        List<String> lst = new LinkedList();
+        for(Argument a: arguments) {
+            for (String s : a.value.split("[:;,\\s]+")) {
+                lst.add(s);
+            }
+        }
+        return lst;
+    }
+
+    /**
+     * Whether or not the bundler should attempt to detect and add used modules
+     */
+    public boolean getDetectModules() {
+        return detectModules;
+    }
+
+    /**
+     * Whether or not the bundler should attempt to detect and add used modules
+     * @ant.not-required default is false
+     */
+    public void setDetectModules(boolean Value) {
+        this.detectModules = Value;
+    }
+
+    /**
+     * Module path within the running applicaiton
+     */
+    public String getJdkModulePath() {
+        return jdkModulePath;
+    }
+
+    /**
+     * Module path within the running applicaiton
+     *
+     * @ant.not-required default is $PACKAGEPATH/modules
+     */
+    public void setJdkModulePath(String Value) {
+        this.jdkModulePath = Value;
+    }
+
     //return instance that actually has data. Could be referenced object ...
     public Application get() {
         return isReference() ?
                 (Application) getRefid().getReferencedObject() : this;
     }