Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved VERSION constants out of MagicMain into GeneralConfig - core classes should not be referencing launch classes.

master
lodici 2015-02-15 12:20:32 +00:00
parent a2f4b822e9
commit 22d07bfdde
12 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/magic/FiremindQueueWorker.java
View File

@ -25,6 +25,7 @@ import java.io.StringWriter;
import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import magic.data.GeneralConfig;
public class FiremindQueueWorker {
@ -180,7 +181,7 @@ public class FiremindQueueWorker {
gameCount++;
played = testDuel.getGamesPlayed();
long diff = System.currentTimeMillis() - started;
String[] vers = MagicMain.VERSION.split("\\.");
String[] vers = GeneralConfig.VERSION.split("\\.");
String log = MagicGameLog.getLogFileName();
FiremindClient.postGame(currentDuel.id, played, new Date(
baseDate.getTime() + diff),

7
src/magic/MagicMain.java
View File

@ -33,11 +33,6 @@ import magic.ui.MagicStyle;
public class MagicMain {
public static final String VERSION = "1.58";
public static final String SOFTWARE_TITLE =
"Magarena " + VERSION +
(MagicSystem.isDevMode() ? " [DEV MODE]" : "");
private static SplashScreen splash;
public static void main(final String[] args) {
@ -197,7 +192,7 @@ public class MagicMain {
final Font f = new Font("Monospaced", Font.PLAIN, 16);
g2d.setFont(f);
// version
final String version = "Version " + MagicMain.VERSION;
final String version = "Version " + GeneralConfig.VERSION;
int w = g2d.getFontMetrics(f).stringWidth(version);
int x = (splash.getSize().width / 2) - (w / 2);
g2d.drawString(version, x, 15);

5
src/magic/data/GeneralConfig.java
View File

@ -9,9 +9,14 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Properties;
import magic.utility.MagicFileSystem;
import magic.utility.MagicSystem;
public class GeneralConfig {
public static final String VERSION = "1.58";
public static final String SOFTWARE_TITLE =
"Magarena " + GeneralConfig.VERSION + (MagicSystem.isDevMode() ? " [DEV MODE]" : "");
private static final GeneralConfig INSTANCE=new GeneralConfig();
public static final Dimension MAXIMUM_CARD_SIZE = new Dimension(480, 680);

3
src/magic/data/json/NewVersionJsonParser.java
View File

@ -2,7 +2,6 @@ package magic.data.json;
import java.io.File;
import java.io.IOException;
import magic.MagicMain;
import magic.data.GeneralConfig;
import magic.utility.MagicFileSystem;
import magic.utility.MagicFileSystem.DataPath;
@ -51,7 +50,7 @@ public final class NewVersionJsonParser {
}
private static boolean isNewVersion(final String releaseValue) {
return releaseValue != null && versionCompare(releaseValue, MagicMain.VERSION) > 0;
return releaseValue != null && versionCompare(releaseValue, GeneralConfig.VERSION) > 0;
}
//source: https://stackoverflow.com/questions/6701948/efficient-way-to-compare-version-strings-in-java

4
src/magic/game/state/GameStateFileWriter.java
View File

@ -8,7 +8,7 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
import java.util.TreeSet;
import magic.MagicMain;
import magic.data.GeneralConfig;
import magic.utility.MagicFileSystem;
public final class GameStateFileWriter {
@ -36,7 +36,7 @@ public final class GameStateFileWriter {
}
private static void setGameProperties(final Properties properties, final GameState gameState) {
properties.setProperty(PROP_Version, MagicMain.VERSION);
properties.setProperty(PROP_Version, GeneralConfig.VERSION);
properties.setProperty(PROP_PlayerCount, Integer.toString(gameState.getPlayers().size()));
properties.setProperty(PROP_Difficulty, Integer.toString(gameState.getDifficulty()));
properties.setProperty(PROP_StartPlayerIndex, Integer.toString(gameState.getStartPlayerIndex()));

4
src/magic/model/FiremindGameReport.java
View File

@ -1,6 +1,5 @@
package magic.model;
import magic.MagicMain;
import magic.data.FileIO;
import magic.firemind.FiremindClient;
import magic.model.action.MagicAction;
@ -14,6 +13,7 @@ import java.io.StringWriter;
import java.nio.file.Path;
import java.text.SimpleDateFormat;
import java.util.Date;
import magic.data.GeneralConfig;
public class FiremindGameReport implements Thread.UncaughtExceptionHandler {
private Integer currentDuelId;
@ -132,7 +132,7 @@ public class FiremindGameReport implements Thread.UncaughtExceptionHandler {
+ (new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"))
.format(new Date()));
sb.append('\n');
sb.append("MAGARENA VERSION " + MagicMain.VERSION);
sb.append("MAGARENA VERSION " + GeneralConfig.VERSION);
sb.append(", JRE " + System.getProperty("java.version"));
sb.append(", OS " + System.getProperty("os.name"));
sb.append("_" + System.getProperty("os.version"));

4
src/magic/model/MagicGameLog.java
View File

@ -4,7 +4,7 @@ import java.io.FileNotFoundException;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.Date;
import magic.MagicMain;
import magic.data.GeneralConfig;
import magic.utility.MagicFileSystem;
import magic.utility.MagicFileSystem.DataPath;
@ -29,7 +29,7 @@ public class MagicGameLog {
sb.append('\n');
sb.append("CREATED ON ").append(new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(new Date()));
sb.append('\n');
sb.append("MAGARENA VERSION ").append(MagicMain.VERSION);
sb.append("MAGARENA VERSION ").append(GeneralConfig.VERSION);
sb.append(", JRE ").append(System.getProperty("java.version"));
sb.append(", OS ").append(System.getProperty("os.name"));
sb.append("_").append(System.getProperty("os.version"));

3
src/magic/model/MagicGameReport.java
View File

@ -13,6 +13,7 @@ import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import magic.MagicMain;
import magic.data.FileIO;
import magic.data.GeneralConfig;
import magic.model.action.MagicAction;
import magic.model.stack.MagicItemOnStack;
import magic.ui.ScreenController;
@ -174,7 +175,7 @@ public class MagicGameReport implements Thread.UncaughtExceptionHandler {
sb.append('\n');
sb.append("CREATED ON ").append(new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(new Date()));
sb.append('\n');
sb.append("MAGARENA VERSION ").append(MagicMain.VERSION);
sb.append("MAGARENA VERSION ").append(GeneralConfig.VERSION);
sb.append(", JRE ").append(System.getProperty("java.version"));
sb.append(", OS ").append(System.getProperty("os.name"));
sb.append("_").append(System.getProperty("os.version"));

3
src/magic/ui/ScreenController.java
View File

@ -3,7 +3,6 @@ package magic.ui;
import java.util.Stack;
import javax.swing.JComponent;
import javax.swing.JOptionPane;
import magic.MagicMain;
import magic.data.GeneralConfig;
import magic.model.MagicCardDefinition;
import magic.model.MagicCardList;
@ -48,7 +47,7 @@ public final class ScreenController {
public static MagicFrame getMainFrame() {
if (mainFrame == null && java.awt.GraphicsEnvironment.isHeadless() == false) {
mainFrame = new MagicFrame(MagicMain.SOFTWARE_TITLE);
mainFrame = new MagicFrame(GeneralConfig.SOFTWARE_TITLE);
}
return mainFrame;
}

3
src/magic/ui/dialog/AboutDialog.java
View File

@ -17,6 +17,7 @@ import javax.swing.JRootPane;
import javax.swing.KeyStroke;
import javax.swing.WindowConstants;
import magic.MagicMain;
import magic.data.GeneralConfig;
import magic.data.MagicIcon;
import magic.ui.IconImages;
import magic.data.URLUtils;
@ -66,7 +67,7 @@ public class AboutDialog extends JDialog implements ActionListener {
descriptionLabel.setFont(FONT_BOLD12);
aboutPanel.add(descriptionLabel);
final JLabel versionLabel = new JLabel("Version: " + MagicMain.VERSION);
final JLabel versionLabel = new JLabel("Version: " + GeneralConfig.VERSION);
versionLabel.setBounds(250, 105, 320, 25);
versionLabel.setFont(FONT_PLAIN12);
aboutPanel.add(versionLabel);

4
src/magic/ui/screen/widget/CaptionPanel.java
View File

@ -1,6 +1,5 @@
package magic.ui.screen.widget;
import magic.MagicMain;
import magic.ui.IconImages;
import magic.ui.widget.FontsAndBorders;
import net.miginfocom.swing.MigLayout;
@ -14,6 +13,7 @@ import javax.swing.JPanel;
import java.awt.Color;
import java.awt.Cursor;
import java.awt.event.ActionEvent;
import magic.data.GeneralConfig;
import magic.data.MagicIcon;
import magic.ui.ScreenController;
@ -56,7 +56,7 @@ public class CaptionPanel extends JPanel {
private JPanel getTitlePanel() {
JPanel titlePanel = new JPanel(new MigLayout("insets 0, gap 0, flowy"));
titlePanel.setOpaque(false);
JLabel version = new JLabel(MagicMain.SOFTWARE_TITLE);
JLabel version = new JLabel(GeneralConfig.SOFTWARE_TITLE);
version.setFont(FontsAndBorders.FONT0);
version.setForeground(Color.WHITE);
titlePanel.add(version);

3
src/magic/ui/widget/firemind/FiremindWorkerPanel.java
View File

@ -20,7 +20,6 @@ import javax.swing.SwingWorker;
import magic.firemind.FiremindClient;
import magic.FiremindQueueWorker;
import magic.MagicMain;
import magic.data.GeneralConfig;
import magic.data.MagicIcon;
import magic.ui.IconImages;
@ -96,7 +95,7 @@ public class FiremindWorkerPanel extends JPanel {
CONFIG.save();
FiremindClient.setHostByEnvironment();
if (FiremindClient.checkMagarenaVersion(MagicMain.VERSION)){
if (FiremindClient.checkMagarenaVersion(GeneralConfig.VERSION)){
setRunningState();
notifyStatusChanged(true);
firemindWorker = getFiremindWorker(CONFIG.getProxy());