[GEF] Align handleMove() with GEF CreationTool

The current command should be set before showing the target feedback.
Doing so requires an early update of the grid so that the grid-target is
up-to-date when calculating the command.

Author: ptziegler

org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java

@@ -75,8 +75,8 @@ protected boolean handleButtonUp(int button) {
 	protected boolean handleMove() {
 		updateTargetRequest();
 		updateTargetUnderMouse();
-		showTargetFeedback();
 		setCurrentCommand(getCommand());
+		showTargetFeedback();
 		return true;
 	}
 

org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridLayoutEditPolicy.java

@@ -23,6 +23,7 @@
 import org.eclipse.wb.core.model.broadcast.ObjectEventListener;
 import org.eclipse.wb.draw2d.FigureUtils;
 import org.eclipse.wb.gef.core.IEditPartViewer;
+import org.eclipse.wb.gef.core.requests.PasteRequest;
 import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy;
 import org.eclipse.wb.internal.core.DesignerPlugin;
 import org.eclipse.wb.internal.draw2d.SemiTransparentFigure;
@@ -35,6 +36,7 @@
 import org.eclipse.gef.EditPartListener;
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
 import org.eclipse.gef.requests.DropRequest;
 import org.eclipse.swt.graphics.Color;
 
@@ -121,6 +123,15 @@ private void refreshSelectionGrid() {
 	private static final Color m_badTargetFillColor = new Color(255, 0, 0);
 	private static final Color m_badTargetBorderColor = new Color(255, 192, 192);
 
+	@Override
+	public EditPart getTargetEditPart(Request request) {
+		if (RequestConstants.REQ_CREATE.equals(request.getType()) || PasteRequest.REQ_PASTE.equals(request.getType())) {
+			Point location = PolicyUtils.getAbsoluteLocation(getHost(), (DropRequest) request);
+			updateGridTarget(location);
+		}
+		return super.getTargetEditPart(request);
+	}
+
 	@Override
 	protected final void showLayoutTargetFeedback(Request request) {
 		IGridInfo gridInfo = getGridInfo();
@@ -368,5 +379,5 @@ public String toString() {
 	 * @param mouseLocation
 	 *          the location of mouse in absolute coordinates.
 	 */
-	protected abstract void updateGridTarget(Point mouseLocation) throws Exception;
+	protected abstract void updateGridTarget(Point mouseLocation);
 }

org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/TableWrapLayoutEditPolicy.java

@@ -244,7 +244,7 @@ public static int[] getInsertFeedbackParameters(Interval interval,
 	}
 
 	@Override
-	protected void updateGridTarget(Point mouseLocation) throws Exception {
+	protected void updateGridTarget(Point mouseLocation) {
 		m_target = new GridTarget();
 		// prepare location in model
 		Point location = mouseLocation.getCopy();

org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/FormLayoutEditPolicy.java

@@ -226,7 +226,7 @@ protected void executeEdit() throws Exception {
 	//
 	////////////////////////////////////////////////////////////////////////////
 	@Override
-	protected void updateGridTarget(Point mouseLocation) throws Exception {
+	protected void updateGridTarget(Point mouseLocation) {
 		m_target = new GridTarget();
 		//
 		mouseLocation = mouseLocation.getCopy();

org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/MigLayoutEditPolicy.java

@@ -323,7 +323,7 @@ public static int[] getInsertFeedbackParameters(Interval interval,
 	}
 
 	@Override
-	protected void updateGridTarget(Point mouseLocation) throws Exception {
+	protected void updateGridTarget(Point mouseLocation) {
 		m_target = new GridTarget();
 		// prepare location in model
 		Point location = mouseLocation.getCopy();

org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/GridBagLayoutEditPolicy.java

@@ -180,7 +180,7 @@ protected Command getAddCommand(ChangeBoundsRequest request) {
 	//
 	////////////////////////////////////////////////////////////////////////////
 	@Override
-	protected void updateGridTarget(Point mouseLocation) throws Exception {
+	protected void updateGridTarget(Point mouseLocation) {
 		m_target = new GridTarget();
 		// prepare location in model
 		Point location = mouseLocation.getCopy();

org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/GridLayoutEditPolicy.java

@@ -294,7 +294,7 @@ public static int[] getInsertFeedbackParameters(Interval interval,
 	}
 
 	@Override
-	protected void updateGridTarget(Point mouseLocation) throws Exception {
+	protected void updateGridTarget(Point mouseLocation) {
 		m_target = new GridTarget();
 		// prepare location in model
 		Point location = mouseLocation.getCopy();

org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/AbstractCreationToolTest.java

@@ -76,8 +76,8 @@ public void test_Move_DND() throws Exception {
 					"getTargetEditPart",
 					"getTargetEditPart",
 					"showTargetFeedback",
-					"showTargetFeedback",
-			"getCommand"}, m_request);
+					"getCommand",
+			"showTargetFeedback"}, m_request);
 			assertLoggers(expectedLogger, actualLogger);
 		}
 		// exit from "editPart" and enter in "childEditPart1"
@@ -92,8 +92,8 @@ public void test_Move_DND() throws Exception {
 			expectedLogger.log(editPart, "eraseTargetFeedback", m_request);
 			expectedLogger.log(childEditPart1, new String[]{
 					"showTargetFeedback",
-					"showTargetFeedback",
-			"getCommand"}, m_request);
+					"getCommand",
+			"showTargetFeedback"}, m_request);
 			assertLoggers(expectedLogger, actualLogger);
 		}
 		// move into "childEditPart1"
@@ -105,8 +105,8 @@ public void test_Move_DND() throws Exception {
 			expectedLogger.log(childEditPart1, new String[]{
 					"getTargetEditPart",
 					"getTargetEditPart",
-					"showTargetFeedback",
-			"getCommand"}, m_request);
+					"getCommand",
+			"showTargetFeedback"}, m_request);
 			assertLoggers(expectedLogger, actualLogger);
 		}
 		// start drag process
@@ -184,8 +184,8 @@ public void test_Move_DND_InvalidInput() throws Exception {
 					"getTargetEditPart",
 					"getTargetEditPart",
 					"showTargetFeedback",
-					"showTargetFeedback",
-			"getCommand"}, m_request);
+					"getCommand",
+			"showTargetFeedback"}, m_request);
 			assertLoggers(expectedLogger, actualLogger);
 		}
 		// click into "editPart" invalid button
@@ -213,8 +213,8 @@ public void test_Move_DND_InvalidInput() throws Exception {
 					"getTargetEditPart",
 					"getTargetEditPart",
 					"showTargetFeedback",
-					"showTargetFeedback",
-			"getCommand"}, m_request);
+					"getCommand",
+			"showTargetFeedback"}, m_request);
 			assertLoggers(expectedLogger, actualLogger);
 		}
 		// start drag process