From 8b7aae17858579ff84b96bf50a3efe895a9a76da Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Mon, 2 Jun 2014 15:13:46 +0200 Subject: LDAP interface refactoring --- src/main/java/com/c2kernel/gui/ItemFinder.java | 14 +++++++------- src/main/java/com/c2kernel/gui/MenuBuilder.java | 8 ++++---- .../c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java | 10 +++++----- src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java | 6 +++--- src/main/java/com/c2kernel/gui/tree/NodeContext.java | 12 ++++++------ 5 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src') 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 { diff --git a/src/main/java/com/c2kernel/gui/MenuBuilder.java b/src/main/java/com/c2kernel/gui/MenuBuilder.java index 2200f4b..195c4f5 100644 --- a/src/main/java/com/c2kernel/gui/MenuBuilder.java +++ b/src/main/java/com/c2kernel/gui/MenuBuilder.java @@ -2,8 +2,8 @@ package com.c2kernel.gui; import java.awt.Dimension; import java.awt.event.ActionListener; import java.awt.event.ItemListener; -import java.util.Enumeration; import java.util.HashMap; +import java.util.Iterator; import javax.swing.Box; import javax.swing.ButtonGroup; @@ -96,9 +96,9 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene * */ private void addServerConsoles() { - Enumeration servers = Gateway.getLDAPLookup().searchEntities(new DomainPath("/servers")); - while(servers.hasMoreElements()) { - Path thisServerPath = (Path)servers.nextElement(); + Iterator servers = Gateway.getLookup().searchEntities(new DomainPath("/servers")); + while(servers.hasNext()) { + Path thisServerPath = (Path)servers.next(); try { int syskey = thisServerPath.getSysKey(); String serverName = ((Property)Gateway.getStorage().get(syskey, ClusterStorage.PROPERTY+"/Name", null)).getValue(); diff --git a/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java b/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java index 03dfebc..aa7294a 100644 --- a/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java +++ b/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java @@ -5,13 +5,13 @@ package com.c2kernel.gui.lifecycle.chooser; */ import java.awt.Dimension; -import com.c2kernel.gui.MainFrame; import java.util.ArrayList; import java.util.Collections; -import java.util.Enumeration; +import java.util.Iterator; import javax.swing.JComboBox; +import com.c2kernel.gui.MainFrame; import com.c2kernel.lookup.DomainPath; import com.c2kernel.process.Gateway; @@ -33,10 +33,10 @@ public class LDAPEntryChooser extends JComboBox { try { - Enumeration children = Gateway.getLDAPLookup().searchAliases(mDomainPath); - while (children.hasMoreElements()) + Iterator children = Gateway.getLookup().searchAliases(mDomainPath); + while (children.hasNext()) { - DomainPath domPath = (DomainPath)children.nextElement(); + DomainPath domPath = (DomainPath)children.next(); allItems.add(domPath.getName()); } } diff --git a/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java b/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java index ce195c8..c5d6683 100644 --- a/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java +++ b/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java @@ -3,7 +3,7 @@ package com.c2kernel.gui.tabs; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; -import java.util.Enumeration; +import java.util.Iterator; import javax.swing.Box; import javax.swing.BoxLayout; @@ -116,8 +116,8 @@ public void actionPerformed(ActionEvent e) { public void loadPaths() { domPaths.clear(); - for (Enumeration currentPaths = Gateway.getLDAPLookup().search(new DomainPath(), entity.getName()); currentPaths.hasMoreElements();) { - DomainPath thisPath = (DomainPath)currentPaths.nextElement(); + for (Iterator currentPaths = Gateway.getLookup().search(new DomainPath(), entity.getName()); currentPaths.hasNext();) { + DomainPath thisPath = (DomainPath)currentPaths.next(); if (thisPath.getSysKey() == entity.getSystemKey()) domPaths.add(thisPath); } diff --git a/src/main/java/com/c2kernel/gui/tree/NodeContext.java b/src/main/java/com/c2kernel/gui/tree/NodeContext.java index f63855c..fcd1553 100644 --- a/src/main/java/com/c2kernel/gui/tree/NodeContext.java +++ b/src/main/java/com/c2kernel/gui/tree/NodeContext.java @@ -1,6 +1,6 @@ package com.c2kernel.gui.tree; -import java.util.Enumeration; +import java.util.Iterator; import com.c2kernel.entity.proxy.DomainPathSubscriber; import com.c2kernel.gui.ItemTabManager; @@ -11,7 +11,7 @@ import com.c2kernel.utils.Logger; public class NodeContext extends Node implements DomainPathSubscriber { - Enumeration children; + Iterator children; public NodeContext(Path path, ItemTabManager desktop) { super(path, desktop); @@ -26,18 +26,18 @@ public class NodeContext extends Node implements DomainPathSubscriber { public void loadChildren() { if (children == null) { Gateway.getProxyManager().subscribeTree(this, (DomainPath)binding); - children = binding.getChildren(); + children = Gateway.getLookup().getChildren(binding); } int batch = 75; - while (children.hasMoreElements() && batch > 0) { - Path newPath = children.nextElement(); + while (children.hasNext() && batch > 0) { + Path newPath = children.next(); if (newPath == null) break; Logger.msg(2, "Subscription.run() - new node: " + newPath ); add( newNode(newPath)); batch--; } - end(children.hasMoreElements()); + end(children.hasNext()); } @Override -- cgit v1.2.3