Merge origin/master

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

View file

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

View file

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

View file

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