From 79bdf4aa01fb9ca991de032733919923a19192c8 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Sun, 27 Oct 2013 21:06:45 +0100 Subject: 3.0-SNAPSHOT Do Integer.parseInt(propObj.toString()) to tolerate String or Integer version properties. --- src/main/java/com/c2kernel/lifecycle/ActivitySlotDef.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/main/java/com/c2kernel/lifecycle/ActivitySlotDef.java') diff --git a/src/main/java/com/c2kernel/lifecycle/ActivitySlotDef.java b/src/main/java/com/c2kernel/lifecycle/ActivitySlotDef.java index 9a3819b..514dc72 100644 --- a/src/main/java/com/c2kernel/lifecycle/ActivitySlotDef.java +++ b/src/main/java/com/c2kernel/lifecycle/ActivitySlotDef.java @@ -44,7 +44,7 @@ public class ActivitySlotDef extends WfVertexDef public ActivityDef getTheActivityDef() throws ObjectNotFoundException, InvalidDataException { - ActivityDef actDef = LocalObjectLoader.getActDef(getActivityDef(), getActVersion()); + ActivityDef actDef = LocalObjectLoader.getActDef(getActivityDef(), getVersionNumberProperty("Version")); if (actDef instanceof CompositeActivityDef) mIsComposite = true; return actDef; @@ -142,14 +142,6 @@ public class ActivitySlotDef extends WfVertexDef { return (String) getProperties().get("Name"); } - public int getActVersion() throws InvalidDataException - { - Object verObj = getProperties().get("Version"); - if (verObj instanceof Integer) - return (Integer)verObj; - else - throw new InvalidDataException("Version string was not an integer", ""); - } @Override public WfVertex instantiate() throws ObjectNotFoundException, InvalidDataException { -- cgit v1.2.3