From d4592b2ee2f1b72de5743afae9226cf864a87a32 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 11 Feb 2014 19:36:05 +0100 Subject: [PATCH] * Simplified version info handling. --- .../src/main/java/mage/client/MageFrame.java | 2 +- .../java/mage/client/game/MultiConnectTest.java | 6 +++--- Mage.Common/src/mage/utils/MageVersion.java | 17 +++++++++++------ .../java/mage/server/console/ConsoleFrame.java | 4 ++-- Mage.Server/src/main/java/mage/server/Main.java | 2 +- .../org/mage/test/load/SimpleMageClient.java | 6 +++--- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index b0189a83cbf..582c02e358d 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -151,7 +151,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, ""); + private static final MageVersion version = new MageVersion(1, 3, 0, MageVersion.MAGE_VERSION_INFO); private UUID clientId; private static MagePane activeFrame; private static boolean liteMode = false; diff --git a/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java b/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java index 45c90301770..e8b46c73d55 100644 --- a/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java +++ b/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java @@ -30,17 +30,17 @@ public class MultiConnectTest { private static final CountDownLatch latch = new CountDownLatch(USER_CONNECT_COUNT); - private static final MageVersion version = new MageVersion(1, 3, 0, ""); + private static final MageVersion version = new MageVersion(1, 3, 0, MageVersion.MAGE_VERSION_INFO); private static volatile int connected; - private Object sync = new Object(); + private final Object sync = new Object(); private MageUI ui; private class ClientMock implements MageClient { private Session session; - private String username; + private final String username; public ClientMock(String username) { this.username = username; diff --git a/Mage.Common/src/mage/utils/MageVersion.java b/Mage.Common/src/mage/utils/MageVersion.java index 4716ddf697e..4d165b9db25 100644 --- a/Mage.Common/src/mage/utils/MageVersion.java +++ b/Mage.Common/src/mage/utils/MageVersion.java @@ -36,9 +36,11 @@ import java.io.Serializable; */ public class MageVersion implements Serializable, Comparable { - private int major; - private int minor; - private int patch; + public final static String MAGE_VERSION_INFO = ""; + + private final int major; + private final int minor; + private final int patch; private String info = ""; @@ -68,12 +70,15 @@ public class MageVersion implements Serializable, Comparable { @Override public int compareTo(MageVersion o) { - if (major != o.major) + if (major != o.major) { return major - o.major; - if (minor != o.minor) + } + if (minor != o.minor) { return minor - o.minor; - if (patch != o.patch) + } + if (patch != o.patch) { return patch - o.patch; + } return info.compareTo(o.info); } diff --git a/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java b/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java index b4af2478b57..c8c05ebd14a 100644 --- a/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java +++ b/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java @@ -58,8 +58,8 @@ public class ConsoleFrame extends javax.swing.JFrame implements MageClient { private static Session session; private ConnectDialog connectDialog; - private static Preferences prefs = Preferences.userNodeForPackage(ConsoleFrame.class); - private static final MageVersion version = new MageVersion(1, 3, 0, ""); + private static final Preferences prefs = Preferences.userNodeForPackage(ConsoleFrame.class); + private static final MageVersion version = new MageVersion(1, 3, 0, MageVersion.MAGE_VERSION_INFO); /** * @return the session diff --git a/Mage.Server/src/main/java/mage/server/Main.java b/Mage.Server/src/main/java/mage/server/Main.java index 4013818a2b9..645cc75d4ed 100644 --- a/Mage.Server/src/main/java/mage/server/Main.java +++ b/Mage.Server/src/main/java/mage/server/Main.java @@ -78,7 +78,7 @@ import org.w3c.dom.Element; public class Main { private static final Logger logger = Logger.getLogger(Main.class); - private static final MageVersion version = new MageVersion(1, 3, 0, ""); + private static final MageVersion version = new MageVersion(1, 3, 0, MageVersion.MAGE_VERSION_INFO); private static final String testModeArg = "-testMode="; private static final String adminPasswordArg = "-adminPassword="; diff --git a/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java b/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java index c02d56d2e11..131ad45b66f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java +++ b/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java @@ -15,12 +15,12 @@ import org.apache.log4j.Logger; */ public class SimpleMageClient implements MageClient { - private UUID clientId; - private static final MageVersion version = new MageVersion(1, 3, 0, ""); + private final UUID clientId; + private static final MageVersion version = new MageVersion(1, 3, 0, MageVersion.MAGE_VERSION_INFO); private static final transient Logger log = Logger.getLogger(SimpleMageClient.class); - private CallbackClient callbackClient; + private final CallbackClient callbackClient; public SimpleMageClient() { clientId = UUID.randomUUID();