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

Build tool window: hide filtered messages group nodes IDEA-209459

Browse Source
This commit is contained in:
Vladislav.Soroka
2019-03-25 17:32:54 +03:00
parent 9ccb2c2629
commit d15a44808f
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/build/BuildTreeConsoleView.java
+4 -1
View File
@@ -266,8 +266,11 @@ public class BuildTreeConsoleView implements ConsoleView, DataProvider, BuildCon
@Override
public void setFilter(@Nullable Predicate<ExecutionNode> executionTreeFilter) {
myExecutionTreeFilter = executionTreeFilter;
ExecutionNode buildProgressRootNode = getBuildProgressRootNode();
ExecutionNode rootElement = getRootElement();
rootElement.setFilter(executionTreeFilter);
Predicate<ExecutionNode> predicate = executionTreeFilter == null ? null :
node -> node == buildProgressRootNode || executionTreeFilter.test(node);
rootElement.setFilter(predicate);
scheduleUpdate(rootElement);
}
platform/lang-impl/src/com/intellij/build/ExecutionNode.java
+18 -21
View File
@@ -69,6 +69,8 @@ public class ExecutionNode extends CachingSimpleNode {
};
private final Collection<ExecutionNode> myChildrenList = new ConcurrentLinkedDeque<>(); //ContainerUtil.newSmartList();
private final AtomicInteger myErrors = new AtomicInteger();
private final AtomicInteger myWarnings = new AtomicInteger();
private long startTime;
private long endTime;
@Nullable
@@ -84,8 +86,6 @@ public class ExecutionNode extends CachingSimpleNode {
private Navigatable myNavigatable;
@Nullable
private NullableLazyValue<Icon> myPreferredIconValue;
private final AtomicInteger myErrors = new AtomicInteger();
private final AtomicInteger myWarnings = new AtomicInteger();
@Nullable
private Predicate<ExecutionNode> myFilter;
private volatile boolean myVisible = true;
@@ -221,11 +221,8 @@ public class ExecutionNode extends CachingSimpleNode {
myFilter = filter;
for (ExecutionNode node : myChildrenList) {
node.setFilter(myFilter);
node.cleanUpCache();
}
if (getParent() != null) {
cleanUpCache();
}
cleanUpCache();
}
public void setVisible(boolean visible) {
@@ -238,14 +235,6 @@ public class ExecutionNode extends CachingSimpleNode {
}
}
public static boolean isFailed(@Nullable EventResult result) {
return result instanceof FailureResult;
}
public static boolean isSkipped(@Nullable EventResult result) {
return result instanceof SkippedResult;
}
public boolean isRunning() {
return endTime <= 0 && !isSkipped(myResult) && !isFailed(myResult);
}
@@ -256,6 +245,11 @@ public class ExecutionNode extends CachingSimpleNode {
(myResult instanceof MessageEventResult && ((MessageEventResult)myResult).getKind() == MessageEvent.Kind.ERROR);
}
@Nullable
public EventResult getResult() {
return myResult;
}
public void setResult(@Nullable EventResult result) {
myResult = result;
if (myFilter != null) {
@@ -263,14 +257,9 @@ public class ExecutionNode extends CachingSimpleNode {
}
}
@Nullable
public EventResult getResult() {
return myResult;
}
@Override
public boolean isAutoExpandNode() {
return myAutoExpandNode || isRunning() || isFailed() ;
return myAutoExpandNode || (myFilter != null && (isRunning() || isFailed()));
}
public void setAutoExpandNode(boolean autoExpandNode) {
@@ -290,7 +279,7 @@ public class ExecutionNode extends CachingSimpleNode {
if (myResult instanceof FailureResult) {
List<Navigatable> result = new SmartList<>();
for (Failure failure: ((FailureResult)myResult).getFailures()) {
for (Failure failure : ((FailureResult)myResult).getFailures()) {
ContainerUtil.addIfNotNull(result, failure.getNavigatable());
}
return result;
@@ -378,6 +367,14 @@ public class ExecutionNode extends CachingSimpleNode {
}
}
public static boolean isFailed(@Nullable EventResult result) {
return result instanceof FailureResult;
}
public static boolean isSkipped(@Nullable EventResult result) {
return result instanceof SkippedResult;
}
public static Icon getEventResultIcon(@Nullable EventResult result) {
if (result == null) {
return NODE_ICON_RUNNING;