Fix various warnings and do some minor cleanups

ctrueden · ctrueden · commit 3ae68ab47d15 · 2022-09-13T13:28:40.000-05:00
diff --git a/src/main/java/org/scijava/ui/swing/commands/CommandFinderPanel.java b/src/main/java/org/scijava/ui/swing/commands/CommandFinderPanel.java
@@ -64,10 +64,11 @@
 
 import org.scijava.MenuEntry;
 import org.scijava.MenuPath;
+import org.scijava.log.LogService;
 import org.scijava.module.ModuleInfo;
 import org.scijava.module.ModuleService;
-import org.scijava.util.ClassUtils;
 import org.scijava.util.FileUtils;
+import org.scijava.util.Types;
 
 /**
  * A panel that allows the user to search for SciJava commands. Based on the
@@ -76,7 +77,6 @@
  * @author Curtis Rueden
  * @author Johannes Schindelin
  */
-@SuppressWarnings("serial")
 public class CommandFinderPanel extends JPanel implements ActionListener,
 	DocumentListener
 {
@@ -85,11 +85,13 @@ public class CommandFinderPanel extends JPanel implements ActionListener,
 	protected final JTable commandsList;
 	protected final CommandTableModel tableModel;
 
+	private final LogService log;
 	private final List<ModuleInfo> commands;
 
 	public CommandFinderPanel(final ModuleService moduleService,
 		final String baseDir)
 	{
+		log = moduleService.context().getService(LogService.class);
 		commands = buildCommands(moduleService);
 
 		setPreferredSize(new Dimension(800, 600));
@@ -272,7 +274,7 @@ private void filterUpdated() {
 
 	// -- Helper classes --
 
-	protected static class CommandTableModel extends AbstractTableModel {
+	protected class CommandTableModel extends AbstractTableModel {
 		public final static int COLUMN_COUNT = 8;
 
 		private final String baseDir;
@@ -351,7 +353,15 @@ public Object getValueAt(int row, int column) {
 			}
 			if (column == 4) return info.getDelegateClassName();
 			if (column == 5) {
-				final URL location = ClassUtils.getLocation(info.getDelegateClassName());
+				Class<?> c = null;
+				try {
+					c = info.loadDelegateClass();
+				}
+				catch (final ClassNotFoundException exc) {
+					log.warn(exc);
+				}
+				final URL location = Types.location(c);
+
 				final File file = FileUtils.urlToFile(location);
 				final String path = file == null ? null : file.getAbsolutePath();
 				if (path != null && path.startsWith(baseDir)) {
diff --git a/src/main/java/org/scijava/ui/swing/commands/WatchEventsFrame.java b/src/main/java/org/scijava/ui/swing/commands/WatchEventsFrame.java
@@ -64,8 +64,8 @@
 import org.scijava.swing.checkboxtree.CheckBoxNodeData;
 import org.scijava.swing.checkboxtree.CheckBoxNodeEditor;
 import org.scijava.swing.checkboxtree.CheckBoxNodeRenderer;
-import org.scijava.util.ClassUtils;
 import org.scijava.util.IteratorPlus;
+import org.scijava.util.Types;
 
 /**
  * Swing-specific window for event watcher plugin.
@@ -348,8 +348,8 @@ private Class<? extends SciJavaEvent> getEventType(
 		if (data == null) return null;
 		final String className = data.getText();
 		@SuppressWarnings({ "rawtypes", "unchecked" })
-		final Class<? extends SciJavaEvent> eventType =
-			(Class) ClassUtils.loadClass(className);
+		final Class<? extends SciJavaEvent> eventType = //
+			(Class) Types.load(className);
 		if (eventType == null) {
 			throw new IllegalStateException("Invalid class: " + className);
 		}
diff --git a/src/main/java/org/scijava/ui/swing/menu/AbstractSwingMenuCreator.java b/src/main/java/org/scijava/ui/swing/menu/AbstractSwingMenuCreator.java
@@ -97,15 +97,16 @@ protected void addSeparatorToMenu(final JMenu target) {
 	protected JMenuItem createLeaf(final ShadowMenu shadow) {
 		final String name = shadow.getMenuEntry().getName();
 		final JMenuItem menuItem;
-		if (false) ; // CTR TEMP - disable checkbox menu items for beta1 release
-//		if (shadow.isCheckBox()) {
-//			menuItem = new JCheckBoxMenuItem(name, isSelected(shadow));
-//		}
-//		else if (shadow.isRadioButton()) {
-//			menuItem = new JRadioButtonMenuItem(name, isSelected(shadow));
-//			getButtonGroup(shadow).add(menuItem);
-//		}
-		else menuItem = new JMenuItem(name);
+		// CTR TEMP - disable checkbox menu items for beta1 release
+		//if (shadow.isCheckBox()) {
+		//	menuItem = new JCheckBoxMenuItem(name, isSelected(shadow));
+		//}
+		//else if (shadow.isRadioButton()) {
+		//	menuItem = new JRadioButtonMenuItem(name, isSelected(shadow));
+		//	getButtonGroup(shadow).add(menuItem);
+		//}
+		//else
+		menuItem = new JMenuItem(name);
 		assignProperties(menuItem, shadow);
 		linkAction(shadow, menuItem);
 		return menuItem;
diff --git a/src/main/java/org/scijava/ui/swing/options/OptionsLookAndFeel.java b/src/main/java/org/scijava/ui/swing/options/OptionsLookAndFeel.java
@@ -239,16 +239,16 @@ private DisplayService displayService() {
 	public static void setupLookAndFeel(final String lookAndFeel) {
 		switch (lookAndFeel) { // FIXME: should FlatLaf.updateUI() calls be replaced with updateUILater()?
 		case FlatLightLaf.NAME:
-			if (FlatLightLaf.setup()) FlatLightLaf.updateUI();
+			if (FlatLightLaf.setup()) FlatLaf.updateUI();
 			return;
 		case FlatDarkLaf.NAME:
-			if (FlatDarkLaf.setup()) FlatDarkLaf.updateUI();
+			if (FlatDarkLaf.setup()) FlatLaf.updateUI();
 			return;
 		case FlatDarculaLaf.NAME:
-			if (FlatDarculaLaf.setup()) FlatDarculaLaf.updateUI();
+			if (FlatDarculaLaf.setup()) FlatLaf.updateUI();
 			return;
 		case FlatIntelliJLaf.NAME:
-			if (FlatIntelliJLaf.setup()) FlatIntelliJLaf.updateUI();
+			if (FlatIntelliJLaf.setup()) FlatLaf.updateUI();
 			return;
 		default:
 			try {
diff --git a/src/main/java/org/scijava/ui/swing/plot/converter/PlotToBufferedImageConverter.java b/src/main/java/org/scijava/ui/swing/plot/converter/PlotToBufferedImageConverter.java
@@ -47,7 +47,7 @@
  * @author Matthias Arzt
  * @see ConvertService
  */
-@Plugin(type = Converter.class, priority = Priority.NORMAL_PRIORITY)
+@Plugin(type = Converter.class, priority = Priority.NORMAL)
 public class PlotToBufferedImageConverter extends AbstractConverter<Plot, BufferedImage>
 {
 
diff --git a/src/main/java/org/scijava/ui/swing/viewer/plot/jfreechart/CategoryChartConverter.java b/src/main/java/org/scijava/ui/swing/viewer/plot/jfreechart/CategoryChartConverter.java
@@ -39,7 +39,7 @@
 /**
  * @author Matthias Arzt
  */
-@Plugin(type = Converter.class, priority = Priority.NORMAL_PRIORITY)
+@Plugin(type = Converter.class, priority = Priority.NORMAL)
 public class CategoryChartConverter extends AbstractConverter<CategoryChart, JFreeChart> {
 	@SuppressWarnings("unchecked")
 	@Override
diff --git a/src/main/java/org/scijava/ui/swing/viewer/plot/jfreechart/Utils.java b/src/main/java/org/scijava/ui/swing/viewer/plot/jfreechart/Utils.java
@@ -29,16 +29,15 @@
 
 package org.scijava.ui.swing.viewer.plot.jfreechart;
 
-import org.scijava.plot.NumberAxis;
-import org.scijava.plot.NumberAxis.RangeStrategy;
+import java.awt.Color;
+import java.util.Objects;
+
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.axis.LogAxis;
 import org.jfree.chart.axis.ValueAxis;
 import org.jfree.chart.block.BlockBorder;
 import org.jfree.chart.plot.Plot;
-
-import java.awt.*;
-import java.util.Objects;
+import org.scijava.plot.NumberAxis;
 
 /**
  * @author Matthias Arzt
@@ -54,13 +53,10 @@ static JFreeChart setupJFreeChart(String title, Plot plot) {
 	}
 
 	static ValueAxis getJFreeChartAxis(NumberAxis v) {
-		if(v.isLogarithmic())
-			return getJFreeChartLogarithmicAxis(v);
-		else
-			return getJFreeCharLinearAxis(v);
+		return v.isLogarithmic() ? logarithmicAxis(v) : linearAxis(v);
 	}
 
-	static ValueAxis getJFreeChartLogarithmicAxis(NumberAxis v) {
+	static ValueAxis logarithmicAxis(NumberAxis v) {
 		LogAxis axis = new LogAxis(v.getLabel());
 		switch (v.getRangeStrategy()) {
 			case MANUAL:
@@ -72,7 +68,7 @@ static ValueAxis getJFreeChartLogarithmicAxis(NumberAxis v) {
 		return axis;
 	}
 
-	static ValueAxis getJFreeCharLinearAxis(NumberAxis v) {
+	static ValueAxis linearAxis(NumberAxis v) {
 		org.jfree.chart.axis.NumberAxis axis = new org.jfree.chart.axis.NumberAxis(v.getLabel());
 		switch(v.getRangeStrategy()) {
 			case MANUAL:
diff --git a/src/main/java/org/scijava/ui/swing/viewer/plot/jfreechart/XYPlotConverter.java b/src/main/java/org/scijava/ui/swing/viewer/plot/jfreechart/XYPlotConverter.java
@@ -39,7 +39,7 @@
 /**
  * @author Matthias.Arzt
  */
-@Plugin(type = Converter.class, priority = Priority.NORMAL_PRIORITY)
+@Plugin(type = Converter.class, priority = Priority.NORMAL)
 public class XYPlotConverter extends AbstractConverter<XYPlot, JFreeChart> {
 	@SuppressWarnings("unchecked")
 	@Override
diff --git a/src/main/java/org/scijava/ui/swing/widget/SwingFileListWidget.java b/src/main/java/org/scijava/ui/swing/widget/SwingFileListWidget.java
@@ -65,7 +65,6 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.thread.ThreadService;
-import org.scijava.ui.UIService;
 import org.scijava.widget.FileListWidget;
 import org.scijava.widget.FileWidget;
 import org.scijava.widget.InputWidget;
diff --git a/src/test/java/org/scijava/ui/swing/console/SwingConsolePaneBenchmark.java b/src/test/java/org/scijava/ui/swing/console/SwingConsolePaneBenchmark.java
@@ -110,43 +110,39 @@ public void run() {
 		final String completenessMessage = "Checking for completeness of output...";
 		System.out.println();
 		System.out.println(completenessMessage);
-		threadService.queue(new Runnable() {
-
-			@Override
-			public void run() {
-				System.out.println();
-				final SwingSDIUI ui =
-					(SwingSDIUI) context.service(UIService.class).getVisibleUIs().get(0);
-				final JTextPane textPane = ui.getConsolePane().getTextPane();
-				final Document doc = textPane.getDocument();
-				try {
-					final String text = doc.getText(0, doc.getLength());
-					final String[] lines = text.split("\n");
-					Arrays.sort(lines);
-
-					int lineIndex = 0;
-					assertEquals("", lines[lineIndex++]);
-					assertEquals("", lines[lineIndex++]);
-					for (int t = 0; t < numThreads; t++) {
-						for (int s = 0; s < numStreams; s++) {
-							for (int i = 0; i < numOperations; i++) {
-								final String expected = str(t, streamLabels[s], i);
-								final String actual = lines[lineIndex++];
-								assertEquals(expected, actual);
-							}
+		threadService.queue(() -> {
+			System.out.println();
+			final SwingSDIUI ui =
+				(SwingSDIUI) context.service(UIService.class).getVisibleUIs().get(0);
+			final JTextPane textPane = ui.getConsolePane().getTextPane();
+			final Document doc = textPane.getDocument();
+			try {
+				final String text = doc.getText(0, doc.getLength());
+				final String[] lines = text.split("\n");
+				Arrays.sort(lines);
+
+				int lineIndex = 0;
+				assertEquals("", lines[lineIndex++]);
+				assertEquals("", lines[lineIndex++]);
+				for (int t = 0; t < numThreads; t++) {
+					for (int s = 0; s < numStreams; s++) {
+						for (int i = 0; i < numOperations; i++) {
+							final String expected = str(t, streamLabels[s], i);
+							final String actual = lines[lineIndex++];
+							assertEquals(expected, actual);
 						}
 					}
-					assertTrue(lines[lineIndex++].startsWith("Benchmark took "));
-					assertEquals(completenessMessage, lines[lineIndex++]);
-					assertEquals("Goodbye cruel world!", lines[lineIndex++]);
-					assertEquals("Hello world!", lines[lineIndex++]);
-					assertEquals(lineIndex, lines.length);
-
-					System.out.println("Success! All output accounted for!");
-				}
-				catch (final BadLocationException exc) {
-					exc.printStackTrace();
 				}
+				assertTrue(lines[lineIndex++].startsWith("Benchmark took "));
+				assertEquals(completenessMessage, lines[lineIndex++]);
+				assertEquals("Goodbye cruel world!", lines[lineIndex++]);
+				assertEquals("Hello world!", lines[lineIndex++]);
+				assertEquals(lineIndex, lines.length);
+
+				System.out.println("Success! All output accounted for!");
+			}
+			catch (final BadLocationException exc) {
+				exc.printStackTrace();
 			}
 		});
 
diff --git a/src/test/java/org/scijava/ui/swing/widget/SwingNumberWidgetTest.java b/src/test/java/org/scijava/ui/swing/widget/SwingNumberWidgetTest.java
@@ -33,24 +33,19 @@
 
 import java.io.StringReader;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.Collections;
 
 import javax.swing.JSpinner;
 import javax.swing.JSpinner.NumberEditor;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.module.Module;
-import org.scijava.module.ModuleException;
 import org.scijava.module.ModuleItem;
 import org.scijava.module.ModuleService;
 import org.scijava.script.ScriptInfo;
-import org.scijava.script.ScriptService;
-import org.scijava.util.ListUtils;
 import org.scijava.widget.InputWidget;
 import org.scijava.widget.WidgetModel;
 import org.scijava.widget.WidgetService;
@@ -74,7 +69,9 @@ public void tearDown() {
 	}
 
 	@Test
-	public void test() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException, ModuleException {
+	public void test() throws NoSuchFieldException, SecurityException,
+		IllegalArgumentException, IllegalAccessException
+	{
 		String[] expecteds = getExpectedValues();
 		Field spinnerField = SwingNumberWidget.class.getDeclaredField("spinner");
 		spinnerField.setAccessible(true);

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`* @author Matthias Arzt`
`48`	`48`	`* @see ConvertService`
`49`	`49`	`*/`
`50`		`-@Plugin(type = Converter.class, priority = Priority.NORMAL_PRIORITY)`
	`50`	`+@Plugin(type = Converter.class, priority = Priority.NORMAL)`
`51`	`51`	`public class PlotToBufferedImageConverter extends AbstractConverter<Plot, BufferedImage>`
`52`	`52`	`{`
`53`	`53`