Add links to new documentation sections an include end-of-the-line for java8

tferr · tferr · commit 8613adc49e88 · 2023-07-24T15:55:57.000-04:00
See #181
diff --git a/src/main/java/sc/fiji/snt/PathManagerUI.java b/src/main/java/sc/fiji/snt/PathManagerUI.java
@@ -304,8 +304,7 @@ public PathManagerUI(final SNT plugin) {
 			fittingHelper.showPrompt();
 		});
 		fitMenu.add(jmi);
-		jmi = GuiUtils.menuItemTriggeringURL("<HTML>Help on <i>Fitting", FIT_URI);
-		jmi.setIcon(IconFactory.getMenuIcon(IconFactory.GLYPH.QUESTION));
+		jmi = GuiUtils.menuItemTriggeringHelpURL("<HTML>Help on <i>Fitting", FIT_URI);
 		fitMenu.add(jmi);
 
 		final JMenu fillMenu = new JMenu("Fill");
@@ -459,6 +458,10 @@ private JMenu getSpineUtilsMenu(final MultiPathActionListener multiPathListener)
 		jmi.setToolTipText(tooltip);
 		jmi.addActionListener(multiPathListener);
 		menu.add(jmi);
+		menu.addSeparator();
+		jmi = GuiUtils.menuItemTriggeringHelpURL("Spine/Varicosity Utilities Help",
+				"https://imagej.net/plugins/snt/step-by-step-instructions#spinevaricosity-analysis");
+		menu.add(jmi);
 		return menu;
 	}
 
@@ -478,6 +481,10 @@ private JMenu getTimeSequenceMenu(final MultiPathActionListener multiPathListene
 		jmi.setToolTipText(tooltip);
 		jmi.addActionListener(multiPathListener);
 		menu.add(jmi);
+		menu.addSeparator();
+		jmi = GuiUtils.menuItemTriggeringHelpURL("Time-lapse Utilities Help",
+				"https://imagej.net/plugins/snt/step-by-step-instructions#time-lapse-analysis");
+		menu.add(jmi);
 		return menu;
 	}
 
diff --git a/src/main/java/sc/fiji/snt/SNTUI.java b/src/main/java/sc/fiji/snt/SNTUI.java
@@ -2057,9 +2057,8 @@ private JPanel secondaryDataPanel() {
 		GuiUtils.addSeparator(secLayerMenu, "Dispose/Disable:");
 		secLayerMenu.add(mi4);
 		secLayerMenu.addSeparator();
-		final JMenuItem mi6 = GuiUtils.menuItemTriggeringURL("Help on Secondary Layers",
+		final JMenuItem mi6 = GuiUtils.menuItemTriggeringHelpURL("Help on Secondary Layers",
 				"https://imagej.net/plugins/snt/manual#tracing-on-secondary-image");
-		mi6.setIcon(IconFactory.getMenuIcon(IconFactory.GLYPH.QUESTION));
 		secLayerMenu.add(mi6);
 
 		// Assemble panel
@@ -2947,6 +2946,9 @@ public void itemStateChanged(final ItemEvent e) {
 			manRbmi.setSelected(!newStatsState);
 			autoRbmi.setSelected(newStatsState);
 		});
+		optionsMenu.addSeparator();
+		optionsMenu.add(GuiUtils.menuItemTriggeringHelpURL("Help on Algorithm Settings",
+				"https://imagej.net/plugins/snt/manual#auto-tracing"));
 		aStarPanel = new JPanel(new BorderLayout());
 		aStarPanel.add(checkboxPanel, BorderLayout.CENTER);
 		aStarPanel.add(optionsButton, BorderLayout.EAST);
diff --git a/src/main/java/sc/fiji/snt/gui/GuiUtils.java b/src/main/java/sc/fiji/snt/gui/GuiUtils.java
@@ -211,9 +211,13 @@ public void error(final String msg, final String title) {
 	public void notifyIfNewVersion(final int delay) {
 		final Timer timer = new Timer(delay, e -> {
 			if (SNTPrefs.firstRunAfterUpdate()) {
-				final JLabel msg = leftAlignedLabel("<HTML>&nbsp;<b>SNT was updated!</b> Click here to browse release notes.",
-						releaseNotesURL(), true);
-				showNotification(msg, true);
+				final StringBuilder sb = new StringBuilder("<HTML>");
+				sb.append("&nbsp;<b>SNT was updated!</b> Click here to browse release notes.");
+				if (SNTUtils.VERSION.startsWith("4.2.")) {
+					sb.append("<br>&nbsp;<b>This is the last version supporting java 8!</b>");
+					sb.append("<br>&nbsp;To run newer SNT versions you will need a Fiji release supporting at least Java 11.");
+				}
+				showNotification(leftAlignedLabel(sb.toString(), releaseNotesURL(), true), true);
 			}
 		});
 		timer.setRepeats(false);
@@ -1665,6 +1669,12 @@ public static JMenuItem menuItemTriggeringURL(final String label, final String U
 		return mi;
 	}
 
+	public static JMenuItem menuItemTriggeringHelpURL(final String label, final String URL) {
+		final JMenuItem mi = menuItemTriggeringURL(label, URL);
+		mi.setIcon(IconFactory.getMenuIcon(IconFactory.GLYPH.QUESTION));
+		return mi;
+	}
+
 	static class TextFieldWithPlaceholder extends JTextField {
 
 		private static final long serialVersionUID = 1L;
