From 2385df357e2f6f00676c9836ff5bbe3fc15223f8 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 23 Nov 2009 14:28:50 +0300 Subject: [PATCH] bindToElement call should catch IOE --- .../move/moveClassesOrPackages/MoveJavaFileHandler.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java index 3810b2a29d07..69264c50165a 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java @@ -22,6 +22,7 @@ package com.intellij.refactoring.move.moveClassesOrPackages; import com.intellij.codeInsight.ChangeContextUtil; import com.intellij.codeInsight.daemon.impl.CollectHighlightsUtil; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFileHandler; @@ -35,6 +36,7 @@ import java.util.List; import java.util.Map; public class MoveJavaFileHandler extends MoveFileHandler { + private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveClassesOrPackages.MoveJavaFileHandler"); @Override public boolean canProcessElement(PsiFile element) { return element instanceof PsiJavaFile && !JspPsiUtil.isInJspFile(element) && !CollectHighlightsUtil.isOutsideSourceRootJavaFile(element); @@ -69,7 +71,11 @@ public class MoveJavaFileHandler extends MoveFileHandler { final PsiElement newElement = oldToNewMap.get(oldElement); final PsiReference reference = moveRenameUsage.getReference(); if (reference != null) { - reference.bindToElement(newElement); + try { + reference.bindToElement(newElement); + } catch (IncorrectOperationException ex) { + LOG.error(ex); + } } } }