From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 00:42:34 +0200
Subject: 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

---
 .../c2kernel/lifecycle/chooser/LDAPEntryChooser.java    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java')

diff --git a/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java b/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java
index e8143be..d86c0a0 100644
--- a/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java
+++ b/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java
@@ -17,10 +17,10 @@ import com.c2kernel.utils.Logger;
 
 public class LDAPEntryChooser extends JComboBox<String>
 {
-   
+
     DomainPath mDomainPath = null;
     ArrayList<String> allItems = new ArrayList<String>();
-    
+
     public LDAPEntryChooser(DomainPath domPath, boolean editable)
     {
         super();
@@ -28,12 +28,12 @@ public class LDAPEntryChooser extends JComboBox<String>
         mDomainPath = domPath;
         initialise();
      }
- 
+
     private void initialise()
     {
         try
         {
-            Enumeration children = Gateway.getLDAPLookup().searchAliases(mDomainPath);
+            Enumeration<?> children = Gateway.getLDAPLookup().searchAliases(mDomainPath);
             while (children.hasMoreElements())
             {
                 DomainPath domPath = (DomainPath)children.nextElement();
@@ -44,13 +44,13 @@ public class LDAPEntryChooser extends JComboBox<String>
         {
             Logger.exceptionDialog(ex);
         }
-        
+
         Collections.sort(allItems);
         addItem("");
         for (String element : allItems) {
 			addItem(element);
 		}
-        
+
     }
 
     public void reload()
@@ -58,8 +58,9 @@ public class LDAPEntryChooser extends JComboBox<String>
         removeAllItems();
         initialise();
     }
-    
-    public synchronized Dimension getSize()
+
+    @Override
+	public synchronized Dimension getSize()
     {
         if ("1".equals(Gateway.getProperty("ResizeCombo")))
             return new Dimension(super.getSize().width<400?400:super.getSize().width,super.getSize().height);
-- 
cgit v1.2.3