Merge branch 'GLES2' of github.com:nicolasgramlich/AndEngineMultiplay…

…erExtension into GLES2
JesperLR · Mar 3, 2013 · e902910 · e902910
2 parents 4aae56d + 7c6a9b9
commit e902910
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/org/andengine/extension/multiplayer/protocol/server/BluetoothSocketServer.java b/src/org/andengine/extension/multiplayer/protocol/server/BluetoothSocketServer.java
@@ -3,12 +3,12 @@
 import java.io.IOException;
 import java.util.UUID;
 
+import org.andengine.extension.multiplayer.protocol.server.connector.ClientConnector;
+import org.andengine.extension.multiplayer.protocol.shared.BluetoothSocketConnection;
 import org.andengine.extension.multiplayer.protocol.exception.BluetoothException;
 import org.andengine.extension.multiplayer.protocol.server.BluetoothSocketServer.IBluetoothSocketServerListener.DefaultBluetoothSocketServerListener;
 import org.andengine.extension.multiplayer.protocol.server.connector.BluetoothSocketConnectionClientConnector.DefaultBluetoothSocketClientConnectorListener;
-import org.andengine.extension.multiplayer.protocol.server.connector.ClientConnector;
 import org.andengine.extension.multiplayer.protocol.server.connector.ClientConnector.IClientConnectorListener;
-import org.andengine.extension.multiplayer.protocol.shared.BluetoothSocketConnection;
 import org.andengine.extension.multiplayer.protocol.util.Bluetooth;
 import org.andengine.util.debug.Debug;
 

diff --git a/src/org/andengine/extension/multiplayer/protocol/server/SocketServer.java b/src/org/andengine/extension/multiplayer/protocol/server/SocketServer.java
@@ -6,11 +6,11 @@
 
 import javax.net.ServerSocketFactory;
 
-import org.andengine.extension.multiplayer.protocol.server.SocketServer.ISocketServerListener.DefaultSocketServerListener;
+import org.andengine.extension.multiplayer.protocol.shared.SocketConnection;
 import org.andengine.extension.multiplayer.protocol.server.connector.ClientConnector;
 import org.andengine.extension.multiplayer.protocol.server.connector.ClientConnector.IClientConnectorListener;
+import org.andengine.extension.multiplayer.protocol.server.SocketServer.ISocketServerListener.DefaultSocketServerListener;
 import org.andengine.extension.multiplayer.protocol.server.connector.SocketConnectionClientConnector.DefaultSocketConnectionClientConnectorListener;
-import org.andengine.extension.multiplayer.protocol.shared.SocketConnection;
 import org.andengine.util.SocketUtils;
 import org.andengine.util.debug.Debug;
 

diff --git a/src/org/andengine/extension/multiplayer/protocol/server/SocketServerDiscoveryServer.java b/src/org/andengine/extension/multiplayer/protocol/server/SocketServerDiscoveryServer.java
@@ -7,9 +7,9 @@
 import java.net.SocketException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.andengine.extension.multiplayer.protocol.server.SocketServerDiscoveryServer.ISocketServerDiscoveryServerListener.DefaultSocketServerDiscoveryServerListener;
 import org.andengine.extension.multiplayer.protocol.shared.IDiscoveryData;
 import org.andengine.extension.multiplayer.protocol.shared.IDiscoveryData.DiscoveryDataFactory;
+import org.andengine.extension.multiplayer.protocol.server.SocketServerDiscoveryServer.ISocketServerDiscoveryServerListener.DefaultSocketServerDiscoveryServerListener;
 import org.andengine.util.SocketUtils;
 import org.andengine.util.adt.array.ArrayUtils;
 import org.andengine.util.debug.Debug;