[494322] Ensured all policies extend AbstractFXInteractionPolicy.

- Changed superclass of FXDeleteSelectedOnTypePolicy, FXPanOnTypePolicy, FXPanOrZoomOnScrollPolicy, and FXRotateSelectedOnRotatePolicy from AbstractInteractionPolicy to AbstractFXInteractionPolicy.
eclipse · May 23, 2016 · f067b86 · f067b86
1 parent 8001e1b
commit f067b86
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/...clipse.gef4.mvc.fx/src/org/eclipse/gef4/mvc/fx/policies/FXDeleteSelectedOnTypePolicy.java b/...clipse.gef4.mvc.fx/src/org/eclipse/gef4/mvc/fx/policies/FXDeleteSelectedOnTypePolicy.java
@@ -17,7 +17,6 @@
 import org.eclipse.gef4.mvc.fx.tools.FXClickDragTool;
 import org.eclipse.gef4.mvc.models.SelectionModel;
 import org.eclipse.gef4.mvc.parts.IContentPart;
-import org.eclipse.gef4.mvc.policies.AbstractInteractionPolicy;
 import org.eclipse.gef4.mvc.policies.DeletionPolicy;
 import org.eclipse.gef4.mvc.viewer.IViewer;
 
@@ -34,8 +33,8 @@
  * @author mwienand
  *
  */
-public class FXDeleteSelectedOnTypePolicy
-		extends AbstractInteractionPolicy<Node> implements IFXOnTypePolicy {
+public class FXDeleteSelectedOnTypePolicy extends AbstractFXInteractionPolicy
+		implements IFXOnTypePolicy {
 
 	/**
 	 * Returns <code>true</code> if the given {@link KeyEvent} is a "delete"

diff --git a/org.eclipse.gef4.mvc.fx/src/org/eclipse/gef4/mvc/fx/policies/FXPanOnTypePolicy.java b/org.eclipse.gef4.mvc.fx/src/org/eclipse/gef4/mvc/fx/policies/FXPanOnTypePolicy.java
@@ -12,10 +12,8 @@
 package org.eclipse.gef4.mvc.fx.policies;
 
 import org.eclipse.gef4.fx.nodes.InfiniteCanvas;
-import org.eclipse.gef4.mvc.policies.AbstractInteractionPolicy;
 
 import javafx.animation.AnimationTimer;
-import javafx.scene.Node;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 
@@ -26,7 +24,7 @@
  * @author mwienand
  *
  */
-public class FXPanOnTypePolicy extends AbstractInteractionPolicy<Node>
+public class FXPanOnTypePolicy extends AbstractFXInteractionPolicy
 		implements IFXOnTypePolicy {
 
 	/**

diff --git a/org.eclipse.gef4.mvc.fx/src/org/eclipse/gef4/mvc/fx/policies/FXPanOrZoomOnScrollPolicy.java b/org.eclipse.gef4.mvc.fx/src/org/eclipse/gef4/mvc/fx/policies/FXPanOrZoomOnScrollPolicy.java
@@ -15,10 +15,8 @@
 import org.eclipse.gef4.fx.nodes.InfiniteCanvas;
 import org.eclipse.gef4.geometry.planar.Dimension;
 import org.eclipse.gef4.mvc.fx.viewer.FXViewer;
-import org.eclipse.gef4.mvc.policies.AbstractInteractionPolicy;
 
 import javafx.geometry.Bounds;
-import javafx.scene.Node;
 import javafx.scene.input.ScrollEvent;
 
 /**
@@ -29,7 +27,7 @@
  * @author mwienand
  *
  */
-public class FXPanOrZoomOnScrollPolicy extends AbstractInteractionPolicy<Node>
+public class FXPanOrZoomOnScrollPolicy extends AbstractFXInteractionPolicy
 		implements IFXOnScrollPolicy {
 
 	private boolean stopped = false;

diff --git a/...ipse.gef4.mvc.fx/src/org/eclipse/gef4/mvc/fx/policies/FXRotateSelectedOnRotatePolicy.java b/...ipse.gef4.mvc.fx/src/org/eclipse/gef4/mvc/fx/policies/FXRotateSelectedOnRotatePolicy.java
@@ -23,7 +23,6 @@
 import org.eclipse.gef4.mvc.models.SelectionModel;
 import org.eclipse.gef4.mvc.parts.IContentPart;
 import org.eclipse.gef4.mvc.parts.IVisualPart;
-import org.eclipse.gef4.mvc.policies.AbstractInteractionPolicy;
 
 import com.google.common.reflect.TypeToken;
 
@@ -38,8 +37,8 @@
  * @author anyssen
  *
  */
-public class FXRotateSelectedOnRotatePolicy
-		extends AbstractInteractionPolicy<Node> implements IFXOnRotatePolicy {
+public class FXRotateSelectedOnRotatePolicy extends AbstractFXInteractionPolicy
+		implements IFXOnRotatePolicy {
 
 	private Point pivotInScene;
 	private Map<IContentPart<Node, ? extends Node>, Integer> rotationIndices = new HashMap<>();