github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2014-04-05 16:21:52 +02:00
commit 5768d2a8d5
3 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -1203,11 +1203,6 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
drafts.put(draftId, draftPanel); drafts.put(draftId, draftPanel);
} }
@Override
public UUID getId() {
return clientId;
}
@Override @Override
public void connected(final String message) { public void connected(final String message) {
if (SwingUtilities.isEventDispatchThread()) { if (SwingUtilities.isEventDispatchThread()) {

6
Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java
View file

@ -57,12 +57,6 @@ public class MultiConnectTest {
session.connect(connection); session.connect(connection);
} }
@Override
public UUID getId() {
logger.info("getId");
return null;
}
@Override @Override
public MageVersion getVersion() { public MageVersion getVersion() {
logger.info("getVersion"); logger.info("getVersion");

2
Mage.Common/src/mage/interfaces/MageClient.java
View file

@ -28,7 +28,6 @@
package mage.interfaces; package mage.interfaces;
import java.util.UUID;
import mage.interfaces.callback.CallbackClient; import mage.interfaces.callback.CallbackClient;
import mage.utils.MageVersion; import mage.utils.MageVersion;
@ -38,7 +37,6 @@ import mage.utils.MageVersion;
*/ */
public interface MageClient extends CallbackClient { public interface MageClient extends CallbackClient {
UUID getId();
MageVersion getVersion(); MageVersion getVersion();
void connected(String message); void connected(String message);
void disconnected(); void disconnected();