|
From: <tre...@us...> - 2008-01-03 02:13:15
|
Revision: 667
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=667&view=rev
Author: trevorolio
Date: 2008-01-02 18:13:19 -0800 (Wed, 02 Jan 2008)
Log Message:
-----------
Fixed the browser test for the non-Java3D case.
Modified Paths:
--------------
maven/trunk/ogoglio-test-applet/src/main/java/com/ogoglio/testapplet/TestApplet.java
Modified: maven/trunk/ogoglio-test-applet/src/main/java/com/ogoglio/testapplet/TestApplet.java
===================================================================
--- maven/trunk/ogoglio-test-applet/src/main/java/com/ogoglio/testapplet/TestApplet.java 2008-01-03 02:13:08 UTC (rev 666)
+++ maven/trunk/ogoglio-test-applet/src/main/java/com/ogoglio/testapplet/TestApplet.java 2008-01-03 02:13:19 UTC (rev 667)
@@ -1,6 +1,5 @@
package com.ogoglio.testapplet;
-
import java.applet.Applet;
import java.awt.Color;
@@ -27,10 +26,10 @@
public String getJavaVersion() {
return System.getProperty("java.specification.version");
}
-
+
public boolean hasAcceptableJava() {
String versionProp = getJavaVersion();
- if(versionProp == null) {
+ if (versionProp == null) {
return false;
}
try {
@@ -43,12 +42,22 @@
}
public String getJava3DVersion() {
- return Java3DTester.getVersion("com.sun.j3d.utils.universe", "SimpleUniverse");
+ try {
+ return Java3DTester.getVersion("com.sun.j3d.utils.universe", "SimpleUniverse");
+ } catch (Throwable e) {
+ System.out.println("Could not load Java3D: " + e);
+ return null;
+ }
}
-
+
public boolean hasJava3D() {
- System.out.println("Version: " + Java3DTester.getVersion("com.sun.j3d.utils.universe", "SimpleUniverse"));
- return Java3DTester.getVersion("com.sun.j3d.utils.universe", "SimpleUniverse") != null;
+ try {
+ System.out.println("Java3D Version: " + Java3DTester.getVersion("com.sun.j3d.utils.universe", "SimpleUniverse"));
+ return Java3DTester.getVersion("com.sun.j3d.utils.universe", "SimpleUniverse") != null;
+ } catch (Throwable e) {
+ System.out.println("Could not load Java3D: " + e);
+ return false;
+ }
}
public boolean canStartJava3D() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|