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

IDEA-141243 added support for ant-contrib try/catch-task

Browse Source 
when exception is thrown in try block it'll get logged as verbosive message

Signed-off-by: Martin Zdarsky-Jones zdary@zdary.cz
This commit is contained in:
Martin Zdarsky
2016-10-28 00:00:58 +11:00
parent a75cc0fec7
commit 7d69c0d255
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-runtime/src/com/intellij/rt/ant/execution/IdeaAntLogger2.java
+17 -2
View File
@@ -24,6 +24,7 @@ import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.Field;
import java.util.Stack;
public final class IdeaAntLogger2 extends DefaultLogger {
static SegmentedOutputStream ourErr;
@@ -46,6 +47,9 @@ public final class IdeaAntLogger2 extends DefaultLogger {
*/
public static final String OUTPUT_PREFIX = "IDEA_ANT_INTEGRATION";
private final Thread myMainThread;
private final Stack myCallingTasks = new Stack();
private final Priority myMessagePriority = new MessagePriority();
private final Priority myTargetPriority = new StatePriority(Project.MSG_INFO);
private final Priority myTaskPriority = new StatePriority(Project.MSG_INFO);
@@ -59,6 +63,7 @@ public final class IdeaAntLogger2 extends DefaultLogger {
public IdeaAntLogger2() {
guardStreams();
myMainThread = Thread.currentThread();
}
public synchronized void setMessageOutputLevel(int level) {
@@ -87,12 +92,18 @@ public final class IdeaAntLogger2 extends DefaultLogger {
}
public synchronized void taskStarted(BuildEvent event) {
if (Thread.currentThread() == myMainThread) {
myCallingTasks.push(event.getTask().getTaskName());
}
myTaskPriority.sendMessage(TASK, event.getPriority(), event.getTask().getTaskName());
}
public synchronized void taskFinished(BuildEvent event) {
sendException(event, true);
myTaskPriority.sendMessage(TASK_END, event.getPriority(), event.getException());
if (Thread.currentThread() == myMainThread) {
myCallingTasks.pop();
}
}
public synchronized void messageLogged(BuildEvent event) {
@@ -133,14 +144,18 @@ public final class IdeaAntLogger2 extends DefaultLogger {
return true; // default value
}
private boolean isInTryCatch() {
return myCallingTasks.contains("try");
}
private boolean sendException(BuildEvent event, boolean isFailOnError) {
Throwable exception = event.getException();
if (exception != null) {
if (isFailOnError) {
if (isFailOnError && !isInTryCatch()) {
myAlwaysSend.sendMessage(EXCEPTION, event.getPriority(), exception);
return true;
}
myMessagePriority.sendMessage(MESSAGE, Project.MSG_WARN, exception.getMessage());
myMessagePriority.sendMessage(MESSAGE, isInTryCatch() ? Project.MSG_VERBOSE : Project.MSG_WARN, exception.getMessage());
}
return false;
}