From 15fed7337ea846e7e7af350df58a0c264b80247f Mon Sep 17 00:00:00 2001 From: tpietzsch <tobias.pietzsch@gmail.com> Date: Tue, 7 Jul 2020 20:58:44 +0200 Subject: [PATCH] WIP move net.imglib2.ui classes TransformEventHandler -> bdv --- .../java/{net/imglib2/ui => bdv}/TransformEventHandler.java | 2 +- src/main/java/bdv/TransformEventHandler2D.java | 1 - src/main/java/bdv/TransformEventHandler3D.java | 1 - src/main/java/bdv/TransformEventHandlerFactory.java | 2 -- src/main/java/bdv/viewer/ViewerFrame.java | 2 +- src/main/java/bdv/viewer/ViewerPanel.java | 2 +- src/main/java/net/imglib2/ui/InteractiveDisplayCanvas.java | 1 + 7 files changed, 4 insertions(+), 7 deletions(-) rename src/main/java/{net/imglib2/ui => bdv}/TransformEventHandler.java (99%) diff --git a/src/main/java/net/imglib2/ui/TransformEventHandler.java b/src/main/java/bdv/TransformEventHandler.java similarity index 99% rename from src/main/java/net/imglib2/ui/TransformEventHandler.java rename to src/main/java/bdv/TransformEventHandler.java index 96f76532..530ba94a 100644 --- a/src/main/java/net/imglib2/ui/TransformEventHandler.java +++ b/src/main/java/bdv/TransformEventHandler.java @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imglib2.ui; +package bdv; import org.scijava.ui.behaviour.util.Behaviours; diff --git a/src/main/java/bdv/TransformEventHandler2D.java b/src/main/java/bdv/TransformEventHandler2D.java index 646e7ebd..1b809e18 100644 --- a/src/main/java/bdv/TransformEventHandler2D.java +++ b/src/main/java/bdv/TransformEventHandler2D.java @@ -30,7 +30,6 @@ package bdv; import net.imglib2.realtransform.AffineTransform3D; -import net.imglib2.ui.TransformEventHandler; import org.scijava.ui.behaviour.Behaviour; import org.scijava.ui.behaviour.ClickBehaviour; import org.scijava.ui.behaviour.DragBehaviour; diff --git a/src/main/java/bdv/TransformEventHandler3D.java b/src/main/java/bdv/TransformEventHandler3D.java index 61f1da09..e690d9a9 100644 --- a/src/main/java/bdv/TransformEventHandler3D.java +++ b/src/main/java/bdv/TransformEventHandler3D.java @@ -29,7 +29,6 @@ package bdv; import net.imglib2.realtransform.AffineTransform3D; -import net.imglib2.ui.TransformEventHandler; import org.scijava.ui.behaviour.Behaviour; import org.scijava.ui.behaviour.ClickBehaviour; import org.scijava.ui.behaviour.DragBehaviour; diff --git a/src/main/java/bdv/TransformEventHandlerFactory.java b/src/main/java/bdv/TransformEventHandlerFactory.java index 4de69e9e..552571a3 100644 --- a/src/main/java/bdv/TransformEventHandlerFactory.java +++ b/src/main/java/bdv/TransformEventHandlerFactory.java @@ -33,8 +33,6 @@ */ package bdv; -import net.imglib2.ui.TransformEventHandler; - /** * Factory for {@code TransformEventHandler}. * diff --git a/src/main/java/bdv/viewer/ViewerFrame.java b/src/main/java/bdv/viewer/ViewerFrame.java index f519e9db..7652c023 100644 --- a/src/main/java/bdv/viewer/ViewerFrame.java +++ b/src/main/java/bdv/viewer/ViewerFrame.java @@ -28,6 +28,7 @@ */ package bdv.viewer; +import bdv.TransformEventHandler; import bdv.ui.CardPanel; import bdv.ui.BdvDefaultCards; import bdv.ui.splitpanel.SplitPanel; @@ -47,7 +48,6 @@ import org.scijava.ui.behaviour.util.InputActionBindings; import org.scijava.ui.behaviour.util.TriggerBehaviourBindings; import bdv.cache.CacheControl; -import net.imglib2.ui.TransformEventHandler; import net.imglib2.ui.util.GuiUtil; /** diff --git a/src/main/java/bdv/viewer/ViewerPanel.java b/src/main/java/bdv/viewer/ViewerPanel.java index f45b44e8..61012f1e 100644 --- a/src/main/java/bdv/viewer/ViewerPanel.java +++ b/src/main/java/bdv/viewer/ViewerPanel.java @@ -28,6 +28,7 @@ */ package bdv.viewer; +import bdv.TransformEventHandler; import bdv.TransformState; import java.awt.BorderLayout; import java.awt.Color; @@ -84,7 +85,6 @@ import net.imglib2.realtransform.AffineTransform3D; import net.imglib2.ui.InteractiveDisplayCanvas; import net.imglib2.ui.OverlayRenderer; import net.imglib2.ui.PainterThread; -import net.imglib2.ui.TransformEventHandler; import net.imglib2.util.LinAlgHelpers; import org.scijava.listeners.Listeners; diff --git a/src/main/java/net/imglib2/ui/InteractiveDisplayCanvas.java b/src/main/java/net/imglib2/ui/InteractiveDisplayCanvas.java index accc2ffc..3819f9fa 100644 --- a/src/main/java/net/imglib2/ui/InteractiveDisplayCanvas.java +++ b/src/main/java/net/imglib2/ui/InteractiveDisplayCanvas.java @@ -33,6 +33,7 @@ */ package net.imglib2.ui; +import bdv.TransformEventHandler; import java.awt.Component; import java.awt.Dimension; import java.awt.Graphics; -- GitLab