3.0-SNAPSHOT

IssueID #28

1 files changed, 13 insertions, 5 deletions

diff --git a/src/main/java/com/c2kernel/gui/tabs/execution/RequestButton.java b/src/main/java/com/c2kernel/gui/tabs/execution/RequestButton.java
index 96123ff..440bb58 100644
--- a/src/main/java/com/c2kernel/gui/tabs/execution/RequestButton.java
+++ b/src/main/java/com/c2kernel/gui/tabs/execution/RequestButton.java
@@ -6,7 +6,8 @@ import java.awt.event.ActionListener;
 import javax.swing.JButton;

 

 import com.c2kernel.entity.agent.Job;

-import com.c2kernel.lifecycle.instance.stateMachine.Transitions;

+import com.c2kernel.gui.MainFrame;

+import com.c2kernel.utils.Logger;

 /**

      * Each job gets a RequestButton

      */

@@ -20,10 +21,17 @@ import com.c2kernel.lifecycle.instance.stateMachine.Transitions;
             super();

             this.myJob = myJob;

             this.parent = parent;

-            String label = Transitions.getTransitionName(myJob.getPossibleTransition());

-            label = Character.toUpperCase(label.charAt(0))+label.substring(1);

-            if (myJob.requiresOutcome()) setBackground(Color.white);

-            if (myJob.isError()) setBackground(Color.pink);

+            String label = myJob.getTransition().getName();

+            if (myJob.hasOutcome()) {

+            	setBackground(Color.white);

+                try {

+                	if (myJob.getSchemaName().equals("Errors")) setBackground(Color.pink);

+                } catch (Exception e) {

+                	Logger.error(e);

+                	MainFrame.exceptionDialog(e);

+                	setEnabled(false);

+                }

+            }

             super.setText(label);

             addActionListener(this);

         }