[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[7814] VASSAL-src/trunk
Brought to you by:
rodneykinney,
uckelman
From: <uck...@us...> - 2011-09-12 20:28:27
|
Revision: 7814 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7814&view=rev Author: uckelman Date: 2011-09-12 20:28:20 +0000 (Mon, 12 Sep 2011) Log Message: ----------- Merged 3.1@7811:HEAD. Bug: If no gameModule (which happens in test beds), use the default speed instead of looking up module preferences. Modified Paths: -------------- VASSAL-src/trunk/src/VASSAL/tools/AdjustableSpeedScrollPane.java Property Changed: ---------------- VASSAL-src/trunk/ Property changes on: VASSAL-src/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /VASSAL-src/branches/3.1:7756,7764,7810 /VASSAL-src/branches/george973-bugs:7806 /VASSAL-src/branches/lancel-3.1:7680 /VASSAL-src/branches/uckelman-working2:7194-7700 + /VASSAL-src/branches/3.1:7756,7764,7810,7812-7813 /VASSAL-src/branches/george973-bugs:7806 /VASSAL-src/branches/lancel-3.1:7680 /VASSAL-src/branches/uckelman-working2:7194-7700 Modified: VASSAL-src/trunk/src/VASSAL/tools/AdjustableSpeedScrollPane.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/tools/AdjustableSpeedScrollPane.java 2011-09-12 20:22:13 UTC (rev 7813) +++ VASSAL-src/trunk/src/VASSAL/tools/AdjustableSpeedScrollPane.java 2011-09-12 20:28:20 UTC (rev 7814) @@ -82,13 +82,18 @@ public void propertyChange(PropertyChangeEvent e) { if (SCROLL_SPEED.equals(e.getPropertyName())) setSpeed(((Integer) e.getNewValue()).intValue()); - } } - ); + }); - final Prefs prefs = GameModule.getGameModule().getPrefs(); - prefs.addOption(Resources.getString("Prefs.general_tab"), config); //$NON-NLS-1$ - setSpeed(((Integer) prefs.getValue(SCROLL_SPEED)).intValue()); + final GameModule g = GameModule.getGameModule(); + if (g == null) { + setSpeed(defaultSpeed); + } + else { + final Prefs prefs = g.getPrefs(); + prefs.addOption(Resources.getString("Prefs.general_tab"), config); //$NON-NLS-1$ + setSpeed(((Integer) prefs.getValue(SCROLL_SPEED)).intValue()); + } } private void setSpeed(int speed) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Doing More with Less: The Next Generation Virtual Desktop What are the key obstacles that have prevented many mid-market businesses from deploying virtual desktops? How do next-generation virtual desktops provide companies an easier-to-deploy, easier-to-manage and more affordable virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/ _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |