From 0f892332b19ba8741a7db66a5c4daa386b2b5c1e Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 25 Oct 2013 17:27:29 +0200
Subject: Changes and refactoring to gui requirements Used descriptions must
 use an integer version.

---
 .../java/com/c2kernel/process/UserCodeProcess.java | 30 ++++++----------------
 1 file changed, 8 insertions(+), 22 deletions(-)

(limited to 'src/main/java/com/c2kernel/process/UserCodeProcess.java')

diff --git a/src/main/java/com/c2kernel/process/UserCodeProcess.java b/src/main/java/com/c2kernel/process/UserCodeProcess.java
index f58da51..f7bbe74 100644
--- a/src/main/java/com/c2kernel/process/UserCodeProcess.java
+++ b/src/main/java/com/c2kernel/process/UserCodeProcess.java
@@ -85,8 +85,9 @@ public class UserCodeProcess extends StandardClient implements EntityProxyObserv
 
             if (thisJob != null) {
                 String jobKey = thisJob.getItemSysKey()+":"+thisJob.getStepPath();
+                int transitionId = thisJob.getTransition().getId();
                 try {
-                    if (thisJob.getTransitionId()==START) {
+                    if (transitionId==START) {
                         Logger.msg(5, "Testing start conditions");
                         boolean start = assessStartConditions(thisJob);
                         if (start) {
@@ -97,13 +98,13 @@ public class UserCodeProcess extends StandardClient implements EntityProxyObserv
                             Logger.msg(5, "Start conditions failed "+thisJob.getStepName()+" in "+thisJob.getItemSysKey());
                         }
                     }
-                    else if (thisJob.getTransitionId()==COMPLETE) {
+                    else if (transitionId==COMPLETE) {
                         Logger.msg(5, "Executing logic");
                         runUCLogic(thisJob);
                         if (ignoredPaths.contains(jobKey))
                             ignoredPaths.remove(jobKey);
                     }
-                    else if (thisJob.getTransitionId()==SUSPEND) {
+                    else if (transitionId==SUSPEND) {
                         if (ignoredPaths.contains(jobKey)) {
                         	if (errors.containsKey(jobKey)) {
                         		thisJob.setOutcome(Gateway.getMarshaller().marshall(errors.get(jobKey)));
@@ -112,7 +113,7 @@ public class UserCodeProcess extends StandardClient implements EntityProxyObserv
                             agent.execute(thisJob);
                         }
                     }
-                    else if (thisJob.getTransitionId()==RESUME) {
+                    else if (transitionId==RESUME) {
                         if (!ignoredPaths.contains(jobKey))
                             agent.execute(thisJob);
                     }
@@ -122,7 +123,7 @@ public class UserCodeProcess extends StandardClient implements EntityProxyObserv
                 } catch (InvalidTransitionException ex) {
                     // must have already been done by someone else - ignore
                 } catch (Throwable ex) {
-                    Logger.error("Error executing "+getTransitionName(thisJob.getTransitionId())+" job:");
+                    Logger.error("Error executing "+thisJob.getTransition().getName()+" job:");
                     Logger.error(ex);
                     ErrorInfo ei = new ErrorInfo();
                     ei.setFatal();
@@ -154,27 +155,12 @@ public class UserCodeProcess extends StandardClient implements EntityProxyObserv
         }
     }
 
-    private static String getTransitionName(int transitionId) {
-		switch (transitionId) {
-		case 1:
-			return "Start";
-		case 2:
-			return "Complete";
-		case 3:
-			return "Suspend";
-		case 4:
-			return "Resume";
-		default:
-			return "Unknown";
-		}
-	}
-
 	private static Job getJob(HashMap<String, C2KLocalObject> jobs, int transition) {
         for (C2KLocalObject c2kLocalObject : jobs.values()) {
             Job thisJob = (Job)c2kLocalObject;
-            if (thisJob.getTransitionId() == transition) {
+            if (thisJob.getTransition().getId() == transition) {
                 Logger.msg(1,"=================================================================");
-                Logger.msg(1, "Got "+getTransitionName(transition)+" job for "+thisJob.getStepName()+" in "+thisJob.getItemSysKey());
+                Logger.msg(1, "Got "+thisJob.getTransition().getName()+" job for "+thisJob.getStepName()+" in "+thisJob.getItemSysKey());
                 return thisJob;
             }
         }
-- 
cgit v1.2.3