From 5664fd4644c78f4571a1a72e6b9f0511fb10720a Mon Sep 17 00:00:00 2001 From: abranson Date: Tue, 2 Aug 2011 22:10:28 +0200 Subject: Finished move to generics. Enforced 1.6 compliance for now. No errors or warnings :) --- source/com/c2kernel/lifecycle/instance/Activity.java | 12 ++++++------ .../c2kernel/lifecycle/instance/AdvancementCalculator.java | 14 +++++++------- .../com/c2kernel/lifecycle/instance/CompositeActivity.java | 11 ++++++----- source/com/c2kernel/lifecycle/instance/Join.java | 4 ++-- source/com/c2kernel/lifecycle/instance/ParserWF.java | 4 ++-- source/com/c2kernel/lifecycle/instance/Split.java | 4 ++-- source/com/c2kernel/lifecycle/instance/Workflow.java | 6 ++++-- source/com/c2kernel/lifecycle/instance/XOrSplit.java | 2 +- .../lifecycle/instance/gui/model/WfVertexFactory.java | 3 ++- .../lifecycle/instance/gui/view/TransitionPanel.java | 2 +- .../instance/predefined/CreateItemFromDescription.java | 2 +- .../instance/predefined/entitycreation/Aggregation.java | 1 - .../instance/predefined/entitycreation/NewItem.java | 4 ++-- 13 files changed, 36 insertions(+), 33 deletions(-) mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/Activity.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/CompositeActivity.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/Join.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/ParserWF.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/Split.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/Workflow.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/XOrSplit.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java (limited to 'source/com/c2kernel/lifecycle/instance') diff --git a/source/com/c2kernel/lifecycle/instance/Activity.java b/source/com/c2kernel/lifecycle/instance/Activity.java old mode 100755 new mode 100644 index 458c0a5..a0df570 --- a/source/com/c2kernel/lifecycle/instance/Activity.java +++ b/source/com/c2kernel/lifecycle/instance/Activity.java @@ -38,7 +38,7 @@ public class Activity extends WfVertex /** * vector of errors (Strings) that is constructed each time verify() is launched */ - protected Vector mErrors; + protected Vector mErrors; /** @associates a State machine engine */ private StateMachine machine; /** true is avalaibe to be executed */ @@ -56,7 +56,7 @@ public class Activity extends WfVertex { super(); setProperties(new WfCastorHashMap()); - mErrors = new Vector(0, 1); + mErrors = new Vector(0, 1); machine = new StateMachine(this); eventIds = new EventStorage(); mStartDate = new GTimeStamp(); @@ -483,20 +483,20 @@ public class Activity extends WfVertex /** * returns the lists of jobs for the activity and children (cf com.c2kernel.entity.Job) */ - public ArrayList calculateJobs(AgentPath agent, boolean recurse) + public ArrayList calculateJobs(AgentPath agent, boolean recurse) { return calculateJobsBase(agent, false); } // - public ArrayList calculateAllJobs(AgentPath agent, boolean recurse) + public ArrayList calculateAllJobs(AgentPath agent, boolean recurse) { return calculateJobsBase(agent, true); } - private ArrayList calculateJobsBase(AgentPath agent, boolean all) + private ArrayList calculateJobsBase(AgentPath agent, boolean all) { Logger.msg(7, "calculateJobs - " + getPath()); int[] transitions = { }; - ArrayList jobs = new ArrayList(); + ArrayList jobs = new ArrayList(); try { String agentName = checkAccessRights(agent); diff --git a/source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java b/source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java old mode 100755 new mode 100644 index ea47721..a0d4aab --- a/source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java +++ b/source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java @@ -10,9 +10,9 @@ import com.c2kernel.lifecycle.instance.stateMachine.States; public class AdvancementCalculator implements Serializable { private CompositeActivity activity; - private Hashtable isMarked; - private Hashtable HasNextMarked; - public Hashtable hasprevActive; + private Hashtable isMarked; + private Hashtable HasNextMarked; + public Hashtable hasprevActive; private long mCurrentNbActExp = 0; private long mMaximuNbActexp = 0; private long mNbActpassed = 0; @@ -24,9 +24,9 @@ public class AdvancementCalculator implements Serializable private boolean mHasPrevActive = false; public AdvancementCalculator() { - isMarked = new Hashtable(); - HasNextMarked = new Hashtable(); - hasprevActive = new Hashtable(); + isMarked = new Hashtable(); + HasNextMarked = new Hashtable(); + hasprevActive = new Hashtable(); } public void calculate(CompositeActivity act) { @@ -39,7 +39,7 @@ public class AdvancementCalculator implements Serializable activity = act; Vertex v = activity.getChildGraphModel().getStartVertex(); check(v, this); - isMarked = new Hashtable(); + isMarked = new Hashtable(); calc(v, this); // Logger.debug(0, act.getName()+" <<<<<<<<<"); } diff --git a/source/com/c2kernel/lifecycle/instance/CompositeActivity.java b/source/com/c2kernel/lifecycle/instance/CompositeActivity.java old mode 100755 new mode 100644 index 5292127..797a5db --- a/source/com/c2kernel/lifecycle/instance/CompositeActivity.java +++ b/source/com/c2kernel/lifecycle/instance/CompositeActivity.java @@ -8,6 +8,7 @@ import com.c2kernel.common.AccessRightsException; import com.c2kernel.common.InvalidDataException; import com.c2kernel.common.InvalidTransitionException; import com.c2kernel.common.ObjectAlreadyExistsException; +import com.c2kernel.entity.agent.Job; import com.c2kernel.graph.model.GraphModel; import com.c2kernel.graph.model.GraphPoint; import com.c2kernel.graph.model.GraphableVertex; @@ -297,7 +298,7 @@ public class CompositeActivity extends Activity */ public Activity[] query(AgentPath agent, int stateID, boolean filter) { - Vector steps = new Vector(); + Vector steps = new Vector(); Activity[] returnArray = null; for (int i = 0; i < getChildren().length; i++) { @@ -327,9 +328,9 @@ public class CompositeActivity extends Activity /** * @see com.c2kernel.lifecycle.instance.Activity#calculateJobs() */ - public ArrayList calculateJobs(AgentPath agent, boolean recurse) + public ArrayList calculateJobs(AgentPath agent, boolean recurse) { - ArrayList jobs = new ArrayList(); + ArrayList jobs = new ArrayList(); boolean childActive = false; if (recurse) for (int i = 0; i < getChildren().length; i++) @@ -344,9 +345,9 @@ public class CompositeActivity extends Activity return jobs; } - public ArrayList calculateAllJobs(AgentPath agent, boolean recurse) + public ArrayList calculateAllJobs(AgentPath agent, boolean recurse) { - ArrayList jobs = new ArrayList(); + ArrayList jobs = new ArrayList(); if (recurse) for (int i = 0; i < getChildren().length; i++) if (getChildren()[i] instanceof Activity) diff --git a/source/com/c2kernel/lifecycle/instance/Join.java b/source/com/c2kernel/lifecycle/instance/Join.java old mode 100755 new mode 100644 index 205d264..b61100e --- a/source/com/c2kernel/lifecycle/instance/Join.java +++ b/source/com/c2kernel/lifecycle/instance/Join.java @@ -11,14 +11,14 @@ import com.c2kernel.scripting.ScriptingEngineException; */ public class Join extends WfVertex { - public Vector mErrors; + public Vector mErrors; /** * @see java.lang.Object#Object() */ public Join() { super(); - mErrors = new Vector(0, 1); + mErrors = new Vector(0, 1); } private boolean loopTested; public int counter = 0; diff --git a/source/com/c2kernel/lifecycle/instance/ParserWF.java b/source/com/c2kernel/lifecycle/instance/ParserWF.java old mode 100755 new mode 100644 index c3d718d..35fed90 --- a/source/com/c2kernel/lifecycle/instance/ParserWF.java +++ b/source/com/c2kernel/lifecycle/instance/ParserWF.java @@ -14,7 +14,7 @@ import com.c2kernel.utils.Logger; */ public class ParserWF { - static Vector nexts; + static Vector nexts; static String file = ""; static int i; static CastorHashMap mInfo = new CastorHashMap(); @@ -32,7 +32,7 @@ public class ParserWF */ public static CompositeActivity addStep(CompositeActivity act, String xmlfile, AgentPath agent) throws IOException { - nexts = new Vector(1, 1); + nexts = new Vector(1, 1); i = 0; file = xmlfile; int c; diff --git a/source/com/c2kernel/lifecycle/instance/Split.java b/source/com/c2kernel/lifecycle/instance/Split.java old mode 100755 new mode 100644 index 1f269af..e7b275c --- a/source/com/c2kernel/lifecycle/instance/Split.java +++ b/source/com/c2kernel/lifecycle/instance/Split.java @@ -13,14 +13,14 @@ import com.c2kernel.scripting.ScriptingEngineException; */ public abstract class Split extends WfVertex { - public Vector mErrors; + public Vector mErrors; /** * @see java.lang.Object#Object() */ public Split() { - mErrors = new Vector(0, 1); + mErrors = new Vector(0, 1); getProperties().put("RoutingScriptName", ""); getProperties().put("RoutingScriptVersion", ""); } diff --git a/source/com/c2kernel/lifecycle/instance/Workflow.java b/source/com/c2kernel/lifecycle/instance/Workflow.java old mode 100755 new mode 100644 index a7066d8..4c8aa94 --- a/source/com/c2kernel/lifecycle/instance/Workflow.java +++ b/source/com/c2kernel/lifecycle/instance/Workflow.java @@ -1,12 +1,14 @@ package com.c2kernel.lifecycle.instance; import java.awt.Point; import java.util.ArrayList; + import com.c2kernel.common.AccessRightsException; import com.c2kernel.common.InvalidDataException; import com.c2kernel.common.InvalidTransitionException; import com.c2kernel.common.ObjectAlreadyExistsException; import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.entity.C2KLocalObject; +import com.c2kernel.entity.agent.Job; import com.c2kernel.graph.model.GraphPoint; import com.c2kernel.graph.model.TypeNameAndConstructionInfo; import com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer; @@ -171,9 +173,9 @@ public class Workflow extends CompositeActivity implements C2KLocalObject /** * if type = 0 only domain steps will be queried if type = 1 only predefined steps will be queried else both will be queried */ - public ArrayList calculateJobs(AgentPath agent, int type) + public ArrayList calculateJobs(AgentPath agent, int type) { - ArrayList jobs = new ArrayList(); + ArrayList jobs = new ArrayList(); if (type != 1) jobs.addAll(((CompositeActivity) search("workflow/domain")).calculateJobs(agent, true)); if (type != 0) diff --git a/source/com/c2kernel/lifecycle/instance/XOrSplit.java b/source/com/c2kernel/lifecycle/instance/XOrSplit.java old mode 100755 new mode 100644 index bd999af..108aa61 --- a/source/com/c2kernel/lifecycle/instance/XOrSplit.java +++ b/source/com/c2kernel/lifecycle/instance/XOrSplit.java @@ -23,7 +23,7 @@ public class XOrSplit extends Split public void runNext(AgentPath agent) throws ScriptingEngineException { - ArrayList nextsToFollow = new ArrayList(); + ArrayList nextsToFollow = new ArrayList(); String nexts = this.evaluateScript( (String) getProperties().get("RoutingScriptName"), (String) getProperties().get("RoutingScriptVersion")).toString(); diff --git a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java old mode 100755 new mode 100644 index 020d694..d363dc6 --- a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java +++ b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java @@ -1,5 +1,6 @@ package com.c2kernel.lifecycle.instance.gui.model; import java.awt.Point; +import java.io.Serializable; import java.util.HashMap; import javax.swing.JOptionPane; @@ -26,7 +27,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue vertexTypeId = (String) typeNameAndConstructionInfo.mInfo; if (vertexTypeId.equals("Atomic") || vertexTypeId.equals("Composite")) { - HashMap mhm = new HashMap(); + HashMap mhm = new HashMap(); mhm.put("P1", vertexTypeId); mhm.put("P2", location); //************************************************ diff --git a/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java b/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java old mode 100755 new mode 100644 index fc0cd99..d33b717 --- a/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java +++ b/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java @@ -40,7 +40,7 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen protected GridBagConstraints c; protected Box transBox; protected JComboBox executors; - protected JComboBox states = new JComboBox(States.states); + protected JComboBox states = new JComboBox(States.states); protected JCheckBox active = new JCheckBox(); protected JLabel status = new JLabel(); protected ItemProxy mItem; diff --git a/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java b/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java old mode 100755 new mode 100644 index eddec34..7bedc81 --- a/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java +++ b/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java @@ -82,7 +82,7 @@ public class CreateItemFromDescription extends PredefinedStep // get init objects String[] collNames = storage.getClusterContents(myPath.getSysKey(), ClusterStorage.COLLECTION); - ArrayList collections = new ArrayList(); + ArrayList collections = new ArrayList(); // loop through collections to instantiate diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java old mode 100755 new mode 100644 index 4abb0e6..3677220 --- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java +++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java @@ -20,7 +20,6 @@ public class Aggregation implements java.io.Serializable { } public com.c2kernel.collection.Aggregation create() { - // TODO: create aggregation return new com.c2kernel.collection.AggregationInstance(); } } diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java old mode 100755 new mode 100644 index 4988700..32ca623 --- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java +++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java @@ -43,7 +43,7 @@ public class NewItem { /** * New Properties for the item */ - public ArrayList propertyList; + public ArrayList propertyList; /** * Field _aggregationList @@ -58,7 +58,7 @@ public class NewItem { public NewItem() { super(); - propertyList = new ArrayList(); + propertyList = new ArrayList(); aggregationList = new ArrayList(); dependencyList = new ArrayList(); } -- cgit v1.2.3