[vassalengine-svn] SF.net SVN: vassalengine: [1666] VASSAL-src/trunk/VASSAL
Brought to you by:
rodneykinney,
uckelman
From: <rod...@us...> - 2007-01-24 11:07:49
|
Revision: 1666 http://svn.sourceforge.net/vassalengine/?rev=1666&view=rev Author: rodneykinney Date: 2007-01-24 03:07:46 -0800 (Wed, 24 Jan 2007) Log Message: ----------- Fix message board access from Server Status window Modified Paths: -------------- VASSAL-src/trunk/VASSAL/build/module/map/PieceMover.java VASSAL-src/trunk/VASSAL/chat/DummyClient.java VASSAL-src/trunk/VASSAL/chat/HttpMessageServer.java VASSAL-src/trunk/VASSAL/chat/node/NodeClientFactory.java VASSAL-src/trunk/VASSAL/chat/ui/ShowServerStatusAction.java VASSAL-src/trunk/VASSAL/configure/FontConfigurer.java Modified: VASSAL-src/trunk/VASSAL/build/module/map/PieceMover.java =================================================================== --- VASSAL-src/trunk/VASSAL/build/module/map/PieceMover.java 2007-01-24 01:31:25 UTC (rev 1665) +++ VASSAL-src/trunk/VASSAL/build/module/map/PieceMover.java 2007-01-24 11:07:46 UTC (rev 1666) @@ -168,11 +168,8 @@ GamePiece selected = null; if (this.map.getStackMetrics().isStackingEnabled() && this.map.getPieceCollection().canMerge(dragging, s) && !DragBuffer.getBuffer().contains(s) && s.topPiece() != null) { - if (!s.isExpanded() && this.map.isLocationRestricted(pt)) { - pt = this.map.snapTo(pt); - if (s.getPosition().equals(pt) && s.topPiece() != null) { - selected = s; - } + if (this.map.isLocationRestricted(pt) && s.getPosition().equals(this.map.snapTo(pt))) { + selected = s; } else { selected = (GamePiece) super.visitStack(s); Modified: VASSAL-src/trunk/VASSAL/chat/DummyClient.java =================================================================== --- VASSAL-src/trunk/VASSAL/chat/DummyClient.java 2007-01-24 01:31:25 UTC (rev 1665) +++ VASSAL-src/trunk/VASSAL/chat/DummyClient.java 2007-01-24 11:07:46 UTC (rev 1666) @@ -31,8 +31,7 @@ return GameModule.getGameModule() == null ? "<anonymous>" : (String) GameModule.getGameModule().getPrefs().getValue(GameModule.REAL_NAME); } }; - httpMessageServer = new HttpMessageServer("http://www.vassalengine.org/util/getMessages", "http://www.vassalengine.org/util/postMessage", - "http://www.vassalengine.org/util/motd", publicInfo); + httpMessageServer = new HttpMessageServer(publicInfo); msgControls = new MessageBoardControlsInitializer("Messages",httpMessageServer); statusControls = new ServerStatusControlsInitializer(new CgiServerStatus()); } Modified: VASSAL-src/trunk/VASSAL/chat/HttpMessageServer.java =================================================================== --- VASSAL-src/trunk/VASSAL/chat/HttpMessageServer.java 2007-01-24 01:31:25 UTC (rev 1665) +++ VASSAL-src/trunk/VASSAL/chat/HttpMessageServer.java 2007-01-24 11:07:46 UTC (rev 1666) @@ -36,6 +36,11 @@ private HttpRequestWrapper postMessageURL; private PeerPoolInfo info; + public HttpMessageServer(PeerPoolInfo info) { + this("http://www.vassalengine.org/util/getMessages", "http://www.vassalengine.org/util/postMessage", + "http://www.vassalengine.org/util/motd",info); + } + public HttpMessageServer(String getMessagesURL, String postMessageURL, String welcomeURL, PeerPoolInfo info) { this.getMessagesURL = new HttpRequestWrapper(getMessagesURL); this.welcomeURL = new HttpRequestWrapper(welcomeURL); Modified: VASSAL-src/trunk/VASSAL/chat/node/NodeClientFactory.java =================================================================== --- VASSAL-src/trunk/VASSAL/chat/node/NodeClientFactory.java 2007-01-24 01:31:25 UTC (rev 1665) +++ VASSAL-src/trunk/VASSAL/chat/node/NodeClientFactory.java 2007-01-24 11:07:46 UTC (rev 1666) @@ -74,8 +74,7 @@ return GameModule.getGameModule() == null ? UNKNOWN_USER : (String) GameModule.getGameModule().getPrefs().getValue(GameModule.REAL_NAME); } }; - HttpMessageServer httpMessageServer = new HttpMessageServer("http://www.vassalengine.org/util/getMessages", "http://www.vassalengine.org/util/postMessage", - "http://www.vassalengine.org/util/motd", publicInfo); + HttpMessageServer httpMessageServer = new HttpMessageServer(publicInfo); SocketNodeClient server = new SocketNodeClient(GameModule.getGameModule().getGameName(), GameModule.getUserId()+"."+System.currentTimeMillis(), GameModule.getGameModule(), nodeServerInfo, httpMessageServer, httpMessageServer); GameModule.getGameModule().getPrefs().getOption(GameModule.REAL_NAME).fireUpdate(); GameModule.getGameModule().getPrefs().getOption(GameModule.PERSONAL_INFO).fireUpdate(); Modified: VASSAL-src/trunk/VASSAL/chat/ui/ShowServerStatusAction.java =================================================================== --- VASSAL-src/trunk/VASSAL/chat/ui/ShowServerStatusAction.java 2007-01-24 01:31:25 UTC (rev 1665) +++ VASSAL-src/trunk/VASSAL/chat/ui/ShowServerStatusAction.java 2007-01-24 11:07:46 UTC (rev 1666) @@ -11,10 +11,13 @@ import javax.swing.ImageIcon; import javax.swing.JFrame; import javax.swing.JToolBar; +import VASSAL.build.GameModule; import VASSAL.chat.ChatServerConnection; +import VASSAL.chat.HttpMessageServer; import VASSAL.chat.ServerStatus; import VASSAL.chat.messageboard.MessageBoard; import VASSAL.chat.messageboard.MessageBoardControls; +import VASSAL.chat.peer2peer.PeerPoolInfo; /** * Copyright (c) 2003 by Rodney Kinney. All rights reserved. @@ -76,18 +79,16 @@ String name = null; if (evt.getNewValue() instanceof ServerStatus.ModuleSummary) { final String moduleName = ((ServerStatus.ModuleSummary) evt.getNewValue()).getModuleName(); - // TODO Message board access from server status window - throw new IllegalStateException("Not implemented: update message board"); -// name = moduleName; -// server = new CgiPeerPool(new PeerPoolInfo() { -// public String getModuleName() { -// return moduleName; -// } -// -// public String getUserName() { -// return Module.getSvr().getUserInfo().getName(); -// } -// }, "http://www.vassalengine.org/util/"); + name = moduleName; + server = new HttpMessageServer(new PeerPoolInfo() { + public String getModuleName() { + return moduleName; + } + + public String getUserName() { + return ((ChatServerConnection) GameModule.getGameModule().getServer()).getUserInfo().getName(); + } + }); } messageMgr.setServer(server, name); } Modified: VASSAL-src/trunk/VASSAL/configure/FontConfigurer.java =================================================================== --- VASSAL-src/trunk/VASSAL/configure/FontConfigurer.java 2007-01-24 01:31:25 UTC (rev 1665) +++ VASSAL-src/trunk/VASSAL/configure/FontConfigurer.java 2007-01-24 11:07:46 UTC (rev 1666) @@ -18,6 +18,7 @@ */ package VASSAL.configure; +import java.awt.Dimension; import java.awt.Font; import java.awt.GraphicsEnvironment; import java.awt.event.ItemEvent; @@ -71,6 +72,7 @@ family.addItem(s[i]); } family.setSelectedItem(value == null ? "SansSerif" : ((Font) value).getFamily()); + family.setMaximumSize(new Dimension(family.getMaximumSize().width,family.getPreferredSize().height)); p.add(family); size = new JComboBox(); @@ -79,6 +81,7 @@ } size.setSelectedItem(value == null ? sizes[sizes.length / 2] + "" : ((Font) value).getSize() + ""); + size.setMaximumSize(new Dimension(size.getMaximumSize().width,size.getPreferredSize().height)); p.add(size); ItemListener l = new ItemListener() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |