Update to pom-scijava 40

Supports icons in menus

Author: NicoKiaru

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>39.0.0</version>
+		<version>40.0.0</version>
 		<relativePath />
 	</parent>
 
@@ -121,9 +121,7 @@
 
 		<!-- package version below are not present in the parent pom. A version is needed -->
 		<bigdataviewer-selector.version>0.2.7</bigdataviewer-selector.version>
-		<bigvolumeviewer.version>0.3.4</bigvolumeviewer.version>
 		<reflections.version>0.10.2</reflections.version> <!-- for test only -->
-		<!--<spim_data.version>2.3.4</spim_data.version>-->
 
 		<!-- package version below are determined by the parent pom but need to be upgraded or temporarily fixed for bugs -->
 

src/main/java/sc/fiji/bdvpg/scijava/BdvScijavaHelper.java

@@ -38,11 +38,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.JSeparator;
 import java.awt.Component;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -75,8 +78,9 @@ static public void addCommandToBdvHandleMenu(BdvHandle bdvh, Context ctx,
 		Class<? extends Command> commandClass, int skipTopLevels, Object... args)
 	{
 		Plugin plugin = commandClass.getDeclaredAnnotation(Plugin.class);
+
 		addActionToBdvHandleMenu(bdvh, plugin.menuPath(), skipTopLevels, () -> ctx
-			.getService(CommandService.class).run(commandClass, true, args));
+			.getService(CommandService.class).run(commandClass, true, args), plugin.iconPath(), plugin.description());
 	}
 
 	static public void addSeparator(BdvHandle bdvh,	String pathHierarchy) {
@@ -106,12 +110,20 @@ static public void addSeparator(BdvHandle bdvh,	String pathHierarchy) {
 	static public void addCommandToBdvHandleMenu(BdvHandle bdvh, Context ctx, String path,
 												 Class<? extends Command> commandClass, Object... args)
 	{
+
+		Plugin plugin = commandClass.getDeclaredAnnotation(Plugin.class);
+
 		addActionToBdvHandleMenu(bdvh, path, 0, () -> ctx
-				.getService(CommandService.class).run(commandClass, true, args));
+				.getService(CommandService.class).run(commandClass, true, args), plugin.iconPath(), plugin.description());
+	}
+
+	static public void addActionToBdvHandleMenu(BdvHandle bdvh,
+												String pathHierarchy, int skipTopLevels, Runnable runnable) {
+		addActionToBdvHandleMenu(bdvh, pathHierarchy, skipTopLevels, runnable, null, null);
 	}
 
 	static public void addActionToBdvHandleMenu(BdvHandle bdvh,
-		String pathHierarchy, int skipTopLevels, Runnable runnable)
+		String pathHierarchy, int skipTopLevels, Runnable runnable, String iconPath, String description)
 	{
 		if (bdvh instanceof BdvHandleFrame) {
 			final JMenuBar bdvMenuBar = ((BdvHandleFrame) bdvh).getBigDataViewer()
@@ -126,6 +138,18 @@ static public void addActionToBdvHandleMenu(BdvHandle bdvh,
 			JMenuItem jMenuItemRoot = findOrCreateJMenu(bdvMenuBar, path);
 			if (jMenuItemRoot != null) {
 				final JMenuItem jMenuItem = new JMenuItem(path.get(path.size() - 1));
+
+				if ((iconPath!=null) && (!iconPath.isEmpty())) {
+					URL iconURL = BdvScijavaHelper.class.getResource(iconPath);
+					ImageIcon iconRotX = new ImageIcon(iconURL);
+					Icon icon = new ImageIcon( iconRotX.getImage().getScaledInstance( 32, 32,  java.awt.Image.SCALE_SMOOTH ) );
+					jMenuItem.setIcon(icon);
+				}
+
+				if ((description!=null) && (!description.isEmpty())) {
+					jMenuItem.setToolTipText(description);
+				}
+
 				jMenuItem.addActionListener(e -> runnable.run());
 				jMenuItemRoot.add(jMenuItem);
 				bdvMenuBar.updateUI();