diff --git a/java/compiler/impl/src/com/intellij/compiler/progress/CompilerTask.java b/java/compiler/impl/src/com/intellij/compiler/progress/CompilerTask.java index 174f6627ef82..006f4740858b 100644 --- a/java/compiler/impl/src/com/intellij/compiler/progress/CompilerTask.java +++ b/java/compiler/impl/src/com/intellij/compiler/progress/CompilerTask.java @@ -55,6 +55,7 @@ import com.intellij.openapi.wm.ex.ProgressIndicatorEx; import com.intellij.pom.Navigatable; import com.intellij.problems.WolfTheProblemSolver; import com.intellij.ui.AppIcon; +import com.intellij.ui.GuiUtils; import com.intellij.ui.content.*; import com.intellij.util.ArrayUtil; import com.intellij.util.ui.MessageCategory; @@ -306,8 +307,10 @@ public class CompilerTask extends Task.Backgroundable { public void setFraction(final double fraction) { super.setFraction(fraction); updateProgressText(); - UIUtil.invokeLaterIfNeeded( - () -> AppIcon.getInstance().setProgress(myProject, APP_ICON_ID, AppIconScheme.Progress.BUILD, fraction, true)); + GuiUtils.invokeLaterIfNeeded( + () -> AppIcon.getInstance().setProgress(myProject, APP_ICON_ID, AppIconScheme.Progress.BUILD, fraction, true), + ModalityState.any() + ); } @Override diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java index b104cb507636..fb14dee65b5c 100644 --- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java @@ -28,10 +28,7 @@ import com.intellij.execution.ExecutionException; import com.intellij.execution.ExecutionListener; import com.intellij.execution.ExecutionManager; import com.intellij.execution.configurations.GeneralCommandLine; -import com.intellij.execution.process.OSProcessHandler; -import com.intellij.execution.process.ProcessAdapter; -import com.intellij.execution.process.ProcessEvent; -import com.intellij.execution.process.ProcessHandler; +import com.intellij.execution.process.*; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.ide.DataManager; import com.intellij.ide.PowerSaveMode; @@ -1266,7 +1263,14 @@ public class BuildManager implements Disposable { // re-translate builder's output to idea.log final String text = event.getText(); if (!StringUtil.isEmptyOrSpaces(text)) { - LOG.info("BUILDER_PROCESS [" + outputType.toString() + "]: " + text.trim()); + if (ProcessOutputTypes.SYSTEM.equals(outputType)) { + if (LOG.isDebugEnabled()) { + LOG.debug("BUILDER_PROCESS [" + outputType.toString() + "]: " + text.trim()); + } + } + else { + LOG.info("BUILDER_PROCESS [" + outputType.toString() + "]: " + text.trim()); + } } } }); diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/PanelContentUI.java b/platform/lang-api/src/com/intellij/execution/dashboard/PanelContentUI.java index 9e8a5b5dfe69..d0093dde1e42 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/PanelContentUI.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/PanelContentUI.java @@ -38,13 +38,9 @@ class PanelContentUI implements ContentUI { @Override public void setManager(@NotNull ContentManager manager) { manager.addContentManagerListener(new ContentManagerAdapter() { - @Override - public void contentAdded(ContentManagerEvent event) { - initUI(); - } - @Override public void selectionChanged(final ContentManagerEvent event) { + initUI(); if (ContentManagerEvent.ContentOperation.add == event.getOperation()) { showContent(event.getContent()); }