From 18a416d184346ad6507cdab5b757110d58b2e3ff Mon Sep 17 00:00:00 2001 From: magenoxx Date: Thu, 9 Jun 2011 20:20:28 +0400 Subject: [PATCH] Change Mage version to 0.7.4-beta --- Mage.Client/src/main/java/mage/client/MageFrame.java | 2 +- Mage.Common/src/mage/utils/MageVersion.java | 9 ++++++--- .../src/main/java/mage/server/console/ConsoleFrame.java | 2 +- Mage.Server/src/main/java/mage/server/Main.java | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index 4ea04ce957..28e2405069 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -108,7 +108,7 @@ public class MageFrame extends javax.swing.JFrame implements Client { private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class); private JLabel title; private Rectangle titleRectangle; - private final static MageVersion version = new MageVersion(0, 7, 3); + private final static MageVersion version = new MageVersion(0, 7, 4, "beta"); private UUID clientId; private static MagePane activeFrame; diff --git a/Mage.Common/src/mage/utils/MageVersion.java b/Mage.Common/src/mage/utils/MageVersion.java index 9901ac9398..bd0695809d 100644 --- a/Mage.Common/src/mage/utils/MageVersion.java +++ b/Mage.Common/src/mage/utils/MageVersion.java @@ -40,10 +40,13 @@ public class MageVersion implements Serializable, Comparable { private int minor; private int patch; - public MageVersion(int major, int minor, int patch) { + private String info = ""; + + public MageVersion(int major, int minor, int patch, String info) { this.major = major; this.minor = minor; this.patch = patch; + this.info = info; } public int getMajor() { @@ -60,7 +63,7 @@ public class MageVersion implements Serializable, Comparable { @Override public String toString() { - return major + "." + minor + "." + patch; + return major + "." + minor + "." + patch + info; } @Override @@ -71,7 +74,7 @@ public class MageVersion implements Serializable, Comparable { return minor - o.minor; if (patch != o.patch) return patch - o.patch; - return 0; + 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 4d6c969b37..ce732dc65e 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 @@ -53,7 +53,7 @@ public class ConsoleFrame extends javax.swing.JFrame { private static Session session; private ConnectDialog connectDialog; private static Preferences prefs = Preferences.userNodeForPackage(ConsoleFrame.class); - private final static MageVersion version = new MageVersion(0, 7, 3); + private final static MageVersion version = new MageVersion(0, 7, 4, "beta"); /** * @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 a43ab5a609..9353215ff6 100644 --- a/Mage.Server/src/main/java/mage/server/Main.java +++ b/Mage.Server/src/main/java/mage/server/Main.java @@ -61,7 +61,7 @@ public class Main { private final static String testModeArg = "-testMode="; private final static String adminPasswordArg = "-adminPassword="; private final static String pluginFolder = "plugins"; - private static MageVersion version = new MageVersion(0, 7, 3); + private static MageVersion version = new MageVersion(0, 7, 4, "beta"); public static PluginClassLoader classLoader = new PluginClassLoader(); public static ServerImpl server;