sigonasr2
/
jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unwinding the ouroboros... modified these public API

Browse Source 
classes to not expose their internals by implementing
listeners directly.  Moved the listeners inside.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7005 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
PSp..om 14 years ago
parent e441958434
commit 212b5e243a
2 changed files with 90 additions and 81 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 110
      engine/src/networking/com/jme3/network/connection/Client.java
  2. 47
      engine/src/networking/com/jme3/network/connection/Server.java

110
engine/src/networking/com/jme3/network/connection/Client.java
Unescape View File

@ -54,7 +54,7 @@ import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
public class Client extends ServiceManager implements MessageListener, ConnectionListener { public class Client extends ServiceManager {
protected Logger log = Logger.getLogger(Client.class.getName()); protected Logger log = Logger.getLogger(Client.class.getName());
protected static int clientIDCounter = 0; protected static int clientIDCounter = 0;
@ -79,6 +79,7 @@ public class Client extends ServiceManager implements MessageListener, Connectio
protected boolean isConnector; protected boolean isConnector;
protected ClientObserver listener = new ClientObserver();
/** /**
* Constructs this client. * Constructs this client.
@ -211,10 +212,10 @@ public class Client extends ServiceManager implements MessageListener, Connectio
private void registerInternalListeners() { private void registerInternalListeners() {
if (tcp != null) { if (tcp != null) {
tcp.addConnectionListener(this); tcp.addConnectionListener(listener);
tcp.socketChannel.keyFor(tcp.selector).attach(this); tcp.socketChannel.keyFor(tcp.selector).attach(this);
} }
addMessageListener(this, DisconnectMessage.class); addMessageListener(listener, DisconnectMessage.class);
} }
/** /**
@ -517,69 +518,72 @@ public class Client extends ServiceManager implements MessageListener, Connectio
} }
} }
public void messageReceived(Message message) { /**
try { * {@inheritDoc}
disconnectInternal((DisconnectMessage)message); */
} catch (IOException e) { public boolean equals(Object obj) {
log.log(Level.WARNING, "[{0}][???] Could not disconnect.", label); if (obj == null || !(obj instanceof Client || obj instanceof Integer)) {
return false;
} else if (obj instanceof Client){
return ((Client)obj).getClientID() == getClientID();
} else if (obj instanceof Integer) {
return ((Integer)obj).intValue() == getClientID();
} else {
return false;
} }
} }
public void messageSent(Message message) { protected class ClientObserver implements MessageListener, ConnectionListener {
}
public void objectReceived(Object object) { public void messageReceived(Message message) {
try {
disconnectInternal((DisconnectMessage)message);
} catch (IOException e) {
log.log(Level.WARNING, "[{0}][???] Could not disconnect.", label);
}
}
} public void messageSent(Message message) {
public void objectSent(Object object) { }
} public void objectReceived(Object object) {
public void clientConnected(Client client) {
// We are a client. This means that we succeeded in connecting to the server.
if (!isConnected) return;
long time = System.currentTimeMillis();
playerID = time;
ClientRegistrationMessage message = new ClientRegistrationMessage();
message.setId(time);
try {
message.setReliable(false);
send(message);
message.setReliable(true);
send(message);
} catch (Exception e) {
e.printStackTrace();
log.log(Level.SEVERE, "[{0}][???] Could not sent client registration message. Disconnecting.", label);
try {
disconnect(DisconnectMessage.ERROR);
} catch (IOException ie) {}
} }
}
public void clientDisconnected(Client client) { public void objectSent(Object object) {
if (thread != null) {
// We can disconnect now.
thread.setKeepAlive(false);
// GC it.
thread = null;
} }
}
/** public void clientConnected(Client client) {
* {@inheritDoc} // We are a client. This means that we succeeded in connecting to the server.
*/ if (!isConnected) return;
public boolean equals(Object obj) { long time = System.currentTimeMillis();
if (obj == null || !(obj instanceof Client || obj instanceof Integer)) { playerID = time;
return false; ClientRegistrationMessage message = new ClientRegistrationMessage();
} else if (obj instanceof Client){ message.setId(time);
return ((Client)obj).getClientID() == getClientID(); try {
} else if (obj instanceof Integer) { message.setReliable(false);
return ((Integer)obj).intValue() == getClientID(); send(message);
} else { message.setReliable(true);
return false; send(message);
} catch (Exception e) {
e.printStackTrace();
log.log(Level.SEVERE, "[{0}][???] Could not sent client registration message. Disconnecting.", label);
try {
disconnect(DisconnectMessage.ERROR);
} catch (IOException ie) {}
}
}
public void clientDisconnected(Client client) {
if (thread != null) {
// We can disconnect now.
thread.setKeepAlive(false);
// GC it.
thread = null;
}
} }
} }

47
engine/src/networking/com/jme3/network/connection/Server.java
Unescape View File

@ -56,7 +56,7 @@ import java.util.logging.Logger;
* *
* @author Lars Wesselius * @author Lars Wesselius
*/ */
public class Server extends ServiceManager implements MessageListener { public class Server extends ServiceManager {
protected Logger log = Logger.getLogger(Server.class.getName()); protected Logger log = Logger.getLogger(Server.class.getName());
protected static int serverIDCounter = 0; protected static int serverIDCounter = 0;
@ -75,6 +75,8 @@ public class Server extends ServiceManager implements MessageListener {
protected ClientManager clientManager = new ClientManager(); protected ClientManager clientManager = new ClientManager();
protected MessageListener listener = new ServerMessageObserver();
/** /**
* Default constructor. Sets the label to * Default constructor. Sets the label to
* <code>Server#[serverID]</code> * <code>Server#[serverID]</code>
@ -171,12 +173,12 @@ public class Server extends ServiceManager implements MessageListener {
private void registerInternalListeners() { private void registerInternalListeners() {
if (tcp != null) { if (tcp != null) {
tcp.addMessageListener(DisconnectMessage.class, this); tcp.addMessageListener(DisconnectMessage.class, listener);
tcp.addMessageListener(ClientRegistrationMessage.class, clientManager); tcp.addMessageListener(ClientRegistrationMessage.class, clientManager);
tcp.addConnectionListener(clientManager); tcp.addConnectionListener(clientManager);
} }
if (udp != null) { if (udp != null) {
udp.addMessageListener(DisconnectMessage.class, this); udp.addMessageListener(DisconnectMessage.class, listener);
udp.addMessageListener(ClientRegistrationMessage.class, clientManager); udp.addMessageListener(ClientRegistrationMessage.class, clientManager);
udp.addConnectionListener(clientManager); udp.addConnectionListener(clientManager);
} }
@ -423,31 +425,34 @@ public class Server extends ServiceManager implements MessageListener {
} }
} }
public void messageReceived(Message message) { protected class ServerMessageObserver implements MessageListener {
// Right now, this is definitely a DisconnectMessage.
DisconnectMessage dcMessage = (DisconnectMessage)message; public void messageReceived(Message message) {
Client client = dcMessage.getClient(); // Right now, this is definitely a DisconnectMessage.
DisconnectMessage dcMessage = (DisconnectMessage)message;
Client client = dcMessage.getClient();
if (clientManager.isClientConnected(client)) { if (clientManager.isClientConnected(client)) {
log.log(Level.INFO, "[{0}][???] Client {1} disconnected ({2}: {3}).", new Object[]{ log.log(Level.INFO, "[{0}][???] Client {1} disconnected ({2}: {3}).", new Object[]{
label, label,
client, client,
dcMessage.getType(), dcMessage.getType(),
(dcMessage.getReason() != null) ? dcMessage.getReason() : "No description" (dcMessage.getReason() != null) ? dcMessage.getReason() : "No description"
}); });
}
dcMessage.getConnection().addToDisconnectionQueue(client);
} }
dcMessage.getConnection().addToDisconnectionQueue(client);
}
public void messageSent(Message message) { public void messageSent(Message message) {
} }
public void objectReceived(Object object) { public void objectReceived(Object object) {
} }
public void objectSent(Object object) { public void objectSent(Object object) {
}
} }
} }

Write Preview
Loading…
Cancel
Save