From b9402204384bb5cfc25e6038d2f976f9f0c16fba Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 18 Nov 2013 09:53:33 +0100
Subject: 3.0-SNAPSHOT IssueID #28

---
 src/main/java/com/c2kernel/gui/tabs/execution/ActivityItem.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com/c2kernel/gui/tabs/execution/ActivityItem.java')

diff --git a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityItem.java b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityItem.java
index 6a8f2f7..bacdd52 100644
--- a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityItem.java
+++ b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityItem.java
@@ -2,11 +2,11 @@ package com.c2kernel.gui.tabs.execution;
 import java.util.ArrayList;
 
 import com.c2kernel.entity.agent.Job;
-import com.c2kernel.lifecycle.instance.stateMachine.States;
 
 public class ActivityItem {
     public String stepPath;
     public int state;
+    public String stateName;
     public String name;
     ArrayList<Job> jobs = new ArrayList<Job>();
 
@@ -18,7 +18,8 @@ public class ActivityItem {
 
     public ActivityItem(Job thisJob) {
         stepPath = thisJob.getStepPath();
-        state = thisJob.getCurrentState();
+        state = thisJob.getTransition().getOriginStateId();
+        stateName = thisJob.getOriginStateName();
         name = thisJob.getStepName();
         jobs.add(thisJob);
     }
@@ -37,7 +38,7 @@ public class ActivityItem {
 
     @Override
 	public String toString() {
-        return name+(state>-1?" ("+States.getStateName(state)+")":"");
+        return name+(state>-1?" ("+stateName+")":"");
     }
 
     @Override
-- 
cgit v1.2.3