Minor code cleanup

Author: tferr

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

@@ -355,17 +355,13 @@ public JPanel getPanel() {
                 + "Double-click an issue to navigate to its location; "
                 + "right-click the issues table for actions.", panel), gbc);
         gbc.gridy++;
-        // Parameters region (live + on-demand). Wrapped in a scroll pane so
-        // that when the user shrinks the top half of the split below the
-        // params' natural height, the content scrolls instead of clipping.
-        // The two sections are also independently collapsible via the
-        // chevron next to each header -- collapse one to focus on the other.
-        // WidthTrackingPanel (see below) instead of plain JPanel: it
-        // implements Scrollable with getScrollableTracksViewportWidth() ==
-        // true, so the panel reflows to the viewport's width instead of
-        // sizing to its preferred width and overflowing the right edge
-        // (which, with HORIZONTAL_SCROLLBAR_NEVER, would clip the histogram
-        // buttons at the right of each row).
+        // Parameters region (live + on-demand). Wrapped in a scroll pane so that when the user shrinks the top half of
+        // the split below the  params' natural height, the content scrolls instead of clipping.  The two sections are
+        // collapsible via the chevron next to each header -- collapse one to focus on the other.
+        // WidthTrackingPanel (see below) instead of plain JPanel: it implements Scrollable with
+        // getScrollableTracksViewportWidth() ==  true, so the panel reflows to the viewport's width instead of sizing
+        // to its preferred width and overflowing the right edge (which, with HORIZONTAL_SCROLLBAR_NEVER, would clip the
+        // histogram buttons at the right of each row)
         final JPanel paramsPane = new WidthTrackingPanel(new GridBagLayout());
         final GridBagConstraints paramsGbc = GuiUtils.defaultGbc();
         paramsGbc.fill = GridBagConstraints.HORIZONTAL;
@@ -378,26 +374,20 @@ public JPanel getPanel() {
         paramsGbc.weighty = 1.0;
         paramsPane.add(Box.createVerticalGlue(), paramsGbc);
 
-        // VERTICAL_SCROLLBAR_ALWAYS rather than AS_NEEDED so the scrollbar's
-        // width is always reserved by the viewport, never overlapping the
-        // chevron and per-row histogram buttons that sit at the right edge.
-        // The "non-functional scrollbar when content fits" cost is small;
-        // for this dense panel the bar is usually active anyway.
+        // VERTICAL_SCROLLBAR_ALWAYS rather than AS_NEEDED so the scrollbar's width is always reserved by the viewport,
+        // never overlapping the chevron and per-row histogram buttons that sit at the right edge. The "non-functional
+        // scrollbar when content fits" cost is small; for this dense panel the bar is usually active anyway
         final JScrollPane paramsScroll = new JScrollPane(paramsPane,
                 JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
                 JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-        paramsScroll.setBorder(BorderFactory.createEmptyBorder());
+        GuiUtils.ScrollPanes.setTopBottomBorder(paramsScroll);
         paramsScroll.setViewportBorder(BorderFactory.createEmptyBorder());
         paramsScroll.setOpaque(false);
         paramsScroll.getViewport().setOpaque(false);
-        // Faster scroll than the default 1px-per-tick
-        paramsScroll.getVerticalScrollBar().setUnitIncrement(16);
-
-        // Bottom half of the split: toolbar + warnings table. Bundling them
-        // here (rather than as separate top-level rows) lets the JSplitPane
-        // treat "params" and "warnings + their controls" as the two natural
-        // sides of the divider; the toolbar always sits with what it
-        // operates on.
+
+        // Bottom half of the split: toolbar + warnings table. Bundling them  here (rather than as separate top-level
+        // rows) lets the JSplitPane treat "params" and "warnings + their controls" as the two natural  sides of the
+        // divider; the toolbar always sits with what it operates on
         tableScroll = new JScrollPane(warningsTable);
         tableScroll.setMinimumSize(new Dimension(0, 0)); // allow shrinking
         warningsTable.setPreferredScrollableViewportSize(null); // defer to layout
@@ -406,21 +396,18 @@ public JPanel getPanel() {
         bottomHalf.add(buildToolbar(), BorderLayout.NORTH);
         bottomHalf.add(tableScroll, BorderLayout.CENTER);
 
-        // Vertical split between params (top) and toolbar+table (bottom).
-        // resizeWeight = 0.0 means: when the whole tab is resized, the
-        // bottom (table) absorbs the change while params stays at its
-        // current size -- which matches users' usual mental model of
-        // "give me more room for the issues list".
+        // Vertical split between params (top) and toolbar+table (bottom). resizeWeight = 0.0 means: when the whole tab
+        // is resized, the  bottom (table) absorbs the change while params stays at its current size -- which matches
+        // users' usual mental model of  "give me more room for the issues list"
         final javax.swing.JSplitPane paramsTableSplit = new javax.swing.JSplitPane(
                 javax.swing.JSplitPane.VERTICAL_SPLIT, paramsScroll, bottomHalf);
         paramsTableSplit.setBorder(BorderFactory.createEmptyBorder());
         paramsTableSplit.setOpaque(false);
         paramsTableSplit.setContinuousLayout(true);
         paramsTableSplit.setOneTouchExpandable(false);
-        // Initial split: ~60% to params (typical content fits there), rest
-        // for the issues list. setDividerLocation(double) only works after
-        // the component is realized, so we also set a sensible absolute
-        // fallback that takes effect immediately.
+        // Initial split: ~60% to params (typical content fits there), rest for the issues list.
+        // setDividerLocation(double) only works after  the component is realized, so we also set a sensible absolute
+        // fallback that takes effect immediately
         paramsTableSplit.setDividerLocation(0.7);
         SwingUtilities.invokeLater(() -> paramsTableSplit.setDividerLocation(0.7));
 
@@ -431,11 +418,9 @@ public JPanel getPanel() {
         gbc.gridy++;
         gbc.insets.top = 0;
 
-        // Detach / dock table: the helper needs the scroll pane to exist
-        // (it captures a reference to it). We can't wire it inside
-        // buildTablePopupMenu() because that runs from the constructor,
-        // long before tableScroll is created here. Append the toggle item
-        // to the existing popup now that everything it needs is in place.
+        // Detach / dock table: the helper needs the scroll pane to exist. We can't wire it inside
+        // buildTablePopupMenu() because that runs from the constructor,  long before tableScroll is created here.
+        // Append the toggle item to the existing popup now that everything it needs is in place
         if (tableDetacher == null) {
             tableDetacher = new GuiUtils.JTables.DetachableTable(
                     tableScroll, "Issues (Curation Assistant)", this::redockTableScroll,

src/main/java/sc/fiji/snt/gui/GuiUtils.java

@@ -25,6 +25,7 @@
 import com.formdev.flatlaf.*;
 import com.formdev.flatlaf.extras.FlatSVGIcon;
 import com.formdev.flatlaf.icons.FlatClearIcon;
+import com.formdev.flatlaf.ui.FlatLineBorder;
 import com.formdev.flatlaf.util.SystemFileChooser;
 import com.formdev.flatlaf.util.UIScale;
 import com.jidesoft.plaf.LookAndFeelFactory;
@@ -586,11 +587,11 @@ public int getNextMatch(final String prefix, final int startIndex, final Positio
 		final JPanel panel = new JPanel(layout);
 		panel.add(getLabel(message),gbc);
 		gbc.gridy++;
-		panel.add(getScrollPane(list), gbc);
+		panel.add(ScrollPanes.create(list), gbc);
 		gbc.gridy++;
 		panel.add(new JLabel("<HTML>&nbsp;"), gbc); // spacer
 		gbc.gridy++;
-		panel.add(getScrollPane(ta), gbc);
+		panel.add(ScrollPanes.create(ta), gbc);
 		if (choices.length >  4) {
 			final ListSearchable searchable = new ListSearchable(list) {
 				@Override
@@ -648,15 +649,9 @@ public void keyTyped(final KeyEvent e) {
 		return list;
 	}
 
-	private JScrollPane getScrollPane(final Component c) {
-		final JScrollPane sp = new JScrollPane(c);
-		sp.setWheelScrollingEnabled(true);
-		return sp;
-	}
-
 	public List<String> getMultipleChoices(final String title, final String[] choices, final String defaultChoice) {
 		final JList<String> list = getJList(choices, defaultChoice);
-		if (JOptionPane.showConfirmDialog(parent, getScrollPane(list), title,
+		if (JOptionPane.showConfirmDialog(parent, ScrollPanes.create(list), title,
 				JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION)
 			return list.getSelectedValuesList();
 		return null;
@@ -671,7 +666,7 @@ public Object[] getMultipleChoicesAndChoice(final String title,
 		combo.setSelectedItem(defaultChoice2);
 		final JPanel panel = new JPanel();
 		panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
-		panel.add(getScrollPane(list1));
+		panel.add(ScrollPanes.create(list1));
 		panel.add(combo);
 		if (JOptionPane.showConfirmDialog(parent, panel, title,
 				JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION) {
@@ -1492,7 +1487,7 @@ private Object getObj(final String promptMsg, final String promptTitle,
 	}
 
 	private JDialog htmlOptionPane(final String msg, final String title, final boolean modal) {
-		final JOptionPane op = new JOptionPane(getScrollPane(htmlEditorPane(msg)),
+		final JOptionPane op = new JOptionPane(ScrollPanes.create(htmlEditorPane(msg)),
 				JOptionPane.PLAIN_MESSAGE, JOptionPane.DEFAULT_OPTION);
 		final JDialog d = op.createDialog(parent, title);
 		d.setModal(modal);
@@ -2342,23 +2337,6 @@ public static GridBagConstraints defaultGbc() {
 		return cp;
 	}
 
-	public static void recolorTracks(final JScrollPane scrollPane, final Color color, final boolean updateUI) {
-		final Component c = scrollPane.getCorner(JScrollPane.LOWER_TRAILING_CORNER);
-		if (c != null) {
-			c.setBackground(color);
-		} else {
-			final JPanel dummy = new JPanel();
-			dummy.setBackground(color);
-			scrollPane.setCorner(JScrollPane.LOWER_TRAILING_CORNER, dummy);
-		}
-		final Map<String, Object> style = new HashMap<>();
-		style.put("track", color);
-		style.put("hoverTrackColor", color);
-		scrollPane.getHorizontalScrollBar().putClientProperty(FlatClientProperties.STYLE, style);
-		scrollPane.getVerticalScrollBar().putClientProperty(FlatClientProperties.STYLE, style);
-		if (updateUI) scrollPane.updateUI();
-	}
-
 	public static void addClearButton(final JTextField textField) {
 		textField.putClientProperty(FlatClientProperties.TEXT_FIELD_SHOW_CLEAR_BUTTON, true);
 	}
@@ -2737,7 +2715,7 @@ public JDialog showHTMLDialog(final String msg, final String title, final boolea
 
 	public boolean yesNoHTMLDialog(final String htmlMsg, final String title,
 								   final String yesLabel, final String noLabel) {
-		return yesNoDialog(new Object[]{getScrollPane(htmlEditorPane(htmlMsg))}, title,
+		return yesNoDialog(new Object[]{ScrollPanes.create(htmlEditorPane(htmlMsg))}, title,
 				new String[]{yesLabel, noLabel}, JOptionPane.PLAIN_MESSAGE) == JOptionPane.YES_OPTION;
 	}
 
@@ -2804,7 +2782,7 @@ JPanel panel() {
 				++c.gridy;
 				contentPane.add(leftAlignedLabel("Charts to be combined:", true), c);
 				++c.gridy;
-				contentPane.add(getScrollPane(titles), c);
+				contentPane.add(ScrollPanes.create(titles), c);
 				++c.gridy;
 				contentPane.add(leftAlignedLabel("Montage Layout:", true), c);
 				++c.gridy;
@@ -5021,6 +4999,38 @@ public void setEnabled(final boolean enabled) {
 	}
 
 
+	public static class ScrollPanes {
+
+		private static JScrollPane create(final Component c) {
+			final JScrollPane sp = new JScrollPane(c);
+			sp.setWheelScrollingEnabled(true);
+			return sp;
+		}
+
+		public static void setTopBottomBorder(final JScrollPane scrollPane) {
+			scrollPane.setBorder(new FlatLineBorder(new Insets(1, 0, 1, 0),
+					UIManager.getColor("Component.borderColor")));
+		}
+
+		public static void recolorTracks(final JScrollPane scrollPane, final Color color, final boolean updateUI) {
+			final Component c = scrollPane.getCorner(JScrollPane.LOWER_TRAILING_CORNER);
+			if (c != null) {
+				c.setBackground(color);
+			} else {
+				final JPanel dummy = new JPanel();
+				dummy.setBackground(color);
+				scrollPane.setCorner(JScrollPane.LOWER_TRAILING_CORNER, dummy);
+			}
+			final Map<String, Object> style = new HashMap<>();
+			style.put("track", color);
+			style.put("hoverTrackColor", color);
+			scrollPane.getHorizontalScrollBar().putClientProperty(FlatClientProperties.STYLE, style);
+			scrollPane.getVerticalScrollBar().putClientProperty(FlatClientProperties.STYLE, style);
+			if (updateUI) scrollPane.updateUI();
+		}
+	}
+
+
 	public static class SplitPanes {
 
 		public static JSplitPane nonDraggableRightSplitPane() {

src/main/java/sc/fiji/snt/gui/SNTCommandFinder.java

@@ -1185,7 +1185,7 @@ private JScrollPane getScrollPane() {
 
                 @Override
                 public void updateUI() {
-                    GuiUtils.recolorTracks(this, BACKGROUND, false);
+                    GuiUtils.ScrollPanes.recolorTracks(this, BACKGROUND, false);
                     super.updateUI();
                 }
             };

src/main/java/sc/fiji/snt/gui/SNTEditorPane.java

@@ -170,7 +170,7 @@ public void applyTheme(final String theme) throws IllegalArgumentException {
             th.apply(this);
             setFont(getFont().deriveFont(GuiUtils.uiFontSize())); // theme may contain hardwired fonts
             scrollPane.getGutter().setLineNumberFont(scrollPane.getGutter().getLineNumberFont().deriveFont(getFontSize()*.75f)); // theme may contain hardwired fonts
-            GuiUtils.recolorTracks(scrollPane, th.bgColor, true);
+            GuiUtils.ScrollPanes.recolorTracks(scrollPane, th.bgColor, true);
             // Ensure gutter and row header backgrounds match the editor
             scrollPane.getGutter().setBackground(th.bgColor);
             if (scrollPane.getRowHeader() != null) {

src/main/java/sc/fiji/snt/gui/cmds/BigDataLoaderCmd.java

@@ -133,7 +133,7 @@ and big data formats with lazy loading (N5, Zarr, HDF5, OME-TIFF,
     @Parameter(required = false, visibility= ItemVisibility.MESSAGE, persist = false)
     String msg;
 
-    @Parameter(label = "Load Remote Demo...", callback = "loadDemo", persist = false, required = false)
+    @Parameter(label = "Load Remote Demo", callback = "loadDemo", persist = false, required = false)
     private Button demoButton;
 
     @SuppressWarnings("unused")