From aa86f8eae3660509db4a2d53fa80c7247f6fe972 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Mon, 6 Apr 2020 09:21:10 +0800 Subject: [PATCH] Forge constant for close command message --- .../src/forge/screens/online/OnlineLobbyScreen.java | 3 ++- forge-gui/src/main/java/forge/net/NetConnectUtil.java | 3 ++- forge-gui/src/main/java/forge/properties/ForgeConstants.java | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java index 1fc609fdb5e..fbd00c54e0f 100644 --- a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java +++ b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java @@ -11,6 +11,7 @@ import forge.net.IOnlineLobby; import forge.net.NetConnectUtil; import forge.net.OfflineLobby; import forge.net.client.FGameClient; +import forge.properties.ForgeConstants; import forge.screens.LoadingOverlay; import forge.screens.constructed.LobbyScreen; import forge.screens.online.OnlineMenu.OnlineScreen; @@ -96,7 +97,7 @@ public class OnlineLobbyScreen extends LobbyScreen implements IOnlineLobby { final IOnlineChatInterface chatInterface = (IOnlineChatInterface)OnlineScreen.Chat.getScreen(); if (joinServer) { result = NetConnectUtil.join(url, OnlineLobbyScreen.this, chatInterface); - if (result.getMessage() == "<<_EM_ESOLC_<<") { //this message is returned via netconnectutil on exception + if (result.getMessage() == ForgeConstants.CLOSE_CONN_COMMAND) { //this message is returned via netconnectutil on exception closeConn("Invalid host address (" + url + ") was detected."); return; } diff --git a/forge-gui/src/main/java/forge/net/NetConnectUtil.java b/forge-gui/src/main/java/forge/net/NetConnectUtil.java index 89ecf568be3..8b9e5fc39db 100644 --- a/forge-gui/src/main/java/forge/net/NetConnectUtil.java +++ b/forge-gui/src/main/java/forge/net/NetConnectUtil.java @@ -1,6 +1,7 @@ package forge.net; import forge.match.LobbySlotType; +import forge.properties.ForgeConstants; import org.apache.commons.lang3.StringUtils; import forge.GuiBase; @@ -179,7 +180,7 @@ public class NetConnectUtil { } catch (Exception ex) { //return a message to close the connection so we will not crash... - return new ChatMessage(null, "<<_EM_ESOLC_<<"); + return new ChatMessage(null, ForgeConstants.CLOSE_CONN_COMMAND); } return new ChatMessage(null, String.format("Connected to %s:%d", hostname, port)); diff --git a/forge-gui/src/main/java/forge/properties/ForgeConstants.java b/forge-gui/src/main/java/forge/properties/ForgeConstants.java index 471e6acbbf0..12e9b309a5d 100644 --- a/forge-gui/src/main/java/forge/properties/ForgeConstants.java +++ b/forge-gui/src/main/java/forge/properties/ForgeConstants.java @@ -237,6 +237,7 @@ public final class ForgeConstants { public static final String QUEST_PREFS_FILE = USER_PREFS_DIR + "quest.preferences"; public static final String CONQUEST_PREFS_FILE = USER_PREFS_DIR + "conquest.preferences"; public static final String ITEM_VIEW_PREFS_FILE = USER_PREFS_DIR + "item_view.preferences"; + public static final String CLOSE_CONN_COMMAND = "<<_EM_ESOLC_<<"; // data that has defaults in the program dir but overrides/additions in the user dir private static final String _DEFAULTS_DIR = RES_DIR + "defaults" + PATH_SEPARATOR;