github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-24 19:19:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change Mage version to 0.7.4-beta

Browse source
This commit is contained in:
magenoxx 2011-06-09 20:20:28 +04:00
parent 9764a4e1b2
commit 18a416d184
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,7 +108,7 @@ public class MageFrame extends javax.swing.JFrame implements Client {
private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class); private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class);
private JLabel title; private JLabel title;
private Rectangle titleRectangle; 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 UUID clientId;
private static MagePane activeFrame; private static MagePane activeFrame;

9
Mage.Common/src/mage/utils/MageVersion.java
View file

@ -40,10 +40,13 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
private int minor; private int minor;
private int patch; 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.major = major;
this.minor = minor; this.minor = minor;
this.patch = patch; this.patch = patch;
this.info = info;
} }
public int getMajor() { public int getMajor() {
@ -60,7 +63,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
@Override @Override
public String toString() { public String toString() {
return major + "." + minor + "." + patch; return major + "." + minor + "." + patch + info;
} }
@Override @Override
@ -71,7 +74,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
return minor - o.minor; return minor - o.minor;
if (patch != o.patch) if (patch != o.patch)
return patch - o.patch; return patch - o.patch;
return 0; return info.compareTo(o.info);
} }
} }

2
Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java
View file

@ -53,7 +53,7 @@ public class ConsoleFrame extends javax.swing.JFrame {
private static Session session; private static Session session;
private ConnectDialog connectDialog; private ConnectDialog connectDialog;
private static Preferences prefs = Preferences.userNodeForPackage(ConsoleFrame.class); 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 * @return the session

2
Mage.Server/src/main/java/mage/server/Main.java
View file

@ -61,7 +61,7 @@ public class Main {
private final static String testModeArg = "-testMode="; private final static String testModeArg = "-testMode=";
private final static String adminPasswordArg = "-adminPassword="; private final static String adminPasswordArg = "-adminPassword=";
private final static String pluginFolder = "plugins"; 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 PluginClassLoader classLoader = new PluginClassLoader();
public static ServerImpl server; public static ServerImpl server;