external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve display of chat messages for app

Browse Source
This commit is contained in:
drdev
2015-06-06 18:11:36 +00:00
parent fc0e527877
commit 7a2bac60de
6 changed files with 131 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/net/IOnlineChatInterface.java
View File

@@ -2,5 +2,5 @@ package forge.net;
public interface IOnlineChatInterface {
void setGameClient(IRemote iRemote);
void addMessage(String message);
void addMessage(ChatMessage message);
}

31
forge-gui/src/main/java/forge/net/NetConnectUtil.java
View File

@@ -1,8 +1,5 @@
package forge.net;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.commons.lang3.StringUtils;
import forge.GuiBase;
@@ -41,7 +38,7 @@ public class NetConnectUtil {
return url;
}
public static String host(final IOnlineLobby onlineLobby, final IOnlineChatInterface chatInterface) {
public static ChatMessage host(final IOnlineLobby onlineLobby, final IOnlineChatInterface chatInterface) {
final int port = ForgeProfileProperties.getServerPort();
final FServerManager server = FServerManager.getInstance();
final ServerGameLobby lobby = new ServerGameLobby();
@@ -72,7 +69,7 @@ public class NetConnectUtil {
}
@Override
public final void message(final String source, final String message) {
chatInterface.addMessage(formatMessage(source, message));
chatInterface.addMessage(new ChatMessage(source, message));
}
@Override
public final void close() {
@@ -84,7 +81,7 @@ public class NetConnectUtil {
public final void send(final NetEvent event) {
if (event instanceof MessageEvent) {
final MessageEvent message = (MessageEvent) event;
chatInterface.addMessage(formatMessage(message.getSource(), message.getMessage()));
chatInterface.addMessage(new ChatMessage(message.getSource(), message.getMessage()));
server.broadcast(event);
}
}
@@ -97,7 +94,7 @@ public class NetConnectUtil {
view.update(true);
return String.format("Hosting on port %d.", port);
return new ChatMessage(null, String.format("Hosting on port %d.", port));
}
public static void copyHostedServerUrl() {
@@ -107,7 +104,7 @@ public class NetConnectUtil {
SOptionPane.showMessageDialog("Share the following URL with anyone who wishes to join your server. It has been copied to your clipboard for convenience.\n\n" + url, "Server URL", SOptionPane.INFORMATION_ICON);
}
public static String join(final String url, final IOnlineLobby onlineLobby, final IOnlineChatInterface chatInterface) {
public static ChatMessage join(final String url, final IOnlineLobby onlineLobby, final IOnlineChatInterface chatInterface) {
final IGuiGame gui = GuiBase.getInterface().getNewGuiGame();
final FGameClient client = new FGameClient(FModel.getPreferences().getPref(FPref.PLAYER_NAME), "0", gui);
onlineLobby.setClient(client);
@@ -118,7 +115,7 @@ public class NetConnectUtil {
client.addLobbyListener(new ILobbyListener() {
@Override
public final void message(final String source, final String message) {
chatInterface.addMessage(formatMessage(source, message));
chatInterface.addMessage(new ChatMessage(source, message));
}
@Override
public final void update(final GameLobbyData state, final int slot) {
@@ -154,20 +151,6 @@ public class NetConnectUtil {
client.connect(hostname, port);
return String.format("Connected to %s:%d", hostname, port);
}
private final static SimpleDateFormat inFormat = new SimpleDateFormat("HH:mm:ss");
public static String formatMessage(final String source, final String message) {
final String now = inFormat.format(new Date());
final String toAdd;
if (source == null) {
toAdd = String.format("%n[%s] %s", now, message);
}
else {
toAdd = String.format("%n[%s] %s: %s", now, source, message);
}
return toAdd;
return new ChatMessage(null, String.format("Connected to %s:%d", hostname, port));
}
}