external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +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

10
forge-gui-desktop/src/main/java/forge/gui/FNetOverlay.java
View File

@@ -6,6 +6,7 @@ import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import javax.swing.ScrollPaneConstants;
import net.miginfocom.swing.MigLayout;
@@ -15,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
import forge.Singletons;
import forge.gui.framework.SDisplayUtil;
import forge.model.FModel;
import forge.net.ChatMessage;
import forge.net.IOnlineChatInterface;
import forge.net.IRemote;
import forge.net.event.MessageEvent;
@@ -132,7 +134,7 @@ public enum FNetOverlay implements IOnlineChatInterface {
public void show() {
show(null);
}
public void show(final String message) {
public void show(final ChatMessage message) {
if (!hasBeenShown) {
hasBeenShown = true;
loadLocation();
@@ -144,7 +146,7 @@ public enum FNetOverlay implements IOnlineChatInterface {
});
}
if (message != null) {
txtLog.setText(message);
txtLog.setText(message.getFormattedMessage());
}
window.setVisible(true);
}
@@ -203,7 +205,7 @@ public enum FNetOverlay implements IOnlineChatInterface {
}
@Override
public void addMessage(final String message) {
txtLog.append(message);
public void addMessage(final ChatMessage message) {
txtLog.append(message.getFormattedMessage());
}
}

5
forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java
View File

@@ -13,6 +13,7 @@ import forge.gui.framework.EDocID;
import forge.gui.framework.ICDoc;
import forge.menus.IMenuProvider;
import forge.menus.MenuUtil;
import forge.net.ChatMessage;
import forge.net.NetConnectUtil;
import forge.screens.home.CHomeUI;
import forge.screens.home.CLobby;
@@ -55,7 +56,7 @@ public enum CSubmenuOnlineLobby implements ICDoc, IMenuProvider {
}
});
final String result = NetConnectUtil.host(VSubmenuOnlineLobby.SINGLETON_INSTANCE, FNetOverlay.SINGLETON_INSTANCE);
final ChatMessage result = NetConnectUtil.host(VSubmenuOnlineLobby.SINGLETON_INSTANCE, FNetOverlay.SINGLETON_INSTANCE);
SwingUtilities.invokeLater(new Runnable() {
@Override
@@ -79,7 +80,7 @@ public enum CSubmenuOnlineLobby implements ICDoc, IMenuProvider {
}
});
final String result = NetConnectUtil.join(url, VSubmenuOnlineLobby.SINGLETON_INSTANCE, FNetOverlay.SINGLETON_INSTANCE);
final ChatMessage result = NetConnectUtil.join(url, VSubmenuOnlineLobby.SINGLETON_INSTANCE, FNetOverlay.SINGLETON_INSTANCE);
SwingUtilities.invokeLater(new Runnable() {
@Override