From c89abe9dc88697d7a38c96dbeeffe2bb5d72a82e Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Sun, 26 Feb 2012 19:08:28 +0400 Subject: [PATCH] cleanup --- .../intellij/openapi/application/impl/ApplicationImpl.java | 2 +- platform/testFramework/src/_LastInSuiteTest.java | 7 +------ .../com/intellij/testFramework/LightPlatformTestCase.java | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java index b3f56b46d224..62e85334f893 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java @@ -202,7 +202,7 @@ public class ApplicationImpl extends ComponentManagerImpl implements Application boolean isHeadless, boolean isCommandLine, @NotNull String appName, - Splash splash) { + @Nullable Splash splash) { super(null); ApplicationManager.setApplication(this, myLastDisposable); // reset back to null only when all components already disposed diff --git a/platform/testFramework/src/_LastInSuiteTest.java b/platform/testFramework/src/_LastInSuiteTest.java index 6ef2c2afd273..ea8463a6d3c3 100644 --- a/platform/testFramework/src/_LastInSuiteTest.java +++ b/platform/testFramework/src/_LastInSuiteTest.java @@ -42,12 +42,7 @@ public class _LastInSuiteTest extends TestCase { UIUtil.invokeAndWaitIfNeeded(new Runnable() { @Override public void run() { - try { - LightPlatformTestCase.disposeApplication(); - } - catch (Exception e) { - throw new RuntimeException(e); - } + LightPlatformTestCase.disposeApplication(); } }); diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java index 58c841027f5d..9ed1809a4b89 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java @@ -155,7 +155,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da } @TestOnly - public static void disposeApplication() throws Exception { + public static void disposeApplication() { if (ourApplication != null) { Disposer.dispose(ourApplication); ourApplication = null;