[jetrix-cvs] SF.net SVN: jetrix:[723] jetrix/trunk/src/java/net/jetrix

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

Revision: 723
          http://jetrix.svn.sourceforge.net/jetrix/?rev=723&view=rev
Author:   smanux
Date:     2008-08-13 15:55:33 +0000 (Wed, 13 Aug 2008)

Log Message:
-----------
Fixed a regression in the handling of query clients

Modified Paths:
--------------
    jetrix/trunk/src/java/net/jetrix/agent/ChannelInfo.java
    jetrix/trunk/src/java/net/jetrix/agent/PlayerInfo.java
    jetrix/trunk/src/java/net/jetrix/agent/QueryInfo.java
    jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java
    jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java

Modified: jetrix/trunk/src/java/net/jetrix/agent/ChannelInfo.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/agent/ChannelInfo.java	2008-08-07 21:03:46 UTC (rev 722)
+++ jetrix/trunk/src/java/net/jetrix/agent/ChannelInfo.java	2008-08-13 15:55:33 UTC (rev 723)
@@ -76,6 +76,11 @@
         this.status = status;
     }
 
+    public boolean isPlaying()
+    {
+        return status > 1;
+    }
+
     public int getPlayernum()
     {
         return playernum;

Modified: jetrix/trunk/src/java/net/jetrix/agent/PlayerInfo.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/agent/PlayerInfo.java	2008-08-07 21:03:46 UTC (rev 722)
+++ jetrix/trunk/src/java/net/jetrix/agent/PlayerInfo.java	2008-08-13 15:55:33 UTC (rev 723)
@@ -87,6 +87,11 @@
         this.status = status;
     }
 
+    public boolean isPlaying()
+    {
+        return status > 0;
+    }
+
     public int getAuthenticationLevel()
     {
         return authenticationLevel;

Modified: jetrix/trunk/src/java/net/jetrix/agent/QueryInfo.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/agent/QueryInfo.java	2008-08-07 21:03:46 UTC (rev 722)
+++ jetrix/trunk/src/java/net/jetrix/agent/QueryInfo.java	2008-08-13 15:55:33 UTC (rev 723)
@@ -75,10 +75,11 @@
      */
     public List getPlayers(String channel)
     {
+        // todo
         return players;
     }
 
-    public List getChannels()
+    public List<ChannelInfo> getChannels()
     {
         return channels;
     }

Modified: jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java	2008-08-07 21:03:46 UTC (rev 722)
+++ jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java	2008-08-13 15:55:33 UTC (rev 723)
@@ -132,7 +132,7 @@
                         message.append(" ");
                         message.append(config.getMaxPlayers());
                         message.append(" 0 ");
-                        message.append(channel.getGameState().getValue() + 1);
+                        message.append(channel.getGameState().getValue());
                         message.append(QueryProtocol.EOL);
                     }
                 }

Modified: jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java	2008-08-07 21:03:46 UTC (rev 722)
+++ jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java	2008-08-13 15:55:33 UTC (rev 723)
@@ -26,7 +26,7 @@
 import java.util.logging.*;
 
 import net.jetrix.*;
-import net.jetrix.protocols.TetrinetProtocol;
+import net.jetrix.protocols.AbstractProtocol;
 import net.jetrix.config.*;
 import net.jetrix.messages.*;
 
@@ -249,7 +249,7 @@
     public Message receive() throws IOException
     {
         // read raw message from socket
-        String line = ((TetrinetProtocol) protocol).readLine(in);
+        String line = ((AbstractProtocol) protocol).readLine(in);
         lastMessageTime = System.currentTimeMillis();
         if (log.isLoggable(Level.FINER))
         {


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