More code cleanup:

Refactored Entity Proxy Subscription to handle generics better
Rewrote RemoteMap to use TreeMap instead of the internal array for
order. It now sorts its keys by number if they parse, else as strings.
Removed a no-longer-in-progress outcome form class

24 files changed, 158 insertions, 137 deletions

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java b/source/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
index 27759be..b61187c 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
@@ -37,7 +37,8 @@ public class AddC2KObject extends PredefinedStep
     }

 

 	//requestdata is xmlstring

-    public void request(  AgentPath agent, int transitionID, String requestData)

+    @Override

+	public void request(  AgentPath agent, int transitionID, String requestData)

         throws AccessRightsException,

                InvalidTransitionException,

                InvalidDataException

@@ -54,7 +55,7 @@ public class AddC2KObject extends PredefinedStep
             {

 

                 Logger.msg(5, "AddC2KObject::request() - data:" + getDataList(requestData)[0]);

-                

+

 				C2KLocalObject obj = (C2KLocalObject)CastorXMLUtility.unmarshall(getDataList(requestData)[0]);

 				Gateway.getStorage().put(entityPath.getSysKey(), obj, null );

 				sendEventStoreOutcome(transitionID, requestData, agent);

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/AddDomainPath.java b/source/com/c2kernel/lifecycle/instance/predefined/AddDomainPath.java
index 6756895..2cf619e 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/AddDomainPath.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/AddDomainPath.java
@@ -29,7 +29,8 @@ public class AddDomainPath extends PredefinedStep
     }

 

 	//requestdata is xmlstring

-    public void request( AgentPath agent, int transitionID, String requestData)

+    @Override

+	public void request( AgentPath agent, int transitionID, String requestData)

         throws AccessRightsException,

                InvalidTransitionException,

                InvalidDataException

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java b/source/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
index c4fab0c..f70c053 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
@@ -21,6 +21,7 @@ public class AddStepsFromDescription extends PredefinedStep
 		super();

 	}

 

+	@Override

 	public void request( AgentPath agent, int transitionID, String requestData)

 		throws AccessRightsException, InvalidTransitionException, InvalidDataException

 	{

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java b/source/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
index 88f89c3..40fe740 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
@@ -11,7 +11,6 @@
 

 package com.c2kernel.lifecycle.instance.predefined;

 

-import java.util.Iterator;

 

 import com.c2kernel.collection.Collection;

 import com.c2kernel.collection.CollectionMember;

@@ -41,14 +40,15 @@ public class AssignItemToSlot extends PredefinedStep
         super();

     }

 

-	

+

     /**

      * Params:

      * 0 - collection name

      * 1 - slot number

      * 2 - target entity key

      */

-    public void request(AgentPath agent, int transitionID, String requestData)

+    @Override

+	public void request(AgentPath agent, int transitionID, String requestData)

         throws AccessRightsException,

                InvalidTransitionException,

                InvalidDataException

@@ -57,35 +57,35 @@ public class AssignItemToSlot extends PredefinedStep
         String collName;

         int slotNo;

         int entityKey;

-        Collection coll;

+        Collection<?> coll;

 

         Logger.msg(1, "AssignItemToSlot::request() - Starting.");

 

         checkAccessRights(agent);

-        

+

         // extract parameters

         try {

             entityPath = getItemEntityPath();

             String[] params = getDataList(requestData);

             collName = params[0];

             slotNo = Integer.parseInt(params[1]);

-            entityKey = Integer.parseInt(params[2]);           

+            entityKey = Integer.parseInt(params[2]);

         } catch (Exception e) {

             throw new InvalidDataException("Invalid parameters", "");

         }

-        

+

         // load collection

         try {

-            coll = (Collection)Gateway.getStorage().get(entityPath.getSysKey(), ClusterStorage.COLLECTION+"/"+collName, null);

+            coll = (Collection<?>)Gateway.getStorage().get(entityPath.getSysKey(), ClusterStorage.COLLECTION+"/"+collName, null);

         } catch (Exception e) {

             Logger.error(e);

             throw new InvalidDataException("Error loading collection "+collName, "");

         }

-        

+

         // find member and assign entity

         boolean stored = false;

-        for (Iterator iter = coll.getMembers().list.iterator(); iter.hasNext();) {

-            CollectionMember member = (CollectionMember)iter.next();

+        for (Object name : coll.getMembers().list) {

+            CollectionMember member = (CollectionMember)name;

             if (member.getID() == slotNo) {

                 if (member.getEntityKey() > -1)

                     throw new InvalidDataException("Member slot not empty", "");

@@ -101,8 +101,8 @@ public class AssignItemToSlot extends PredefinedStep
         if (!stored) {

             throw new InvalidDataException("Member slot "+slotNo+" not found.", "");

         }

-        

-        

+

+

 		try {

             Gateway.getStorage().put(entityPath.getSysKey(), coll, null);

         } catch (ClusterStorageException e) {

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java b/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
index 7bedc81..ad92052 100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
@@ -55,6 +55,7 @@ public class CreateItemFromDescription extends PredefinedStep
 	}

 

 	//requestdata is xmlstring

+	@Override

 	public void request(AgentPath agent, int transitionID, String requestData)

 	throws AccessRightsException, InvalidTransitionException, InvalidDataException,ObjectAlreadyExistsException

 	{

@@ -65,66 +66,66 @@ public class CreateItemFromDescription extends PredefinedStep
         String wfDefName = null;

         if (input.length > 2)  // override wf

             wfDefName = input[2];

-        

+

 		PropertyArrayList props = new PropertyArrayList();

 		Logger.msg(1, "AddNewItem::request() - Starting.");

 		TransactionManager storage = Gateway.getStorage();

 		LDAPLookup lookup = Gateway.getLDAPLookup();

 		EntityPath myPath = getItemEntityPath();

 		checkAccessRights(agent);

-		

+

         try {

-            // check if the path is already taken            

+            // check if the path is already taken

 			DomainPath context = new DomainPath(new DomainPath(domPath), newName);

 			Logger.debug(8,"context "+context.getSysKey()+" "+context.getPath()+" "+context.getString());

-			if (context.getSysKey()!=-1)  	

-                throw new ObjectAlreadyExistsException("The item name " +newName+ " exists already.");			

-            									

+			if (context.getSysKey()!=-1)

+                throw new ObjectAlreadyExistsException("The item name " +newName+ " exists already.");

+

             // get init objects

             String[] collNames = storage.getClusterContents(myPath.getSysKey(), ClusterStorage.COLLECTION);

             ArrayList<String> collections = new ArrayList<String>();

-            

-            

+

+

             // loop through collections to instantiate

-            for (int i = 0; i < collNames.length; i++) {

-            	Collection thisCol = (Collection)storage.get(myPath.getSysKey(), ClusterStorage.COLLECTION+"/"+collNames[i], null);

+            for (String collName : collNames) {

+            	Collection<?> thisCol = (Collection<?>)storage.get(myPath.getSysKey(), ClusterStorage.COLLECTION+"/"+collName, null);

             	if (thisCol instanceof CollectionDescription) {

-            		CollectionDescription thisDesc = (CollectionDescription)thisCol;

-            		collections.add(CastorXMLUtility.marshall(thisDesc.newInstance()));				

+            		CollectionDescription<?> thisDesc = (CollectionDescription<?>)thisCol;

+            		collections.add(CastorXMLUtility.marshall(thisDesc.newInstance()));

             	}

             	else if (thisCol.getName().equals("Workflow") && wfDefName == null) {

-            		ArrayList members = thisCol.getMembers().list;

+            		ArrayList<?> members = thisCol.getMembers().list;

             		// get the first member from the wf collection

             		CollectionMember wfMember = (CollectionMember)members.get(0);

             		wfDefName = wfMember.resolveEntity().getName();

             	}

             }

-            

+

             // load workflow def

             if (wfDefName == null)

                 throw new InvalidDataException("No workflow given or defined", "");

-            	

+

             try {

                 wfDef = (CompositeActivityDef)LocalObjectLoader.getActDef(wfDefName, "last");

             } catch (ObjectNotFoundException ex) {

-                throw new InvalidDataException("Workflow def '"+wfDefName+"' item not found", "");    

+                throw new InvalidDataException("Workflow def '"+wfDefName+"' item not found", "");

             } catch (ClassCastException ex) {

              	throw new InvalidDataException("Activity def '"+wfDefName+"' was not Composite", "");

             }

-            

-            

+

+

             // copy properties -- intend to create from propdesc

             PropertyDescriptionList pdList = PropertyUtility.getPropertyDescriptionOutcome(myPath.getSysKey());

             for (int i = 0; i < pdList.list.size(); i++) {

-            	PropertyDescription pd = (PropertyDescription) pdList.list.get(i);

+            	PropertyDescription pd = pdList.list.get(i);

             	String propName = pd.getName();

-            	String propVal = pd.getDefaultValue();				

+            	String propVal = pd.getDefaultValue();

             	if (propName.equals("Name"))

             		propVal = newName;

-            	props.list.add( new Property(propName, propVal));					

+            	props.list.add( new Property(propName, propVal));

             }

             props.list.add( new Property("Creator", agent.getAgentName()));

-            

+

             /* ITEM CREATION */

 

             // generate new entity key

@@ -132,8 +133,8 @@ public class CreateItemFromDescription extends PredefinedStep
             EntityPath entityPath = lookup.getNextKeyManager().generateNextEntityKey();

 

             // resolve the item factory

-            Logger.msg(6, "CreateItemFromDescription - Resolving item factory");            

-           

+            Logger.msg(6, "CreateItemFromDescription - Resolving item factory");

+

             // create the Item object

             Logger.msg(3, "CreateItemFromDescription - Creating Item");

             CorbaServer factory = Gateway.getCorbaServer();

@@ -141,26 +142,26 @@ public class CreateItemFromDescription extends PredefinedStep
             TraceableEntity newItem = (TraceableEntity)factory.createEntity(entityPath);

             Gateway.getLDAPLookup().add(entityPath);

 

-            

+

             // initialise it with its properties and workflow

-            

+

             Logger.msg(3, "CreateItemFromDescription - Initializing Item");

-            

+

             newItem.initialise(

                 agent.getSysKey(),

             	CastorXMLUtility.marshall(props),

             	CastorXMLUtility.marshall(wfDef.instantiate()));

-                

+

             // add collections

             if (collections.size() > 0) {

                 Logger.msg(6, "CreateItemFromDescription - Adding Collections");

                 String[] colls = new String[1];

-                for (Iterator iter = collections.iterator(); iter.hasNext();) {

-                    colls[0] = (String)iter.next();

-                    newItem.requestAction(agent.getSysKey(), "workflow/predefined/AddC2KObject", Transitions.COMPLETE, PredefinedStep.bundleData(colls));                                    

+                for (Iterator<String> iter = collections.iterator(); iter.hasNext();) {

+                    colls[0] = iter.next();

+                    newItem.requestAction(agent.getSysKey(), "workflow/predefined/AddC2KObject", Transitions.COMPLETE, PredefinedStep.bundleData(colls));

                 }

-            }              

-            

+            }

+

             // add its domain path

             Logger.msg(3, "CreateItemFromDescription - Creating "+context);

             context.setEntity(entityPath);

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/Erase.java b/source/com/c2kernel/lifecycle/instance/predefined/Erase.java
index 5c04f93..07d76b1 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/Erase.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/Erase.java
@@ -40,7 +40,8 @@ public class Erase extends PredefinedStep
     }

 

 	//requestdata is xmlstring

-    public void request(AgentPath agent, int transitionID, String requestData)

+    @Override

+	public void request(AgentPath agent, int transitionID, String requestData)

         throws AccessRightsException,

                InvalidTransitionException,

                InvalidDataException

@@ -51,22 +52,22 @@ public class Erase extends PredefinedStep
         try

         {

             EntityPath entityPath = getItemEntityPath();

-            

+

             // find entity name

             Property name = (Property)Gateway.getStorage().get(entityPath.getSysKey(), ClusterStorage.PROPERTY+"/Name", null);

-            

+

             // get all domain paths

-            Enumeration domPaths = Gateway.getLDAPLookup().search(new DomainPath(), name.getValue());

+            Enumeration<?> domPaths = Gateway.getLDAPLookup().search(new DomainPath(), name.getValue());

             while (domPaths.hasMoreElements()) {

                 DomainPath path = (DomainPath)domPaths.nextElement();

                 // delete them

                 if (path.getSysKey() == entityPath.getSysKey())

                     Gateway.getLDAPLookup().delete(path);

             }

-            

+

             //clear out all storages

             Gateway.getStorage().removeCluster(entityPath.getSysKey(), "", null);

-            

+

             //remove domain path

             Gateway.getLDAPLookup().delete(entityPath);

         }

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/Import.java b/source/com/c2kernel/lifecycle/instance/predefined/Import.java
index 36b7fc9..2f99937 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/Import.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/Import.java
@@ -7,7 +7,9 @@
 

 package com.c2kernel.lifecycle.instance.predefined;

 

-import com.c2kernel.common.*;

+import com.c2kernel.common.AccessRightsException;

+import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.InvalidTransitionException;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.utils.Logger;

 

@@ -15,7 +17,7 @@ import com.c2kernel.utils.Logger;
  *

  * $Revision: 1.21 $

  * $Date: 2005/06/02 12:17:22 $

- * 

+ *

  * Params: Schemaname_version:Viewpoint (optional), Outcome

  *

  * Copyright (C) 2003 CERN - European Organization for Nuclear Research

@@ -29,7 +31,8 @@ public class Import extends PredefinedStep
     }

 

 	//requestdata is xmlstring

-    public void request( AgentPath agent, int transitionID, String requestData)

+    @Override

+	public void request( AgentPath agent, int transitionID, String requestData)

         throws AccessRightsException,

                InvalidTransitionException,

                InvalidDataException

@@ -41,11 +44,11 @@ public class Import extends PredefinedStep
         checkAccessRights(agent);

 

         String[] params = getDataList(requestData);

-        

-       

+

+

         int split1 = params[0].indexOf('_');

         int split2 = params[0].indexOf(':');

-        

+

         String schemaName = params[0].substring(0, split1);

         String viewpoint = "last";

         int schemaVersion;

@@ -55,14 +58,14 @@ public class Import extends PredefinedStep
         }

         else

             schemaVersion = Integer.parseInt(params[0].substring(split1+1));

-        

+

         // set type & ver

         getProperties().put("SchemaType", schemaName);

         getProperties().put("SchemaVersion", String.valueOf(schemaVersion));

         getProperties().put("Viewpoint", viewpoint);

-        

+

         requestData = params[1];

-        

+

         sendEventStoreOutcome(transitionID, requestData, agent);

     }

 }

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/PredefinedStep.java b/source/com/c2kernel/lifecycle/instance/predefined/PredefinedStep.java
index 8d95438..8aec993 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/PredefinedStep.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/PredefinedStep.java
@@ -1,8 +1,10 @@
 package com.c2kernel.lifecycle.instance.predefined;

 import java.io.StringReader;

 import java.io.StringWriter;

+

 import javax.xml.parsers.DocumentBuilder;

 import javax.xml.parsers.DocumentBuilderFactory;

+

 import org.apache.xml.serialize.Method;

 import org.apache.xml.serialize.OutputFormat;

 import org.apache.xml.serialize.XMLSerializer;

@@ -13,6 +15,7 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;

 import org.w3c.dom.Text;

 import org.xml.sax.InputSource;

+

 import com.c2kernel.lifecycle.instance.Activity;

 import com.c2kernel.utils.Logger;

 /***********************************************************************************************************************************************************************************************************************************************************************************************************

@@ -25,6 +28,7 @@ public class PredefinedStep extends Activity
 	 * predefined Steps are always Active, and have only one transition subclasses could override this method (if necessary)

 	 ******************************************************************************************************************************************************************************************************************************************************************************************************/

 	private boolean isPredefined = false;

+	@Override

 	public boolean getActive()

 	{

 		if (isPredefined)

@@ -32,6 +36,7 @@ public class PredefinedStep extends Activity
 		else

 			return super.getActive();

 	}

+	@Override

 	public String getTransitions()

 	{

 		if (isPredefined)

@@ -39,6 +44,7 @@ public class PredefinedStep extends Activity
 		else

 			return super.getTransitions();

 	}

+	@Override

 	public String getErrors()

 	{

 		if (isPredefined)

@@ -46,6 +52,7 @@ public class PredefinedStep extends Activity
 		else

 			return super.getErrors();

 	}

+	@Override

 	public boolean verify()

 	{

 		if (isPredefined)

@@ -55,7 +62,7 @@ public class PredefinedStep extends Activity
 	}

 	/**

 	 * Returns the isPredefined.

-	 * 

+	 *

 	 * @return boolean

 	 */

 	public boolean getIsPredefined()

@@ -64,7 +71,7 @@ public class PredefinedStep extends Activity
 	}

 	/**

 	 * Sets the isPredefined.

-	 * 

+	 *

 	 * @param isPredefined

 	 *            The isPredefined to set

 	 */

@@ -72,6 +79,7 @@ public class PredefinedStep extends Activity
 	{

 		this.isPredefined = isPredefined;

 	}

+	@Override

 	public String getType()

 	{

 		return getName();

@@ -86,10 +94,9 @@ public class PredefinedStep extends Activity
 			Document dom = builder.newDocument();

 			Element root = dom.createElement("PredefinedStepOutcome");

 			dom.appendChild(root);

-			for (int i = 0; i < data.length; i++)

-			{

+			for (String element : data) {

 				Element param = dom.createElement("param");

-				Text t = dom.createTextNode(data[i]);

+				Text t = dom.createTextNode(element);

 				param.appendChild(t);

 				root.appendChild(param);

 			}

@@ -104,15 +111,15 @@ public class PredefinedStep extends Activity
             StringWriter stringOut = new StringWriter();

             XMLSerializer serial = new XMLSerializer(stringOut, format);

             serial.asDOMSerializer();

-            serial.serialize(dom);            

+            serial.serialize(dom);

             return stringOut.toString();

 		}

 		catch (Exception e)

 		{

             Logger.error(e);

 			StringBuffer xmlData = new StringBuffer().append("<PredefinedStepOutcome>");

-			for (int i = 0; i < data.length; i++)

-				xmlData.append("<param><![CDATA[").append(data[i]).append("]]></param>");

+			for (String element : data)

+				xmlData.append("<param><![CDATA[").append(element).append("]]></param>");

 			xmlData.append("</PredefinedStepOutcome>");

 			return xmlData.toString();

 		}

@@ -130,7 +137,7 @@ public class PredefinedStep extends Activity
 			NodeList nodeList = scriptDoc.getElementsByTagName("param");

 			String[] result = new String[nodeList.getLength()];

 			for (int i = 0; i < nodeList.getLength(); i++)

-            {      

+            {

                 Node n = nodeList.item(i).getFirstChild();

                 if (n instanceof CDATASection)

                 	result[i] = ((CDATASection) n).getData();

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/PredefinedStepContainer.java b/source/com/c2kernel/lifecycle/instance/predefined/PredefinedStepContainer.java
index 10a9d12..d065afb 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/PredefinedStepContainer.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/PredefinedStepContainer.java
@@ -4,12 +4,12 @@ import com.c2kernel.lifecycle.instance.CompositeActivity;
 public class PredefinedStepContainer extends CompositeActivity

 {

 	protected int num = 0;

-    

+

 	public PredefinedStepContainer()

 	{

 		super();

 		setName("predefined");

-		getProperties().put("Description", "Contains all predefined Steps");        

+		getProperties().put("Description", "Contains all predefined Steps");

 		createChildren();

 	}

 	public void createChildren()

@@ -26,7 +26,7 @@ public class PredefinedStepContainer extends CompositeActivity
         predInit("Erase", "Deletes all objects and domain paths for this item.", new Erase());

         predInit("Import", "Imports an outcome into the Item, with a given schema and viewpoint", new Import());

 	}

-    

+

 	public void predInit(String alias, String Description, PredefinedStep act)

 	{

 		act.setName(alias);

@@ -38,18 +38,22 @@ public class PredefinedStepContainer extends CompositeActivity
 		act.setIsPredefined(true);

 		addChild(act, new GraphPoint(100, 75 * ++num));

 	}

+	@Override

 	public boolean verify()

 	{

 		return true;

 	}

+	@Override

 	public String getErrors()

 	{

 		return "predefined";

 	}

+	@Override

 	public boolean getActive()

 	{

 		return true;

 	}

+	@Override

 	public String getTransitions()

 	{

 		return "<PossibleTransitions></PossibleTransitions>";

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java b/source/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
index 8004488..c9513a8 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
@@ -35,7 +35,8 @@ public class RemoveC2KObject extends PredefinedStep
     }

 

 	//requestdata is xmlstring

-    public void request(AgentPath agent, int transitionID, String requestData)

+    @Override

+	public void request(AgentPath agent, int transitionID, String requestData)

         throws AccessRightsException,

                InvalidTransitionException,

                InvalidDataException

@@ -51,7 +52,7 @@ public class RemoveC2KObject extends PredefinedStep
 

             Logger.msg(5, "RemoveC2KObject::request() - path:"+path);

 

-            Gateway.getStorage().remove( entityPath.getSysKey(), path, null ); 

+            Gateway.getStorage().remove( entityPath.getSysKey(), path, null );

 			sendEventStoreOutcome(transitionID, requestData, agent);

         }

         catch( Exception ex )

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/RemoveDomainPath.java b/source/com/c2kernel/lifecycle/instance/predefined/RemoveDomainPath.java
index af118e5..19ff7c6 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/RemoveDomainPath.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/RemoveDomainPath.java
@@ -27,7 +27,8 @@ public class RemoveDomainPath extends PredefinedStep
     }

 

 	//requestdata is xmlstring

-    public void request( AgentPath agent, int transitionID, String requestData)

+    @Override

+	public void request( AgentPath agent, int transitionID, String requestData)

         throws AccessRightsException,

                InvalidTransitionException,

                InvalidDataException

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java b/source/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
index e8c6a6f..ba3e6c6 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
@@ -20,6 +20,7 @@ public class ReplaceDomainWorkflow extends PredefinedStep
 		super();

 	}

 

+	@Override

 	public void request( AgentPath agent, int transitionID, String requestData)

 		throws AccessRightsException, InvalidTransitionException, InvalidDataException

 	{

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/ServerPredefinedStepContainer.java b/source/com/c2kernel/lifecycle/instance/predefined/ServerPredefinedStepContainer.java
index 363d1fc..21eacda 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/ServerPredefinedStepContainer.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/ServerPredefinedStepContainer.java
@@ -17,13 +17,14 @@ import com.c2kernel.lifecycle.instance.predefined.entitycreation.CreateNewItem;
 public class ServerPredefinedStepContainer extends PredefinedStepContainer {

 

 

-    public void createChildren()

+    @Override

+	public void createChildren()

     {

         super.createChildren();

         serverPredInit("CreateNewItem", "Creates a new Item in this Server without description.", new CreateNewItem(), "NewItem");

         serverPredInit("CreateNewAgent", "Creates a new Item in this Server without description.", new CreateNewAgent(), "NewAgent");

     }

-    

+

     public void serverPredInit(String alias, String Description, PredefinedStep act, String schema)

     {

         act.setName(alias);

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java b/source/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java
index da526a2..77a0b43 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java
@@ -36,7 +36,8 @@ public class WriteProperty extends PredefinedStep
     }

 

 	//requestdata is xmlstring

-    public void request(  AgentPath agent, int transitionID, String requestData)

+    @Override

+	public void request(  AgentPath agent, int transitionID, String requestData)

         throws AccessRightsException,

                InvalidTransitionException,

                InvalidDataException

@@ -56,7 +57,7 @@ public class WriteProperty extends PredefinedStep
             {

 

                 Logger.msg(5, "WriteProperty::request() - name:" + params[0] +" val:"+params[1]);

-                

+

                 Property newProp = new Property(params[0], params[1]);

 				Gateway.getStorage().put(entityPath.getSysKey(), newProp, null );

 				sendEventStoreOutcome(transitionID, requestData, agent);

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
index 3677220..073d662 100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
@@ -5,20 +5,20 @@ import java.util.ArrayList;
 public class Aggregation implements java.io.Serializable {

 

     public boolean isDescription;

-    public ArrayList aggregationMemberList;

+    public ArrayList<?> aggregationMemberList;

     public String name;

 

     public Aggregation() {

         super();

-        aggregationMemberList = new ArrayList();

-    } 

-    

+        aggregationMemberList = new ArrayList<Object>();

+    }

+

     public Aggregation(String name, boolean isDescription) {

         this();

         this.name = name;

         this.isDescription = isDescription;

     }

-    

+

     public com.c2kernel.collection.Aggregation create() {

         return new com.c2kernel.collection.AggregationInstance();

     }

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/AggregationMember.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/AggregationMember.java
index 87baa1d..29d3cf9 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/AggregationMember.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/AggregationMember.java
@@ -11,7 +11,7 @@ public class AggregationMember implements java.io.Serializable {
     public AggregationMember() {

         super();

     }

-    

+

     public AggregationMember(int slotNo, String itemDescPath, String itemPath, Geometry geometry) {

         this.slotNo = slotNo;

         this.itemDescriptionPath = itemDescPath;

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java
index b0eaaec..96371dd 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java
@@ -26,7 +26,8 @@ public class CreateNewAgent extends PredefinedStep
     }

 

 	//requestdata is xmlstring

-    public void request( AgentPath agent, int transitionID, String requestData)

+    @Override

+	public void request( AgentPath agent, int transitionID, String requestData)

         throws AccessRightsException,

                InvalidTransitionException,

                InvalidDataException

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewItem.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewItem.java
index 49f8ada..a66b062 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewItem.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewItem.java
@@ -26,7 +26,8 @@ public class CreateNewItem extends PredefinedStep
     }

 

 	//requestdata is xmlstring

-    public void request( AgentPath agent, int transitionID, String requestData)

+    @Override

+	public void request( AgentPath agent, int transitionID, String requestData)

         throws AccessRightsException,

                InvalidTransitionException,

                InvalidDataException

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java
index 0896534..311c108 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java
@@ -1,7 +1,6 @@
 package com.c2kernel.lifecycle.instance.predefined.entitycreation;

 

 import java.util.ArrayList;

-import java.util.Iterator;

 

 import com.c2kernel.collection.MembershipException;

 import com.c2kernel.lookup.DomainPath;

@@ -12,13 +11,13 @@ public class Dependency implements java.io.Serializable {
     public String name;

     public boolean isDescription;

     public String itemDescriptionPath;

-    public ArrayList dependencyMemberList;

+    public ArrayList<?> dependencyMemberList;

 

     public Dependency() {

         super();

-        dependencyMemberList = new ArrayList();

-    } 

-    

+        dependencyMemberList = new ArrayList<Object>();

+    }

+

     public Dependency(String itemDesc) {

         this();

         this.itemDescriptionPath = itemDesc;

@@ -33,8 +32,8 @@ public class Dependency implements java.io.Serializable {
             PropertyUtility.getPropertyDescriptionOutcome(new DomainPath(itemDescriptionPath).getSysKey());

             //TODO: set props and class identifiers

         }

-        for (Iterator mems = dependencyMemberList.iterator(); mems.hasNext();) {

-            DependencyMember thisMem = (DependencyMember) mems.next();

+        for (Object name2 : dependencyMemberList) {

+            DependencyMember thisMem = (DependencyMember) name2;

             int syskey = new DomainPath(thisMem.itemPath).getSysKey();

             if (syskey == -1)

             	throw new MembershipException("Cannot find "+thisMem.itemPath+" specified for collection.");

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/DependencyMember.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/DependencyMember.java
index 00ac445..b70619f 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/DependencyMember.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/DependencyMember.java
@@ -9,10 +9,10 @@ public class DependencyMember implements java.io.Serializable {
     public DependencyMember() {

         super();

     }

-    

+

     public DependencyMember(String itemPath) {

         this.itemPath = itemPath;

-        

+

     }

 

 }

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Geometry.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Geometry.java
index 25a1455..f18b6d4 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Geometry.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Geometry.java
@@ -25,5 +25,5 @@ public class Geometry implements java.io.Serializable {
         this.width = width;

         this.height = height;

     }

-    

+

 }

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
index fa575a3..30b80c4 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
@@ -2,7 +2,6 @@ package com.c2kernel.lifecycle.instance.predefined.entitycreation;
 

 import java.security.NoSuchAlgorithmException;

 import java.util.ArrayList;

-import java.util.Iterator;

 

 import com.c2kernel.common.CannotManageException;

 import com.c2kernel.common.ObjectAlreadyExistsException;

@@ -21,19 +20,19 @@ public class NewAgent implements java.io.Serializable {
     public String name;

 

     public String password;

-    

-    public ArrayList roles;

+

+    public ArrayList<?> roles;

 

     public NewAgent() {

         super();

-        roles = new ArrayList();

-    } 

-    

+        roles = new ArrayList<Object>();

+    }

+

     public NewAgent(String name, String password) {

         this.name = name;

         this.password = password;

     }

-    

+

     protected void create(int agentId) throws ObjectNotFoundException, ObjectCannotBeUpdated, NoSuchAlgorithmException, CannotManageException, ObjectAlreadyExistsException {

         AgentPath newAgent = Gateway.getLDAPLookup().getNextKeyManager().generateNextAgentKey();

         newAgent.setAgentName(name);

@@ -50,8 +49,8 @@ public class NewAgent implements java.io.Serializable {
             Logger.error(ex);

             throw new CannotManageException("Error initialising new agent");

         }

-        for (Iterator iter = roles.iterator(); iter.hasNext();) {

-            String role = (String) iter.next();

+        for (Object name2 : roles) {

+            String role = (String) name2;

             RolePath thisRole;

             try {

                 thisRole = Gateway.getLDAPLookup().getRoleManager().getRolePath(role);

@@ -60,6 +59,6 @@ public class NewAgent implements java.io.Serializable {
             }

             thisRole.addAgent(newAgent);

         }

-               

+

     }

 }

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
index 32ca623..339e294 100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
@@ -2,7 +2,6 @@ package com.c2kernel.lifecycle.instance.predefined.entitycreation;
 

 

 import java.util.ArrayList;

-import java.util.Iterator;

 

 import com.c2kernel.collection.MembershipException;

 import com.c2kernel.common.CannotManageException;

@@ -22,7 +21,7 @@ import com.c2kernel.utils.Logger;
 

 /**

  * Complete Structure for new item

- * 

+ *

  * @version $Revision: 1.8 $ $Date: 2006/03/03 13:52:21 $

  */

 public class NewItem  {

@@ -48,31 +47,30 @@ public class NewItem  {
     /**

      * Field _aggregationList

      */

-    public ArrayList aggregationList;

+    public ArrayList<?> aggregationList;

 

     /**

      * Field _dependencyList

      */

-    public ArrayList dependencyList;

+    public ArrayList<?> dependencyList;

 

 

     public NewItem() {

         super();

         propertyList = new ArrayList<Property>();

-        aggregationList = new ArrayList();

-        dependencyList = new ArrayList();

+        aggregationList = new ArrayList<Object>();

+        dependencyList = new ArrayList<Object>();

     }

-    

+

     public NewItem(String name, String initialPath, String wf) {

         this();

         this.name = name;

         this.initialPath = initialPath;

         this.workflow = wf;

     }

-    

+

     public void setProperty(String name, String value) {

-        for (Iterator iter = propertyList.iterator(); iter.hasNext();) {

-            Property prop = (Property) iter.next();

+        for (Property prop : propertyList) {

             if (prop.name.equals(name)) {

                 prop.value = value;

                 return;

@@ -80,30 +78,29 @@ public class NewItem  {
         }

         propertyList.add(new Property(name, value));

     }

-    

+

     protected void create(int agentId) throws ObjectCannotBeUpdated, ObjectNotFoundException, CannotManageException, ObjectAlreadyExistsException {

         DomainPath domPath = new DomainPath(new DomainPath(initialPath), name);

         if (domPath.exists())

             throw new ObjectAlreadyExistsException(domPath+" already exists!", "");

-        

+

         // create item

         EntityPath entPath = Gateway.getLDAPLookup().getNextKeyManager().generateNextEntityKey();

         TraceableEntity newItem = (TraceableEntity)Gateway.getCorbaServer().createEntity(entPath);

         Gateway.getLDAPLookup().add(entPath);

-        

+

         // assemble properties

         PropertyArrayList propList = new PropertyArrayList();

         propList.list.add(new com.c2kernel.property.Property("Name", name));

-        for (Iterator iter = propertyList.iterator(); iter.hasNext();) {

-            Property element = (Property) iter.next();

+        for (Property element : propertyList) {

             propList.list.add(new com.c2kernel.property.Property(element.name, element.value));

         }

         // init the new item

         try {

-        

+

         	// find workflow def

         	CompositeActivityDef compact = (CompositeActivityDef)LocalObjectLoader.getActDef(workflow, "last");

-        

+

             newItem.initialise(

                     agentId,

                     CastorXMLUtility.marshall(propList),

@@ -113,11 +110,11 @@ public class NewItem  {
             Logger.error(ex);

             throw new CannotManageException("Problem initialising new item. See server log.", "");

         }

-        

+

         // create collections

-        

-        for (Iterator iter = dependencyList.iterator(); iter.hasNext();) {

-            Dependency element = (Dependency) iter.next();

+

+        for (Object name2 : dependencyList) {

+            Dependency element = (Dependency) name2;

             try {

                 Gateway.getStorage().put(entPath.getSysKey(), element.create(), null);

             } catch (ClusterStorageException ex) {

@@ -128,9 +125,9 @@ public class NewItem  {
                 throw new CannotManageException("A specified member is not of the correct type in "+element.name, "");

             }

         }

-        

-        for (Iterator iter = aggregationList.iterator(); iter.hasNext();) {

-            Aggregation element = (Aggregation) iter.next();

+

+        for (Object name2 : aggregationList) {

+            Aggregation element = (Aggregation) name2;

             try {

                 Gateway.getStorage().put(entPath.getSysKey(), element.create(), null);

             } catch (ClusterStorageException ex) {

@@ -140,6 +137,6 @@ public class NewItem  {
         }

         // register domain path

         domPath.setEntity(entPath);

-        Gateway.getLDAPLookup().add(domPath);        

+        Gateway.getLDAPLookup().add(domPath);

     }

 }

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Property.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Property.java
index d99a3e3..e2d214c 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Property.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Property.java
@@ -1,7 +1,7 @@
 package com.c2kernel.lifecycle.instance.predefined.entitycreation;

 /**

  * New Properties for the item

- * 

+ *

  * @version $Revision: 1.1 $ $Date: 2005/04/28 13:48:26 $

  */

 public class Property implements java.io.Serializable {