From 44805a5075b630237f2333775db433866269a85c Mon Sep 17 00:00:00 2001
From: Dave Ward <left@alfresco.com>
Date: Wed, 18 Mar 2009 14:53:37 +0000
Subject: [PATCH] Remove JDK 1.6 dependencies

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13670 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/repo/management/JmxDumpUtil.java    | 16 +++++++++++++---
 .../AbstractAuthenticationComponent.java         |  2 +-
 .../ntlm/NTLMAuthenticationComponentImpl.java    |  4 ++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/source/java/org/alfresco/repo/management/JmxDumpUtil.java b/source/java/org/alfresco/repo/management/JmxDumpUtil.java
index f267750bfa..f0b0dcf166 100644
--- a/source/java/org/alfresco/repo/management/JmxDumpUtil.java
+++ b/source/java/org/alfresco/repo/management/JmxDumpUtil.java
@@ -27,6 +27,7 @@ package org.alfresco.repo.management;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.reflect.Array;
+import java.util.Comparator;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -75,8 +76,16 @@ public class JmxDumpUtil
         // Get all the object names
         Set<ObjectName> objectNames = connection.queryNames(null, null);
 
-        // Sort the names
-        objectNames = new TreeSet<ObjectName>(objectNames);
+        // Sort the names (don't assume ObjectName implements Comparable in JDK 1.5)
+        Set<ObjectName> newObjectNames = new TreeSet<ObjectName>(new Comparator<ObjectName>()
+        {
+            public int compare(ObjectName o1, ObjectName o2)
+            {
+                return o1.toString().compareTo(o2.toString());
+            }
+        });
+        newObjectNames.addAll(objectNames);
+        objectNames = newObjectNames;
 
         // Dump each MBean
         for (ObjectName objectName : objectNames)
@@ -148,10 +157,11 @@ public class JmxDumpUtil
      * @throws IOException
      *             Signals that an I/O exception has occurred.
      */
+    @SuppressWarnings("unchecked")
     private static void printCompositeInfo(CompositeData composite, PrintWriter out, int nestLevel) throws IOException
     {
         Map<String, Object> attributes = new TreeMap<String, Object>();
-        for (String key : composite.getCompositeType().keySet())
+        for (String key : (Set<String>)composite.getCompositeType().keySet())
         {
             Object value;
             try
diff --git a/source/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java b/source/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java
index 444c43f03b..6d89995646 100644
--- a/source/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java
+++ b/source/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java
@@ -530,7 +530,7 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
     public void setDefaultAdministratorUserNames(String defaultAdministratorUserNames)
     {
         Set<String> nameSet = new TreeSet<String>();
-        if (!defaultAdministratorUserNames.isEmpty())
+        if (defaultAdministratorUserNames.length() > 0)
         {
             nameSet.addAll(Arrays.asList(defaultAdministratorUserNames.split(",")));
         }
diff --git a/source/java/org/alfresco/repo/security/authentication/ntlm/NTLMAuthenticationComponentImpl.java b/source/java/org/alfresco/repo/security/authentication/ntlm/NTLMAuthenticationComponentImpl.java
index 486b4d1f6d..5a7efb3306 100644
--- a/source/java/org/alfresco/repo/security/authentication/ntlm/NTLMAuthenticationComponentImpl.java
+++ b/source/java/org/alfresco/repo/security/authentication/ntlm/NTLMAuthenticationComponentImpl.java
@@ -279,7 +279,7 @@ public class NTLMAuthenticationComponentImpl extends AbstractAuthenticationCompo
      */
     @Managed(category="Security")
     public void setDomain(String domain) {
-        if (!domain.isEmpty())
+        if (domain.length() > 0)
         {        
             // Check if the passthru server list is already configured
             
@@ -306,7 +306,7 @@ public class NTLMAuthenticationComponentImpl extends AbstractAuthenticationCompo
      */
     @Managed(category="Security")
     public void setServers(String servers) {        
-        if (!servers.isEmpty())
+        if (servers.length() > 0)
         {
             // Check if the passthru server list is already configured