From a7369fabd4d854b3bb4a230200b52329f19ea36a Mon Sep 17 00:00:00 2001 From: betasteward Date: Sat, 20 Jun 2015 09:30:28 -0400 Subject: [PATCH] some minor changes --- Mage.Common/src/mage/utils/MageVersion.java | 4 ++++ Mage.Network/src/main/java/org/mage/network/Client.java | 4 ---- Mage.Server/src/main/java/mage/server/ServerMain.java | 2 +- .../src/main/java/mage/server/util/ServerMessagesUtil.java | 5 +---- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Mage.Common/src/mage/utils/MageVersion.java b/Mage.Common/src/mage/utils/MageVersion.java index 7c4f67d2dfb..2baafa2e561 100644 --- a/Mage.Common/src/mage/utils/MageVersion.java +++ b/Mage.Common/src/mage/utils/MageVersion.java @@ -60,6 +60,10 @@ public class MageVersion implements Serializable, Comparable { this.info = info; } + public static MageVersion getCurrent() { + return new MageVersion(MAGE_VERSION_MAJOR, MAGE_VERSION_MINOR, MAGE_VERSION_PATCH, MAGE_VERSION_MINOR_PATCH, MAGE_VERSION_INFO); + } + public int getMajor() { return major; } diff --git a/Mage.Network/src/main/java/org/mage/network/Client.java b/Mage.Network/src/main/java/org/mage/network/Client.java index d61cd4e2d6e..b17b13a33a3 100644 --- a/Mage.Network/src/main/java/org/mage/network/Client.java +++ b/Mage.Network/src/main/java/org/mage/network/Client.java @@ -311,10 +311,6 @@ public class Client { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } - public UUID getMainRoomId() { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } - public void watchTable(UUID roomId, UUID tableId) { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } diff --git a/Mage.Server/src/main/java/mage/server/ServerMain.java b/Mage.Server/src/main/java/mage/server/ServerMain.java index cf899a5ab52..4095159054d 100644 --- a/Mage.Server/src/main/java/mage/server/ServerMain.java +++ b/Mage.Server/src/main/java/mage/server/ServerMain.java @@ -120,7 +120,7 @@ public class ServerMain implements MageServer { private static final Logger logger = Logger.getLogger(MageServer.class); // private static final ExecutorService callExecutor = ThreadExecutor.getInstance().getCallExecutor(); - 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 final MageVersion version = MageVersion.getCurrent(); private static final String testModeArg = "-testMode="; private static final String fastDBModeArg = "-fastDbMode="; diff --git a/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java b/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java index d97d85ba098..bf6e3627f0e 100644 --- a/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java +++ b/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java @@ -72,6 +72,7 @@ public class ServerMessagesUtil { } public ServerMessagesUtil() { + this.startDate = System.currentTimeMillis(); updateExecutor = Executors.newSingleThreadScheduledExecutor(); updateExecutor.scheduleAtFixedRate(new Runnable() { @Override @@ -182,10 +183,6 @@ public class ServerMessagesUtil { // } // }); - public void setStartDate(long milliseconds) { - this.startDate = milliseconds; - } - public void incGamesStarted() { int value; do {