[jetrix-cvs] SF.net SVN: jetrix:[748] jetrix/trunk/src
Brought to you by:
smanux
Menu
▾
▴
[jetrix-cvs] SF.net SVN: jetrix:[748] jetrix/trunk/src
|
From: <sm...@us...> - 2008-08-27 17:44:15
|
Revision: 748
http://jetrix.svn.sourceforge.net/jetrix/?rev=748&view=rev
Author: smanux
Date: 2008-08-27 17:44:12 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Implemented the parsing of winlist messages for tetrinet agents
Modified Paths:
--------------
jetrix/trunk/src/java/net/jetrix/protocols/TetrinetProtocol.java
jetrix/trunk/src/java/net/jetrix/winlist/Score.java
jetrix/trunk/src/test/net/jetrix/winlist/ScoreTest.java
jetrix/trunk/src/test/net/jetrix/winlist/SimpleWinlistTest.java
jetrix/trunk/src/test/net/jetrix/winlist/TetrixWinlistTest.java
Modified: jetrix/trunk/src/java/net/jetrix/protocols/TetrinetProtocol.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/protocols/TetrinetProtocol.java 2008-08-27 15:07:12 UTC (rev 747)
+++ jetrix/trunk/src/java/net/jetrix/protocols/TetrinetProtocol.java 2008-08-27 17:44:12 UTC (rev 748)
@@ -315,7 +315,29 @@
noconnecting.setText(line.substring(cmd.length() + 1));
m = noconnecting;
}
+ else if ("winlist".equals(cmd))
+ {
+ WinlistMessage winlist = new WinlistMessage();
+ winlist.setRawMessage(this, line);
+ List<Score> scores = new ArrayList<Score>();
+ String[] tokens = line.split(" ");
+ for (int i = 1; i < tokens.length; i++)
+ {
+ String token = tokens[i];
+ String[] values = token.split(";");
+ Score score = new Score();
+ score.setName(values[0].substring(1));
+ score.setType(values[0].charAt(0) == 'p' ? Score.TYPE_PLAYER : Score.TYPE_TEAM);
+ score.setScore(Long.parseLong(values[1]));
+
+ scores.add(score);
+ }
+ winlist.setScores(scores);
+
+ m = winlist;
+ }
+
return m;
}
Modified: jetrix/trunk/src/java/net/jetrix/winlist/Score.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/winlist/Score.java 2008-08-27 15:07:12 UTC (rev 747)
+++ jetrix/trunk/src/java/net/jetrix/winlist/Score.java 2008-08-27 17:44:12 UTC (rev 748)
@@ -34,6 +34,17 @@
public static final int TYPE_PLAYER = 0;
public static final int TYPE_TEAM = 1;
+ public Score()
+ {
+ }
+
+ public Score(String name, int type, long score)
+ {
+ this.name = name;
+ this.type = type;
+ this.score = score;
+ }
+
public String getName()
{
return name;
Modified: jetrix/trunk/src/test/net/jetrix/winlist/ScoreTest.java
===================================================================
--- jetrix/trunk/src/test/net/jetrix/winlist/ScoreTest.java 2008-08-27 15:07:12 UTC (rev 747)
+++ jetrix/trunk/src/test/net/jetrix/winlist/ScoreTest.java 2008-08-27 17:44:12 UTC (rev 748)
@@ -31,21 +31,10 @@
{
public void testEquals()
{
- Score score1 = new Score();
- score1.setName("user1");
- score1.setType(Score.TYPE_PLAYER);
- score1.setScore(1000);
+ Score score1 = new Score("user1", Score.TYPE_PLAYER, 1000);
+ Score score2 = new Score("user1", Score.TYPE_PLAYER, 2000);
+ Score score3 = new Score("user1", Score.TYPE_TEAM, 2000);
- Score score2 = new Score();
- score2.setName("user1");
- score2.setType(Score.TYPE_PLAYER);
- score2.setScore(2000);
-
- Score score3 = new Score();
- score3.setName("user1");
- score3.setType(Score.TYPE_TEAM);
- score3.setScore(2000);
-
assertTrue("score value not ignored", score1.equals(score2) && score2.equals(score1));
assertFalse("score type ignored", score2.equals(score3) || score3.equals(score2));
}
Modified: jetrix/trunk/src/test/net/jetrix/winlist/SimpleWinlistTest.java
===================================================================
--- jetrix/trunk/src/test/net/jetrix/winlist/SimpleWinlistTest.java 2008-08-27 15:07:12 UTC (rev 747)
+++ jetrix/trunk/src/test/net/jetrix/winlist/SimpleWinlistTest.java 2008-08-27 17:44:12 UTC (rev 748)
@@ -140,15 +140,9 @@
winlist.init(config);
// add two scores to the list
- Score score1 = new Score();
- score1.setName("LFJR");
- score1.setScore(4321);
- score1.setType(Score.TYPE_TEAM);
+ Score score1 = new Score("LFJR", Score.TYPE_TEAM, 4321);
- Score score2 = new Score();
- score2.setName("Smanux");
- score2.setScore(1234);
- score2.setType(Score.TYPE_PLAYER);
+ Score score2 = new Score("Smanux", Score.TYPE_PLAYER, 1234);
winlist.scores.add(score1);
winlist.scores.add(score2);
@@ -174,10 +168,7 @@
winlist.init(new WinlistConfig());
// add two scores to the list
- Score score = new Score();
- score.setName("LFJR");
- score.setScore(4321);
- score.setType(Score.TYPE_TEAM);
+ Score score = new Score("LFJR", Score.TYPE_TEAM, 4321);
winlist.scores.add(score);
@@ -193,10 +184,7 @@
SimpleWinlist winlist = getWinlist();
// add two scores to the list
- Score score = new Score();
- score.setName("LFJR");
- score.setScore(4321);
- score.setType(Score.TYPE_TEAM);
+ Score score = new Score("LFJR", Score.TYPE_TEAM, 4321);
winlist.scores.add(score);
Modified: jetrix/trunk/src/test/net/jetrix/winlist/TetrixWinlistTest.java
===================================================================
--- jetrix/trunk/src/test/net/jetrix/winlist/TetrixWinlistTest.java 2008-08-27 15:07:12 UTC (rev 747)
+++ jetrix/trunk/src/test/net/jetrix/winlist/TetrixWinlistTest.java 2008-08-27 17:44:12 UTC (rev 748)
@@ -37,10 +37,7 @@
public void setUp()
{
super.setUp();
- score = new Score();
- score.setScore(1418);
- score.setName("hell's_players\x86");
- score.setType(Score.TYPE_TEAM);
+ score = new Score("hell's_players\x86", Score.TYPE_TEAM, 1418);
}
public void testBuildScore() throws Exception
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
