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

* UI: fixed error message window for long text (auto-size), improved wrong version message;

Browse source
This commit is contained in:
Oleg Agafonov 2019-03-18 09:00:27 +04:00
parent 410fd68996
commit 2a0d2d125b
3 changed files with 40 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Common/src/main/java/mage/remote/MageVersionException.java
View file

@ -1,11 +1,9 @@
package mage.remote;
import mage.MageException;
import mage.utils.MageVersion;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class MageVersionException extends MageException {
@ -13,7 +11,11 @@ public class MageVersionException extends MageException {
private final MageVersion serverVersion;
public MageVersionException(MageVersion clientVersion, MageVersion serverVersion) {
super("Wrong client version " + clientVersion + ", expecting version " + serverVersion + ". \r\n\r\nPlease download needed version from http://XMage.de or http://www.slightlymagic.net/forum/viewforum.php?f=70");
super("Wrong client version."
+ "<br/>Your version: " + clientVersion
+ "<br/>Server version: " + serverVersion
+ "<br/>Release app download: http://xmage.de"
+ "<br/>BETA app download: http://xmage.today");
this.serverVersion = serverVersion;
}

15
Mage.Common/src/main/java/mage/view/UserRequestMessage.java
View file

@ -1,19 +1,18 @@
package mage.view;
import mage.constants.PlayerAction;
import java.io.Serializable;
import java.util.UUID;
import mage.constants.PlayerAction;
/**
*
* @author LevelX2
*/
public class UserRequestMessage implements Serializable {
private static final long serialVersionUID = 1L;
private final String titel;
private final String title;
private final String message;
private UUID relatedUserId;
private String relatedUserName;
@ -32,8 +31,8 @@ public class UserRequestMessage implements Serializable {
private String button3Text;
private PlayerAction button3Action;
public UserRequestMessage(String titel, String message) {
this.titel = titel;
public UserRequestMessage(String title, String message) {
this.title = title;
this.message = message;
this.button1Action = null;
this.button2Action = null;
@ -68,8 +67,8 @@ public class UserRequestMessage implements Serializable {
this.button3Action = buttonAction;
}
public String getTitel() {
return titel;
public String getTitle() {
return title;
}
public static long getSerialVersionUID() {