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

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

         }