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

1 files changed, 25 insertions, 26 deletions

diff --git a/source/com/c2kernel/property/PropertyUtility.java b/source/com/c2kernel/property/PropertyUtility.java
index 9c65598..40d15bd 100755..100644
--- a/source/com/c2kernel/property/PropertyUtility.java
+++ b/source/com/c2kernel/property/PropertyUtility.java
@@ -21,66 +21,65 @@ import com.c2kernel.utils.Logger;
 

 public class PropertyUtility

 {

-    static public String getValue(ArrayList pdlist, String name)

+    static public String getValue(ArrayList<?> pdlist, String name)

 	{

 		Object[] values = pdlist.toArray();

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

-		{

-			PropertyDescription pd = (PropertyDescription) values[i];

-			if ( name.equalsIgnoreCase(pd.getName()) )			

-				return pd.getDefaultValue();			

-		}			

+		for (Object value : values) {

+			PropertyDescription pd = (PropertyDescription) value;

+			if ( name.equalsIgnoreCase(pd.getName()) )

+				return pd.getDefaultValue();

+		}

 		return null;

 	}

 

-	static public String getNames(ArrayList pdlist)

+	static public String getNames(ArrayList<?> pdlist)

 	{

 		Object[] values = pdlist.toArray();

 		StringBuffer names = new StringBuffer();

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

-			names.append( ((PropertyDescription)values[i]).getDefaultValue()).append(" ");

+		for (Object value : values)

+			names.append( ((PropertyDescription)value).getDefaultValue()).append(" ");

 		return names.toString();

 	}

 

-	static public String getClassIdNames(ArrayList pdlist)

+	static public String getClassIdNames(ArrayList<?> pdlist)

 	{

 		Object[] values = pdlist.toArray();

 		StringBuffer names = new StringBuffer();

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

 		{

-			PropertyDescription pd = ((PropertyDescription)values[i]);			

+			PropertyDescription pd = ((PropertyDescription)values[i]);

 			if (pd.getIsClassIdentifier())

 				names.append(pd.getName());

 			if (i<values.length-1 && i!=0)

-				names.append(",");				

-		}			

+				names.append(",");

+		}

 		return names.toString();

 	}

 

 

 	static public PropertyDescriptionList getPropertyDescriptionOutcome(int entityKey)

 	{

-        try 

-        {    

-            Outcome outc = (Outcome) Gateway.getStorage().get(entityKey, ClusterStorage.VIEWPOINT+"/PropertyDescription/last/data", null);                                                            

+        try

+        {

+            Outcome outc = (Outcome) Gateway.getStorage().get(entityKey, ClusterStorage.VIEWPOINT+"/PropertyDescription/last/data", null);

 			return (PropertyDescriptionList)CastorXMLUtility.unmarshall(outc.getData());

-        } 

-        catch (Exception ex) 

-        { 

+        }

+        catch (Exception ex)

+        {

         	Logger.error(ex);

             return null;

-        }		

+        }

 	}

 

-	static public CastorHashMap createProperty(PropertyDescriptionList pdList)	

+	static public CastorHashMap createProperty(PropertyDescriptionList pdList)

 	{

 		CastorHashMap props = new CastorHashMap();

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

 		{

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

-			if (pd.getIsClassIdentifier())			

-				props.put(pd.getName(),pd.getDefaultValue());							

-		}		

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

+			if (pd.getIsClassIdentifier())

+				props.put(pd.getName(),pd.getDefaultValue());

+		}

 		return props;

 	}