[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[8301] VASSAL-src/trunk
Brought to you by:
rodneykinney,
uckelman
From: <uck...@us...> - 2012-08-25 21:45:39
|
Revision: 8301 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=8301&view=rev Author: uckelman Date: 2012-08-25 21:45:31 +0000 (Sat, 25 Aug 2012) Log Message: ----------- Merged Brent-3.2-New@8283. Fixed Bug 4504: Map-level GKC issues too many reports Bring Global Map level GKC reporting in line with Module level GKC's. Remove redundant ArrayList copy in GlobalKeyCommand Modified Paths: -------------- VASSAL-src/trunk/src/VASSAL/build/module/GlobalKeyCommand.java VASSAL-src/trunk/src/VASSAL/build/module/map/MassKeyCommand.java Property Changed: ---------------- VASSAL-src/trunk/ Property changes on: VASSAL-src/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /VASSAL-src/branches/3.1:7756,7764,7810,7812-7813,7872,7876,7879,7909,7913,7964,7966,7968,7998,8097,8111-8112,8159-8162,8172,8181-8182,8233,8235-8238,8241,8244,8246,8260-8261 /VASSAL-src/branches/Brent-3.2:8206,8216-8217,8219-8220,8222,8225,8227,8248,8252 /VASSAL-src/branches/Brent-3.2-New:8263,8267,8269-8272,8279-8282,8289,8295-8296 /VASSAL-src/branches/brent-3.2:7824-7825,7862-7865,7875,7878,7882,7884,7886,7896,7903,7911,7917,7929,7942,7988,7995 /VASSAL-src/branches/george973-bugs:7800,7806,7962-7963 /VASSAL-src/branches/george973-bugs-3.2:8081 /VASSAL-src/branches/george973-ocs:8167-8169 /VASSAL-src/branches/lance-3.2 8085:8127 /VASSAL-src/branches/lancel-3.1:7680 /VASSAL-src/branches/pgeerkens-3.2:7836-7837,7839,7841-7842,7849,7893,7899,7902,7904,7906,7922,7930 /VASSAL-src/branches/uckelman-integration:7971-8007 /VASSAL-src/branches/uckelman-working2:7194-7700 /VASSAL-src/branches/viewport-3.2:7992 + /VASSAL-src/branches/3.1:7756,7764,7810,7812-7813,7872,7876,7879,7909,7913,7964,7966,7968,7998,8097,8111-8112,8159-8162,8172,8181-8182,8233,8235-8238,8241,8244,8246,8260-8261 /VASSAL-src/branches/Brent-3.2:8206,8216-8217,8219-8220,8222,8225,8227,8248,8252 /VASSAL-src/branches/Brent-3.2-New:8263,8267,8269-8272,8279-8283,8289,8295-8296 /VASSAL-src/branches/brent-3.2:7824-7825,7862-7865,7875,7878,7882,7884,7886,7896,7903,7911,7917,7929,7942,7988,7995 /VASSAL-src/branches/george973-bugs:7800,7806,7962-7963 /VASSAL-src/branches/george973-bugs-3.2:8081 /VASSAL-src/branches/george973-ocs:8167-8169 /VASSAL-src/branches/lance-3.2 8085:8127 /VASSAL-src/branches/lancel-3.1:7680 /VASSAL-src/branches/pgeerkens-3.2:7836-7837,7839,7841-7842,7849,7893,7899,7902,7904,7906,7922,7930 /VASSAL-src/branches/uckelman-integration:7971-8007 /VASSAL-src/branches/uckelman-working2:7194-7700 /VASSAL-src/branches/viewport-3.2:7992 Modified: VASSAL-src/trunk/src/VASSAL/build/module/GlobalKeyCommand.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/module/GlobalKeyCommand.java 2012-08-25 21:12:14 UTC (rev 8300) +++ VASSAL-src/trunk/src/VASSAL/build/module/GlobalKeyCommand.java 2012-08-25 21:45:31 UTC (rev 8301) @@ -18,7 +18,7 @@ */ package VASSAL.build.module; -import java.util.ArrayList; +import java.util.List; import VASSAL.build.GameModule; import VASSAL.build.module.map.MassKeyCommand; @@ -31,10 +31,7 @@ public class GlobalKeyCommand extends MassKeyCommand { public void apply() { - final ArrayList<Map> l = new ArrayList<Map>(); - for (Map m : Map.getMapList()) { - l.add(m); - } + final List<Map> l = Map.getMapList(); GameModule.getGameModule().sendAndLog( globalCommand.apply(l.toArray(new Map[l.size()]), getFilter())); } Modified: VASSAL-src/trunk/src/VASSAL/build/module/map/MassKeyCommand.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/module/map/MassKeyCommand.java 2012-08-25 21:12:14 UTC (rev 8300) +++ VASSAL-src/trunk/src/VASSAL/build/module/map/MassKeyCommand.java 2012-08-25 21:45:31 UTC (rev 8301) @@ -32,6 +32,7 @@ import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.util.List; import javax.swing.Box; import javax.swing.JLabel; @@ -133,19 +134,15 @@ public void apply() { buildFilter(); if (singleMap) { - apply(map); + GameModule.getGameModule().sendAndLog(globalCommand.apply(map, getFilter())); } else { - for (Map m : Map.getMapList()) { - apply(m); - } + final List<Map> l = Map.getMapList(); + GameModule.getGameModule().sendAndLog( + globalCommand.apply(l.toArray(new Map[l.size()]), getFilter())); } } - public void apply(Map m) { - GameModule.getGameModule().sendAndLog(globalCommand.apply(m, getFilter())); - } - public void setPropertySource (PropertySource source) { propertySource = source; globalCommand.setPropertySource(source); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |