diff --git a/forge-gui-desktop/src/main/java/forge/view/Main.java b/forge-gui-desktop/src/main/java/forge/view/Main.java index c49f69764a7..05675d2225d 100644 --- a/forge-gui-desktop/src/main/java/forge/view/Main.java +++ b/forge-gui-desktop/src/main/java/forge/view/Main.java @@ -50,7 +50,7 @@ public final class Main { GuiBase.setInterface(new GuiDesktop()); //set PropertyConfig log4j to true - GuiBase.setpropertyConfig(true); + GuiBase.enablePropertyConfig(true); //install our error handler ExceptionHandler.registerErrorHandling(); diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 85e5ba365ea..068971c14c2 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -72,7 +72,7 @@ public class Forge implements ApplicationListener { clipboard = clipboard0; deviceAdapter = deviceAdapter0; GuiBase.setInterface(new GuiMobile(assetDir0)); - GuiBase.setpropertyConfig(value); + GuiBase.enablePropertyConfig(value); } return app; } diff --git a/forge-gui/src/main/java/forge/GuiBase.java b/forge-gui/src/main/java/forge/GuiBase.java index 13fb19043de..aee6e20dd49 100644 --- a/forge-gui/src/main/java/forge/GuiBase.java +++ b/forge-gui/src/main/java/forge/GuiBase.java @@ -13,7 +13,7 @@ public class GuiBase { public static void setInterface(IGuiBase i0) { guiInterface = i0; } - public static void setpropertyConfig(boolean value) { + public static void enablePropertyConfig(boolean value) { propertyConfig = value; } public static boolean isNetworkplay() { @@ -22,7 +22,7 @@ public class GuiBase { public static void setNetworkplay(boolean value) { networkplay = value; } - public static boolean getpropertyConfig() { + public static boolean hasPropertyConfig() { return propertyConfig; } } diff --git a/forge-gui/src/main/java/forge/net/CustomObjectDecoder.java b/forge-gui/src/main/java/forge/net/CustomObjectDecoder.java index dae2dd39e15..47d898769d4 100644 --- a/forge-gui/src/main/java/forge/net/CustomObjectDecoder.java +++ b/forge-gui/src/main/java/forge/net/CustomObjectDecoder.java @@ -27,7 +27,7 @@ public class CustomObjectDecoder extends LengthFieldBasedFrameDecoder { if (frame == null) { return null; } else { - if (GuiBase.getpropertyConfig()){ + if (GuiBase.hasPropertyConfig()){ ElsaObjectInputStream ois = new ElsaObjectInputStream(new ByteBufInputStream(frame, true)); Object var5; diff --git a/forge-gui/src/main/java/forge/net/CustomObjectEncoder.java b/forge-gui/src/main/java/forge/net/CustomObjectEncoder.java index 255a784bfac..58dc82a58fb 100644 --- a/forge-gui/src/main/java/forge/net/CustomObjectEncoder.java +++ b/forge-gui/src/main/java/forge/net/CustomObjectEncoder.java @@ -20,7 +20,7 @@ public class CustomObjectEncoder extends MessageToByteEncoder { int startIdx = out.writerIndex(); ByteBufOutputStream bout = new ByteBufOutputStream(out); - if (GuiBase.getpropertyConfig()){ + if (GuiBase.hasPropertyConfig()){ ElsaObjectOutputStream oout = null; try { bout.write(LENGTH_PLACEHOLDER); diff --git a/forge-gui/src/main/java/forge/net/ProtocolMethod.java b/forge-gui/src/main/java/forge/net/ProtocolMethod.java index da4829bfb8b..fa32e8b1e58 100644 --- a/forge-gui/src/main/java/forge/net/ProtocolMethod.java +++ b/forge-gui/src/main/java/forge/net/ProtocolMethod.java @@ -156,7 +156,7 @@ public enum ProtocolMethod { } public void checkArgs(final Object[] args) { - if (GuiBase.getpropertyConfig()) + if (GuiBase.hasPropertyConfig()) return; //uses custom serializer for Android 8+.. for (int iArg = 0; iArg < args.length; iArg++) { Object arg = null; diff --git a/forge-gui/src/main/java/forge/net/server/FServerManager.java b/forge-gui/src/main/java/forge/net/server/FServerManager.java index 08c27102817..27cd0df0f87 100644 --- a/forge-gui/src/main/java/forge/net/server/FServerManager.java +++ b/forge-gui/src/main/java/forge/net/server/FServerManager.java @@ -87,7 +87,7 @@ public final class FServerManager { */ public static FServerManager getInstance() { if (instance == null) { - if(GuiBase.getpropertyConfig()) + if(GuiBase.hasPropertyConfig()) PropertyConfigurator.configure(ForgeConstants.ASSETS_DIR + "/src/main/resources/log4jConfig.config"); instance = new FServerManager(); }