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, 8 insertions, 8 deletions

diff --git a/source/com/c2kernel/utils/LocalObjectLoader.java b/source/com/c2kernel/utils/LocalObjectLoader.java
index 620b030..8a73e3c 100755..100644
--- a/source/com/c2kernel/utils/LocalObjectLoader.java
+++ b/source/com/c2kernel/utils/LocalObjectLoader.java
@@ -14,8 +14,8 @@ import com.c2kernel.process.Gateway;
 public class LocalObjectLoader {

 	private static ActDefCache actCache = new ActDefCache();

 

-	static public ItemProxy loadLocalObjectDef(String root, String name) 

-		throws ObjectNotFoundException 

+	static public ItemProxy loadLocalObjectDef(String root, String name)

+		throws ObjectNotFoundException

 	{

 		DomainPath defRoot = new DomainPath(root);

 	    DomainPath defPath = (DomainPath)defRoot.find(name);

@@ -32,7 +32,7 @@ public class LocalObjectLoader {
 	    	Logger.error(ex);

 	        throw new ObjectNotFoundException("Error loading script " + scriptName + " version " + scriptVersion, "");

 	    }

-	

+

 	}

 

 	static public Schema getSchema(String schemaName, int schemaVersion) throws ObjectNotFoundException {

@@ -40,14 +40,14 @@ public class LocalObjectLoader {
 	    Schema thisSchema = new Schema();

 	    thisSchema.docType = schemaName;

 	    thisSchema.docVersion = schemaVersion;

-	    

+

 	    // don't bother if this is the Schema schema - for bootstrap esp.

 	    if (schemaName.equals("Schema") && schemaVersion == 0) {

 	        thisSchema.breakApart = false;

 	        thisSchema.schema="";

 	        return thisSchema;

 	    }

-	        

+

 	        ItemProxy schema = loadLocalObjectDef("/desc/OutcomeDesc/", schemaName);

 	        Viewpoint schemaView = (Viewpoint)schema.getObject(ClusterStorage.VIEWPOINT + "/Schema/" + schemaVersion);

 	        try {

@@ -58,18 +58,18 @@ public class LocalObjectLoader {
 	        }

 	        String breakApart = schema.getProperty("BreakApart");

 	        thisSchema.breakApart = breakApart.equals("1");

-	

+

 	    return thisSchema;

 	}

 

 	/**

 	 * Retrieves a named version of activity def from the database

-	 * 

+	 *

 	 * @param actName - activity name

 	 * @param version - named version (String)

 	 * @return ActivityDef

 	 * @throws ObjectNotFoundException - When activity or version does not exist

-	 */ 

+	 */

 	static public ActivityDef getActDef(String actName, String actVersion) throws ObjectNotFoundException, InvalidDataException {

 		Logger.msg(5, "Loading activity def "+actName+" v"+actVersion);

 		return actCache.get(actName, actVersion);