Do some clean up in SLC

[gpl/argeo-slc.git] / runtime / org.argeo.slc.specs / src / main / java / org / argeo / slc / process / SlcExecutionStep.java

diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java
index 58f9d01a072d63f3f7ed378d418e99c893a0f2d5..bc79688ff7033eb703b9f96dc5033aff872b3229 100644 (file)
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java
@@ -16,39 +16,28 @@
 \r
 package org.argeo.slc.process;\r
 \r
-import java.io.Serializable;\r
 import java.util.ArrayList;\r
 import java.util.Date;\r
 import java.util.List;\r
 import java.util.StringTokenizer;\r
 import java.util.UUID;\r
 \r
+import org.argeo.slc.execution.ExecutionStep;\r
+\r
 /**\r
  * An atomic step to be notified in during an {@link SlcExecution}. Can be a log\r
  * or the start/end of a phase, etc.\r
+ * \r
+ * @deprecated use {@link ExecutionStep} instead\r
  */\r
-public class SlcExecutionStep implements Serializable {\r
+public class SlcExecutionStep extends ExecutionStep {\r
        private static final long serialVersionUID = -7308643628104726471L;\r
 \r
-       public final static String START = "START";\r
-       public final static String END = "END";\r
-       public final static String PHASE_START = "PHASE_START";\r
-       public final static String PHASE_END = "PHASE_END";\r
-       public final static String ERROR = "ERROR";\r
-       public final static String WARNING = "WARNING";\r
-       public final static String INFO = "INFO";\r
-       public final static String DEBUG = "DEBUG";\r
-       public final static String TRACE = "TRACE";\r
-\r
        private String uuid = UUID.randomUUID().toString();\r
-       private String type;\r
-       private String thread;\r
-       private Date timestamp = new Date();\r
        private List<String> logLines = new ArrayList<String>();\r
 \r
        /** Empty constructor */\r
        public SlcExecutionStep() {\r
-               thread = Thread.currentThread().getName();\r
        }\r
 \r
        /** Creates a step at the current date of type INFO */\r
@@ -68,10 +57,7 @@ public class SlcExecutionStep implements Serializable {
 \r
        public SlcExecutionStep(Date timestamp, String type, String log,\r
                        String thread) {\r
-               this.type = type;\r
-               this.timestamp = timestamp;\r
-               this.thread = thread;\r
-               addLog(log);\r
+               super("UNKOWN_LOCATION", timestamp, type, log, thread);\r
        }\r
 \r
        public String getUuid() {\r
@@ -82,26 +68,14 @@ public class SlcExecutionStep implements Serializable {
                this.uuid = uuid;\r
        }\r
 \r
-       public String getType() {\r
-               return type;\r
-       }\r
-\r
        public void setType(String type) {\r
                this.type = type;\r
        }\r
 \r
-       public Date getTimestamp() {\r
-               return timestamp;\r
-       }\r
-\r
        public void setTimestamp(Date begin) {\r
                this.timestamp = begin;\r
        }\r
 \r
-       public String getThread() {\r
-               return thread;\r
-       }\r
-\r
        public void setThread(String thread) {\r
                this.thread = thread;\r
        }\r
@@ -114,13 +88,18 @@ public class SlcExecutionStep implements Serializable {
                this.logLines = logLines;\r
        }\r
 \r
-       public void addLog(String log) {\r
+       /** public for legacy reasons */\r
+       public String addLog(String log) {\r
+               if (logLines == null)\r
+                       logLines = new ArrayList<String>();\r
+\r
                if (log == null)\r
-                       return;\r
+                       return null;\r
 \r
                StringTokenizer st = new StringTokenizer(log, "\n");\r
                while (st.hasMoreTokens())\r
                        logLines.add(removeNonXmlChars(st.nextToken()));\r
+               return null;\r
        }\r
 \r
        /**\r