jdk-1.5 dependency removed

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@62 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 18 insertions, 19 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPMappingStore.java b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPMappingStore.java
index 324e859..2cd51ba 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPMappingStore.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPMappingStore.java
@@ -14,12 +14,13 @@ import org.apache.log4j.Logger;
  */

 public class LDAPMappingStore {

 	

-	private Hashtable<Name, LDAPMapping> storedMappings;

+//	private Hashtable<Name, LDAPMapping> storedMappings;

+	private Hashtable storedMappings;

 	private LDAPIssuerNameFilter issuerNameFilter;

 	private Logger log = Logger.getLogger(getClass());

 	

 	public LDAPMappingStore(LDAPIssuerNameFilter issuerNameFilter) {

-		this.storedMappings = new Hashtable<Name, LDAPMapping>();

+		this.storedMappings = new Hashtable();

 		this.issuerNameFilter = issuerNameFilter;

 	}

 	

@@ -28,7 +29,7 @@ public class LDAPMappingStore {
 	}

 	

 	public void clearStore() {

-		this.storedMappings = new Hashtable<Name, LDAPMapping>();

+		this.storedMappings = new Hashtable();

 	}

 	

 	public boolean isEmpty() {

@@ -39,25 +40,23 @@ public class LDAPMappingStore {
 		return this.issuerNameFilter != null;

 	}

 	

-	public void storeMapping(LDAPMapping... mappings) {

-		for (LDAPMapping mapping : mappings) {

-			Name name = mapping.getIssuerName();

-			if (issuerNameFilter != null) {

-				name = this.issuerNameFilter.applyFilter(name);

-			}

-			if (this.storedMappings.containsKey(name)) {

-				log.warn("Skipping mapping \"" + mapping + "\" because is has already been stored under \"" + name.getName() + "\".");

-			} else {

-				log.debug("Storing mapping \"" + mapping + "\" under \"" + name.getName() + "\".");

-				this.storedMappings.put(name, mapping);

-			}

+	public void storeMapping(LDAPMapping mapping) {

+		Name name = mapping.getIssuerName();

+		if (issuerNameFilter != null) {

+			name = this.issuerNameFilter.applyFilter(name);

+		}

+		if (this.storedMappings.containsKey(name)) {

+			log.warn("Skipping mapping \"" + mapping + "\" because is has already been stored under \"" + name.getName() + "\".");

+		} else {

+			log.debug("Storing mapping \"" + mapping + "\" under \"" + name.getName() + "\".");

+			this.storedMappings.put(name, mapping);

 		}

 	}

 

-	public void storeMappings(Iterable<LDAPMapping> iterable) {

-		Iterator<LDAPMapping> it = iterable.iterator();

+	public void storeMappings(Iterable iterable) {

+		Iterator it = iterable.iterator();

 		while (it.hasNext()) {

-			this.storeMapping(it.next());

+			this.storeMapping((LDAPMapping) it.next());

 		}

 	}

 	

@@ -65,7 +64,7 @@ public class LDAPMappingStore {
 		if (issuerNameFilter != null) {

 			name = this.issuerNameFilter.applyFilter(name);

 		}

-		return this.storedMappings.get(name);

+		return (LDAPMapping) this.storedMappings.get(name);

 	}

 	

 	public LDAPMapping getMapping(String nameString) throws LDAPException {