[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine: [2587] VASSAL-src/trunk/VASSAL/counters

[<rod...@us...>]

Revision: 2587
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=2587&view=rev
Author:   rodneykinney
Date:     2007-11-08 05:44:00 -0800 (Thu, 08 Nov 2007)

Log Message:
-----------
Replace:  always select replacement piece

Modified Paths:
--------------
    VASSAL-src/trunk/VASSAL/counters/PlaceMarker.java
    VASSAL-src/trunk/VASSAL/counters/Replace.java

Modified: VASSAL-src/trunk/VASSAL/counters/PlaceMarker.java
===================================================================
--- VASSAL-src/trunk/VASSAL/counters/PlaceMarker.java	2007-11-08 13:34:40 UTC (rev 2586)
+++ VASSAL-src/trunk/VASSAL/counters/PlaceMarker.java	2007-11-08 13:44:00 UTC (rev 2587)
@@ -158,11 +158,7 @@
         marker.setProperty(Properties.SNAPSHOT, PieceCloner.getInstance().clonePiece(marker));
         c.append(marker.keyEvent(afterBurnerKey));
       }
-      if (marker.getProperty(Properties.SELECT_EVENT_FILTER) == null) {
-        if (marker.getParent() != null && marker.getParent().equals(getParent())) {
-          KeyBuffer.getBuffer().add(marker);
-        }
-      }
+      selectMarker(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))
             && !Boolean.TRUE.equals(outer.getProperty(Properties.INVISIBLE_TO_OTHERS))) {
@@ -179,6 +175,14 @@
     return c;
   }
 
+  protected void selectMarker(GamePiece marker) {
+    if (marker.getProperty(Properties.SELECT_EVENT_FILTER) == null) {
+      if (marker.getParent() != null && marker.getParent().equals(getParent())) {
+        KeyBuffer.getBuffer().add(marker);
+      }
+    }
+  }
+
   /**
    * The marker, with prototypes fully expanded
    * 

Modified: VASSAL-src/trunk/VASSAL/counters/Replace.java
===================================================================
--- VASSAL-src/trunk/VASSAL/counters/Replace.java	2007-11-08 13:34:40 UTC (rev 2586)
+++ VASSAL-src/trunk/VASSAL/counters/Replace.java	2007-11-08 13:44:00 UTC (rev 2587)
@@ -55,6 +55,10 @@
     c.append(remove);
     return c;
   }
+  
+  protected void selectMarker(GamePiece marker) {
+    KeyBuffer.getBuffer().add(marker);
+  }
 
   public String getDescription() {
     String d = "Replace with Other";


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