MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java] support for both old and new JRT FS layouts (IDEA-143432)

Browse Source
This commit is contained in:
Roman Shevchenko
2015-09-07 15:36:16 +03:00
parent 1b35315869
commit 75326d1aea
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/openapi/vfs/impl/jrt/JrtHandler.java
+11 -5
View File
@@ -43,7 +43,6 @@ class JrtHandler extends ArchiveHandler {
private static final URI ROOT_URI = URI.create("jrt:/");
private static final Map<String, Object> EMPTY_ENV = Collections.emptyMap();
private static final String PREFIX = "/modules";
private static class JrtEntryInfo extends EntryInfo {
private final String myModule;
@@ -79,10 +78,16 @@ class JrtHandler extends ArchiveHandler {
map.put("", createRootEntry());
//FileSystem fs = (FileSystem)getFileSystem();
//Path root = fs.getPath("/modules");
//Files.walk(root).forEachOrdered((p) -> {
//Path root = fs.getPath("/modules"); // b74+
//if (!Files.exists(root)) root = fs.getPath("/");
Object fs = getFileSystem();
Object root = call(getPath, fs, PREFIX, ArrayUtil.EMPTY_STRING_ARRAY);
Object root = call(getPath, fs, "/modules", ArrayUtil.EMPTY_STRING_ARRAY);
if (Boolean.FALSE.equals(call(exists, root, linkOptions))) {
root = call(getPath, fs, "/", ArrayUtil.EMPTY_STRING_ARRAY);
}
final int start = root.toString().length() + 1;
//Files.walk(root).forEachOrdered((p) -> {
Object stream = call(walk, root, Array.newInstance(cls("java.nio.file.FileVisitOption"), 0));
call(forEachOrdered, stream, Proxy.newProxyInstance(
getClass().getClassLoader(), new Class[]{cls("java.util.function.Consumer")}, new InvocationHandler() {
@@ -91,7 +96,7 @@ class JrtHandler extends ArchiveHandler {
//String path = p.toString();
String path = args[0].toString();
int p = path.indexOf('/', PREFIX.length() + 1);
int p = path.indexOf('/', start);
if (p < 0) return null;
String module = path.substring(1, p);
path = path.substring(p + 1);
@@ -152,6 +157,7 @@ class JrtHandler extends ArchiveHandler {
private static final Method newFileSystem = method("java.nio.file.FileSystems#newFileSystem", URI.class, Map.class, ClassLoader.class);
private static final Method getPath = method("java.nio.file.FileSystem#getPath", String.class, String[].class);
private static final Method exists = method("java.nio.file.Files#exists", cls("java.nio.file.Path"), cls("java.nio.file.LinkOption", true));
private static final Method walk = method("java.nio.file.Files#walk", cls("java.nio.file.Path"), cls("java.nio.file.FileVisitOption", true));
private static final Method forEachOrdered = method("java.util.stream.Stream#forEachOrdered", cls("java.util.function.Consumer"));
private static final Method readAttributes =