Workerがmessageを設定している場合にはそちらを優先して出力する

[coroid/inqubus.git] / frontend / src / yukihane / inqubus / model / Target.java

diff --git a/frontend/src/yukihane/inqubus/model/Target.java b/frontend/src/yukihane/inqubus/model/Target.java
index fccd90d..e80681a 100644 (file)
--- a/frontend/src/yukihane/inqubus/model/Target.java
+++ b/frontend/src/yukihane/inqubus/model/Target.java
@@ -1,5 +1,6 @@
 package yukihane.inqubus.model;
 
+import org.apache.commons.lang.StringUtils;
 import yukihane.inqubus.manager.RequestProcess;
 import yukihane.inqubus.manager.TaskKind;
 import yukihane.inqubus.manager.TaskStatus;
@@ -11,6 +12,7 @@ public class Target {
 
     public Target(RequestProcess rp) {
         this.requestProcess = rp;
+        this.progress = new Progress("待機中");
     }
 
     public int getRowId() {
@@ -43,7 +45,11 @@ public class Target {
         if (status == TaskStatus.READY) {
             text = status.toString();
         } else if (status == TaskStatus.DOING || status == TaskStatus.DONE || status == TaskStatus.CANCELLED) {
-            text = kind.toString() + " " + status.toString() + String.format("%.02f", percent) + "%";
+            if (StringUtils.isEmpty(message)) {
+                text = kind.toString() + " " + status.toString() + String.format("%.02f", percent) + "%";
+            } else {
+                text = message;
+            }
             p = percent;
         } else {
             text = message;