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

Exceptions wrapping in VFS visitor

Browse Source
This commit is contained in:
Roman Shevchenko
2012-08-25 15:15:15 +04:00
parent 66344d1a49
commit f1dc0dcec7
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
+24 -4
View File
@@ -32,6 +32,9 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import static com.intellij.openapi.vfs.VirtualFileVisitor.Result;
import static com.intellij.openapi.vfs.VirtualFileVisitor.VisitorException;
public class VfsUtilCore {
/**
* Checks whether the <code>ancestor {@link com.intellij.openapi.vfs.VirtualFile}</code> is parent of <code>file
@@ -175,7 +178,7 @@ public class VfsUtilCore {
public static boolean iterateChildrenRecursively(@NotNull final VirtualFile root,
@Nullable final VirtualFileFilter filter,
@NotNull final ContentIterator iterator) {
final VirtualFileVisitor.Result result = visitChildrenRecursively(root, new VirtualFileVisitor() {
final Result result = visitChildrenRecursively(root, new VirtualFileVisitor() {
@NotNull
@Override
public Result visitFileEx(@NotNull VirtualFile file) {
@@ -188,12 +191,12 @@ public class VfsUtilCore {
}
@SuppressWarnings("UnsafeVfsRecursion")
public static VirtualFileVisitor.Result visitChildrenRecursively(@NotNull VirtualFile file, @NotNull VirtualFileVisitor visitor) {
public static Result visitChildrenRecursively(@NotNull VirtualFile file, @NotNull VirtualFileVisitor visitor) throws VisitorException {
visitor.pushFrame();
try {
final boolean visited = visitor.allowVisitFile(file);
if (visited) {
VirtualFileVisitor.Result result = visitor.visitFileEx(file);
Result result = visitor.visitFileEx(file);
if (result.skipChildren) return result;
}
@@ -215,7 +218,7 @@ public class VfsUtilCore {
if (childrenIterable != null) {
for (VirtualFile child : childrenIterable) {
VirtualFileVisitor.Result result = visitChildrenRecursively(child, visitor);
Result result = visitChildrenRecursively(child, visitor);
if (result.skipToParent != null && result.skipToParent != child) return result;
}
}
@@ -231,6 +234,23 @@ public class VfsUtilCore {
}
}
public static <E extends Exception> Result visitChildrenRecursively(@NotNull VirtualFile file,
@NotNull VirtualFileVisitor visitor,
@NotNull Class<E>... classes) throws E {
try {
return visitChildrenRecursively(file, visitor);
}
catch (VisitorException e) {
final Throwable cause = e.getCause();
for (Class<E> eClass : classes) {
if (eClass.isInstance(cause)) {
throw eClass.cast(cause);
}
}
throw e;
}
}
public static boolean isInvalidLink(@NotNull VirtualFile link) {
final VirtualFile target = link.getCanonicalFile();
return target == null || target == link || isAncestor(target, link, true);
platform/core-api/src/com/intellij/openapi/vfs/VirtualFileVisitor.java
+8 -1
View File
@@ -73,6 +73,13 @@ public abstract class VirtualFileVisitor {
}
protected static class VisitorException extends RuntimeException {
public VisitorException(Throwable cause) {
super(cause);
}
}
private boolean myFollowSymLinks = true;
private boolean mySkipRoot = false;
private int myDepthLimit = -1;
@@ -150,7 +157,7 @@ public abstract class VirtualFileVisitor {
frame.put(parameter, value);
}
@Nullable
@SuppressWarnings("ConstantConditions")
public final <T> T get(@NotNull Key<T> parameter) {
if (myParameters == null || myParameters.isEmpty()) {
return null;