Renamed ConnectState to ConnectionState.

Added basic empty string validation to the LoginState.join() method.

Author: pspeed42

sim-eth-basic/src/main/java/example/ConnectState.java renamed to sim-eth-basic/src/main/java/example/ConnectionState.java

@@ -61,9 +61,9 @@
  *
  *  @author    Paul Speed
  */
-public class ConnectState extends BaseAppState {
+public class ConnectionState extends BaseAppState {
 
-    static Logger log = LoggerFactory.getLogger(ConnectState.class);
+    static Logger log = LoggerFactory.getLogger(ConnectionState.class);
 
     private AppState parent;
 
@@ -79,7 +79,7 @@ public class ConnectState extends BaseAppState {
 
     private volatile boolean closing;
 
-    public ConnectState( AppState parent, String host, int port ) {
+    public ConnectionState( AppState parent, String host, int port ) {
         this.parent = parent;
         this.host = host; 
         this.port = port;
@@ -94,6 +94,12 @@ public void disconnect() {
 
     public boolean join( String userName ) {
         log.info("join(" + userName + ")");
+ 
+        userName = userName.trim();
+        if( userName.length() == 0 ) {
+            showError("Join Error", "Please specify a player name for use in game.", null, false);
+            return false;
+        }
 
         return true;        
     }

sim-eth-basic/src/main/java/example/HostState.java

@@ -86,7 +86,7 @@ public HostState( int port, String description ) {
 
     protected void joinGame() {
         log.info("joinGame()");
-        getStateManager().attach(new ConnectState(this, "127.0.0.1", port));
+        getStateManager().attach(new ConnectionState(this, "127.0.0.1", port));
         setEnabled(false); // hide our window        
     }
 

sim-eth-basic/src/main/java/example/LoginState.java

@@ -48,7 +48,7 @@
 /**
  *  A basic "login" state that provides a simple UI for logging in
  *  once a connection has been established.  This just manages the UI
- *  and calls back to the ConnectState to do the actual 'work'.
+ *  and calls back to the ConnectionState to do the actual 'work'.
  *
  *  @author    Paul Speed
  */
@@ -63,13 +63,13 @@ public LoginState() {
     protected void join() {
 
         String name = nameField.getText().trim();
-        if( getState(ConnectState.class).join(nameField.getText()) ) {
+        if( getState(ConnectionState.class).join(nameField.getText()) ) {
             getStateManager().detach(this);
         }
     }
 
     protected void cancel() {
-        getState(ConnectState.class).disconnect();
+        getState(ConnectionState.class).disconnect();
         getStateManager().detach(this);
     }
 

sim-eth-basic/src/main/java/example/MainMenuState.java

@@ -107,7 +107,7 @@ protected void connect() {
 
         // Add the state that will manage our remote connection and create
         // the game states and so on.
-        getStateManager().attach(new ConnectState(this, host, port));
+        getStateManager().attach(new ConnectionState(this, host, port));
 
         // Disable ourselves
         setEnabled(false);
@@ -123,7 +123,7 @@ protected void host() {
 
         try {
             // Add the state to manage the hosting environment.  It will launch
-            // a self-connecting ConnectState on its own.        
+            // a self-connecting ConnectionState on its own.        
             getStateManager().attach(new HostState(port, hostDescription.getText()));
 
             // Disable ourselves