From 0fbc703c1f019c52fd4cbf0a93b8d2f20ed88360 Mon Sep 17 00:00:00 2001 From: Curtis Rueden <ctrueden@wisc.edu> Date: Sat, 25 Feb 2017 14:07:49 -0600 Subject: [PATCH] Organize imports --- src/main/java/bdv/ij/BigDataBrowserPlugIn.java | 4 ++-- src/main/java/bdv/ij/ExportCellVoyagerPlugIn.java | 9 ++++----- src/main/java/bdv/ij/ExportImagePlusPlugIn.java | 7 ++++--- src/main/java/bdv/ij/ExportSpimFusionPlugIn.java | 11 ++++++----- src/main/java/bdv/ij/ImportPlugIn.java | 5 +++-- src/main/java/bdv/ij/OpenImagePlusPlugIn.java | 7 ++++--- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/main/java/bdv/ij/BigDataBrowserPlugIn.java b/src/main/java/bdv/ij/BigDataBrowserPlugIn.java index 76d6b12..98ce441 100644 --- a/src/main/java/bdv/ij/BigDataBrowserPlugIn.java +++ b/src/main/java/bdv/ij/BigDataBrowserPlugIn.java @@ -1,5 +1,7 @@ package bdv.ij; +import com.google.gson.stream.JsonReader; + import java.awt.Component; import java.awt.Dimension; import java.awt.Font; @@ -26,8 +28,6 @@ import javax.swing.JScrollPane; import org.apache.commons.lang.StringUtils; -import com.google.gson.stream.JsonReader; - import bdv.BigDataViewer; import bdv.ij.util.ProgressWriterIJ; import bdv.viewer.ViewerOptions; diff --git a/src/main/java/bdv/ij/ExportCellVoyagerPlugIn.java b/src/main/java/bdv/ij/ExportCellVoyagerPlugIn.java index 31255e4..eaf88e1 100644 --- a/src/main/java/bdv/ij/ExportCellVoyagerPlugIn.java +++ b/src/main/java/bdv/ij/ExportCellVoyagerPlugIn.java @@ -1,10 +1,5 @@ package bdv.ij; -import fiji.util.gui.GenericDialogPlus; -import ij.IJ; -import ij.ImageJ; -import ij.plugin.PlugIn; - import java.awt.Button; import java.awt.FlowLayout; import java.awt.GridBagConstraints; @@ -23,6 +18,10 @@ import bdv.export.ProgressWriter; import bdv.ij.export.tiles.CellVoyagerDataExporter; import bdv.ij.util.PluginHelper; import bdv.ij.util.ProgressWriterIJ; +import fiji.util.gui.GenericDialogPlus; +import ij.IJ; +import ij.ImageJ; +import ij.plugin.PlugIn; public class ExportCellVoyagerPlugIn implements PlugIn { diff --git a/src/main/java/bdv/ij/ExportImagePlusPlugIn.java b/src/main/java/bdv/ij/ExportImagePlusPlugIn.java index 38935e9..124579b 100644 --- a/src/main/java/bdv/ij/ExportImagePlusPlugIn.java +++ b/src/main/java/bdv/ij/ExportImagePlusPlugIn.java @@ -10,6 +10,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import net.imglib2.FinalDimensions; +import net.imglib2.RandomAccessibleInterval; +import net.imglib2.realtransform.AffineTransform3D; + import bdv.export.ExportMipmapInfo; import bdv.export.ProgressWriter; import bdv.export.ProposeMipmaps; @@ -41,9 +45,6 @@ import mpicbg.spim.data.sequence.Channel; import mpicbg.spim.data.sequence.FinalVoxelDimensions; import mpicbg.spim.data.sequence.TimePoint; import mpicbg.spim.data.sequence.TimePoints; -import net.imglib2.FinalDimensions; -import net.imglib2.RandomAccessibleInterval; -import net.imglib2.realtransform.AffineTransform3D; /** * ImageJ plugin to export the current image to xml/hdf5. diff --git a/src/main/java/bdv/ij/ExportSpimFusionPlugIn.java b/src/main/java/bdv/ij/ExportSpimFusionPlugIn.java index 742f258..e313cde 100644 --- a/src/main/java/bdv/ij/ExportSpimFusionPlugIn.java +++ b/src/main/java/bdv/ij/ExportSpimFusionPlugIn.java @@ -17,6 +17,12 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import net.imglib2.Dimensions; +import net.imglib2.FinalDimensions; +import net.imglib2.realtransform.AffineTransform3D; +import net.imglib2.util.Pair; +import net.imglib2.util.ValuePair; + import bdv.export.ExportMipmapInfo; import bdv.export.ProgressWriter; import bdv.export.ProposeMipmaps; @@ -58,11 +64,6 @@ import mpicbg.spim.io.ConfigurationParserException; import mpicbg.spim.io.IOFunctions; import mpicbg.spim.io.SPIMConfiguration; import mpicbg.spim.io.TextFileAccess; -import net.imglib2.Dimensions; -import net.imglib2.FinalDimensions; -import net.imglib2.realtransform.AffineTransform3D; -import net.imglib2.util.Pair; -import net.imglib2.util.ValuePair; import spimopener.SPIMExperiment; public class ExportSpimFusionPlugIn implements PlugIn diff --git a/src/main/java/bdv/ij/ImportPlugIn.java b/src/main/java/bdv/ij/ImportPlugIn.java index 9abccd0..d333896 100644 --- a/src/main/java/bdv/ij/ImportPlugIn.java +++ b/src/main/java/bdv/ij/ImportPlugIn.java @@ -10,6 +10,9 @@ import java.awt.event.TextEvent; import java.io.File; import java.util.List; +import net.imglib2.RandomAccessibleInterval; +import net.imglib2.type.numeric.NumericType; + import bdv.ViewerImgLoader; import bdv.spimdata.SequenceDescriptionMinimal; import bdv.spimdata.SpimDataMinimal; @@ -29,8 +32,6 @@ import mpicbg.spim.data.generic.sequence.BasicViewSetup; import mpicbg.spim.data.generic.sequence.ImgLoaderHint; import mpicbg.spim.data.sequence.TimePoint; import mpicbg.spim.data.sequence.VoxelDimensions; -import net.imglib2.RandomAccessibleInterval; -import net.imglib2.type.numeric.NumericType; /** * ImageJ plugin to import a raw image from xml/hdf5. diff --git a/src/main/java/bdv/ij/OpenImagePlusPlugIn.java b/src/main/java/bdv/ij/OpenImagePlusPlugIn.java index 9110df3..402b6dc 100644 --- a/src/main/java/bdv/ij/OpenImagePlusPlugIn.java +++ b/src/main/java/bdv/ij/OpenImagePlusPlugIn.java @@ -4,6 +4,10 @@ import java.io.File; import java.util.ArrayList; import java.util.HashMap; +import net.imglib2.FinalDimensions; +import net.imglib2.realtransform.AffineTransform3D; +import net.imglib2.type.numeric.ARGBType; + import bdv.BigDataViewer; import bdv.ij.util.ProgressWriterIJ; import bdv.img.imagestack.ImageStackImageLoader; @@ -31,9 +35,6 @@ import mpicbg.spim.data.sequence.Channel; import mpicbg.spim.data.sequence.FinalVoxelDimensions; import mpicbg.spim.data.sequence.TimePoint; import mpicbg.spim.data.sequence.TimePoints; -import net.imglib2.FinalDimensions; -import net.imglib2.realtransform.AffineTransform3D; -import net.imglib2.type.numeric.ARGBType; /** * ImageJ plugin to show the current image in BigDataViewer. -- GitLab