Code cleanup (imports, etc.)

Author: tferr

src/main/java/sc/fiji/snt/BookmarkManager.java

@@ -1511,7 +1511,7 @@ public void remove(final Path path, final int nodeIndex) {
      * @param t the time position of the bookmark
      */
     public void add(final int x, final int y, final int z, final int c, final int t) {
-        add((double) x, (double) y, (double) z, c, t, true);
+        add(x, y, z, c, t, true);
     }
 
     /**

src/main/java/sc/fiji/snt/ClarifyingKeyListener.java

@@ -24,10 +24,7 @@
 
 import java.awt.Component;
 import java.awt.Container;
-import java.awt.event.ContainerEvent;
-import java.awt.event.ContainerListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
+import java.awt.event.*;
 
 import ij.ImagePlus;
 import sc.fiji.snt.gui.GuiUtils;
@@ -37,7 +34,7 @@
  * It is used to capture special keys and to prevent the user from starting operations on the wrong window.
  * It has no scripting value.
  */
-class ClarifyingKeyListener implements KeyListener, ContainerListener {
+class ClarifyingKeyListener extends KeyAdapter implements ContainerListener {
 
 	static { net.imagej.patcher.LegacyInjector.preinit(); } // required for _every_ class that imports ij. classes
 
@@ -106,13 +103,7 @@ else if (e.isShiftDown() && e.isAltDown() && (keyCode == KeyEvent.VK_A)) {
 
 	}
 
-	@Override
-	public void keyReleased(final KeyEvent e) {}
-
-	@Override
-	public void keyTyped(final KeyEvent e) {}
-
-	private boolean isDoublePress(final KeyEvent ke) {
+    private boolean isDoublePress(final KeyEvent ke) {
 		if (lastKeyPressedCode == ke.getKeyCode() && ((ke.getWhen() -
 			timeKeyDown) < DOUBLE_PRESS_INTERVAL)) return true;
 		timeKeyDown = ke.getWhen();

src/main/java/sc/fiji/snt/PathAndFillManager.java

@@ -65,10 +65,6 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.text.DecimalFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.*;
@@ -599,7 +595,7 @@ private void error(final String msg) {
     protected void flushSWCPoints(final List<SWCPoint> swcPoints, final PrintWriter pw, final String commonFileHeader) {
         if (commonFileHeader == null || commonFileHeader.isBlank()) { // legacy header
             pw.println("# Exported from SNT v" + SNTUtils.VERSION + " on "
-                    + LocalDateTime.of(LocalDate.now(), LocalTime.now().truncatedTo(ChronoUnit.SECONDS)));
+                    + SNTUtils.nowTruncatedToSeconds());
             pw.println("# https://imagej.net/SNT");
             pw.println("#");
             if (plugin != null && plugin.accessToValidImageData()) {

src/main/java/sc/fiji/snt/PathDownsampler.java

@@ -52,7 +52,7 @@ protected static ArrayList<SimplePoint> downsample(
 		final ArrayList<SimplePoint> points, final double permittedDeviation)
 	{
 		final int n = points.size();
-		final SimplePoint startPoint = points.get(0);
+		final SimplePoint startPoint = points.getFirst();
 		final SimplePoint endPoint = points.get(n - 1);
 		double vx = endPoint.x - startPoint.x;
 		double vy = endPoint.y - startPoint.y;
@@ -90,7 +90,7 @@ protected static ArrayList<SimplePoint> downsample(
 				secondPart.add(points.get(i));
 			firstPart = downsample(firstPart, permittedDeviation);
 			secondPart = downsample(secondPart, permittedDeviation);
-			firstPart.remove(firstPart.size() - 1);
+			firstPart.removeLast();
 			firstPart.addAll(secondPart);
 			return firstPart;
 		}

src/main/java/sc/fiji/snt/PathManagerUI.java

@@ -2650,7 +2650,7 @@ public void windowClosing(final WindowEvent e) {
         }
     }
 
-    private class JTreeMenuItem extends JMenuItem implements ActionListener {
+    private final class JTreeMenuItem extends JMenuItem implements ActionListener {
 
         private static final long serialVersionUID = 1L;
         private static final String COLLAPSE_ALL_CMD = "Collapse All";
@@ -2704,7 +2704,7 @@ public void actionPerformed(final ActionEvent e) {
         }
     }
 
-    private class JTreeCheckboxMenuItem extends JCheckBoxMenuItem implements ItemListener {
+    private final class JTreeCheckboxMenuItem extends JCheckBoxMenuItem implements ItemListener {
 
         private static final long serialVersionUID = 1L;
         private static final String TOGGLE_NAV_TOOLBAR = "Navigation Toolbar";
@@ -3006,7 +3006,7 @@ private void deselectAllTagsMenu() {
     }
 
     /** ActionListener for JCheckBoxMenuItem's "default tags" */
-    private class TagMenuItem extends JCheckBoxMenuItem implements ActionListener {
+    private final class TagMenuItem extends JCheckBoxMenuItem implements ActionListener {
 
         private static final long serialVersionUID = 1L;
 

src/main/java/sc/fiji/snt/SNTPrefs.java

@@ -83,7 +83,7 @@ public class SNTPrefs { // TODO: Adopt PrefService
 	public static final String BVV_RENDER_HEIGHT = "bvv.renderHeight";
 	public static final String BVV_MAX_RENDER_MILLIS = "bvv.maxRenderMillis";
 	public static final String BVV_MAX_STEP_IN_VOXELS = "bvv.maxStepInVoxels";
-	public static int MAX_UNDO_STEPS = 20;
+	public static final int MAX_UNDO_STEPS = 20;
 
 	/** Boolean identifiers */
 	private static final int DRAW_DIAMETERS = 1;

src/main/java/sc/fiji/snt/SNTService.java

@@ -502,7 +502,7 @@ public Viewer3D getRecViewer() {
 		if (plugin != null) {
 			final Viewer3D viewer = getInstanceViewer();
 			if (viewer == null) {
-				class SNTViewer3D extends Viewer3D {
+				final class SNTViewer3D extends Viewer3D {
 					private SNTViewer3D() {
 						super(plugin);
 					}

src/main/java/sc/fiji/snt/SNTUI.java

@@ -7308,7 +7308,7 @@ protected boolean saveAllPathsToSwc(final String filePath, final String commonFi
         return pathAndFillManager.exportAllPathsAsSWC(primaryPaths, filePath, commonFileHeader);
     }
 
-    private class ImportAction {
+    private final class ImportAction {
 
         private static final int TRACES = 0;
         private static final int SWC = 1;

src/main/java/sc/fiji/snt/SNTUtils.java

@@ -68,6 +68,10 @@
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
@@ -676,6 +680,14 @@ private static void addMatchingBackups(final List<File> copies, final File dir,
 		}
 	}
 
+	/**
+	 * Returns the current date-time truncated to whole seconds, e.g., for stamping exported content with a
+	 * generation time.
+	 */
+	public static LocalDateTime nowTruncatedToSeconds() {
+		return LocalDateTime.of(LocalDate.now(), LocalTime.now().truncatedTo(ChronoUnit.SECONDS));
+	}
+
 	public static String getTimeStamp() {
 		return new SimpleDateFormat(TIMESTAMP_PATTERN).format(new Date());
 	}

src/main/java/sc/fiji/snt/SciViewSNT.java

@@ -416,7 +416,7 @@ private void assembleSoma(final List<PointInImage> somaPoints,
 				return;
 			case 1:
 				// single point soma: http://neuromorpho.org/SomaFormat.html
-				final PointInImage sCenter = somaPoints.get(0);
+				final PointInImage sCenter = somaPoints.getFirst();
 				somaSubShape = sciView.addSphere(convertPIIToVector3(sCenter), DEF_NODE_RADIUS, col);
 				return;
 			case 3: