cleanup: replace unnamed RuntimeException with dedicated ConflictException

java/java-tests/testSrc/com/intellij/refactoring/EncapsulateFieldsTest.java

@@ -120,7 +120,7 @@ public class EncapsulateFieldsTest extends MultiFileTestCase{
       LocalFileSystem.getInstance().refresh(false);
       FileDocumentManager.getInstance().saveAllDocuments();
     }
-    catch (Exception e) {
+    catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
       if (conflicts != null) {
         Assert.assertEquals(conflicts, e.getMessage());
         return;

java/java-tests/testSrc/com/intellij/refactoring/ExtractClassTest.java

@@ -125,7 +125,7 @@ public class ExtractClassTest extends MultiFileTestCase{
       LocalFileSystem.getInstance().refresh(false);
       FileDocumentManager.getInstance().saveAllDocuments();
     }
-    catch (Exception e) {
+    catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
       if (conflicts != null) {
         Assert.assertEquals(e.getMessage(), conflicts);
         return;

java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java

@@ -50,7 +50,7 @@ public class InlineSuperClassTest extends MultiFileTestCase {
         }
       });
     }
-    catch (RuntimeException e) {
+    catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
       if (fail) {
         return;
       }

java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterObjectTest.java

@@ -137,7 +137,7 @@ public class IntroduceParameterObjectTest extends MultiFileTestCase{
     try {
       doTestExistingClass(existingClassName, existingClassPackage);
     }
-    catch (RuntimeException e) {
+    catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
       assertEquals(exceptionMessage, e.getMessage());
       return;
     }

java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java

@@ -47,7 +47,7 @@ public class IntroduceParameterTest extends LightCodeInsightTestCase {
         fail("Conflict expected");
       }
     }
-    catch (Exception e) {
+    catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
       if (conflict == null) {
         throw e;
       }

java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java

@@ -58,7 +58,7 @@ public class MoveClassTest extends CodeInsightTestCase {
       doTest("classAndSecondary", new String[]{"pack1.Class1", "pack1.Class2"}, "pack2");
       fail("Conflicts expected");
     }
-    catch (RuntimeException e) {
+    catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
       assertEquals("A package-local class <b><code>Class2</code></b> will no longer be accessible from field <b><code>User.class2</code></b>", e.getMessage());
     }
   }

java/java-tests/testSrc/com/intellij/refactoring/MoveMembersTest.java

@@ -93,7 +93,7 @@ public class MoveMembersTest extends MultiFileTestCase {
       doTest("B", "A", 0);
       fail("conflict expected");
     }
-    catch (Exception e) {
+    catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
       assertEquals("Field <b><code>B.ONE</code></b> has write access but is moved to an interface", e.getMessage());
     }
   }

java/java-tests/testSrc/com/intellij/refactoring/PushDownImportsTest.java

@@ -58,7 +58,7 @@ public class PushDownImportsTest extends MultiFileTestCase {
         }
       });
     }
-    catch (RuntimeException e) {
+    catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
       if (fail) {
         return;
       }

java/java-tests/testSrc/com/intellij/refactoring/RemoveMiddleManTest.java

@@ -54,7 +54,7 @@ public class RemoveMiddleManTest extends MultiFileTestCase{
           FileDocumentManager.getInstance().saveAllDocuments();
           if (conflict != null) fail("Conflict expected");
         }
-        catch (Exception e) {
+        catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
           if (conflict == null) throw e;
           assertEquals(conflict, e.getMessage());
         }

java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java

@@ -90,7 +90,7 @@ public class ReplaceConstructorWithBuilderTest extends MultiFileTestCase {
             fail("Conflicts were not detected:" + conflicts);
           }
         }
-        catch (Exception e) {
+        catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
 
           if (conflicts == null) {
             fail("Conflict detected:" + e.getMessage());

java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java

@@ -30,7 +30,7 @@ public class SafeDeleteTest extends MultiFileTestCase {
       doTest("Super");
       fail();
     }
-    catch (RuntimeException e) {
+    catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
       String message = e.getMessage();
       assertTrue(message, message.startsWith("constructor <b><code>Super.Super()</code></b> has 1 usage that is not safe to delete"));
     }
@@ -40,7 +40,7 @@ public class SafeDeleteTest extends MultiFileTestCase {
       doTest("Super");
       fail();
     }
-    catch (RuntimeException e) {
+    catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
       String message = e.getMessage();
       assertTrue(message, message.startsWith("constructor <b><code>Super.Super()</code></b> has 1 usage that is not safe to delete"));
     }

java/java-tests/testSrc/com/intellij/refactoring/WrapReturnValueTest.java

@@ -63,7 +63,7 @@ public class WrapReturnValueTest extends MultiFileTestCase{
         }
       });
     }
-    catch (RuntimeException e) {
+    catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
       if (exceptionMessage != null) {
         assertEquals(exceptionMessage, e.getMessage());
         return;