diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java index 9013ec6dcb33..e96cc9a6bdde 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java @@ -6,7 +6,7 @@ import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionPlaces; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.application.ex.ApplicationManagerEx; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; @@ -17,6 +17,8 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; public class ShowSettingsAction extends AnAction implements DumbAware { + private static final Logger LOG = Logger.getInstance(ShowSettingsAction.class); + public ShowSettingsAction() { super(CommonBundle.settingsAction(), CommonBundle.settingsActionDescription(), AllIcons.General.Settings); } @@ -40,13 +42,15 @@ public class ShowSettingsAction extends AnAction implements DumbAware { } public static void perform(@NotNull Project project) { - final long startTime = System.nanoTime(); - SwingUtilities.invokeLater(() -> { - final long endTime = System.nanoTime(); - if (ApplicationManagerEx.getApplicationEx().isInternal()) { - System.out.println("Displaying settings dialog took " + ((endTime - startTime) / 1000000) + " ms"); - } - }); + if (LOG.isDebugEnabled()) { + final long startTime = System.nanoTime(); + // SwingUtilities must be used here + SwingUtilities.invokeLater(() -> { + final long endTime = System.nanoTime(); + LOG.debug("Displaying settings dialog took " + ((endTime - startTime) / 1000000) + " ms"); + }); + } + ShowSettingsUtil.getInstance().showSettingsDialog(project, ShowSettingsUtilImpl.getConfigurableGroups(project, true)); } }