External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

added setPreferences

Browse source
This commit is contained in:
betasteward 2015-06-24 15:01:14 -04:00
parent 8aeadf1143
commit 4ddb871f9b
7 changed files with 53 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Mage.Server/src/main/java/mage/server/ServerMain.java
View file

@ -76,6 +76,7 @@ import mage.view.GameEndView;
import mage.view.GameView;
import mage.view.RoomView;
import mage.view.TableView;
import mage.view.UserDataView;
import mage.view.UserRequestMessage;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.log4j.Logger;
@ -195,7 +196,7 @@ public class ServerMain implements MageServer {
}
@Override
public boolean registerClient(Connection connection, String sessionId, MageVersion version, String host) {
public boolean registerClient(final Connection connection, final String sessionId, final MageVersion version, final String host) {
if (version.compareTo(ServerMain.getVersion()) != 0) {
logger.info("MageVersionException: userName=" + connection.getUsername() + ", version=" + version);
LogServiceImpl.instance.log(LogKeys.KEY_WRONG_VERSION, connection.getUsername(), version.toString(), ServerMain.getVersion().toString(), sessionId);
@ -206,15 +207,10 @@ public class ServerMain implements MageServer {
return SessionManager.getInstance().registerUser(sessionId, connection, host);
}
// @Override
// public boolean setUserData(final String userName, final String sessionId, final UserDataView userDataView) throws MageException {
// return executeWithResult("setUserData", sessionId, new ActionWithBooleanResult() {
// @Override
// public Boolean execute() throws MageException {
// return SessionManager.getInstance().setUserData(userName, sessionId, userDataView);
// }
// });
// }
@Override
public void setPreferences(final String sessionId, final UserDataView userDataView) {
SessionManager.getInstance().setUserData(sessionId, userDataView);
}
//
// @Override
// public boolean registerAdmin(String password, String sessionId, MageVersion version) throws MageException {

18
Mage.Server/src/main/java/mage/server/SessionManager.java
View file

@ -31,13 +31,11 @@ import mage.remote.DisconnectReason;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import mage.MageException;
import mage.remote.Connection;
import mage.server.services.LogKeys;
import mage.server.services.impl.LogServiceImpl;
import mage.view.UserDataView;
import org.apache.log4j.Logger;
import org.mage.network.Server;
import org.mage.network.model.MessageType;
/**
@ -110,14 +108,14 @@ public class SessionManager {
return false;
}
// public boolean setUserData(String userName, String sessionId, UserDataView userDataView) throws MageException {
// Session session = sessions.get(sessionId);
// if (session != null) {
// session.setUserData(userName, userDataView);
// return true;
// }
// return false;
// }
public boolean setUserData(String sessionId, UserDataView userDataView) {
Session session = sessions.get(sessionId);
if (session != null) {
session.setUserData(UserManager.getInstance().getUser(session.getUserId()), userDataView);
return true;
}
return false;
}
public void disconnect(String sessionId, DisconnectReason reason) {
Session session = sessions.get(sessionId);