--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/ant/Resources.java 2016-11-02 13:32:23.295475792 -0400 +++ /dev/null 2016-10-31 09:37:02.128008072 -0400 @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2011, 2013, 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 - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * 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.sun.javafx.tools.ant; - -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import com.sun.javafx.tools.resource.PackagerResource; -import org.apache.tools.ant.types.DataType; -import org.apache.tools.ant.types.resources.FileResource; - -/** - * Collection of resources used by application. - * Defined as set of JavaFX FileSet's. Could be reused using id/refid. - * - * In the example below both rx:resource elements define collection consisting - * of s.jar in the dist directory: - * 
- *    <fx:resource id="aaa">
- *       <fx:fileset dir="dist" includes="s.jar"/>
- *    </fx:resource>
- *
- *    <fx:resource refid="aaa"/>
- *
- * - * @ant.type name="resources" category="javafx" - */ -public class Resources extends DataType { - private List rsets = - new LinkedList(); - - private Resources get() { - if (isReference()) { - return (Resources) getRefid().getReferencedObject(); - } - return this; - } - - public List getResources() { - return get().rsets; - } - - public com.sun.javafx.tools.ant.FileSet createFileSet() { - com.sun.javafx.tools.ant.FileSet r = new com.sun.javafx.tools.ant.FileSet(); - rsets.add(r); - return r; - } - - //not really accurate as platfrom specific resources are not handled - public String exportAsClassPath() { - StringBuffer sb = new StringBuffer(); - - List jars = new LinkedList(); - getJars("progress", jars); - getJars("eager", jars); - getJars("lazy", jars); - - for (String s : jars) { - if (sb.length() != 0) { - sb.append(" "); //jars to be separated by space - } - sb.append(s); - } - return sb.toString(); - } - - private void getJars(String mode, List lst) { - for (com.sun.javafx.tools.ant.FileSet r : getResources()) { - if (mode.equals(r.getMode())) { - for (final Iterator i = r.iterator(); i.hasNext();) { - FileResource fr = (FileResource) i.next(); - PackagerResource p = new PackagerResource(fr.getBaseDir(), - fr.getFile()); - lst.add(p.getRelativePath()); - } - } - } - } -} --- /dev/null 2016-10-31 09:37:02.128008072 -0400 +++ new/modules/jdk.packager/src/antplugin/java/com/sun/javafx/tools/ant/Resources.java 2016-11-02 13:32:23.139479337 -0400 @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2011, 2013, 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 + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * 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.sun.javafx.tools.ant; + +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import com.sun.javafx.tools.resource.PackagerResource; +import org.apache.tools.ant.types.DataType; +import org.apache.tools.ant.types.resources.FileResource; + +/** + * Collection of resources used by application. + * Defined as set of JavaFX FileSet's. Could be reused using id/refid. + * + * In the example below both rx:resource elements define collection consisting + * of s.jar in the dist directory: + * 
+ *    <fx:resource id="aaa">
+ *       <fx:fileset dir="dist" includes="s.jar"/>
+ *    </fx:resource>
+ *
+ *    <fx:resource refid="aaa"/>
+ *
+ * + * @ant.type name="resources" category="javafx" + */ +public class Resources extends DataType { + private List rsets = + new LinkedList(); + + private Resources get() { + if (isReference()) { + return (Resources) getRefid().getReferencedObject(); + } + return this; + } + + public List getResources() { + return get().rsets; + } + + public com.sun.javafx.tools.ant.FileSet createFileSet() { + com.sun.javafx.tools.ant.FileSet r = new com.sun.javafx.tools.ant.FileSet(); + rsets.add(r); + return r; + } + + //not really accurate as platfrom specific resources are not handled + public String exportAsClassPath() { + StringBuffer sb = new StringBuffer(); + + List jars = new LinkedList(); + getJars("progress", jars); + getJars("eager", jars); + getJars("lazy", jars); + + for (String s : jars) { + if (sb.length() != 0) { + sb.append(" "); //jars to be separated by space + } + sb.append(s); + } + return sb.toString(); + } + + private void getJars(String mode, List lst) { + for (com.sun.javafx.tools.ant.FileSet r : getResources()) { + if (mode.equals(r.getMode())) { + for (final Iterator i = r.iterator(); i.hasNext();) { + FileResource fr = (FileResource) i.next(); + PackagerResource p = new PackagerResource(fr.getBaseDir(), + fr.getFile()); + lst.add(p.getRelativePath()); + } + } + } + } +}