From b9402204384bb5cfc25e6038d2f976f9f0c16fba Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Mon, 18 Nov 2013 09:53:33 +0100 Subject: 3.0-SNAPSHOT IssueID #28 --- .../gui/lifecycle/instance/ActivityRenderer.java | 25 ++++++++-------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java') diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java b/src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java index 4d7da95..a13d610 100644 --- a/src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java +++ b/src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java @@ -6,11 +6,11 @@ import java.awt.Paint; import java.awt.Polygon; import com.c2kernel.common.GTimeStamp; +import com.c2kernel.common.InvalidDataException; import com.c2kernel.graph.model.GraphPoint; import com.c2kernel.graph.model.Vertex; import com.c2kernel.gui.graph.view.VertexRenderer; import com.c2kernel.lifecycle.instance.Activity; -import com.c2kernel.lifecycle.instance.stateMachine.States; import com.c2kernel.utils.DateUtility; import com.c2kernel.utils.Language; public class ActivityRenderer implements VertexRenderer @@ -37,21 +37,14 @@ public class ActivityRenderer implements VertexRenderer linesOfText[2] = Language.translate(activity.getErrors()); else { - int cs = activity.getCurrentState(); - if (cs == States.WAITING && activity.getActive()) - linesOfText[2] = - Language.translate(States.getStateName(cs)) - + (((Boolean) activity.getProperties().get("Show time")).booleanValue() - ? " " + getWaitTime(activity.getActiveDate()) - : ""); - else if (cs == States.STARTED) - linesOfText[2] = - Language.translate(States.getStateName(cs)) - + (((Boolean) activity.getProperties().get("Show time")).booleanValue() - ? " " + getWaitTime(activity.getStartDate()) - : ""); - else - linesOfText[2] = Language.translate(States.getStateName(cs)); + boolean showTime = activity.getActive() && ((Boolean) activity.getProperties().get("Show time")).booleanValue(); + String stateName = "Invalid State"; + try { + stateName = activity.getStateName(); + } catch (InvalidDataException ex) { } + + linesOfText[2] = + Language.translate(stateName) + (showTime ? " " + getWaitTime(activity.getStateDate()) : ""); } FontMetrics metrics = g2d.getFontMetrics(); -- cgit v1.2.3