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

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPClientFactory.java b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPClientFactory.java
index f8ce4f2..0d51f96 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPClientFactory.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPClientFactory.java
@@ -20,7 +20,8 @@ public abstract class LDAPClientFactory {
 	 * Mapping of category/identifier to LDAPClientFactory.

 	 * Allows the usage of multiple independently configured LDAPClientFactoryImpls. 

 	 */

-	private static Hashtable<String, LDAPClientFactory> ldapClientFactoryInstances = new Hashtable<String, LDAPClientFactory>();

+//	private static Hashtable<String, LDAPClientFactory> ldapClientFactoryInstances = new Hashtable<String, LDAPClientFactory>();

+	private static Hashtable ldapClientFactoryInstances = new Hashtable();

 

 	private LDAPMappingStore ldapMappingStore;

 	

@@ -44,18 +45,16 @@ public abstract class LDAPClientFactory {
 		return !this.ldapMappingStore.isEmpty();

 	}

 	

-	public synchronized void registerMappings(Iterable<LDAPMapping> iterable) {

+//	public synchronized void registerMappings(Iterable<LDAPMapping> iterable) {

+	public synchronized void registerMappings(Iterable iterable) {

 		if (!iterable.iterator().hasNext()) {

 			log.warn("There were no ldap mappings provided.");

 		}

 		this.ldapMappingStore.storeMappings(iterable);

 	}

 	

-	public synchronized void registerMapping(LDAPMapping... ldapMappings) {

-		if (ldapMappings.length == 0) {

-			log.warn("There were no ldap mappings provided.");

-		}

-		this.ldapMappingStore.storeMapping(ldapMappings);

+	public synchronized void registerMapping(LDAPMapping ldapMapping) {

+		this.ldapMappingStore.storeMapping(ldapMapping);

 	}

 	

 	public void setLDAPIssuerNameFilter(LDAPIssuerNameFilter filter) throws LDAPException {

@@ -70,7 +69,7 @@ public abstract class LDAPClientFactory {
 	}

 

 	public static synchronized LDAPClientFactory getInstance(String idenfifier) {

-		LDAPClientFactory ldapClientFactoryInstance = ldapClientFactoryInstances.get(idenfifier);

+		LDAPClientFactory ldapClientFactoryInstance = (LDAPClientFactory) ldapClientFactoryInstances.get(idenfifier);

 		if (ldapClientFactoryInstance == null) {

 			ldapClientFactoryInstance = new LDAPClientFactoryImpl();

 			ldapClientFactoryInstances.put(idenfifier, ldapClientFactoryInstance);