From 04048a6c4026b47fc6c372e792ffb60726baee56 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Thu, 24 Oct 2013 13:12:52 +0200 Subject: Clear of exceptions --- .../lifecycle/instance/predefined/AddStepsFromDescription.java | 2 +- .../lifecycle/instance/predefined/CreateItemFromDescription.java | 8 +------- .../c2kernel/lifecycle/instance/predefined/PredefinedStep.java | 4 +++- .../lifecycle/instance/predefined/entitycreation/NewItem.java | 3 ++- 4 files changed, 7 insertions(+), 10 deletions(-) (limited to 'src/main/java/com/c2kernel/lifecycle/instance/predefined') diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java index 8d5ba4a..30d014c 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java @@ -35,7 +35,7 @@ public class AddStepsFromDescription extends PredefinedStep lifeCycle.initChild(domain, true, new GraphPoint(150, 100)); domain.setName("domain"); domain.setType(actDef.getName()); - lifeCycle.run(agent); + lifeCycle.run(agent, itemSysKey); Gateway.getStorage().put(itemSysKey, lifeCycle, null); Logger.msg(1, "AddStepsFromDescription::request() - DONE."); return requestData; diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java index 2e4b313..5c600e2 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java @@ -159,7 +159,7 @@ public class CreateItemFromDescription extends PredefinedStep for (Iterator iter = collections.iterator(); iter.hasNext();) { colls[0] = iter.next(); // TODO: initialize - newItem.requestAction(agent.getSysKey(), "workflow/predefined/AddC2KObject", Transitions.DONE, PredefinedStep.bundleData(colls)); + newItem.requestAction(agent.getSysKey(), "workflow/predefined/AddC2KObject", PredefinedStep.DONE, PredefinedStep.bundleData(colls)); } } @@ -168,12 +168,6 @@ public class CreateItemFromDescription extends PredefinedStep context.setEntity(entityPath); Gateway.getLDAPLookup().add(context); return requestData; - } catch (ObjectAlreadyExistsException e) { - Logger.error(e); - throw e; - } catch (AccessRightsException e) { - Logger.error(e); - throw e; } catch (Exception e) { Logger.error(e); throw new InvalidDataException(e.getMessage(), ""); diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/PredefinedStep.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/PredefinedStep.java index a9776ed..5369cb2 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/PredefinedStep.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/PredefinedStep.java @@ -19,11 +19,13 @@ import com.c2kernel.utils.Logger; * @author $Author: sgaspard $ $Date: 2004/09/21 10:32:17 $ * @version $Revision: 1.14 $ **********************************************************************************************************************************************************************************************************************************************************************************************************/ -public class PredefinedStep extends Activity +public abstract class PredefinedStep extends Activity { /******************************************************************************************************************************************************************************************************************************************************************************************************* * predefined Steps are always Active, and have only one transition subclasses could override this method (if necessary) ******************************************************************************************************************************************************************************************************************************************************************************************************/ + public static final int DONE = 0; + public static final int AVAILABLE = 0; private boolean isPredefined = false; @Override public boolean getActive() diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java index c3334d6..f089a83 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java @@ -16,6 +16,7 @@ import com.c2kernel.entity.TraceableEntity; import com.c2kernel.events.Event; import com.c2kernel.events.History; import com.c2kernel.lifecycle.CompositeActivityDef; +import com.c2kernel.lifecycle.instance.predefined.PredefinedStep; import com.c2kernel.lookup.DomainPath; import com.c2kernel.lookup.EntityPath; import com.c2kernel.persistency.ClusterStorage; @@ -128,7 +129,7 @@ public class NewItem extends ModuleImport { } // write new view/outcome/event - Event newEvent = hist.addEvent("system", "Admin", Transitions.DONE, "Import", "Import", "Import", thisOutcome.schema, thisOutcome.version, thisOutcome.viewname, States.FINISHED); + Event newEvent = hist.addEvent("system", "Admin", PredefinedStep.DONE, "Import", "Import", "Import", thisOutcome.schema, thisOutcome.version, thisOutcome.viewname, PredefinedStep.AVAILABLE); newOutcome.setID(newEvent.getID()); impView.setEventId(newEvent.getID()); try { -- cgit v1.2.3