unwrap: allow to unwrap catch for try-with-resources statement

This commit is contained in:
Anna Kozlova
2014-01-02 11:59:12 +01:00
parent 63cf5b9762
commit ef71e0bc15
@@ -28,11 +28,12 @@ public class JavaCatchRemover extends JavaUnwrapper {
@Override
public boolean isApplicableTo(PsiElement e) {
return e instanceof PsiCatchSection && tryHasSeveralCatches(e);
return e instanceof PsiCatchSection && tryHasSeveralCatchesOrResourcesDefined(e);
}
private boolean tryHasSeveralCatches(PsiElement el) {
return ((PsiTryStatement)el.getParent()).getCatchBlocks().length > 1;
private static boolean tryHasSeveralCatchesOrResourcesDefined(PsiElement el) {
PsiTryStatement tryStatement = (PsiTryStatement)el.getParent();
return tryStatement.getCatchBlocks().length > 1 || tryStatement.getResourceList() != null;
}
@Override