[vassalengine-svn] SF.net SVN: vassalengine:[8127] VASSAL-src/branches/lance-3.2 8085

[<lan...@us...>]

Revision: 8127
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=8127&view=rev
Author:   lanceleu
Date:     2012-04-20 02:08:47 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
Fix for Bug 4408

Modified Paths:
--------------
    VASSAL-src/branches/lance-3.2 8085/src/VASSAL/build/module/map/PieceMover.java

Property Changed:
----------------
    VASSAL-src/branches/lance-3.2 8085/


Property changes on: VASSAL-src/branches/lance-3.2 8085
___________________________________________________________________
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
/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/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/trunk:8091-8114
   + /VASSAL-src/branches/3.1:7756,7764,7810,7812-7813,7872,7876,7879,7909,7913,7964,7966,7968,7998,8097,8111-8112
/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/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/trunk:8091-8126

Modified: VASSAL-src/branches/lance-3.2 8085/src/VASSAL/build/module/map/PieceMover.java
===================================================================
--- VASSAL-src/branches/lance-3.2 8085/src/VASSAL/build/module/map/PieceMover.java	2012-04-16 04:38:07 UTC (rev 8126)
+++ VASSAL-src/branches/lance-3.2 8085/src/VASSAL/build/module/map/PieceMover.java	2012-04-20 02:08:47 UTC (rev 8127)
@@ -792,9 +792,9 @@
     implements DragGestureListener,       DragSourceListener,
                DragSourceMotionListener,  DropTargetListener
   {
-    final static private AbstractDragHandler theDragHandler =
-        DragSource.isDragImageSupported() ? new DragHandler()
-                               : new DragHandlerNoImage();
+	  final static private AbstractDragHandler theDragHandler =
+	        DragSource.isDragImageSupported() ? new DragHandler()
+	                               : new DragHandlerNoImage();  
 
     /** returns the singleton DragHandler instance */
     static public AbstractDragHandler getTheDragHandler() {
@@ -830,6 +830,7 @@
     java.util.Map<Component,DropTargetListener> dropTargetListeners =
       new HashMap<Component,DropTargetListener>();
 
+    abstract protected int getOffsetMult();
     /**
      * Creates a new DropTarget and hooks us into the beginning of a
      * DropTargetListener chain. DropTarget events are not multicast;
@@ -1193,11 +1194,12 @@
     }
 
     protected void beginDragging(DragGestureEvent dge) {
+	  BufferedImage bImage = makeDragImage(dragPieceOffCenterZoom); // this call is needed to instantiate the boundingBox object
       final Point dragPointOffset = new Point(
-             boundingBox.x + currentPieceOffsetX - EXTRA_BORDER,
-             boundingBox.y + currentPieceOffsetY - EXTRA_BORDER);
+             getOffsetMult() * (boundingBox.x + currentPieceOffsetX - EXTRA_BORDER),
+             getOffsetMult() * (boundingBox.y + currentPieceOffsetY - EXTRA_BORDER));
       dge.startDrag(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR),
-                   makeDragImage(dragPieceOffCenterZoom),
+                   bImage,
                    dragPointOffset,
                    new StringSelection(""), this); //$NON-NLS-1$
       dge.getDragSource().addDragSourceMotionListener(this);
@@ -1298,6 +1300,11 @@
 
       super.dragGestureRecognized(dge);
     }
+    
+    protected int getOffsetMult()
+    {
+    	return 1;
+    }
 
     @Override
     public void dragDropEnd(DragSourceDropEvent e) {
@@ -1344,6 +1351,11 @@
       if (dragGestureRecognizedPrep(dge) == null) return;
       super.dragGestureRecognized(dge);
     }
+    
+    protected int getOffsetMult()
+    {
+    	return -1;
+    }
 
     public void dragMouseMoved(DragSourceDragEvent e) {}
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.