archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8061876: replace java.io.File with java.nio.file.Path (again)

Browse source 
Reviewed-by: ksrini, jlahoda
This commit is contained in:
Jonathan Gibbons 2014-11-21 10:38:43 -08:00
parent 8bf55955df
commit bdf693fcc5
38 changed files with 678 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

5
langtools/test/tools/javac/unicode/SupplementaryJavaID6.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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
@ -26,7 +26,8 @@
* @bug 4914724 4973116 5014511
* @summary Ensure that a supplementary character can be used as part/whole of a
* class name on platforms that have Unicode aware filesystems.
* @run main SupplementaryJavaID6
* @build Wrapper
* @run main Wrapper SupplementaryJavaID6
*/
public class SupplementaryJavaID6 {

78
langtools/test/tools/javac/unicode/Wrapper.java Normal file
View file

@ -0,0 +1,78 @@
/*
* 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.
*/
import java.io.File;
import java.lang.reflect.Method;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
public class Wrapper {
public static void main(String... args) throws Exception {
if (!isSupplementaryCharactersSupported()) {
System.out.println("Unicode supplementary characters in filenames not supported: pass by default");
return;
}
String testClassName = args[0];
String[] testArgs = Arrays.copyOfRange(args, 1, args.length);
File srcDir = new File(System.getProperty("test.src"));
File clsDir = new File(System.getProperty("test.classes"));
File src = new File(srcDir, testClassName + ".java");
File cls = new File(clsDir, testClassName + ".class");
if (cls.lastModified() < src.lastModified()) {
System.err.println("Recompiling test class...");
String[] javacArgs = { "-d", clsDir.getPath(), src.getPath() };
int rc = com.sun.tools.javac.Main.compile(javacArgs);
if (rc != 0)
throw new Exception("compilation failed");
}
Class<?> mainClass = Class.forName(testClassName);
Method main = mainClass.getMethod("main", String[].class);
main.invoke(null, new Object[] { testArgs });
}
private static boolean isSupplementaryCharactersSupported() {
try {
String s = "p--\ud801\udc00--";
System.err.println("Trying: Paths.get(" + s + ")");
Path p1 = Paths.get(s);
System.err.println("Found: " + p1);
System.err.println("Trying: p1.resolve(" + s + ")");
Path p2 = p1.resolve(s);
System.err.println("Found: " + p2);
return p1.toString().equals(s) && p2.toString().equals(s + java.io.File.separator + s);
} catch (InvalidPathException e) {
System.err.println(e);
return false;
}
}
}