Pom: fix jogamp dependencies/updates

See #212 (comment)
morphonets · Jan 18, 2024 · 21ea56b · 21ea56b
1 parent 843d21c
commit 21ea56b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -140,13 +140,15 @@
 		<enforcer.skip>true</enforcer.skip>
 
 		<!-- Dependency versions -->
-		<font-awesome.version>6.5.1</font-awesome.version>
-		<flatlaf.version>3.2.5</flatlaf.version>
-		<flatlaf-jide-oss.version>${flatlaf.version}</flatlaf-jide-oss.version>
-		<log4j.version>2.21.1</log4j.version>
-		<jide-oss.version>3.7.14</jide-oss.version>
 		<annotations.version>24.1.0</annotations.version>
 		<fastutil-core.version>8.5.12</fastutil-core.version>
+		<flatlaf.version>3.3</flatlaf.version>
+		<flatlaf-jide-oss.version>${flatlaf.version}</flatlaf-jide-oss.version>
+		<font-awesome.version>6.5.1</font-awesome.version>
+		<jgrapht-core.version>1.5.2</jgrapht-core.version>
+		<jgrapht-ext.version>${jgrapht-core.version}</jgrapht-ext.version>
+		<jide-oss.version>3.7.14</jide-oss.version>
+		<log4j.version>2.21.1</log4j.version>
 		<scenery.version>0.9.0</scenery.version>
 		<sciview.version>ba959ae644</sciview.version>
 		<smile.version>3.0.2</smile.version>
@@ -165,6 +167,17 @@
 	</repositories>
 
 	<dependencies>
+		<!-- TEMP Until jogl 2.5.0 is properly deployed to mvn.scijava https://github.com/morphonets/SNT/issues/212 -->
+		<dependency>
+			<groupId>org.jogamp.gluegen</groupId>
+			<artifactId>gluegen-rt</artifactId>
+			<classifier>${scijava.natives.classifier.gluegen}</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.jogamp.jogl</groupId>
+			<artifactId>jogl-all</artifactId>
+			<classifier>${scijava.natives.classifier.jogl}</classifier>
+		</dependency>
 		<!-- Fiji dependencies -->
 		<dependency>
 			<groupId>sc.fiji</groupId>
@@ -297,6 +310,7 @@
 		<dependency>
 			<groupId>com.formdev</groupId>
 			<artifactId>flatlaf</artifactId>
+			<version>${flatlaf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.vlsi.mxgraph</groupId>

diff --git a/src/main/java/sc/fiji/snt/gui/GuiUtils.java b/src/main/java/sc/fiji/snt/gui/GuiUtils.java
@@ -2288,8 +2288,8 @@ public static JTabbedPane getTabbedPane() {
 		// tabbedPane.setBoldActiveTab(true);
 		// tabbedPane.setScrollSelectedTabOnWheel(true);
 		// tabbedPane.setTabResizeMode(JideTabbedPane.RESIZE_MODE_NONE);
-
 		final JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
+		tabbedPane.putClientProperty( "JTabbedPane.tabRotation", "auto" ); // flatlaf v3.3
 		tabbedPane.addMouseWheelListener(e -> {
 			// https://stackoverflow.com/a/38463104
 			final JTabbedPane pane = (JTabbedPane) e.getSource();

diff --git a/src/main/java/sc/fiji/snt/gui/cmds/SNTLoaderCmd.java b/src/main/java/sc/fiji/snt/gui/cmds/SNTLoaderCmd.java
@@ -31,6 +31,7 @@
 
 import net.imagej.display.ImageDisplayService;
 
+import net.imagej.patcher.LegacyInjector;
 import org.scijava.ItemVisibility;
 import org.scijava.command.Command;
 import org.scijava.command.CommandService;
@@ -404,6 +405,7 @@ private void exit(final String msg) {
 	 * IDE debug method
 	 */
 	public static void main(final String[] args) {
+		LegacyInjector.preinit();
 		SNTUtils.startApp();
 	}