Merge remote-tracking branch 'origin/master'

.github/workflows/release.yml

@@ -89,12 +89,12 @@ jobs:
           - task: create-targz
             os: ubuntu-latest
             arch: x64
+          - task: create-targz
+            os: ubuntu-latest
+            arch: aarch64
           - task: create-exe
             os: windows-latest
             arch: x64
-          - task: create-exe
-            os: windows-latest
-            arch: x32
           - task: create-dmg,notarize-dmg
             os: macos-11
             arch: x64

modules/VisualizationImpl/pom.xml

@@ -16,8 +16,7 @@
     <name>VisualizationImpl</name>
 
     <properties>
-        <jogl.version>v2.4.0-rc4</jogl.version>
-        <jogl.version.jogl.all>2.4.0-rc-20221118</jogl.version.jogl.all>
+        <jogl.version>2.4.0</jogl.version>
     </properties>
 
     <dependencies>
@@ -113,58 +112,56 @@
         </dependency>
         <dependency>
             <groupId>org.jogamp.gluegen</groupId>
-            <artifactId>gluegen-rt-natives-linux-amd64</artifactId>
-            <version>${jogl.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jogamp.gluegen</groupId>
-            <artifactId>gluegen-rt-natives-linux-i586</artifactId>
+            <artifactId>gluegen-rt</artifactId>
+            <classifier>natives-linux-amd64</classifier>
             <version>${jogl.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jogamp.gluegen</groupId>
-            <artifactId>gluegen-rt-natives-macosx-universal</artifactId>
+            <artifactId>gluegen-rt</artifactId>
+            <classifier>natives-linux-aarch64</classifier>
             <version>${jogl.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jogamp.gluegen</groupId>
-            <artifactId>gluegen-rt-natives-windows-amd64</artifactId>
+            <artifactId>gluegen-rt</artifactId>
+            <classifier>natives-macosx-universal</classifier>
             <version>${jogl.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jogamp.gluegen</groupId>
-            <artifactId>gluegen-rt-natives-windows-i586</artifactId>
+            <artifactId>gluegen-rt</artifactId>
+            <classifier>natives-windows-amd64</classifier>
             <version>${jogl.version}</version>
         </dependency>
         <!-- JOGL -->
         <dependency>
             <groupId>org.jogamp.jogl</groupId>
             <artifactId>jogl-all</artifactId>
-            <version>${jogl.version.jogl.all}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jogamp.jogl</groupId>
-            <artifactId>jogl-all-natives-linux-amd64</artifactId>
             <version>${jogl.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jogamp.jogl</groupId>
-            <artifactId>jogl-all-natives-linux-i586</artifactId>
+            <artifactId>jogl-all</artifactId>
+            <classifier>natives-linux-amd64</classifier>
             <version>${jogl.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jogamp.jogl</groupId>
-            <artifactId>jogl-all-natives-macosx-universal</artifactId>
+            <artifactId>jogl-all</artifactId>
+            <classifier>natives-linux-aarch64</classifier>
             <version>${jogl.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jogamp.jogl</groupId>
-            <artifactId>jogl-all-natives-windows-amd64</artifactId>
+            <artifactId>jogl-all</artifactId>
+            <classifier>natives-macosx-universal</classifier>
             <version>${jogl.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jogamp.jogl</groupId>
-            <artifactId>jogl-all-natives-windows-i586</artifactId>
+            <artifactId>jogl-all</artifactId>
+            <classifier>natives-windows-amd64</classifier>
             <version>${jogl.version}</version>
         </dependency>
     </dependencies>
@@ -206,9 +203,9 @@
     </build>
     <repositories>
         <repository>
-            <id>jogl-jzy3d</id>
-            <name>JOGL Jzy3d</name>
-            <url>https://maven.jzy3d.org/releases</url>
+            <id>jogl</id>
+            <name>JOGL</name>
+            <url>https://jogamp.org/deployment/maven/</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>

modules/VisualizationImpl/src/main/java/org/gephi/visualization/VizController.java

@@ -119,13 +119,8 @@ public class VizController implements VisualizationController {
         currentModel = new VizModel(true);
         selectionManager = new SelectionManager();
 
-        if (vizConfig.isUseGLJPanel()) {
-            //No more supported
-        } else if (Utilities.isMac()) {
-            drawable = createCanvas();
-        } else {
-            drawable = createNewtCanvas();
-        }
+        drawable = createNewtCanvas();
+        
         drawable.initArchitecture();
         engine.initArchitecture();
         ((CompatibilityScheduler) scheduler).initArchitecture();

modules/VisualizationImpl/src/main/java/org/gephi/visualization/swing/NewtGraphCanvas.java

@@ -53,6 +53,7 @@ import java.awt.*;
 import javax.swing.JPopupMenu;
 import javax.swing.ToolTipManager;
 import org.gephi.ui.utils.UIUtils;
+import org.openide.util.Utilities;
 
 /**
  * @author Mathieu Bastian
@@ -67,8 +68,11 @@ public class NewtGraphCanvas extends GLAbstractListener {
     protected GLAutoDrawable initDrawable() {
         GLWindow glWindow = GLWindow.create(getCaps());
 //        glWindow.setSurfaceScale(new float[]{ScalableSurface.AUTOMAX_PIXELSCALE, ScalableSurface.AUTOMAX_PIXELSCALE});
-        glCanvas = new HighDPIFixCanvas(glWindow);
-//        glCanvas = new NewtCanvasAWT(glWindow);
+        if (!Utilities.isMac()) {
+            glCanvas = new HighDPIFixCanvas(glWindow);
+        } else {
+            glCanvas = new NewtCanvasAWT(glWindow);
+        }
 
 //        glCanvas.setFocusable(true);
 //        glCanvas.setIgnoreRepaint(true);