[jetrix-cvs] SF.net SVN: jetrix:[856] jetrix/trunk/src/java/net/jetrix/listeners/ interceptor/NameCheckInterceptor.java

[<sm...@us...>]

Revision: 856
          http://jetrix.svn.sourceforge.net/jetrix/?rev=856&view=rev
Author:   smanux
Date:     2010-05-04 17:00:37 +0000 (Tue, 04 May 2010)

Log Message:
-----------
Code clarification in NameCheckInterceptor

Modified Paths:
--------------
    jetrix/trunk/src/java/net/jetrix/listeners/interceptor/NameCheckInterceptor.java

Modified: jetrix/trunk/src/java/net/jetrix/listeners/interceptor/NameCheckInterceptor.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/listeners/interceptor/NameCheckInterceptor.java	2010-05-04 16:22:12 UTC (rev 855)
+++ jetrix/trunk/src/java/net/jetrix/listeners/interceptor/NameCheckInterceptor.java	2010-05-04 17:00:37 UTC (rev 856)
@@ -45,20 +45,23 @@
     public void process(Client client) throws ClientValidationException
     {
         User user = client.getUser();
-
+        
+        if (client instanceof QueryClient)
+        {
+            return;
+        }
+        
         // test the name unicity
-        ClientRepository repository = ClientRepository.getInstance();
-        if (repository.getClient(user.getName()) != null)
+        if (isNameUsed(user.getName()))
         {
             Message m = new NoConnectingMessage("Nickname already in use!");
             client.send(m);
             client.disconnect();
             throw new ClientValidationException();
         }
-
+        
         // validate the name
-        String name = user.getName();
-        if (!(client instanceof QueryClient) && (name == null || "server".equalsIgnoreCase(name) || name.indexOf("\u00a0") != -1))
+        if (!isNamedAccepted(user.getName()))
         {
             Message m = new NoConnectingMessage("Invalid name!");
             client.send(m);
@@ -66,4 +69,17 @@
             throw new ClientValidationException();
         }
     }
+
+    protected boolean isNameUsed(String name)
+    {
+        ClientRepository repository = ClientRepository.getInstance();
+        return repository.getClient(name) != null;
+    }
+
+    protected boolean isNamedAccepted(String name)
+    {
+        return name != null 
+                && !"server".equalsIgnoreCase(name)
+                && name.indexOf("\u00a0") == -1;
+    }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.