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, 2 deletions

diff --git a/source/com/c2kernel/lookup/LegacyLDAPPropertyManager.java b/source/com/c2kernel/lookup/LegacyLDAPPropertyManager.java
index 62653fb..638c694 100755..100644
--- a/source/com/c2kernel/lookup/LegacyLDAPPropertyManager.java
+++ b/source/com/c2kernel/lookup/LegacyLDAPPropertyManager.java
@@ -15,7 +15,8 @@ public class LegacyLDAPPropertyManager extends LDAPPropertyManager {
 	public LegacyLDAPPropertyManager(LDAPLookup ldap) {

 		super(ldap);

 	}

-	

+

+	@Override

 	public void deleteProperty(EntityPath thisEntity, String name) throws ObjectNotFoundException, ObjectCannotBeUpdated {

         try {

             LDAPLookupUtils.delete(ldap.getConnection(), "cn="+name+","+thisEntity.getFullDN());

@@ -25,6 +26,7 @@ public class LegacyLDAPPropertyManager extends LDAPPropertyManager {
         }

 	}

 

+	@Override

 	public String[] getPropertyNames(EntityPath thisEntity) throws ObjectNotFoundException {

         String props[]= LDAPLookupUtils.getChildrenDNs(ldap.getConnection(), thisEntity.getFullDN(), "objectclass=cristalproperty");

         String names[] = new String[props.length];

@@ -33,6 +35,7 @@ public class LegacyLDAPPropertyManager extends LDAPPropertyManager {
         return names;

 	}

 

+	@Override

 	public String getPropertyValue(EntityPath thisEntity, String name) throws ObjectNotFoundException {

         LDAPEntry anEntry = LDAPLookupUtils.getEntry(ldap.getConnection(),"cn="+name+","+thisEntity.getFullDN());

         if (anEntry==null)

@@ -40,10 +43,12 @@ public class LegacyLDAPPropertyManager extends LDAPPropertyManager {
         return LDAPLookupUtils.getFirstAttributeValue(anEntry,"propval");

 	}

 

+	@Override

 	public boolean hasProperties(EntityPath thisEntity) throws ObjectNotFoundException {

 		return LDAPLookupUtils.hasChildren(ldap.getConnection(), thisEntity.getFullDN(), "objectclass=cristalproperty" );

 	}

 

+	@Override

 	public void setProperty(EntityPath thisEntity, Property prop) throws ObjectNotFoundException, ObjectCannotBeUpdated {

         try {

             LDAPEntry anEntry = LDAPLookupUtils.getEntry(ldap.getConnection(),"cn="+prop.getName()+","+thisEntity.getFullDN());

@@ -64,7 +69,7 @@ public class LegacyLDAPPropertyManager extends LDAPPropertyManager {
 			} catch (Exception e) {

 				Logger.error(e);

 				throw new ObjectCannotBeUpdated(e.getMessage(), "");

-			} 

+			}

         }

 	}

 }