[jetrix-cvs] SF.net SVN: jetrix:[768] jetrix/trunk
Brought to you by:
smanux
Menu
▾
▴
[jetrix-cvs] SF.net SVN: jetrix:[768] jetrix/trunk
|
From: <sm...@us...> - 2008-09-02 21:41:31
|
Revision: 768
http://jetrix.svn.sourceforge.net/jetrix/?rev=768&view=rev
Author: smanux
Date: 2008-09-02 21:41:15 +0000 (Tue, 02 Sep 2008)
Log Message:
-----------
Removed the dependency on Commons Collections
Modified Paths:
--------------
jetrix/trunk/build.xml
jetrix/trunk/lib/commons-digester.jar
jetrix/trunk/pom.xml
jetrix/trunk/src/java/net/jetrix/Channel.java
jetrix/trunk/src/java/net/jetrix/ClientRepository.java
jetrix/trunk/src/java/net/jetrix/commands/CommandManager.java
jetrix/trunk/src/java/net/jetrix/filter/CommandFilter.java
jetrix/trunk/src/java/net/jetrix/listeners/ClientListener.java
jetrix/trunk/src/java/net/jetrix/messages/ChannelMessage.java
jetrix/trunk/src/java/net/jetrix/protocols/IRCProtocol.java
Added Paths:
-----------
jetrix/trunk/project.properties
Removed Paths:
-------------
jetrix/trunk/lib/commons-collections.jar
Modified: jetrix/trunk/build.xml
===================================================================
--- jetrix/trunk/build.xml 2008-09-02 19:42:47 UTC (rev 767)
+++ jetrix/trunk/build.xml 2008-09-02 21:41:15 UTC (rev 768)
@@ -149,7 +149,6 @@
<!-- Pack the dependencies -->
<antcall target="pack.lib" inheritAll="true"><param name="library" value="commons-digester"/></antcall>
- <antcall target="pack.lib" inheritAll="true"><param name="library" value="commons-collections"/></antcall>
<antcall target="pack.lib" inheritAll="true"><param name="library" value="commons-beanutils"/></antcall>
<antcall target="pack.lib" inheritAll="true"><param name="library" value="commons-lang-2.0-light"/></antcall>
<antcall target="pack.lib" inheritAll="true"><param name="library" value="jetty"/></antcall>
Modified: jetrix/trunk/pom.xml
===================================================================
--- jetrix/trunk/pom.xml 2008-09-02 19:42:47 UTC (rev 767)
+++ jetrix/trunk/pom.xml 2008-09-02 21:41:15 UTC (rev 768)
@@ -93,12 +93,6 @@
<dependencies>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
Added: jetrix/trunk/project.properties
===================================================================
--- jetrix/trunk/project.properties (rev 0)
+++ jetrix/trunk/project.properties 2008-09-02 21:41:15 UTC (rev 768)
@@ -0,0 +1,2 @@
+version=0.3-dev
+version.stable=0.2.3
Property changes on: jetrix/trunk/project.properties
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: jetrix/trunk/src/java/net/jetrix/Channel.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/Channel.java 2008-09-02 19:42:47 UTC (rev 767)
+++ jetrix/trunk/src/java/net/jetrix/Channel.java 2008-09-02 21:41:15 UTC (rev 768)
@@ -33,8 +33,6 @@
import net.jetrix.winlist.*;
import net.jetrix.clients.TetrinetClient;
-import org.apache.commons.collections.*;
-
/**
* Game channel.
*
@@ -614,14 +612,14 @@
{
// players...
JoinMessage mjoin2 = new JoinMessage();
- mjoin2.setChannel(this);
+ mjoin2.setChannelName(getConfig().getName());
mjoin2.setSlot(i + 1);
mjoin2.setName(resident.getUser().getName()); // NPE
client.send(mjoin2);
// ...and teams
TeamMessage mteam = new TeamMessage();
- mteam.setChannel(this);
+ mteam.setChannelName(getConfig().getName());
mteam.setSource(resident);
mteam.setSlot(i + 1);
mteam.setName(resident.getUser().getTeam());
@@ -685,7 +683,7 @@
if (gameState != STOPPED)
{
IngameMessage ingame = new IngameMessage();
- ingame.setChannel(this);
+ ingame.setChannelName(getConfig().getName());
client.send(ingame);
// tell the player if the game is currently paused
@@ -1041,7 +1039,17 @@
*/
public Iterator<Client> getSpectators()
{
- return new FilterIterator(clients.iterator(), ClientRepository.SPECTATOR_PREDICATE);
+ List<Client> spectators = new ArrayList<Client>();
+
+ for (Client client : clients)
+ {
+ if (client.getUser().isSpectator())
+ {
+ spectators.add(client);
+ }
+ }
+
+ return spectators.iterator();
}
/**
Modified: jetrix/trunk/src/java/net/jetrix/ClientRepository.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/ClientRepository.java 2008-09-02 19:42:47 UTC (rev 767)
+++ jetrix/trunk/src/java/net/jetrix/ClientRepository.java 2008-09-02 21:41:15 UTC (rev 768)
@@ -19,11 +19,14 @@
package net.jetrix;
-import java.net.*;
-import java.util.*;
+import java.net.InetAddress;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.concurrent.ConcurrentSkipListMap;
-import org.apache.commons.collections.*;
-
/**
* Repository of clients connected to the server.
*
@@ -33,40 +36,10 @@
public class ClientRepository
{
private static ClientRepository instance = new ClientRepository();
- private Map<String, Client> clients;
+ private Map<String, Client> clients = new ConcurrentSkipListMap<String, Client>();
- public static final Predicate PLAYER_PREDICATE = new Predicate()
- {
- public boolean evaluate(Object obj)
- {
- Client client = (Client) obj;
- return client.getUser().isPlayer();
- }
- };
-
- public static final Predicate SPECTATOR_PREDICATE = new Predicate()
- {
- public boolean evaluate(Object obj)
- {
- Client client = (Client) obj;
- return client.getUser().isSpectator();
- }
- };
-
- public static final Predicate OPERATOR_PREDICATE = new Predicate()
- {
- public boolean evaluate(Object obj)
- {
- Client client = (Client) obj;
- return client.getUser().getAccessLevel() > 0;
- }
- };
-
private ClientRepository()
{
- FastTreeMap map = new FastTreeMap();
- map.setFast(true);
- clients = map;
}
public static ClientRepository getInstance()
@@ -105,7 +78,17 @@
*/
public Iterator<Client> getPlayers()
{
- return new FilterIterator(clients.values().iterator(), PLAYER_PREDICATE);
+ List<Client> player = new ArrayList<Client>();
+
+ for (Client client : clients.values())
+ {
+ if (client.getUser().isPlayer())
+ {
+ player.add(client);
+ }
+ }
+
+ return player.iterator();
}
/**
@@ -113,7 +96,16 @@
*/
public int getPlayerCount()
{
- return CollectionUtils.select(clients.values(), PLAYER_PREDICATE).size();
+ int count = 0;
+ for (Client client : clients.values())
+ {
+ if (client.getUser().isPlayer())
+ {
+ count++;
+ }
+ }
+
+ return count;
}
/**
@@ -121,7 +113,17 @@
*/
public Iterator<Client> getSpectators()
{
- return new FilterIterator(clients.values().iterator(), SPECTATOR_PREDICATE);
+ List<Client> spectators = new ArrayList<Client>();
+
+ for (Client client : clients.values())
+ {
+ if (client.getUser().isSpectator())
+ {
+ spectators.add(client);
+ }
+ }
+
+ return spectators.iterator();
}
/**
@@ -129,7 +131,16 @@
*/
public int getSpectatorCount()
{
- return CollectionUtils.select(clients.values(), SPECTATOR_PREDICATE).size();
+ int count = 0;
+ for (Client client : clients.values())
+ {
+ if (client.getUser().isSpectator())
+ {
+ count++;
+ }
+ }
+
+ return count;
}
/**
@@ -137,7 +148,17 @@
*/
public Iterator<Client> getOperators()
{
- return new FilterIterator(clients.values().iterator(), OPERATOR_PREDICATE);
+ List<Client> operators = new ArrayList<Client>();
+
+ for (Client client : clients.values())
+ {
+ if (client.getUser().getAccessLevel() > 0)
+ {
+ operators.add(client);
+ }
+ }
+
+ return operators.iterator();
}
/**
Modified: jetrix/trunk/src/java/net/jetrix/commands/CommandManager.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/CommandManager.java 2008-09-02 19:42:47 UTC (rev 767)
+++ jetrix/trunk/src/java/net/jetrix/commands/CommandManager.java 2008-09-02 21:41:15 UTC (rev 768)
@@ -21,8 +21,6 @@
import java.util.*;
-import org.apache.commons.collections.*;
-
import net.jetrix.*;
import net.jetrix.messages.*;
@@ -142,16 +140,17 @@
*/
public Iterator<Command> getCommands(final int accessLevel)
{
- Predicate availableToLevel = new Predicate()
+ List<Command> commands = new ArrayList<Command>();
+
+ for (Command command : commandSet.values())
{
- public boolean evaluate(Object obj)
+ if (command.getAccessLevel() <= accessLevel)
{
- Command command = (Command) obj;
- return command.getAccessLevel() <= accessLevel;
+ commands.add(command);
}
- };
+ }
- return new FilterIterator(commandSet.values().iterator(), availableToLevel);
+ return commands.iterator();
}
/**
Modified: jetrix/trunk/src/java/net/jetrix/filter/CommandFilter.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/CommandFilter.java 2008-09-02 19:42:47 UTC (rev 767)
+++ jetrix/trunk/src/java/net/jetrix/filter/CommandFilter.java 2008-09-02 21:41:15 UTC (rev 768)
@@ -22,6 +22,7 @@
import java.util.*;
import java.util.logging.*;
+import net.jetrix.Message;
import net.jetrix.messages.*;
import net.jetrix.commands.*;
@@ -59,9 +60,8 @@
}
}
- public void onMessage(CommandMessage m, List out)
+ public void onMessage(CommandMessage m, List<Message> out)
{
-
for (String alias : command.getAliases())
{
if (m.getCommand().equals(alias))
Modified: jetrix/trunk/src/java/net/jetrix/listeners/ClientListener.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/listeners/ClientListener.java 2008-09-02 19:42:47 UTC (rev 767)
+++ jetrix/trunk/src/java/net/jetrix/listeners/ClientListener.java 2008-09-02 21:41:15 UTC (rev 768)
@@ -91,7 +91,7 @@
InetAddress address = socket.getInetAddress();
// log the connection
- log.info("Incoming client " + address.getHostAddress() + ":" + socket.getPort());
+ log.info("Incoming " + getName() + " client " + address.getHostAddress() + ":" + socket.getPort());
// test the ban list
if (Banlist.getInstance().isBanned(address))
Modified: jetrix/trunk/src/java/net/jetrix/messages/ChannelMessage.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/messages/ChannelMessage.java 2008-09-02 19:42:47 UTC (rev 767)
+++ jetrix/trunk/src/java/net/jetrix/messages/ChannelMessage.java 2008-09-02 21:41:15 UTC (rev 768)
@@ -30,6 +30,7 @@
public abstract class ChannelMessage extends Message
{
private int slot;
+ private String channelName;
public int getSlot()
{
@@ -41,13 +42,13 @@
this.slot = slot;
}
- public Channel getChannel()
+ public String getChannelName()
{
- return (Channel) getDestination();
+ return channelName;
}
- public void setChannel(Channel channel)
+ public void setChannelName(String channelName)
{
- setDestination(channel);
+ this.channelName = channelName;
}
}
Modified: jetrix/trunk/src/java/net/jetrix/protocols/IRCProtocol.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/protocols/IRCProtocol.java 2008-09-02 19:42:47 UTC (rev 767)
+++ jetrix/trunk/src/java/net/jetrix/protocols/IRCProtocol.java 2008-09-02 21:41:15 UTC (rev 768)
@@ -144,12 +144,7 @@
message.setNick("jetrix");
}
- Channel channel = m.getChannel();
- String name = "#jetrix";
- if (channel != null)
- {
- name = "#" + channel.getConfig().getName();
- }
+ String name = m.getChannelName() == null ? "#jetrix" : "#" + m.getChannelName();
message.addParameter(name);
message.addParameter(applyStyle(m.getText(locale)));
@@ -171,12 +166,7 @@
message.setNick("jetrix");
}
- Channel channel = m.getChannel();
- String name = "#jetrix";
- if (channel != null)
- {
- name = "#" + channel.getConfig().getName();
- }
+ String name = m.getChannelName() == null ? "#jetrix" : "#" + m.getChannelName();
message.addParameter(name);
message.addParameter(applyStyle("\u0001ACTION " + m.getText(locale) + "\u0001"));
@@ -198,12 +188,7 @@
message.setNick("jetrix");
}
- Channel channel = m.getChannel();
- String name = "#jetrix";
- if (channel != null)
- {
- name = "#" + channel.getConfig().getName();
- }
+ String name = m.getChannelName() == null ? "#jetrix" : "#" + m.getChannelName();
// todo remove the <name> of the player at the beginning of the message
@@ -239,7 +224,7 @@
IRCMessage message = new IRCMessage(IRCCommand.PRIVMSG);
message.setNick("jetrix");
- message.addParameter("#" + m.getChannel().getConfig().getName());
+ message.addParameter("#" + m.getChannelName());
String messageKey = m.getName() == null ? "channel.team.none" : "channel.team.new";
Object[] params = new Object[] { client.getUser().getName(), m.getName() };
@@ -252,7 +237,7 @@
{
IRCMessage message = new IRCMessage(IRCCommand.JOIN);
message.setNick(m.getName());
- message.addParameter("#" + m.getChannel().getConfig().getName());
+ message.addParameter("#" + m.getChannelName());
return message.toString();
}
@@ -261,7 +246,7 @@
{
IRCMessage message = new IRCMessage(IRCCommand.PART);
message.setNick(m.getName());
- message.addParameter("#" + m.getChannel().getConfig().getName());
+ message.addParameter("#" + m.getChannelName());
return message.toString();
}
@@ -270,7 +255,7 @@
{
IRCMessage message = new IRCMessage(IRCCommand.PRIVMSG);
message.setNick("jetrix");
- message.addParameter("#" + m.getChannel().getConfig().getName());
+ message.addParameter("#" + m.getChannelName());
message.addParameter(applyStyle(Language.getText("channel.game.start", locale)));
return message.toString();
@@ -280,7 +265,7 @@
{
IRCMessage message = new IRCMessage(IRCCommand.PRIVMSG);
message.setNick("jetrix");
- message.addParameter("#" + m.getChannel().getConfig().getName());
+ message.addParameter("#" + m.getChannelName());
message.addParameter(applyStyle(Language.getText("channel.game.stop", locale)));
return message.toString();
@@ -290,7 +275,7 @@
{
IRCMessage message = new IRCMessage(IRCCommand.PRIVMSG);
message.setNick("jetrix");
- message.addParameter("#" + m.getChannel().getConfig().getName());
+ message.addParameter("#" + m.getChannelName());
message.addParameter(applyStyle(Language.getText("channel.game.running", locale)));
return message.toString();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
