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

* Some changes to version handling. Added display of server version (incl. minor server version) in client window titel.

Browse source
This commit is contained in:
LevelX2 2014-10-31 10:35:53 +01:00
parent d50e98f38a
commit 2ac1340af7
8 changed files with 130 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,6 +101,8 @@ import net.java.truevfs.kernel.spec.FsAccessOption;
*/
public class MageFrame extends javax.swing.JFrame implements MageClient {
private static final String TITLE_NAME = "XMage";
private static final Logger logger = Logger.getLogger(MageFrame.class);
private static final String liteModeArg = "-lite";
private static final String grayModeArg = "-gray";
@ -115,7 +117,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
private static final Preferences prefs = Preferences.userNodeForPackage(MageFrame.class);
private JLabel title;
private Rectangle titleRectangle;
private static final MageVersion version = new MageVersion(1, 3, 0, MageVersion.MAGE_VERSION_INFO);
private static final MageVersion version = new MageVersion(MageVersion.MAGE_VERSION_MAJOR, MageVersion.MAGE_VERSION_MINOR, MageVersion.MAGE_VERSION_PATCH, MageVersion.MAGE_VERSION_MINOR_PATCH, MageVersion.MAGE_VERSION_INFO);
private UUID clientId;
private static MagePane activeFrame;
private static boolean liteMode = false;
@ -169,8 +171,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
* Creates new form MageFrame
*/
public MageFrame() {
setTitle("XMage, version " + version);
setWindowTitle();
clientId = UUID.randomUUID();
EDTExceptionHandler.registerExceptionHandler();
addWindowListener(new WindowAdapter() {
@ -324,6 +326,10 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
}
}
public void setWindowTitle() {
setTitle(TITLE_NAME + " Client: " + version.toString() + " Server: " + ((session != null && session.isConnected()) ? session.getVersionInfo():"<not connected>"));
}
private void addTooltipContainer() {
final JEditorPane cardInfoPane = (JEditorPane) Plugins.getInstance().getCardInfoPane();
if (cardInfoPane == null) {
@ -674,7 +680,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
}
public static boolean connect(Connection connection) {
return session.connect(connection);
boolean result = session.connect(connection);
MageFrame.getInstance().setWindowTitle();
return result;
}
public static boolean stopConnecting() {
@ -905,7 +913,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
if (JOptionPane.showConfirmDialog(this, "Are you sure you want to disconnect?", "Confirm disconnect", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
session.disconnect(false);
tablesPane.clearChat();
showMessage("You have disconnected");
setWindowTitle();
showMessage("You have disconnected");
}
} else {
connectDialog.showDialog();

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

@ -30,7 +30,7 @@ public class MultiConnectTest {
private static final CountDownLatch latch = new CountDownLatch(USER_CONNECT_COUNT);
private static final MageVersion version = new MageVersion(1, 3, 0, MageVersion.MAGE_VERSION_INFO);
private static final MageVersion version = new MageVersion(MageVersion.MAGE_VERSION_MAJOR, MageVersion.MAGE_VERSION_MINOR, MageVersion.MAGE_VERSION_PATCH, MageVersion.MAGE_VERSION_MINOR_PATCH, MageVersion.MAGE_VERSION_INFO);
private static volatile int connected;