External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 21:02:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[minor] access modifer order

Browse source
This commit is contained in:
North 2013-03-10 14:47:13 +02:00
parent ec546a5ae6
commit a7a565bb8f
549 changed files with 1032 additions and 1040 deletions
Download patch file Download diff file Expand all files Collapse all files

146
Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java
View file

@ -1,73 +1,73 @@
package org.mage.test.load;
import mage.interfaces.MageClient;
import mage.interfaces.callback.CallbackClient;
import mage.interfaces.callback.ClientCallback;
import mage.remote.Session;
import mage.utils.MageVersion;
import org.apache.log4j.Logger;
import java.util.UUID;
/**
* For tests only
*
* @author noxx
*/
public class SimpleMageClient implements MageClient {
private UUID clientId;
private final static MageVersion version = new MageVersion(1, 0, 1, "");
private static final transient Logger log = Logger.getLogger(SimpleMageClient.class);
private CallbackClient callbackClient;
public SimpleMageClient() {
clientId = UUID.randomUUID();
callbackClient = new LoadCallbackClient();
}
@Override
public UUID getId() {
return clientId;
}
@Override
public MageVersion getVersion() {
return version;
}
@Override
public void connected(String message) {
// do nothing
}
@Override
public void disconnected() {
// do nothing
}
@Override
public void showMessage(String message) {
log.info(message);
}
@Override
public void showError(String message) {
log.error(message);
}
@Override
public void processCallback(ClientCallback callback) {
callbackClient.processCallback(callback);
}
public void setSession(Session session) {
((LoadCallbackClient)callbackClient).setSession(session);
}
public boolean isGameOver() {
return ((LoadCallbackClient)callbackClient).isGameOver();
}
}
package org.mage.test.load;
import mage.interfaces.MageClient;
import mage.interfaces.callback.CallbackClient;
import mage.interfaces.callback.ClientCallback;
import mage.remote.Session;
import mage.utils.MageVersion;
import org.apache.log4j.Logger;
import java.util.UUID;
/**
* For tests only
*
* @author noxx
*/
public class SimpleMageClient implements MageClient {
private UUID clientId;
private static final MageVersion version = new MageVersion(1, 0, 1, "");
private static final transient Logger log = Logger.getLogger(SimpleMageClient.class);
private CallbackClient callbackClient;
public SimpleMageClient() {
clientId = UUID.randomUUID();
callbackClient = new LoadCallbackClient();
}
@Override
public UUID getId() {
return clientId;
}
@Override
public MageVersion getVersion() {
return version;
}
@Override
public void connected(String message) {
// do nothing
}
@Override
public void disconnected() {
// do nothing
}
@Override
public void showMessage(String message) {
log.info(message);
}
@Override
public void showError(String message) {
log.error(message);
}
@Override
public void processCallback(ClientCallback callback) {
callbackClient.processCallback(callback);
}
public void setSession(Session session) {
((LoadCallbackClient)callbackClient).setSession(session);
}
public boolean isGameOver() {
return ((LoadCallbackClient)callbackClient).isGameOver();
}
}

2
Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java
View file

@ -41,7 +41,7 @@ public abstract class MageTestBase {
public static PluginClassLoader classLoader = new PluginClassLoader();
private final static String pluginFolder = "plugins";
private static final String pluginFolder = "plugins";
protected Pattern pattern = Pattern.compile("([a-zA-Z]*):([\\w]*):([a-zA-Z ,\\-.!'\\d]*):([\\d]*)(:\\{tapped\\})?");

2
Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java
View file

@ -38,7 +38,7 @@ public abstract class MageTestPlayerBase {
public static PluginClassLoader classLoader = new PluginClassLoader();
private final static String pluginFolder = "plugins";
private static final String pluginFolder = "plugins";
protected Pattern pattern = Pattern.compile("([a-zA-Z]*):([\\w]*):([a-zA-Z ,\\-.!'\\d]*):([\\d]*)(:\\{tapped\\})?");