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/HistoryPane.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java b/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java
index 7a24f37..8384dd8 100644
--- a/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java
+++ b/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java
@@ -28,9 +28,10 @@ import com.c2kernel.entity.proxy.MemberSubscription;
 import com.c2kernel.events.Event;
 import com.c2kernel.events.History;
 import com.c2kernel.gui.MainFrame;
-import com.c2kernel.lifecycle.instance.stateMachine.Transitions;
+import com.c2kernel.lifecycle.instance.stateMachine.StateMachine;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.utils.Language;
+import com.c2kernel.utils.LocalObjectLoader;
 import com.c2kernel.utils.Logger;
 
 /**
@@ -176,6 +177,7 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity
 
     private class HistoryTableModel extends AbstractTableModel {
     	Event[] event;
+    	StateMachine[] sm;
     	Integer[] ids;
     	int loaded = 0;
     	int startId = 0;
@@ -192,9 +194,13 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity
 		public void setView(int startId, int size) {
 			event = new Event[size];
 			ids = new Integer[size];
+			sm = new StateMachine[size];
 			this.startId = startId;
 			for (int i=0; i<size; i++) {
 				event[i] = history.getEvent(startId+i);
+				try {
+					sm[i] = LocalObjectLoader.getStateMachine(event[i].getStateMachineName(), event[i].getStateMachineVersion());
+				} catch (Exception ex) { Logger.error(ex); }
 				ids[i] = new Integer(startId+i);
 				loaded = i+1;
 			}
@@ -258,11 +264,12 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity
 				switch (columnIndex) {
 					case 0: return ids[rowIndex];
 					case 1: return event[rowIndex].getStepName();
-					case 2: return Transitions.getTransitionName(event[rowIndex].getTransition());
+					case 2: return sm[rowIndex]==null?"Unknown":
+						sm[rowIndex].getTransition(event[rowIndex].getTransition()).getName();
 					case 3: return event[rowIndex].getTimeString();
                     case 4: return event[rowIndex].getAgentName();
                     case 5: return event[rowIndex].getAgentRole();
-                    case 6: return event[rowIndex].getSchemaName();
+                    case 6: return event[rowIndex].getSchemaName()+"v"+event[rowIndex].getSchemaVersion();
                     case 7: return event[rowIndex].getViewName();
 					default: return "";
 				}
-- 
cgit v1.2.3