[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine: [1493] VASSAL-src/trunk/VASSA
Brought to you by:
rodneykinney,
uckelman
From: <rod...@us...> - 2006-11-28 05:46:01
|
Revision: 1493 http://svn.sourceforge.net/vassalengine/?rev=1493&view=rev Author: rodneykinney Date: 2006-11-27 21:44:40 -0800 (Mon, 27 Nov 2006) Log Message: ----------- Wrap toolbar buttons in standalone map windows PlaceMarker: Don't select newly-placed marker if selection is restricted Modified Paths: -------------- VASSAL-src/trunk/VASSAL/build/module/Map.java VASSAL-src/trunk/VASSAL/counters/PlaceMarker.java VASSAL-src/trunk/VASSAL/counters/PropertiesPieceFilter.java Modified: VASSAL-src/trunk/VASSAL/build/module/Map.java =================================================================== --- VASSAL-src/trunk/VASSAL/build/module/Map.java 2006-11-25 21:07:49 UTC (rev 1492) +++ VASSAL-src/trunk/VASSAL/build/module/Map.java 2006-11-28 05:44:40 UTC (rev 1493) @@ -26,6 +26,7 @@ import java.awt.Composite; import java.awt.Container; import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Point; @@ -202,6 +203,8 @@ theMap.addMouseListener(this); theMap.addMouseMotionListener(this); theMap.addFocusListener(this); + toolBar.setLayout(new VASSAL.tools.WrapLayout(FlowLayout.LEFT, 0, 0)); + toolBar.setAlignmentX(0.0F); toolBar.setFloatable(false); } public static final String NAME = "mapName"; Modified: VASSAL-src/trunk/VASSAL/counters/PlaceMarker.java =================================================================== --- VASSAL-src/trunk/VASSAL/counters/PlaceMarker.java 2006-11-25 21:07:49 UTC (rev 1492) +++ VASSAL-src/trunk/VASSAL/counters/PlaceMarker.java 2006-11-28 05:44:40 UTC (rev 1493) @@ -157,8 +157,10 @@ marker.setProperty(Properties.SNAPSHOT, PieceCloner.getInstance().clonePiece(marker)); c.append(marker.keyEvent(afterBurnerKey)); } - KeyBuffer.getBuffer().remove(outer); - KeyBuffer.getBuffer().add(marker); + if (marker.getProperty(Properties.SELECT_EVENT_FILTER) == null) { + KeyBuffer.getBuffer().remove(outer); + KeyBuffer.getBuffer().add(marker); + } if (markerText != null && getMap() != null) { if (!Boolean.TRUE.equals(outer.getProperty(Properties.OBSCURED_TO_OTHERS)) && !Boolean.TRUE.equals(outer.getProperty(Properties.OBSCURED_TO_ME)) Modified: VASSAL-src/trunk/VASSAL/counters/PropertiesPieceFilter.java =================================================================== --- VASSAL-src/trunk/VASSAL/counters/PropertiesPieceFilter.java 2006-11-25 21:07:49 UTC (rev 1492) +++ VASSAL-src/trunk/VASSAL/counters/PropertiesPieceFilter.java 2006-11-28 05:44:40 UTC (rev 1493) @@ -158,6 +158,11 @@ } return retVal; } + + public String toString() { + return "PropertiesPieceFilter["+name+"=="+value+"]"; + } + } private static class NE extends ComparisonFilter { @@ -173,6 +178,9 @@ } return retVal; } + public String toString() { + return "PropertiesPieceFilter["+name+"!="+value+"]"; + } } private static class LT extends ComparisonFilter { @@ -183,6 +191,9 @@ public boolean accept(GamePiece piece) { return compareTo(piece) < 0; } + public String toString() { + return "PropertiesPieceFilter["+name+"<"+value+"]"; + } } private static class LE extends ComparisonFilter { @@ -193,6 +204,9 @@ public boolean accept(GamePiece piece) { return compareTo(piece) <= 0; } + public String toString() { + return "PropertiesPieceFilter["+name+"<="+value+"]"; + } } private static class GT extends ComparisonFilter { @@ -203,6 +217,9 @@ public boolean accept(GamePiece piece) { return compareTo(piece) > 0; } + public String toString() { + return "PropertiesPieceFilter["+name+">"+value+"]"; + } } private static class GE extends ComparisonFilter { @@ -213,6 +230,9 @@ public boolean accept(GamePiece piece) { return compareTo(piece) >= 0; } + public String toString() { + return "PropertiesPieceFilter["+name+">="+value+"]"; + } } private static class MATCH extends ComparisonFilter { @@ -224,6 +244,9 @@ String property = String.valueOf(piece.getProperty(name)); return Pattern.matches(value, property); } + public String toString() { + return "PropertiesPieceFilter["+name+"~"+value+"]"; + } } private static class NOT_MATCH extends MATCH { @@ -234,5 +257,8 @@ public boolean accept(GamePiece piece) { return !super.accept(piece); } + public String toString() { + return "PropertiesPieceFilter["+name+"!~"+value+"]"; + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |