[jetrix-cvs] SF.net SVN: jetrix:[798] jetrix/trunk/src
Brought to you by:
smanux
Menu
▾
▴
[jetrix-cvs] SF.net SVN: jetrix:[798] jetrix/trunk/src
|
From: <sm...@us...> - 2009-02-18 15:24:33
|
Revision: 798
http://jetrix.svn.sourceforge.net/jetrix/?rev=798&view=rev
Author: smanux
Date: 2009-02-18 15:24:28 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
Restructuration of the messages hierarchy
Modified Paths:
--------------
jetrix/trunk/src/java/net/jetrix/Channel.java
jetrix/trunk/src/java/net/jetrix/Field.java
jetrix/trunk/src/java/net/jetrix/Server.java
jetrix/trunk/src/java/net/jetrix/agent/TSpecAgent.java
jetrix/trunk/src/java/net/jetrix/agent/TetrinetAgent.java
jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java
jetrix/trunk/src/java/net/jetrix/clients/TSpecClient.java
jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java
jetrix/trunk/src/java/net/jetrix/commands/AwayCommand.java
jetrix/trunk/src/java/net/jetrix/commands/BroadcastCommand.java
jetrix/trunk/src/java/net/jetrix/commands/Command.java
jetrix/trunk/src/java/net/jetrix/commands/CommandManager.java
jetrix/trunk/src/java/net/jetrix/commands/ConfigCommand.java
jetrix/trunk/src/java/net/jetrix/commands/EmoteCommand.java
jetrix/trunk/src/java/net/jetrix/commands/GotoCommand.java
jetrix/trunk/src/java/net/jetrix/commands/HelpCommand.java
jetrix/trunk/src/java/net/jetrix/commands/IgnoreCommand.java
jetrix/trunk/src/java/net/jetrix/commands/IpCommand.java
jetrix/trunk/src/java/net/jetrix/commands/JoinCommand.java
jetrix/trunk/src/java/net/jetrix/commands/KickCommand.java
jetrix/trunk/src/java/net/jetrix/commands/LanguageCommand.java
jetrix/trunk/src/java/net/jetrix/commands/ListCommand.java
jetrix/trunk/src/java/net/jetrix/commands/ModeCommand.java
jetrix/trunk/src/java/net/jetrix/commands/MotdCommand.java
jetrix/trunk/src/java/net/jetrix/commands/MoveCommand.java
jetrix/trunk/src/java/net/jetrix/commands/OperatorCommand.java
jetrix/trunk/src/java/net/jetrix/commands/PauseCommand.java
jetrix/trunk/src/java/net/jetrix/commands/PetitionCommand.java
jetrix/trunk/src/java/net/jetrix/commands/PingCommand.java
jetrix/trunk/src/java/net/jetrix/commands/RandomCommand.java
jetrix/trunk/src/java/net/jetrix/commands/ReplyCommand.java
jetrix/trunk/src/java/net/jetrix/commands/SpecListCommand.java
jetrix/trunk/src/java/net/jetrix/commands/StartCommand.java
jetrix/trunk/src/java/net/jetrix/commands/StopCommand.java
jetrix/trunk/src/java/net/jetrix/commands/SummonCommand.java
jetrix/trunk/src/java/net/jetrix/commands/TeamMessageCommand.java
jetrix/trunk/src/java/net/jetrix/commands/TeleportCommand.java
jetrix/trunk/src/java/net/jetrix/commands/TellCommand.java
jetrix/trunk/src/java/net/jetrix/commands/TimeCommand.java
jetrix/trunk/src/java/net/jetrix/commands/VersionCommand.java
jetrix/trunk/src/java/net/jetrix/commands/WhoCommand.java
jetrix/trunk/src/java/net/jetrix/filter/AmplifierFilter.java
jetrix/trunk/src/java/net/jetrix/filter/CommandFilter.java
jetrix/trunk/src/java/net/jetrix/filter/FloodFilter.java
jetrix/trunk/src/java/net/jetrix/filter/GenericFilter.java
jetrix/trunk/src/java/net/jetrix/filter/LogoFilter.java
jetrix/trunk/src/java/net/jetrix/filter/PingFilter.java
jetrix/trunk/src/java/net/jetrix/filter/PuzzleFilter.java
jetrix/trunk/src/java/net/jetrix/filter/RandomFilter.java
jetrix/trunk/src/java/net/jetrix/filter/StartFilter.java
jetrix/trunk/src/java/net/jetrix/filter/StatsFilter.java
jetrix/trunk/src/java/net/jetrix/filter/SuddenDeathFilter.java
jetrix/trunk/src/java/net/jetrix/filter/SurvivalFilter.java
jetrix/trunk/src/java/net/jetrix/filter/TetrisFilter.java
jetrix/trunk/src/java/net/jetrix/listeners/TetrinetListener.java
jetrix/trunk/src/java/net/jetrix/listeners/interceptor/MotdInterceptor.java
jetrix/trunk/src/java/net/jetrix/listeners/interceptor/OnlineUsersInterceptor.java
jetrix/trunk/src/java/net/jetrix/protocols/ConsoleProtocol.java
jetrix/trunk/src/java/net/jetrix/protocols/IRCProtocol.java
jetrix/trunk/src/java/net/jetrix/protocols/QueryProtocol.java
jetrix/trunk/src/java/net/jetrix/protocols/TetrifastProtocol.java
jetrix/trunk/src/java/net/jetrix/protocols/TetrinetProtocol.java
jetrix/trunk/src/java/net/jetrix/protocols/TspecProtocol.java
jetrix/trunk/src/java/net/jetrix/winlist/SimpleWinlist.java
jetrix/trunk/src/test/net/jetrix/FieldTest.java
jetrix/trunk/src/test/net/jetrix/MessageTest.java
jetrix/trunk/src/test/net/jetrix/agent/TSpecAgentTest.java
jetrix/trunk/src/test/net/jetrix/agent/TetrinetAgentTest.java
jetrix/trunk/src/test/net/jetrix/commands/CommandManagerTest.java
jetrix/trunk/src/test/net/jetrix/messages/CommandMessageTest.java
jetrix/trunk/src/test/net/jetrix/protocols/QueryProtocolTest.java
jetrix/trunk/src/test/net/jetrix/protocols/TSpecProtocolTest.java
jetrix/trunk/src/test/net/jetrix/protocols/TetrifastProtocolTest.java
jetrix/trunk/src/test/net/jetrix/protocols/TetrinetProtocolTest.java
Added Paths:
-----------
jetrix/trunk/src/java/net/jetrix/messages/channel/
jetrix/trunk/src/java/net/jetrix/messages/channel/ChannelMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/CommandMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/EndGameMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/FieldMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/GmsgMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/IngameMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/JoinMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/LeaveMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/LevelMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/NewGameMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/PauseMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/PlayerLostMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/PlayerNumMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/PlayerWonMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/PlineActMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/PlineMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/ResumeMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/SmsgMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/StartGameMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/StopGameMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/TeamMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/TextMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/package.html
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/AddLineMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/BlockBombMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/BlockQuakeMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/ClearLineMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/ClearSpecialsMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/FourLinesAddedMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/GravityMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/NukeFieldMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/OneLineAddedMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/RandomClearMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/SpecialMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/SwitchFieldsMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/TwoLinesAddedMessage.java
jetrix/trunk/src/java/net/jetrix/messages/channel/specials/package.html
Removed Paths:
-------------
jetrix/trunk/src/java/net/jetrix/messages/AddLineMessage.java
jetrix/trunk/src/java/net/jetrix/messages/BlockBombMessage.java
jetrix/trunk/src/java/net/jetrix/messages/BlockQuakeMessage.java
jetrix/trunk/src/java/net/jetrix/messages/ChannelMessage.java
jetrix/trunk/src/java/net/jetrix/messages/ClearLineMessage.java
jetrix/trunk/src/java/net/jetrix/messages/ClearSpecialsMessage.java
jetrix/trunk/src/java/net/jetrix/messages/CommandMessage.java
jetrix/trunk/src/java/net/jetrix/messages/EndGameMessage.java
jetrix/trunk/src/java/net/jetrix/messages/FieldMessage.java
jetrix/trunk/src/java/net/jetrix/messages/FourLinesAddedMessage.java
jetrix/trunk/src/java/net/jetrix/messages/GmsgMessage.java
jetrix/trunk/src/java/net/jetrix/messages/GravityMessage.java
jetrix/trunk/src/java/net/jetrix/messages/IngameMessage.java
jetrix/trunk/src/java/net/jetrix/messages/JoinMessage.java
jetrix/trunk/src/java/net/jetrix/messages/LeaveMessage.java
jetrix/trunk/src/java/net/jetrix/messages/LevelMessage.java
jetrix/trunk/src/java/net/jetrix/messages/NewGameMessage.java
jetrix/trunk/src/java/net/jetrix/messages/NukeFieldMessage.java
jetrix/trunk/src/java/net/jetrix/messages/OneLineAddedMessage.java
jetrix/trunk/src/java/net/jetrix/messages/PauseMessage.java
jetrix/trunk/src/java/net/jetrix/messages/PlayerLostMessage.java
jetrix/trunk/src/java/net/jetrix/messages/PlayerNumMessage.java
jetrix/trunk/src/java/net/jetrix/messages/PlayerWonMessage.java
jetrix/trunk/src/java/net/jetrix/messages/PlineActMessage.java
jetrix/trunk/src/java/net/jetrix/messages/PlineMessage.java
jetrix/trunk/src/java/net/jetrix/messages/RandomClearMessage.java
jetrix/trunk/src/java/net/jetrix/messages/ResumeMessage.java
jetrix/trunk/src/java/net/jetrix/messages/SmsgMessage.java
jetrix/trunk/src/java/net/jetrix/messages/SpecialMessage.java
jetrix/trunk/src/java/net/jetrix/messages/StartGameMessage.java
jetrix/trunk/src/java/net/jetrix/messages/StopGameMessage.java
jetrix/trunk/src/java/net/jetrix/messages/SwitchFieldsMessage.java
jetrix/trunk/src/java/net/jetrix/messages/TeamMessage.java
jetrix/trunk/src/java/net/jetrix/messages/TextMessage.java
jetrix/trunk/src/java/net/jetrix/messages/TwoLinesAddedMessage.java
Modified: jetrix/trunk/src/java/net/jetrix/Channel.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/Channel.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/Channel.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -30,6 +30,8 @@
import net.jetrix.config.*;
import net.jetrix.filter.*;
import net.jetrix.messages.*;
+import net.jetrix.messages.channel.*;
+import net.jetrix.messages.channel.specials.*;
import net.jetrix.winlist.*;
import net.jetrix.clients.TetrinetClient;
Modified: jetrix/trunk/src/java/net/jetrix/Field.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/Field.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/Field.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -26,7 +26,7 @@
import java.io.*;
import net.jetrix.config.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.*;
/**
* A game field.
@@ -229,7 +229,7 @@
/**
* Return the string representing this field as used in the
- * {@link FieldMessage} messages.
+ * {@link net.jetrix.messages.channel.FieldMessage} messages.
*/
public String getFieldString()
{
Modified: jetrix/trunk/src/java/net/jetrix/Server.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/Server.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/Server.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -28,6 +28,7 @@
import net.jetrix.commands.*;
import net.jetrix.config.*;
import net.jetrix.messages.*;
+import net.jetrix.messages.channel.*;
import net.jetrix.services.VersionService;
import net.jetrix.listeners.ShutdownListener;
Modified: jetrix/trunk/src/java/net/jetrix/agent/TSpecAgent.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/agent/TSpecAgent.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/agent/TSpecAgent.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -21,8 +21,7 @@
import java.io.IOException;
-import net.jetrix.messages.PlayerNumMessage;
-import net.jetrix.messages.TeamMessage;
+import net.jetrix.messages.channel.*;
import net.jetrix.protocols.TspecProtocol;
/**
Modified: jetrix/trunk/src/java/net/jetrix/agent/TetrinetAgent.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/agent/TetrinetAgent.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/agent/TetrinetAgent.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -32,6 +32,8 @@
import net.jetrix.Protocol;
import net.jetrix.protocols.TetrinetProtocol;
import net.jetrix.messages.*;
+import net.jetrix.messages.channel.*;
+import net.jetrix.messages.channel.specials.*;
/**
* Tetrinet agent to log on a server as a player.
Modified: jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/clients/QueryClient.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -26,6 +26,7 @@
import net.jetrix.*;
import net.jetrix.config.*;
import net.jetrix.messages.*;
+import net.jetrix.messages.channel.*;
import net.jetrix.protocols.*;
/**
Modified: jetrix/trunk/src/java/net/jetrix/clients/TSpecClient.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/clients/TSpecClient.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/clients/TSpecClient.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,7 +22,7 @@
import java.io.IOException;
import net.jetrix.Message;
-import net.jetrix.messages.SmsgMessage;
+import net.jetrix.messages.channel.SmsgMessage;
/**
* Spectator client.
Modified: jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -28,6 +28,7 @@
import net.jetrix.*;
import net.jetrix.config.*;
import net.jetrix.messages.*;
+import net.jetrix.messages.channel.*;
/**
* Layer handling communication with a tetrinet or tetrifast client. Incomming
Modified: jetrix/trunk/src/java/net/jetrix/commands/AwayCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/AwayCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/AwayCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -21,9 +21,8 @@
import java.util.Locale;
-import net.jetrix.messages.CommandMessage;
-import net.jetrix.messages.PlineMessage;
-import net.jetrix.AccessLevel;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
import net.jetrix.Language;
import net.jetrix.User;
import net.jetrix.Client;
Modified: jetrix/trunk/src/java/net/jetrix/commands/BroadcastCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/BroadcastCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/BroadcastCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -21,7 +21,8 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Send a message to all clients on the server.
Modified: jetrix/trunk/src/java/net/jetrix/commands/Command.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/Command.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/Command.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -21,7 +21,7 @@
import java.util.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
/**
* A command consummes a CommandMessage to execute a specific operation.
Modified: jetrix/trunk/src/java/net/jetrix/commands/CommandManager.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/CommandManager.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/CommandManager.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,7 +22,8 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* CommandManager
Modified: jetrix/trunk/src/java/net/jetrix/commands/ConfigCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/ConfigCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/ConfigCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -26,7 +26,8 @@
import net.jetrix.*;
import net.jetrix.config.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Display the channel settings.
Modified: jetrix/trunk/src/java/net/jetrix/commands/EmoteCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/EmoteCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/EmoteCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,7 +22,8 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineActMessage;
/**
* Display an emote.
Modified: jetrix/trunk/src/java/net/jetrix/commands/GotoCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/GotoCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/GotoCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,6 +22,8 @@
import net.jetrix.*;
import net.jetrix.config.*;
import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
import java.util.*;
Modified: jetrix/trunk/src/java/net/jetrix/commands/HelpCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/HelpCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/HelpCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,7 +22,8 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* List all commands available.
Modified: jetrix/trunk/src/java/net/jetrix/commands/IgnoreCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/IgnoreCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/IgnoreCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,7 +22,8 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
import org.apache.commons.lang.*;
/**
Modified: jetrix/trunk/src/java/net/jetrix/commands/IpCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/IpCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/IpCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,7 +22,8 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Display the IP of a player.
Modified: jetrix/trunk/src/java/net/jetrix/commands/JoinCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/JoinCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/JoinCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -20,11 +20,12 @@
package net.jetrix.commands;
import java.util.*;
-import java.util.logging.*;
import net.jetrix.*;
import net.jetrix.config.*;
import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Join or create a channel.
Modified: jetrix/trunk/src/java/net/jetrix/commands/KickCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/KickCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/KickCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -20,10 +20,10 @@
package net.jetrix.commands;
import java.util.*;
-import java.util.logging.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Kick a player out of the server.
Modified: jetrix/trunk/src/java/net/jetrix/commands/LanguageCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/LanguageCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/LanguageCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,7 +22,8 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Set the language of the user.
Modified: jetrix/trunk/src/java/net/jetrix/commands/ListCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/ListCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/ListCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -25,7 +25,8 @@
import net.jetrix.*;
import net.jetrix.config.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* List available channels.
Modified: jetrix/trunk/src/java/net/jetrix/commands/ModeCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/ModeCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/ModeCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,7 +22,8 @@
import java.util.Locale;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
import net.jetrix.config.*;
import net.jetrix.*;
Modified: jetrix/trunk/src/java/net/jetrix/commands/MotdCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/MotdCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/MotdCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -21,7 +21,8 @@
import net.jetrix.*;
import net.jetrix.config.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Display the message of the day.
Modified: jetrix/trunk/src/java/net/jetrix/commands/MoveCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/MoveCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/MoveCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -23,6 +23,7 @@
import net.jetrix.*;
import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
/**
* Move a player to a new slot or switch two players.
Modified: jetrix/trunk/src/java/net/jetrix/commands/OperatorCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/OperatorCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/OperatorCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -20,11 +20,11 @@
package net.jetrix.commands;
import java.util.*;
-import java.util.logging.*;
import net.jetrix.*;
import net.jetrix.config.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Grant operator status to the player.
Modified: jetrix/trunk/src/java/net/jetrix/commands/PauseCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/PauseCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/PauseCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -21,9 +21,11 @@
import static net.jetrix.GameState.*;
-import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.ChannelMessage;
+import net.jetrix.messages.channel.PauseMessage;
+import net.jetrix.messages.channel.ResumeMessage;
+import net.jetrix.messages.channel.CommandMessage;
/**
* Pause the game.
Modified: jetrix/trunk/src/java/net/jetrix/commands/PetitionCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/PetitionCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/PetitionCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -20,7 +20,8 @@
package net.jetrix.commands;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
import java.util.*;
Modified: jetrix/trunk/src/java/net/jetrix/commands/PingCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/PingCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/PingCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -19,10 +19,9 @@
package net.jetrix.commands;
-import java.util.*;
-
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.PlayerNumMessage;
+import net.jetrix.messages.channel.CommandMessage;
/**
* Display the ping to the server. To compute the ping of tetrinet and
Modified: jetrix/trunk/src/java/net/jetrix/commands/RandomCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/RandomCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/RandomCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -23,7 +23,8 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Display a random number.
Modified: jetrix/trunk/src/java/net/jetrix/commands/ReplyCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/ReplyCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/ReplyCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -21,7 +21,8 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Reply to a private message sent by a player.
Modified: jetrix/trunk/src/java/net/jetrix/commands/SpecListCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/SpecListCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/SpecListCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -21,7 +21,8 @@
import java.util.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
import net.jetrix.*;
/**
Modified: jetrix/trunk/src/java/net/jetrix/commands/StartCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/StartCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/StartCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -24,7 +24,10 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.StartGameMessage;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.GmsgMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Start the game.
Modified: jetrix/trunk/src/java/net/jetrix/commands/StopCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/StopCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/StopCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -19,9 +19,9 @@
package net.jetrix.commands;
-import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.StopGameMessage;
+import net.jetrix.messages.channel.CommandMessage;
/**
* Stop the game.
Modified: jetrix/trunk/src/java/net/jetrix/commands/SummonCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/SummonCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/SummonCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,6 +22,8 @@
import java.util.*;
import net.jetrix.*;
import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Summon a player to the current channel.
Modified: jetrix/trunk/src/java/net/jetrix/commands/TeamMessageCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/TeamMessageCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/TeamMessageCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,7 +22,8 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Send a message to all members of the player's team.
Modified: jetrix/trunk/src/java/net/jetrix/commands/TeleportCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/TeleportCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/TeleportCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -23,6 +23,8 @@
import net.jetrix.*;
import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Teleport a player to another channel.
Modified: jetrix/trunk/src/java/net/jetrix/commands/TellCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/TellCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/TellCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -21,7 +21,8 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Send a private message to a player.
Modified: jetrix/trunk/src/java/net/jetrix/commands/TimeCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/TimeCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/TimeCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,8 +22,8 @@
import java.util.*;
import java.text.*;
import net.jetrix.*;
-import net.jetrix.config.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Display the server's time.
Modified: jetrix/trunk/src/java/net/jetrix/commands/VersionCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/VersionCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/VersionCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -21,7 +21,8 @@
import net.jetrix.*;
import net.jetrix.config.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Display the version of the server.
Modified: jetrix/trunk/src/java/net/jetrix/commands/WhoCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/WhoCommand.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/commands/WhoCommand.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -19,10 +19,10 @@
package net.jetrix.commands;
-import java.util.*;
import net.jetrix.*;
import net.jetrix.config.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* List all players connected to the server.
Modified: jetrix/trunk/src/java/net/jetrix/filter/AmplifierFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/AmplifierFilter.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/filter/AmplifierFilter.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,8 +22,7 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.config.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.specials.SpecialMessage;
/**
* Amplifies specials sent. One line sent will turn into two lines, a tetris
Modified: jetrix/trunk/src/java/net/jetrix/filter/CommandFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/CommandFilter.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/filter/CommandFilter.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -23,7 +23,7 @@
import java.util.logging.*;
import net.jetrix.Message;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.CommandMessage;
import net.jetrix.commands.*;
/**
Modified: jetrix/trunk/src/java/net/jetrix/filter/FloodFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/FloodFilter.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/filter/FloodFilter.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,8 +22,7 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.config.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Blocks spam over pline.
Modified: jetrix/trunk/src/java/net/jetrix/filter/GenericFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/GenericFilter.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/filter/GenericFilter.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -23,7 +23,8 @@
import java.util.logging.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.*;
+import net.jetrix.messages.channel.specials.*;
/**
* Defines a generic filter to be used and extended by filter developers.
Modified: jetrix/trunk/src/java/net/jetrix/filter/LogoFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/LogoFilter.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/filter/LogoFilter.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -23,7 +23,7 @@
import java.io.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.*;
/**
* Display a logo on the field of players losing the game.
Modified: jetrix/trunk/src/java/net/jetrix/filter/PingFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/PingFilter.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/filter/PingFilter.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,7 +22,7 @@
import java.util.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.*;
/**
* Display the ping of the player if a <tt>team</tt> message is processed
Modified: jetrix/trunk/src/java/net/jetrix/filter/PuzzleFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/PuzzleFilter.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/filter/PuzzleFilter.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -23,7 +23,7 @@
import net.jetrix.*;
import net.jetrix.config.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.*;
/**
* Set the game field and settings when the game starts. A new puzzle is
Modified: jetrix/trunk/src/java/net/jetrix/filter/RandomFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/RandomFilter.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/filter/RandomFilter.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -21,9 +21,9 @@
import java.util.*;
-import net.jetrix.messages.*;
import net.jetrix.*;
import net.jetrix.config.*;
+import net.jetrix.messages.channel.*;
/**
* A filter randomizing the blocks and the specials occurancies when the game starts.
Modified: jetrix/trunk/src/java/net/jetrix/filter/StartFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/StartFilter.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/filter/StartFilter.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -25,8 +25,7 @@
import net.jetrix.*;
import net.jetrix.commands.StartCommand;
-import net.jetrix.config.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.*;
/**
* Starts the game automatically once everyone said "go".
Modified: jetrix/trunk/src/java/net/jetrix/filter/StatsFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/StatsFilter.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/filter/StatsFilter.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -25,7 +25,8 @@
import java.text.*;
import net.jetrix.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.*;
+import net.jetrix.messages.channel.specials.*;
import org.apache.commons.lang.time.StopWatch;
/**
Modified: jetrix/trunk/src/java/net/jetrix/filter/SuddenDeathFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/SuddenDeathFilter.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/filter/SuddenDeathFilter.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -24,7 +24,8 @@
import net.jetrix.*;
import net.jetrix.config.*;
-import net.jetrix.messages.*;
+import net.jetrix.messages.channel.*;
+import net.jetrix.messages.channel.specials.*;
import java.util.*;
Modified: jetrix/trunk/src/java/net/jetrix/filter/SurvivalFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/SurvivalFilter.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/filter/SurvivalFilter.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -21,11 +21,8 @@
import java.util.*;
-import net.jetrix.messages.OneLineAddedMessage;
-import net.jetrix.messages.TwoLinesAddedMessage;
-import net.jetrix.messages.FourLinesAddedMessage;
-import net.jetrix.messages.ClearLineMessage;
import net.jetrix.Message;
+import net.jetrix.messages.channel.specials.*;
/**
* Survival mode. Every time the player clears 2 or more lines, he received
Modified: jetrix/trunk/src/java/net/jetrix/filter/TetrisFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/TetrisFilter.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/filter/TetrisFilter.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -19,9 +19,9 @@
package net.jetrix.filter;
-import net.jetrix.messages.*;
import net.jetrix.*;
-import net.jetrix.config.*;
+import net.jetrix.messages.channel.*;
+import net.jetrix.messages.channel.specials.*;
import java.util.*;
Modified: jetrix/trunk/src/java/net/jetrix/listeners/TetrinetListener.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/listeners/TetrinetListener.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/listeners/TetrinetListener.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -26,6 +26,7 @@
import net.jetrix.*;
import net.jetrix.clients.*;
import net.jetrix.messages.*;
+import net.jetrix.messages.channel.*;
import net.jetrix.protocols.*;
/**
Modified: jetrix/trunk/src/java/net/jetrix/listeners/interceptor/MotdInterceptor.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/listeners/interceptor/MotdInterceptor.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/listeners/interceptor/MotdInterceptor.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -23,7 +23,7 @@
import net.jetrix.Server;
import net.jetrix.clients.QueryClient;
import net.jetrix.config.ServerConfig;
-import net.jetrix.messages.PlineMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Interceptor displaying the message of the day.
Modified: jetrix/trunk/src/java/net/jetrix/listeners/interceptor/OnlineUsersInterceptor.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/listeners/interceptor/OnlineUsersInterceptor.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/listeners/interceptor/OnlineUsersInterceptor.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -22,7 +22,7 @@
import net.jetrix.Client;
import net.jetrix.ClientRepository;
import net.jetrix.clients.QueryClient;
-import net.jetrix.messages.PlineMessage;
+import net.jetrix.messages.channel.PlineMessage;
/**
* Interceptor displaying the number of players and spectators currently online.
Deleted: jetrix/trunk/src/java/net/jetrix/messages/AddLineMessage.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/messages/AddLineMessage.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/messages/AddLineMessage.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -1,32 +0,0 @@
-/**
- * Jetrix TetriNET Server
- * Copyright (C) 2001-2003 Emmanuel Bourg
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package net.jetrix.messages;
-
-/**
- *
- *
- * @author Emmanuel Bourg
- * @version $Revision$, $Date$
- */
-public class AddLineMessage extends SpecialMessage
-{
-
-
-}
Deleted: jetrix/trunk/src/java/net/jetrix/messages/BlockBombMessage.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/messages/BlockBombMessage.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/messages/BlockBombMessage.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -1,34 +0,0 @@
-/**
- * Jetrix TetriNET Server
- * Copyright (C) 2001-2003 Emmanuel Bourg
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package net.jetrix.messages;
-
-import net.jetrix.*;
-
-/**
- *
- *
- * @author Emmanuel Bourg
- * @version $Revision$, $Date$
- */
-public class BlockBombMessage extends SpecialMessage
-{
-
-
-}
Deleted: jetrix/trunk/src/java/net/jetrix/messages/BlockQuakeMessage.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/messages/BlockQuakeMessage.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/messages/BlockQuakeMessage.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -1,34 +0,0 @@
-/**
- * Jetrix TetriNET Server
- * Copyright (C) 2001-2003 Emmanuel Bourg
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package net.jetrix.messages;
-
-import net.jetrix.*;
-
-/**
- *
- *
- * @author Emmanuel Bourg
- * @version $Revision$, $Date$
- */
-public class BlockQuakeMessage extends SpecialMessage
-{
-
-
-}
Deleted: jetrix/trunk/src/java/net/jetrix/messages/ChannelMessage.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/messages/ChannelMessage.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/messages/ChannelMessage.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -1,54 +0,0 @@
-/**
- * Jetrix TetriNET Server
- * Copyright (C) 2001-2003 Emmanuel Bourg
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package net.jetrix.messages;
-
-import net.jetrix.*;
-
-/**
- * A channel message.
- *
- * @author Emmanuel Bourg
- * @version $Revision$, $Date$
- */
-public abstract class ChannelMessage extends Message
-{
- private int slot;
- private String channelName;
-
- public int getSlot()
- {
- return slot;
- }
-
- public void setSlot(int slot)
- {
- this.slot = slot;
- }
-
- public String getChannelName()
- {
- return channelName;
- }
-
- public void setChannelName(String channelName)
- {
- this.channelName = channelName;
- }
-}
Deleted: jetrix/trunk/src/java/net/jetrix/messages/ClearLineMessage.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/messages/ClearLineMessage.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/messages/ClearLineMessage.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -1,34 +0,0 @@
-/**
- * Jetrix TetriNET Server
- * Copyright (C) 2001-2003 Emmanuel Bourg
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package net.jetrix.messages;
-
-import net.jetrix.*;
-
-/**
- *
- *
- * @author Emmanuel Bourg
- * @version $Revision$, $Date$
- */
-public class ClearLineMessage extends SpecialMessage
-{
-
-
-}
Deleted: jetrix/trunk/src/java/net/jetrix/messages/ClearSpecialsMessage.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/messages/ClearSpecialsMessage.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/messages/ClearSpecialsMessage.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -1,34 +0,0 @@
-/**
- * Jetrix TetriNET Server
- * Copyright (C) 2001-2003 Emmanuel Bourg
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package net.jetrix.messages;
-
-import net.jetrix.*;
-
-/**
- *
- *
- * @author Emmanuel Bourg
- * @version $Revision$, $Date$
- */
-public class ClearSpecialsMessage extends SpecialMessage
-{
-
-
-}
Deleted: jetrix/trunk/src/java/net/jetrix/messages/CommandMessage.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/messages/CommandMessage.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/messages/CommandMessage.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -1,178 +0,0 @@
-/**
- * Jetrix TetriNET Server
- * Copyright (C) 2001-2003 Emmanuel Bourg
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package net.jetrix.messages;
-
-import java.util.*;
-
-import net.jetrix.*;
-
-/**
- * A /command.
- *
- * @author Emmanuel Bourg
- * @version $Revision$, $Date$
- */
-public class CommandMessage extends TextMessage
-{
- private String command;
- private List<String> parameters;
-
- public CommandMessage()
- {
- parameters = new ArrayList<String>();
- }
-
- public String getCommand()
- {
- return command;
- }
-
- public void setCommand(String command)
- {
- this.command = command;
- }
-
- public String getParameter(int i)
- {
- return parameters.get(i);
- }
-
- /**
- * Return an integer parameter, or the default value if the specified
- * parameter doesn't map to an integer value.
- *
- * @param i the index of the parameter
- * @param defaultValue the default value
- */
- public int getIntParameter(int i, int defaultValue)
- {
- int value;
-
- try
- {
- value = Integer.parseInt(parameters.get(i));
- }
- catch (Exception e)
- {
- value = defaultValue;
- }
-
- return value;
- }
-
- /**
- * Return an integer parameter, or null if the specified parameter
- * doesn't map to an integer value.
- *
- * @param i the index of the parameter
- */
- public Integer getIntegerParameter(int i)
- {
- Integer value;
-
- try
- {
- value = Integer.valueOf(parameters.get(i));
- }
- catch (Exception e)
- {
- value = null;
- }
-
- return value;
- }
-
- /**
- * Return the Client object associated to the i-th parameter of the command.
- * The client can be specified as a slot number if he is in the same channel
- * as the client issuing the command, or as a case insensitive name. If no
- * client matches the specified parameter a null value is returned.
- */
- public Client getClientParameter(int i)
- {
- Client client = null;
- String param = getParameter(i);
-
- // check if the parameter is a slot number
- try
- {
- int slot = Integer.parseInt(param);
- if (slot >= 1 && slot <= 6)
- {
- // find the channel of the client issuing this command
- if (getSource() instanceof Client)
- {
- Channel channel = ((Client) getSource()).getChannel();
- client = channel.getClient(slot);
- }
- }
- }
- catch (NumberFormatException e) { }
-
- if (client == null)
- {
- // the client is still null, the parameter may be a playername
- ClientRepository repository = ClientRepository.getInstance();
- client = repository.getClient(param);
- }
-
- return client;
- }
-
- /**
- * Returns the channel associated to the i-th parameter of the command. The
- * channel can be specified by a partial name or by its number. If no channel
- * matches the specified parameter a null value is returned.
- */
- public Channel getChannelParameter(int i)
- {
- Channel channel = null;
- String param = getParameter(i);
-
- try
- {
- // trying to parse the number
- int num = Integer.parseInt(param) - 1;
- channel = ChannelManager.getInstance().getChannel(num);
- }
- catch (NumberFormatException e)
- {
- channel = ChannelManager.getInstance().getChannel(param, true);
- }
-
- return channel;
- }
-
- /**
- * Add a parameter to the command.
- */
- public void addParameter(String obj)
- {
- parameters.add(obj);
- }
-
- /**
- * Return the number of parameters on this command.
- */
- public int getParameterCount()
- {
- return parameters.size();
- }
-}
Deleted: jetrix/trunk/src/java/net/jetrix/messages/EndGameMessage.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/messages/EndGameMessage.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/messages/EndGameMessage.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -1,34 +0,0 @@
-/**
- * Jetrix TetriNET Server
- * Copyright (C) 2001-2003 Emmanuel Bourg
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package net.jetrix.messages;
-
-import net.jetrix.*;
-
-/**
- *
- *
- * @author Emmanuel Bourg
- * @version $Revision$, $Date$
- */
-public class EndGameMessage extends ChannelMessage
-{
-
-
-}
Deleted: jetrix/trunk/src/java/net/jetrix/messages/FieldMessage.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/messages/FieldMessage.java 2009-02-18 14:03:17 UTC (rev 797)
+++ jetrix/trunk/src/java/net/jetrix/messages/FieldMessage.java 2009-02-18 15:24:28 UTC (rev 798)
@@ -1,57 +0,0 @@
-/**
- * Jetrix TetriNET Server
- * Copyright (C) 2001-2003 Emmanuel Bourg
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package net.jetrix.messages;
-
-import net.jetrix.*;
-
-/**
- * A field change message.
- *
- * @author Emmanuel Bourg
- * @version $Revision$, $Date$
- */
-public class FieldMessage extends ChannelMessage
-{
- private String field;
-
- public FieldMessage() { }
-
- public FieldMessage(String field)
- {
- this(0, field);
- }
-
- public FieldMessage(int slot, String field)
- {
- setSlot(sl...
[truncated message content] |
