From 4d169dd4b926f9c6e68fbcadd44a6a0ce56b1220 Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 12 Jul 2014 20:24:16 +0000 Subject: [PATCH] Support showing mobile Forge version in BugReporter --- forge-gui-desktop/src/main/java/forge/GuiDesktop.java | 5 +++++ forge-gui-mobile/src/forge/GuiMobile.java | 5 +++++ forge-gui/src/main/java/forge/error/BugReporter.java | 4 ++-- forge-gui/src/main/java/forge/interfaces/IGuiBase.java | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java index bb4bbe70830..885243e91d1 100644 --- a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java +++ b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java @@ -89,6 +89,11 @@ public class GuiDesktop implements IGuiBase { return true; } + @Override + public String getCurrentVersion() { + return BuildInfo.getVersionString(); + } + @Override public void invokeInEdtLater(Runnable proc) { SwingUtilities.invokeLater(proc); diff --git a/forge-gui-mobile/src/forge/GuiMobile.java b/forge-gui-mobile/src/forge/GuiMobile.java index f44cabfbd9b..db1940e71d7 100644 --- a/forge-gui-mobile/src/forge/GuiMobile.java +++ b/forge-gui-mobile/src/forge/GuiMobile.java @@ -70,6 +70,11 @@ public class GuiMobile implements IGuiBase { return Gdx.app.getType() == ApplicationType.Desktop; } + @Override + public String getCurrentVersion() { + return Forge.CURRENT_VERSION; + } + @Override public void invokeInEdtLater(Runnable proc) { Gdx.app.postRunnable(proc); diff --git a/forge-gui/src/main/java/forge/error/BugReporter.java b/forge-gui/src/main/java/forge/error/BugReporter.java index 89e7eb58706..cf97f4df58b 100644 --- a/forge-gui/src/main/java/forge/error/BugReporter.java +++ b/forge-gui/src/main/java/forge/error/BugReporter.java @@ -75,7 +75,7 @@ public class BugReporter { if (message != null) { System.err.printf("%s > %s%n", FThreads.debugGetCurrThreadId(), message); } - System.err.print( FThreads.debugGetCurrThreadId() + " > " ); + System.err.print(FThreads.debugGetCurrThreadId() + " > "); ex.printStackTrace(); StringBuilder sb = new StringBuilder(); @@ -174,7 +174,7 @@ public class BugReporter { private static StringBuilder buildSpoilerHeader(StringBuilder sb, String reportTitle) { sb.append("[spoiler=").append(reportTitle).append("][code]"); - sb.append("\nForge Version: ").append(BuildInfo.getVersionString()); + sb.append("\nForge Version: ").append(GuiBase.getInterface().getCurrentVersion()); sb.append("\nOperating System: ").append(System.getProperty("os.name")) .append(" ").append(System.getProperty("os.version")) .append(" ").append(System.getProperty("os.arch")); diff --git a/forge-gui/src/main/java/forge/interfaces/IGuiBase.java b/forge-gui/src/main/java/forge/interfaces/IGuiBase.java index 606cec1462d..2a7ea99b2cd 100644 --- a/forge-gui/src/main/java/forge/interfaces/IGuiBase.java +++ b/forge-gui/src/main/java/forge/interfaces/IGuiBase.java @@ -36,6 +36,7 @@ import forge.util.ITriggerEvent; public interface IGuiBase { boolean isRunningOnDesktop(); + String getCurrentVersion(); void invokeInEdtLater(Runnable runnable); void invokeInEdtAndWait(final Runnable proc); boolean isGuiThread();