From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 00:42:34 +0200
Subject: 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

---
 .../instance/predefined/PredefinedStep.java        | 25 ++++++++++++++--------
 1 file changed, 16 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/predefined/PredefinedStep.java

(limited to 'source/com/c2kernel/lifecycle/instance/predefined/PredefinedStep.java')

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/PredefinedStep.java b/source/com/c2kernel/lifecycle/instance/predefined/PredefinedStep.java
old mode 100755
new mode 100644
index 8d95438..8aec993
--- 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();
-- 
cgit v1.2.3