From 8994ce1285ebb1386cf4abf32b95034e626ae97a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 25 Oct 2016 13:54:41 +0200 Subject: [PATCH] Cleanup (warnings) --- .../com/intellij/ide/MacOSApplicationProvider.java | 2 +- .../src/com/intellij/idea/IdeaApplication.java | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java b/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java index 8d67456bc2cc..b6e5200f95f0 100644 --- a/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java +++ b/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java @@ -142,7 +142,7 @@ public class MacOSApplicationProvider implements ApplicationComponent { for (File file : list) { if (ProjectUtil.openOrImport(file.getAbsolutePath(), project, true) != null) { LOG.debug("MacMenu: load project from ", file); - IdeaApplication.getInstance().setPerformProjectLoad(false); + IdeaApplication.getInstance().disableProjectLoad(); return; } } diff --git a/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java b/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java index 9d33358d0ec4..b014c03b8c17 100644 --- a/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java +++ b/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java @@ -44,7 +44,6 @@ import com.intellij.ui.CustomProtocolHandler; import com.intellij.ui.Splash; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -56,8 +55,8 @@ import java.util.Arrays; import java.util.List; public class IdeaApplication { - @NonNls public static final String IDEA_IS_INTERNAL_PROPERTY = "idea.is.internal"; - @NonNls public static final String IDEA_IS_UNIT_TEST = "idea.is.unit.test"; + public static final String IDEA_IS_INTERNAL_PROPERTY = "idea.is.internal"; + public static final String IDEA_IS_UNIT_TEST = "idea.is.unit.test"; private static final String[] SAFE_JAVA_ENV_PARAMETERS = {"idea.required.plugins.id"}; @@ -360,7 +359,7 @@ public class IdeaApplication { /** * Used for GUI tests to stop IdeEventQueue dispatching when Application is disposed already */ - public void shutdown(){ + public void shutdown() { myLoaded = false; IdeEventQueue.applicationClose(); ShutDownTracker.getInstance().run(); @@ -370,7 +369,7 @@ public class IdeaApplication { return myArgs; } - public void setPerformProjectLoad(boolean performProjectLoad) { - myPerformProjectLoad = performProjectLoad; + public void disableProjectLoad() { + myPerformProjectLoad = false; } -} +} \ No newline at end of file