Compiler warning elimination

[simantics/3d.git] / org.simantics.g3d.vtk / src / org / simantics / g3d / vtk / swt / TranslateAction.java

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/TranslateAction.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/TranslateAction.java
index 47a3ea3b7a82cf0faec732e13c8d9739a5270229..32b97c1bda3abf576796e52f063327c2ca133a4f 100644 (file)
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/TranslateAction.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/TranslateAction.java
@@ -27,12 +27,12 @@ import org.eclipse.swt.widgets.Display;
 import org.simantics.g3d.math.MathTools;
 import org.simantics.g3d.math.Ray;
 import org.simantics.g3d.scenegraph.IG3DNode;
+import org.simantics.g3d.scenegraph.base.INode;
 import org.simantics.g3d.scenegraph.structural.IStructuralNode;
 import org.simantics.g3d.vtk.Activator;
 import org.simantics.g3d.vtk.common.VTKNodeMap;
 import org.simantics.g3d.vtk.gizmo.TranslateAxisGizmo;
 import org.simantics.g3d.vtk.utils.vtkUtil;
-import org.simantics.utils.threads.AWTThread;
 import org.simantics.utils.threads.ThreadUtils;
 
 import vtk.vtkProp;
@@ -47,7 +47,7 @@ public class TranslateAction extends vtkSwtAction{
        public static final int YZ = 5;
        public static final int P = 6;
 
-       private VTKNodeMap nodeMap;
+       private VTKNodeMap<?, ? extends INode> nodeMap;
        //private TranslateGizmo  gizmo = new TranslateGizmo();
        private TranslateAxisGizmo gizmo = new TranslateAxisGizmo();
        protected IG3DNode node;
@@ -70,7 +70,7 @@ public class TranslateAction extends vtkSwtAction{
                return node;
        }
        
-       public TranslateAction(InteractiveVtkComposite panel, VTKNodeMap nodeMap) {
+       public TranslateAction(InteractiveVtkComposite panel, VTKNodeMap<?, ? extends INode> nodeMap) {
                super(panel);
                setImageDescriptor(Activator.imageDescriptorFromPlugin("com.famfamfam.silk", "icons/arrow_out.png"));
                setText("Translate");
@@ -303,7 +303,8 @@ public class TranslateAction extends vtkSwtAction{
        
        @Override
        public boolean mouseDragged(MouseEvent e) {
-               if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) > 0 && valid) { 
+               //if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) > 0 && valid) {
+           if (e.getButton() == MouseEvent.BUTTON1  && valid) {
                        
                        Vector3d translate = getTranslate(e.getX(), e.getY(), prevTranslate);
                        //System.out.println("translate " + translate);