From c6204281c819ea4514952ed7623e282babcb5f8c Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Wed, 27 Feb 2013 21:36:23 +0100
Subject: More

---
 src/main/java/com/c2kernel/entity/proxy/AgentProxy.java        | 10 +++++-----
 .../java/com/c2kernel/entity/proxy/EntityProxyManager.java     |  7 +++----
 src/main/java/com/c2kernel/entity/transfer/TransferItem.java   |  8 ++++----
 3 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'src/main/java/com/c2kernel/entity')

diff --git a/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java b/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java
index 6d2b17d..18b8ae8 100644
--- a/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java
+++ b/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java
@@ -11,7 +11,7 @@
 package com.c2kernel.entity.proxy;
 
 import java.util.Date;
-import java.util.Enumeration;
+import java.util.Iterator;
 
 import com.c2kernel.common.AccessRightsException;
 import com.c2kernel.common.InvalidDataException;
@@ -257,14 +257,14 @@ public class AgentProxy extends EntityProxy
 
     /** Let scripts resolve items */
     public ItemProxy searchItem(String name) throws ObjectNotFoundException {
-        Enumeration<Path> results = Gateway.getLookup().search(new DomainPath(""),name);
+        Iterator<Path> results = Gateway.getLookup().search(new DomainPath(""),name);
 
         Path returnPath = null;
-        if (!results.hasMoreElements())
+        if (!results.hasNext())
             throw new ObjectNotFoundException(name, "");
 
-        while(results.hasMoreElements()) {
-            Path nextMatch = results.nextElement();
+        while(results.hasNext()) {
+            Path nextMatch = results.next();
             if (returnPath != null && nextMatch.getSysKey() != -1 && returnPath.getSysKey() != nextMatch.getSysKey())
                 throw new ObjectNotFoundException("Too many items with that name");
             returnPath = nextMatch;
diff --git a/src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java b/src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java
index 9ed562b..994343a 100644
--- a/src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java
+++ b/src/main/java/com/c2kernel/entity/proxy/EntityProxyManager.java
@@ -12,7 +12,6 @@ package com.c2kernel.entity.proxy;
 
 import java.util.ArrayList;
 import java.util.ConcurrentModificationException;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
 
@@ -47,9 +46,9 @@ public class EntityProxyManager
     {
         Logger.msg(5, "EntityProxyManager - Starting.....");
 
-        Enumeration<Path> servers = Gateway.getLookup().searchEntities(new DomainPath("/servers"));
-        while(servers.hasMoreElements()) {
-            Path thisServerPath = servers.nextElement();
+        Iterator<Path> servers = Gateway.getLookup().searchEntities(new DomainPath("/servers"));
+        while(servers.hasNext()) {
+            Path thisServerPath = servers.next();
             try {
                 int syskey = thisServerPath.getSysKey();
                 String remoteServer = ((Property)Gateway.getStorage().get(syskey, ClusterStorage.PROPERTY+"/Name", null)).getValue();
diff --git a/src/main/java/com/c2kernel/entity/transfer/TransferItem.java b/src/main/java/com/c2kernel/entity/transfer/TransferItem.java
index 36b8354..c6cf39a 100644
--- a/src/main/java/com/c2kernel/entity/transfer/TransferItem.java
+++ b/src/main/java/com/c2kernel/entity/transfer/TransferItem.java
@@ -2,7 +2,7 @@ package com.c2kernel.entity.transfer;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Enumeration;
+import java.util.Iterator;
 
 import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.entity.C2KLocalObject;
@@ -37,9 +37,9 @@ public class TransferItem {
         this.sysKey = sysKey;
         domainPaths = new ArrayList<String>();
         Property name = (Property)Gateway.getStorage().get(sysKey, ClusterStorage.PROPERTY + "/Name", null);
-        Enumeration<Path> paths = Gateway.getLookup().search(new DomainPath(), name.getValue());
-        while (paths.hasMoreElements()) {
-            DomainPath thisPath = (DomainPath)paths.nextElement();
+        Iterator<Path> paths = Gateway.getLookup().search(new DomainPath(), name.getValue());
+        while (paths.hasNext()) {
+            DomainPath thisPath = (DomainPath)paths.next();
             domainPaths.add(thisPath.toString());
         }
     }
-- 
cgit v1.2.3