summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKevin Rushforth <[email protected]>2007-05-31 20:55:44 +0000
committerKevin Rushforth <[email protected]>2007-05-31 20:55:44 +0000
commit20ae348a58cf4aa9ec838d861e1568352950854d (patch)
treec0052a5f900af2df277b85232d268df5f6cd53a7 /src
parent82bf7db035d82d0fab90fa59899148a410bd552b (diff)
Finalized name of JNLPAppletLauncher class and property
git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@850 ba19aa83-45c5-6ac9-afd3-db810772062c
Diffstat (limited to 'src')
-rw-r--r--src/classes/share/javax/media/j3d/MasterControl.java4
-rw-r--r--src/classes/share/javax/media/j3d/NativePipeline.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/classes/share/javax/media/j3d/MasterControl.java b/src/classes/share/javax/media/j3d/MasterControl.java
index dbb79ac..2b57a77 100644
--- a/src/classes/share/javax/media/j3d/MasterControl.java
+++ b/src/classes/share/javax/media/j3d/MasterControl.java
@@ -860,8 +860,8 @@ class MasterControl {
boolean isWindowsVista = isWindowsOs && osName.indexOf("vista") != -1;
boolean is64Bit = (sunArchDataModel != null) && sunArchDataModel.equals("64");
- // Issue 257: check to see if the sun.applet.launcher property is set to true
- String sunAppletLauncher = getProperty("sun.applet.launcher");
+ // Issue 257: check to see if the sun.jnlp.applet.launcher property is set to true
+ String sunAppletLauncher = getProperty("sun.jnlp.applet.launcher");
appletLauncher = Boolean.valueOf(sunAppletLauncher);
if (isCoreLoggable(Level.CONFIG)) {
diff --git a/src/classes/share/javax/media/j3d/NativePipeline.java b/src/classes/share/javax/media/j3d/NativePipeline.java
index 94d5ff4..dcdf8a5 100644
--- a/src/classes/share/javax/media/j3d/NativePipeline.java
+++ b/src/classes/share/javax/media/j3d/NativePipeline.java
@@ -182,7 +182,7 @@ class NativePipeline extends Pipeline {
public Object run() {
try {
if (useAppletLauncher) {
- Class jnlpAppletLauncherClass = Class.forName("com.sun.applet.util.JNLPAppletLauncher");
+ Class jnlpAppletLauncherClass = Class.forName("org.jdesktop.applet.util.JNLPAppletLauncher");
Method loadLibraryMethod = jnlpAppletLauncherClass.getDeclaredMethod("loadLibrary", String.class);
loadLibraryMethod.invoke(null, libName);
} else {