MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Vladimir.Orlov
2017-03-06 15:37:23 +03:00
parent ce981dba29 4fc94382c8
commit 2b40684ab0
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/progress/CompilerTask.java
+5 -2
View File
@@ -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
java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+9 -5
View File
@@ -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());
}
}
}
});
platform/lang-api/src/com/intellij/execution/dashboard/PanelContentUI.java
+1 -5
View File
@@ -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());
}