Updated JOGL dependencies to latest 2.1.1 release, which seems to fin…

…ally fix the loading native libraries from JAR files problems. Updated Netbeans maven platform version to 7.4
mengyuliu · Oct 23, 2013 · 7409c4f · 7409c4f
1 parent ca72bf6
commit 7409c4f
Show file tree

Hide file tree

Showing 5 changed files with 634 additions and 20 deletions.
diff --git a/modules/VisualizationImpl/pom.xml b/modules/VisualizationImpl/pom.xml
@@ -75,12 +75,12 @@
         <dependency>
             <groupId>org.jogamp.gluegen</groupId>
             <artifactId>gluegen-rt-main</artifactId>
-            <version>2.0.2-rc12</version>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.jogamp.jogl</groupId>
             <artifactId>jogl-all-main</artifactId>
-            <version>2.0.2-rc12</version>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>

diff --git a/...isualizationImpl/src/main/java/org/gephi/visualization/config/GraphicalConfiguration.java b/...isualizationImpl/src/main/java/org/gephi/visualization/config/GraphicalConfiguration.java
@@ -98,7 +98,7 @@ public void checkGeneralCompatibility(GL2 gl) {
 
             //Pbuffer
 
-            pBufferSupport = GLDrawableFactory.getDesktopFactory().canCreateGLPbuffer(device);
+            pBufferSupport = GLDrawableFactory.getDesktopFactory().canCreateGLPbuffer(device, profile);
 
         } catch (final GraphicalConfigurationException exc) {
             messageDelivered = true;

diff --git a/...s/VisualizationImpl/src/main/java/org/gephi/visualization/screenshot/ScreenshotMaker.java b/...s/VisualizationImpl/src/main/java/org/gephi/visualization/screenshot/ScreenshotMaker.java
@@ -42,12 +42,12 @@ Development and Distribution License("CDDL") (collectively, the
 package org.gephi.visualization.screenshot;
 
 import com.jogamp.opengl.util.awt.ImageUtil;
-import com.jogamp.opengl.util.gl2.TileRenderer;
 import java.awt.Cursor;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.nio.ByteBuffer;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -305,22 +305,29 @@ public void openglSignal(GLAutoDrawable drawable) {
         }
     }
 
-    private void beforeTaking() {
-        WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-    }
+    private void beforeTaking() throws InterruptedException, InvocationTargetException {
+		SwingUtilities.invokeLater(new Runnable() {
 
-    private void afterTaking() {
-        WindowManager.getDefault().getMainWindow().setCursor(Cursor.getDefaultCursor());
-        if (finishedMessage && file != null) {
-            final String msg = NbBundle.getMessage(ScreenshotMaker.class, "ScreenshotMaker.finishedMessage.message", file.getName());
-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    JOptionPane.showMessageDialog(WindowManager.getDefault().getMainWindow(), msg, NbBundle.getMessage(ScreenshotMaker.class, "ScreenshotMaker.finishedMessage.title"), JOptionPane.INFORMATION_MESSAGE);
-                }
-            });
-        }
+			@Override
+			public void run() {
+				WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+			}
+		});
     }
+
+	private void afterTaking() {
+		SwingUtilities.invokeLater(new Runnable() {
+			@Override
+			public void run() {
+				WindowManager.getDefault().getMainWindow().setCursor(Cursor.getDefaultCursor());
+				if (finishedMessage && file != null) {
+					final String msg = NbBundle.getMessage(ScreenshotMaker.class, "ScreenshotMaker.finishedMessage.message", file.getName());
+					JOptionPane.showMessageDialog(WindowManager.getDefault().getMainWindow(), msg, NbBundle.getMessage(ScreenshotMaker.class, "ScreenshotMaker.finishedMessage.title"), JOptionPane.INFORMATION_MESSAGE);
+				}
+			}
+		});
+	}
+
     private static final String DATE_FORMAT_NOW = "HHmmss";
 
     private String getDefaultFileName() {