--- old/make/langtools/tools/anttasks/PropertiesParserTask.java 2020-04-29 12:11:13.548610666 +0200 +++ /dev/null 2020-02-11 10:29:13.086348146 +0100 @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2014, 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 anttasks; - -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import propertiesparser.PropertiesParser; -import propertiesparser.gen.ClassGenerator; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Resource; - -public class PropertiesParserTask extends MatchingTask { - public void addSrc(Path src) { - if (srcDirs == null) - srcDirs = new Path(getProject()); - srcDirs.add(src); - } - - public void setDestDir(File destDir) { - this.destDir = destDir; - } - - @Override - public void execute() { - List mainOpts = new ArrayList(); - int count = 0; - for (String dir : srcDirs.list()) { - File baseDir = getProject().resolveFile(dir); - DirectoryScanner s = getDirectoryScanner(baseDir); - for (String path : s.getIncludedFiles()) { - if (path.endsWith(".properties")) { - File srcFile = new File(baseDir, path); - String destPath = - path.substring(0, path.lastIndexOf(File.separator) + 1) + - ClassGenerator.toplevelName(srcFile) + ".java"; - File destFile = new File(this.destDir, destPath); - File destDir = destFile.getParentFile(); - // Arguably, the comparison in the next line should be ">", not ">=" - // but that assumes the resolution of the last modified time is fine - // grained enough; in practice, it is better to use ">=". - if (destFile.exists() && destFile.lastModified() >= srcFile.lastModified()) - continue; - destDir.mkdirs(); - mainOpts.add("-compile"); - mainOpts.add(srcFile.getPath()); - mainOpts.add(destDir.getPath()); - count++; - } - } - } - if (mainOpts.size() > 0) { - log("Generating " + count + " resource files to " + destDir, Project.MSG_INFO); - PropertiesParser pp = new PropertiesParser(msg -> log(msg, Project.MSG_INFO)); - boolean ok = pp.run(mainOpts.toArray(new String[mainOpts.size()])); - if (!ok) - throw new BuildException("PropertiesParser failed."); - } - } - - private Path srcDirs; - private File destDir; -} --- /dev/null 2020-02-11 10:29:13.086348146 +0100 +++ new/make/ide/idea/langtools/tools/anttasks/PropertiesParserTask.java 2020-04-29 12:11:13.132610669 +0200 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2014, 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 anttasks; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import propertiesparser.PropertiesParser; +import propertiesparser.gen.ClassGenerator; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.Resource; + +public class PropertiesParserTask extends MatchingTask { + public void addSrc(Path src) { + if (srcDirs == null) + srcDirs = new Path(getProject()); + srcDirs.add(src); + } + + public void setDestDir(File destDir) { + this.destDir = destDir; + } + + @Override + public void execute() { + List mainOpts = new ArrayList(); + int count = 0; + for (String dir : srcDirs.list()) { + File baseDir = getProject().resolveFile(dir); + DirectoryScanner s = getDirectoryScanner(baseDir); + for (String path : s.getIncludedFiles()) { + if (path.endsWith(".properties")) { + File srcFile = new File(baseDir, path); + String destPath = + path.substring(0, path.lastIndexOf(File.separator) + 1) + + ClassGenerator.toplevelName(srcFile) + ".java"; + File destFile = new File(this.destDir, destPath); + File destDir = destFile.getParentFile(); + // Arguably, the comparison in the next line should be ">", not ">=" + // but that assumes the resolution of the last modified time is fine + // grained enough; in practice, it is better to use ">=". + if (destFile.exists() && destFile.lastModified() >= srcFile.lastModified()) + continue; + destDir.mkdirs(); + mainOpts.add("-compile"); + mainOpts.add(srcFile.getPath()); + mainOpts.add(destDir.getPath()); + count++; + } + } + } + if (mainOpts.size() > 0) { + log("Generating " + count + " resource files to " + destDir, Project.MSG_INFO); + PropertiesParser pp = new PropertiesParser(msg -> log(msg, Project.MSG_INFO)); + boolean ok = pp.run(mainOpts.toArray(new String[mainOpts.size()])); + if (!ok) + throw new BuildException("PropertiesParser failed."); + } + } + + private Path srcDirs; + private File destDir; +}