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, 12 insertions, 9 deletions

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);

     }

 }