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, 18 insertions, 22 deletions

diff --git a/source/com/c2kernel/entity/transfer/TransferSet.java b/source/com/c2kernel/entity/transfer/TransferSet.java
index f67ba9c..71a593a 100644
--- a/source/com/c2kernel/entity/transfer/TransferSet.java
+++ b/source/com/c2kernel/entity/transfer/TransferSet.java
@@ -2,7 +2,6 @@ package com.c2kernel.entity.transfer;
 

 import java.io.File;

 import java.util.ArrayList;

-import java.util.Iterator;

 

 import com.c2kernel.lookup.EntityPath;

 import com.c2kernel.lookup.NextKeyManager;

@@ -23,36 +22,35 @@ import com.c2kernel.utils.Logger;
 public class TransferSet {

 

     public ArrayList<TransferItem> items;

-    

+

     public TransferSet() {

     }

-    

+

     public TransferSet(int[] sysKeys) {

         items = new ArrayList<TransferItem>();

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

+        for (int sysKey : sysKeys) {

             try {

-                items.add(new TransferItem(sysKeys[i]));

+                items.add(new TransferItem(sysKey));

             } catch (Exception ex) {

-                Logger.error("Could not add item "+sysKeys[i]);

+                Logger.error("Could not add item "+sysKey);

                 Logger.error(ex);

             }

         }

     }

-    

+

     public void exportPackage(File dir) throws Exception {

         if (items==null || items.size() == 0)

             throw new Exception("Nothing to dump");

         FileStringUtility.createNewDir(dir.getAbsolutePath());

-        for (Iterator iter = items.iterator(); iter.hasNext();) {

-            TransferItem element = (TransferItem)iter.next();

+        for (TransferItem element : items) {

             try {

                 element.exportItem(new File(dir, String.valueOf(element.sysKey)), "/");

             } catch (Exception ex) {

-                Logger.error("Error dumping item "+element.sysKey);     

-                Logger.error(ex);  

+                Logger.error("Error dumping item "+element.sysKey);

+                Logger.error(ex);

             }

         }

-        

+

         try {

             String self = CastorXMLUtility.marshall(this);

             FileStringUtility.string2File(new File(dir, "transferSet.xml"), self);

@@ -61,10 +59,9 @@ public class TransferSet {
             Logger.error(ex);

         }

     }

-    

+

     public void importPackage(File rootDir) {

-        for (Iterator iter = items.iterator(); iter.hasNext();) {

-            TransferItem element = (TransferItem)iter.next();

+        for (TransferItem element : items) {

             Logger.msg(5, "Importing "+element.sysKey);

             try {

                 element.importItem(new File(rootDir, String.valueOf(element.sysKey)));

@@ -76,24 +73,23 @@ public class TransferSet {
         }

         checkLastKey();

     }

-    

+

     private void checkLastKey()

-    {   

+    {

         // find highest key in out import set

         int packageLastKey = 0;

-        for (Iterator iter = items.iterator(); iter.hasNext();) {

-            TransferItem element = (TransferItem)iter.next();

+        for (TransferItem element : items) {

             if (element.sysKey > packageLastKey)

                 packageLastKey = element.sysKey;

         }

-        

+

         try

         {   // find the current last key

             NextKeyManager nextKeyMan = Gateway.getLDAPLookup().getNextKeyManager();

             EntityPath lastKey = nextKeyMan.getLastEntityPath();

             Logger.msg(1, "Last key imported was "+packageLastKey+". LDAP lastkey was "+lastKey.getSysKey());

 

-                

+

             if (packageLastKey > lastKey.getSysKey()) { // set new last

                 Logger.msg(1, "Updating lastKey to "+packageLastKey);

                 nextKeyMan.writeLastEntityKey(packageLastKey);

@@ -102,6 +98,6 @@ public class TransferSet {
         catch (Exception ex)

         {

             Logger.error("Exception::LoadKeys::processFile() " + ex);

-        }           

+        }

     }

 }