1 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/com/c2kernel/gui/ItemFinder.java b/src/main/java/com/c2kernel/gui/ItemFinder.java
index 6b1ed00..9197ea0 100644
--- a/src/main/java/com/c2kernel/gui/ItemFinder.java
+++ b/src/main/java/com/c2kernel/gui/ItemFinder.java
@@ -7,7 +7,7 @@ import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;

 import java.awt.event.ItemListener;

 import java.io.IOException;

-import java.util.Enumeration;

+import java.util.Iterator;

 import java.util.StringTokenizer;

 

 import javax.swing.Box;

@@ -20,7 +20,7 @@ import javax.swing.JTextField;
 import javax.swing.JToggleButton;

 

 import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.lookup.LDAPLookup;

+import com.c2kernel.lookup.Lookup;

 import com.c2kernel.lookup.Path;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.Language;

@@ -31,10 +31,10 @@ public class ItemFinder extends Box implements Runnable {
     JButton findButton;

     JButton findNextButton;

     GridBagLayout gridbag = new GridBagLayout();

-    LDAPLookup lookup = Gateway.getLDAPLookup();

+    Lookup lookup = Gateway.getLookup();

     DomainKeyConsumer defaultConsumer = null;

 	DomainKeyConsumer currentConsumer = null;

-    Enumeration<?> matches;

+    Iterator<?> matches;

     Path rootNode = MainFrame.userNode.getPath();

 

 	static protected ImageIcon 			mFindIcon 			= null;

@@ -164,7 +164,7 @@ public class ItemFinder extends Box implements Runnable {
 //        	matches = lookup.search(rootNode,term.substring(0, colonPos), term.substring(colonPos+1));

 //        else

         	matches = lookup.search(rootNode,term);

-        if (!matches.hasMoreElements()) {

+        if (!matches.hasNext()) {

             MainFrame.progress.stopBouncing("No results");

             currentConsumer.push(searchTerm); // for subscribers who don't care if it exists

             findButton.setEnabled(true);

@@ -177,7 +177,7 @@ public class ItemFinder extends Box implements Runnable {
 

     void nextMatch() {

         findButton.setEnabled(false); findNextButton.setEnabled(false);

-        DomainPath nextMatch = (DomainPath)matches.nextElement();

+        DomainPath nextMatch = (DomainPath)matches.next();

         try

         {

             currentConsumer.push(nextMatch);

@@ -188,7 +188,7 @@ public class ItemFinder extends Box implements Runnable {
         }

         findButton.setEnabled(true);

         findNextButton.setToolTipText("Click to show next match");

-        if (matches.hasMoreElements()) findNextButton.setEnabled(true);

+        if (matches.hasNext()) findNextButton.setEnabled(true);

     }

 

     private class ListenerButtonListener implements ItemListener {