[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine: [2374] VASSAL-src/trunk
Brought to you by:
rodneykinney,
uckelman
From: <rod...@us...> - 2007-08-27 16:06:30
|
Revision: 2374 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=2374&view=rev Author: rodneykinney Date: 2007-08-26 22:01:19 -0700 (Sun, 26 Aug 2007) Log Message: ----------- Bug fix: Masked pieces un-maskable by anybody Modified Paths: -------------- VASSAL-src/trunk/VASSAL/build/widget/PieceSlot.java VASSAL-src/trunk/VASSAL/configure/PropertiesWindow.java VASSAL-src/trunk/VASSAL/counters/Obscurable.java VASSAL-src/trunk/VASSAL/counters/PieceDefiner.java VASSAL-src/trunk/doc/ReferenceManual/Mask.htm Modified: VASSAL-src/trunk/VASSAL/build/widget/PieceSlot.java =================================================================== --- VASSAL-src/trunk/VASSAL/build/widget/PieceSlot.java 2007-08-23 10:06:50 UTC (rev 2373) +++ VASSAL-src/trunk/VASSAL/build/widget/PieceSlot.java 2007-08-27 05:01:19 UTC (rev 2374) @@ -377,8 +377,8 @@ definer.setPiece(slot.getPiece()); } + @Deprecated public void setBaseWindow(HelpWindow w) { - definer.setBaseWindow(w); } public String getValueString() { Modified: VASSAL-src/trunk/VASSAL/configure/PropertiesWindow.java =================================================================== --- VASSAL-src/trunk/VASSAL/configure/PropertiesWindow.java 2007-08-23 10:06:50 UTC (rev 2373) +++ VASSAL-src/trunk/VASSAL/configure/PropertiesWindow.java 2007-08-27 05:01:19 UTC (rev 2374) @@ -34,10 +34,10 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; + import VASSAL.build.Builder; import VASSAL.build.Configurable; import VASSAL.build.module.documentation.HelpWindow; -import VASSAL.build.module.documentation.HelpWindowExtension; /** * Window for editing properties of a {@link Configurable} object @@ -73,10 +73,6 @@ } getContentPane().setLayout(new BoxLayout(getContentPane(),BoxLayout.Y_AXIS)); configurer = target.getConfigurer(); - if (helpWindow != null - && configurer instanceof HelpWindowExtension) { - ((HelpWindowExtension)configurer).setBaseWindow(helpWindow); - } target.addPropertyChangeListener(new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (Configurable.NAME_PROPERTY.equals(evt.getPropertyName())) { Modified: VASSAL-src/trunk/VASSAL/counters/Obscurable.java =================================================================== --- VASSAL-src/trunk/VASSAL/counters/Obscurable.java 2007-08-23 10:06:50 UTC (rev 2373) +++ VASSAL-src/trunk/VASSAL/counters/Obscurable.java 2007-08-27 05:01:19 UTC (rev 2374) @@ -408,9 +408,12 @@ if (!obscuredToMe()) { return super.keyEvent(stroke); } - else { + else if (isMaskable()){ return myKeyEvent(stroke); } + else { + return null; + } } public Command myKeyEvent(KeyStroke stroke) { Modified: VASSAL-src/trunk/VASSAL/counters/PieceDefiner.java =================================================================== --- VASSAL-src/trunk/VASSAL/counters/PieceDefiner.java 2007-08-23 10:06:50 UTC (rev 2373) +++ VASSAL-src/trunk/VASSAL/counters/PieceDefiner.java 2007-08-27 05:01:19 UTC (rev 2374) @@ -25,6 +25,7 @@ import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.BoxLayout; import javax.swing.DefaultListCellRenderer; import javax.swing.DefaultListModel; @@ -40,11 +41,13 @@ import javax.swing.border.TitledBorder; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; + import VASSAL.build.GameModule; import VASSAL.build.module.documentation.HelpFile; import VASSAL.build.module.documentation.HelpWindow; import VASSAL.build.module.documentation.HelpWindowExtension; import VASSAL.build.widget.PieceSlot; +import VASSAL.tools.BrowserSupport; /** * This is the GamePiece designer dialog. It appears when you edit @@ -58,7 +61,6 @@ protected ListCellRenderer r; protected PieceSlot slot; private GamePiece piece; - private HelpWindow helpWindow; protected static Decorator clipBoard; /** Creates new form test */ @@ -138,8 +140,8 @@ refresh(); } + @Deprecated public void setBaseWindow(HelpWindow w) { - helpWindow = w; } private void refresh() { @@ -482,13 +484,7 @@ Object o = availableList.getSelectedValue(); if (o instanceof EditablePiece) { HelpFile h = ((EditablePiece) o).getHelpFile(); - if (helpWindow != null) { - helpWindow.update(h.getContents()); - helpWindow.setVisible(true); - } - else { - h.showWindow(); - } + BrowserSupport.openURL(h.getContents()); } } Modified: VASSAL-src/trunk/doc/ReferenceManual/Mask.htm =================================================================== --- VASSAL-src/trunk/doc/ReferenceManual/Mask.htm 2007-08-23 10:06:50 UTC (rev 2373) +++ VASSAL-src/trunk/doc/ReferenceManual/Mask.htm 2007-08-27 05:01:19 UTC (rev 2374) @@ -48,7 +48,7 @@ the owner. Menu commands of traits hidden by a masked piece are not available to non-owning players. A setting in the <a - href="GameModule.htm#GlobalOptions">Global Options</a> determines + href="GlobalOptions.htm">Global Options</a> determines whether or not non-owning players can unmask pieces.<br> <br> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |