Use getUsersC() instead of getUsers()

We do the lookup immediately after anyway, so save a step.

diff --git a/acid/src/main/java/net/rizon/acid/commands/Shutdown.java b/acid/src/main/java/net/rizon/acid/commands/Shutdown.java
index 0c4f023b5c512515d5ef6ae0329e86babf7c8714..40fe15c6fa8a4b85ecd1c9cab63a1f0fb6f527b7 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/commands/Shutdown.java
+++ b/acid/src/main/java/net/rizon/acid/commands/Shutdown.java
@@ -38,9 +38,8 @@ public class Shutdown extends Command
                 */
                Acidictive.acidcore_sql.shutdown();
 
-               for (Iterator<String> it = User.getUsers().iterator(); it.hasNext();)
+               for (User u : User.getUsersC())
                {
-                       User u = User.findUser(it.next());
                        if (u == null || u.getServer() != AcidCore.me)
                                continue;
 

diff --git a/acid/src/main/java/net/rizon/acid/core/Acidictive.java b/acid/src/main/java/net/rizon/acid/core/Acidictive.java
index c507f414b2a75261fe804ef74cb95a64a3837033..615422d55fd27a1642aaeaff53ff68d81bf536cf 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/Acidictive.java
+++ b/acid/src/main/java/net/rizon/acid/core/Acidictive.java
@@ -159,9 +159,8 @@ public class Acidictive extends AcidCore
        {
                startTime = new Date().getTime();
 
-               for (String s : User.getUsers())
+               for (User u : User.getUsersC())
                {
-                       User u = User.findUser(s);
                        if (!(u instanceof AcidUser))
                                continue;
 

diff --git a/acid/src/main/java/net/rizon/acid/core/UserList.java b/acid/src/main/java/net/rizon/acid/core/UserList.java
index 5ab866fce661b6dc547848c584f689cbf4926dea..2423d19ed6103aa0d3bd19d1a08fe2e725cbf88f 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/UserList.java
+++ b/acid/src/main/java/net/rizon/acid/core/UserList.java
@@ -14,9 +14,8 @@ public class UserList
                        return null;
                Boolean IP = ip.matches("^(\\d{1,3}\\.){3}\\d{1,3}$");
                ArrayList<User> capUsers = new ArrayList<User>();
-               for (Iterator<String> it = User.getUsers().iterator(); it.hasNext();)
+               for (User u : User.getUsersC())
                {
-                       User u = User.findUser(it.next());
                        if ((IP && u.getIP().equals(ip)) || (!IP && u.getHost().equals(ip)))
                                capUsers.add(u);
                }
@@ -33,9 +32,8 @@ public class UserList
 
        public static User locateNick(String nick)
        {
-               for (Iterator<String> it = User.getUsers().iterator(); it.hasNext();)
+               for (User x : User.getUsersC())
                {
-                       User x = User.findUser(it.next());
                        ArrayList<String> n = x.oldNicks();
                        for (int e = 0; e < n.size(); e++)
                        {
@@ -49,9 +47,8 @@ public class UserList
        public static int identedNicks()
        {
                int num = 0;
-               for (Iterator<String> it = User.getUsers().iterator(); it.hasNext();)
+               for (User x : User.getUsersC())
                {
-                       User x = User.findUser(it.next());
                        if (x.hasMode("r"))
                                num++;
                }
@@ -60,20 +57,14 @@ public class UserList
 
        public static void flushNicks()
        {
-               for (Iterator<String> it = User.getUsers().iterator(); it.hasNext();)
-               {
-                       User x = User.findUser(it.next());
+               for (User x : User.getUsersC())
                        x.flush();
-               }
        }
 
        public static void clearChans()
        {
-               for (Iterator<String> it = User.getUsers().iterator(); it.hasNext();)
-               {
-                       User x = User.findUser(it.next());
+               for (User x : User.getUsersC())
                        x.clearFlood();
-               }
        }
 
        public static String globToRegex(String glob)