Improve SlcExecution notifications

[gpl/argeo-slc.git] / org.argeo.slc.core / src / main / java / org / argeo / slc / ant / SlcExecutionBuildListener.java

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
index 7f0b30b2e2b4fa71112938b91ca2c5169d036d28..f2bedce400527b3f8ed0e484d75edf0e346355fe 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
@@ -31,7 +31,8 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
        // private Map<SlcExecution, SlcExecutionStep> currentStep = new\r
        // HashMap<SlcExecution, SlcExecutionStep>();\r
 \r
-       private SlcExecutionStep currentStep = null;\r
+       // private SlcExecutionStep currentStep = null;\r
+       private boolean currentStepNotified = true;\r
 \r
        public void init(Project project) {\r
                if (this.project != null) {\r
@@ -72,12 +73,13 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
        public void messageLogged(BuildEvent event) {\r
                SlcExecution slcExecution = getSlcExecution(event);\r
                if (slcExecution != null) {\r
-                       if (currentStep == null) {\r
-                               currentStep = new SlcExecutionStep("LOG", event.getMessage());\r
-                               notifyStep(slcExecution, currentStep);\r
-                               currentStep = null;\r
+                       if (currentStepNotified) {\r
+                               slcExecution.getSteps().add(\r
+                                               new SlcExecutionStep("LOG", event.getMessage()));\r
+                               notifyStep(slcExecution, slcExecution.currentStep());\r
+                               currentStepNotified = true;\r
                        } else {\r
-                               currentStep.addLog(event.getMessage());\r
+                               slcExecution.currentStep().addLog(event.getMessage());\r
                        }\r
                } else {\r
                        // TODO: log before initialization?\r
@@ -94,23 +96,24 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
 \r
        public void taskStarted(BuildEvent event) {\r
                SlcExecution slcExecution = getSlcExecution(event);\r
-               if (currentStep != null) {\r
-                       notifyStep(slcExecution, currentStep);\r
-                       currentStep = null;\r
+               if (!currentStepNotified) {\r
+                       notifyStep(slcExecution, slcExecution.currentStep());\r
+                       currentStepNotified = true;\r
                }\r
 \r
-               currentStep = new SlcExecutionStep("LOG", "Task "\r
-                               + event.getTask().getTaskName() + " started");\r
+               slcExecution.getSteps().add(\r
+                               new SlcExecutionStep("LOG", "Task "\r
+                                               + event.getTask().getTaskName() + " started"));\r
+               currentStepNotified = false;\r
        }\r
 \r
        public void taskFinished(BuildEvent event) {\r
                SlcExecution slcExecution = getSlcExecution(event);\r
-               if (currentStep != null) {\r
-                       currentStep.addLog("Task " + event.getTask().getTaskName()\r
-                                       + " finished");\r
-                       slcExecution.getSteps().add(currentStep);\r
-                       notifyStep(slcExecution, currentStep);\r
-                       currentStep = null;\r
+               if (!currentStepNotified) {\r
+                       slcExecution.currentStep().addLog(\r
+                                       "Task " + event.getTask().getTaskName() + " finished");\r
+                       notifyStep(slcExecution, slcExecution.currentStep());\r
+                       currentStepNotified = true;\r
                }\r
        }\r
 \r
@@ -129,49 +132,15 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
 \r
                if (slcExecution == null)\r
                        throw new SlcAntException("No SLC Execution registered.");\r
-\r
-               // if (slcExecution == null) {\r
-               // // for log4j\r
-               // this.project = project;\r
-               // if (!LogManager.getRootLogger().isAttached(this)) {\r
-               // LogManager.getRootLogger().addAppender(this);\r
-               // }\r
-               //                      \r
-               // slcExecution = new SlcExecution();\r
-               // slcExecution.setUuid(UUID.randomUUID().toString());\r
-               // try {\r
-               // slcExecution.setHost(InetAddress.getLocalHost().getHostName());\r
-               // } catch (UnknownHostException e) {\r
-               // slcExecution.setHost(SlcExecution.UNKOWN_HOST);\r
-               // }\r
-               //\r
-               // if (project.getReference(SlcProjectHelper.REF_ROOT_CONTEXT) != null)\r
-               // {\r
-               // slcExecution.setType(SLC_ANT_TYPE);\r
-               // } else {\r
-               // slcExecution.setType(ANT_TYPE);\r
-               // }\r
-               //\r
-               // slcExecution.setPath(project.getProperty("ant.file"));\r
-               // slcExecution.setStatus(SlcExecution.STATUS_RUNNING);\r
-               //\r
-               // project.addReference(REF_SLC_EXECUTION, slcExecution);\r
-               //\r
-               // for (SlcExecutionNotifier notifier : notifiers) {\r
-               // notifier.newExecution(slcExecution);\r
-               // }\r
-               //\r
-               // }\r
-\r
                return slcExecution;\r
        }\r
 \r
        protected void addLogStep(BuildEvent event, String msg) {\r
-               SlcExecutionStep step = new SlcExecutionStep("LOG", msg);\r
                SlcExecution slcExecution = getSlcExecution(event);\r
-               slcExecution.getSteps().add(step);\r
+               slcExecution.getSteps().add(new SlcExecutionStep("LOG", msg));\r
 \r
-               notifyStep(slcExecution, step);\r
+               notifyStep(slcExecution, slcExecution.currentStep());\r
+               currentStepNotified = true;\r
        }\r
 \r
        protected void notifyStep(SlcExecution slcExecution, SlcExecutionStep step) {\r
@@ -207,11 +176,14 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
                        SlcExecution slcExecution = (SlcExecution) project\r
                                        .getReference(REF_SLC_EXECUTION);\r
                        if (slcExecution != null) {\r
-                               if (currentStep == null) {\r
-                                       currentStep = new SlcExecutionStep("LOG", event\r
-                                                       .getMessage().toString());\r
+                               if (currentStepNotified) {\r
+                                       slcExecution.getSteps().add(\r
+                                                       new SlcExecutionStep("LOG", event.getMessage()\r
+                                                                       .toString()));\r
+                                       currentStepNotified = false;\r
                                }\r
-                               currentStep.addLog(event.getMessage().toString());\r
+                               slcExecution.currentStep()\r
+                                               .addLog(event.getMessage().toString());\r
                        } else {\r
                                // TODO: log before initialization?\r
                        }\r