[jetrix-cvs] SF.net SVN: jetrix:[857] jetrix/trunk/src
Brought to you by:
smanux
Menu
▾
▴
[jetrix-cvs] SF.net SVN: jetrix:[857] jetrix/trunk/src
|
From: <sm...@us...> - 2010-05-04 17:55:25
|
Revision: 857
http://jetrix.svn.sourceforge.net/jetrix/?rev=857&view=rev
Author: smanux
Date: 2010-05-04 17:55:19 +0000 (Tue, 04 May 2010)
Log Message:
-----------
The name of the client software is stored in a separate field and replaces the type field
Modified Paths:
--------------
jetrix/trunk/src/admin/server.jsp
jetrix/trunk/src/admin/user.jsp
jetrix/trunk/src/java/net/jetrix/Client.java
jetrix/trunk/src/java/net/jetrix/clients/ConsoleClient.java
jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java
jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java
jetrix/trunk/src/java/net/jetrix/commands/WhoCommand.java
jetrix/trunk/src/java/net/jetrix/listeners/TSpecListener.java
jetrix/trunk/src/java/net/jetrix/listeners/TetrinetListener.java
Modified: jetrix/trunk/src/admin/server.jsp
===================================================================
--- jetrix/trunk/src/admin/server.jsp 2010-05-04 17:00:37 UTC (rev 856)
+++ jetrix/trunk/src/admin/server.jsp 2010-05-04 17:55:19 UTC (rev 857)
@@ -143,8 +143,7 @@
<table class="thin" style="width: 500px">
<tr>
<th>Name</th>
- <th>Type</th>
- <th>Version</th>
+ <th>Agent</th>
<th>Protocol</th>
<th>IP</th>
<th>Access Level</th>
@@ -154,8 +153,7 @@
User user = client.getUser(); %>
<tr>
<td><a href="user.jsp?name=<%= user.getName() %>"><%= user.getName() %></a></td>
- <td align="center"><%= client.getType() %></td>
- <td align="center"><%= client.getVersion() %></td>
+ <td align="center"><%= client.getAgent() %> <%= client.getVersion() %></td>
<td align="center"><%= client.getProtocol().getName() %></td>
<td><%= client.getInetAddress().getHostName() %></td>
<td align="center"><%= user.getAccessLevel() %></td>
Modified: jetrix/trunk/src/admin/user.jsp
===================================================================
--- jetrix/trunk/src/admin/user.jsp 2010-05-04 17:00:37 UTC (rev 856)
+++ jetrix/trunk/src/admin/user.jsp 2010-05-04 17:55:19 UTC (rev 857)
@@ -48,14 +48,10 @@
<table class="thin" style="width: 500px">
<tr>
- <td width="30%">Type</td>
- <td><%= client.getType() %></td>
+ <td width="30%">Agent</td>
+ <td><%= client.getAgent() %> <%= client.getVersion() %></td>
</tr>
<tr>
- <td>Version</td>
- <td><%= client.getVersion() %></td>
- </tr>
- <tr>
<td>Protocol</td>
<td><%= client.getProtocol().getName() %></td>
</tr>
Modified: jetrix/trunk/src/java/net/jetrix/Client.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/Client.java 2010-05-04 17:00:37 UTC (rev 856)
+++ jetrix/trunk/src/java/net/jetrix/Client.java 2010-05-04 17:55:19 UTC (rev 857)
@@ -69,12 +69,14 @@
User getUser();
/**
- * Return the type of the client (tetrinet or tetrifast).
+ * Returns the name of the user agent (GTetrinet, aTwin, Blocktrix...)
+ *
+ * @since 0.3
*/
- String getType();
+ String getAgent();
/**
- * Return the version of this client (1.13, 1.14, GTetrinet 0.7.10, etc).
+ * Return the version of the user agent (1.13, 1.14, etc)
*/
String getVersion();
Modified: jetrix/trunk/src/java/net/jetrix/clients/ConsoleClient.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/clients/ConsoleClient.java 2010-05-04 17:00:37 UTC (rev 856)
+++ jetrix/trunk/src/java/net/jetrix/clients/ConsoleClient.java 2010-05-04 17:55:19 UTC (rev 857)
@@ -148,14 +148,14 @@
return user;
}
- public String getVersion()
+ public String getAgent()
{
- return "1.0";
+ return "Console";
}
- public String getType()
+ public String getVersion()
{
- return "Console";
+ return "1.0";
}
public Date getConnectionTime()
Modified: jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java 2010-05-04 17:00:37 UTC (rev 856)
+++ jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java 2010-05-04 17:55:19 UTC (rev 857)
@@ -99,7 +99,7 @@
message.append("\" \"");
message.append(user.getTeam() == null ? "" : user.getTeam());
message.append("\" \"");
- message.append(client.getVersion());
+ message.append(client.getAgent() + " " + client.getVersion());
message.append("\" ");
message.append(client.getChannel().getClientSlot(client));
message.append(" ");
Modified: jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java 2010-05-04 17:00:37 UTC (rev 856)
+++ jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java 2010-05-04 17:55:19 UTC (rev 857)
@@ -41,7 +41,7 @@
*/
public class TetrinetClient implements Client
{
- private String type;
+ private String agent;
private String version;
private Protocol protocol;
private Channel channel;
@@ -143,7 +143,8 @@
else if (message instanceof ClientInfoMessage)
{
ClientInfoMessage info = (ClientInfoMessage) message;
- setVersion(info.getName() + " " + info.getVersion());
+ setAgent(info.getName());
+ setVersion(info.getVersion());
if ("gtetrinet".equalsIgnoreCase(info.getName()))
{
encoding = "UTF-8";
@@ -351,14 +352,14 @@
return version;
}
- public void setType(String type)
+ public String getAgent()
{
- this.type = type;
+ return agent;
}
- public String getType()
+ public void setAgent(String agent)
{
- return type;
+ this.agent = agent;
}
public Date getConnectionTime()
@@ -408,7 +409,7 @@
public String toString()
{
- return "[Client " + getInetAddress() + " type=" + type + "]";
+ return "[Client " + getInetAddress() + " type=" + agent + " " + version + "]";
}
/**
Modified: jetrix/trunk/src/java/net/jetrix/commands/WhoCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/WhoCommand.java 2010-05-04 17:00:37 UTC (rev 856)
+++ jetrix/trunk/src/java/net/jetrix/commands/WhoCommand.java 2010-05-04 17:55:19 UTC (rev 857)
@@ -71,11 +71,13 @@
{
message.append("<purple>\xAE</purple>");
}
-
+
+ boolean fast = clientInChannel.getProtocol().getName().equals("tetrifast");
+
if (user.getAccessLevel() > AccessLevel.PLAYER) message.append("<b>");
- if (clientInChannel.getProtocol().getName().equals("tetrifast")) message.append("<i>");
+ if (fast) message.append("<i>");
message.append(user.getName());
- if (clientInChannel.getProtocol().getName().equals("tetrifast")) message.append("</i>");
+ if (fast) message.append("</i>");
if (user.getAccessLevel() > AccessLevel.PLAYER) message.append("</b>");
}
Modified: jetrix/trunk/src/java/net/jetrix/listeners/TSpecListener.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/listeners/TSpecListener.java 2010-05-04 17:00:37 UTC (rev 856)
+++ jetrix/trunk/src/java/net/jetrix/listeners/TSpecListener.java 2010-05-04 17:55:19 UTC (rev 857)
@@ -80,7 +80,10 @@
user.setName(tokens[1]);
}
-
+
+ client.setAgent("TSpec");
+ client.setVersion("1.13");
+
return client;
}
}
Modified: jetrix/trunk/src/java/net/jetrix/listeners/TetrinetListener.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/listeners/TetrinetListener.java 2010-05-04 17:00:37 UTC (rev 856)
+++ jetrix/trunk/src/java/net/jetrix/listeners/TetrinetListener.java 2010-05-04 17:55:19 UTC (rev 857)
@@ -88,10 +88,12 @@
if ((tokens.get(0)).equals(TetrinetProtocol.INIT_TOKEN))
{
client.setProtocol(protocolManager.getProtocol(TetrinetProtocol.class));
+ client.setAgent("TetriNET");
}
else if ((tokens.get(0)).equals(TetrifastProtocol.INIT_TOKEN))
{
client.setProtocol(protocolManager.getProtocol(TetrifastProtocol.class));
+ client.setAgent("TetriFast");
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
