aboutsummaryrefslogtreecommitdiffstats
path: root/plugin/icedteanp/java/netscape/javascript/JSObject.java
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-01-30 10:39:16 +0100
committerSven Gothel <[email protected]>2014-01-30 10:39:16 +0100
commit64e7dcc21339ae56841f10131a4f8a462454dec4 (patch)
treea62d2fbafc6fbe412d2d5ad599cd992bdf97ddbe /plugin/icedteanp/java/netscape/javascript/JSObject.java
parent98c9d6e1ea22db18913b531b8056fbdc5465eb18 (diff)
Experimental Applet without AWT (Applet3)
DISCLAIMER: - Only new Applet3 applets are supported under X11 for now - AWT Applet are disabled - Namespace com.jogamp.* and jogamp.* is only chosen to indicate new AWT-less code - Applet3 code path does not invoke any AWT function - JNLP code path still utilizes AWT/Swing (UIs, ..) TODO: - Refactor AWT dependencies properly via UI interfaces ? - Decide whether we shall merge netx and plugin namespace ? IMHO the right thing to do, jumping hoops due to separation. - Add support for Windows, OSX, Wayland, .. Applet3: - New AWT-less Applet3 interfaces are: - com.jogamp.plugin.applet.Applet3 - User implements - com.jogamp.plugin.applet.Applet3Context - Plugin implements - com.jogamp.plugin.ui.NativeWindowUpstream - Plugin window, aka browser parent of Applet3 - com.jogamp.plugin.ui.NativeWindowDownstream - Applet3 user window - User interfaces are exported as: - plugin3-public.jar - plugin3-public-src.zip
Diffstat (limited to 'plugin/icedteanp/java/netscape/javascript/JSObject.java')
-rw-r--r--plugin/icedteanp/java/netscape/javascript/JSObject.java23
1 files changed, 11 insertions, 12 deletions
diff --git a/plugin/icedteanp/java/netscape/javascript/JSObject.java b/plugin/icedteanp/java/netscape/javascript/JSObject.java
index 489efa6..d3eec67 100644
--- a/plugin/icedteanp/java/netscape/javascript/JSObject.java
+++ b/plugin/icedteanp/java/netscape/javascript/JSObject.java
@@ -50,7 +50,7 @@ import java.applet.Applet;
import java.security.AccessControlException;
import java.security.AccessController;
-import sun.applet.PluginAppletViewer;
+import jogamp.plugin.applet.PluginApplet3Viewer;
import sun.applet.PluginDebug;
/**
@@ -162,7 +162,7 @@ public final class JSObject {
public Object getMember(String name) {
PluginDebug.debug("JSObject.getMember ", name);
- Object o = PluginAppletViewer.getMember(internal, name);
+ Object o = PluginApplet3Viewer.getMember(internal, name);
PluginDebug.debug("JSObject.getMember GOT ", o);
return o;
}
@@ -175,7 +175,7 @@ public final class JSObject {
public Object getSlot(int index) {
PluginDebug.debug("JSObject.getSlot ", index);
- return PluginAppletViewer.getSlot(internal, index);
+ return PluginApplet3Viewer.getSlot(internal, index);
}
/**
@@ -185,7 +185,7 @@ public final class JSObject {
public void setMember(String name, Object value) {
PluginDebug.debug("JSObject.setMember ", name, " ", value);
- PluginAppletViewer.setMember(internal, name, value);
+ PluginApplet3Viewer.setMember(internal, name, value);
}
/**
@@ -198,7 +198,7 @@ public final class JSObject {
public void setSlot(int index, Object value) {
PluginDebug.debug("JSObject.setSlot ", index, " ", value);
- PluginAppletViewer.setSlot(internal, index, value);
+ PluginApplet3Viewer.setSlot(internal, index, value);
}
/**
@@ -207,7 +207,7 @@ public final class JSObject {
public void removeMember(String name) {
PluginDebug.debug("JSObject.removeMember ", name);
- PluginAppletViewer.removeMember(internal, name);
+ PluginApplet3Viewer.removeMember(internal, name);
}
/**
@@ -223,7 +223,7 @@ public final class JSObject {
PluginDebug.debug(" ", arg);
}
PluginDebug.debug("");
- return PluginAppletViewer.call(internal, methodName, args);
+ return PluginApplet3Viewer.call(internal, methodName, args);
}
/**
@@ -233,7 +233,7 @@ public final class JSObject {
*/
public Object eval(String s) {
PluginDebug.debug("JSObject.eval ", s);
- return PluginAppletViewer.eval(internal, s);
+ return PluginApplet3Viewer.eval(internal, s);
}
/**
@@ -241,7 +241,7 @@ public final class JSObject {
*/
public String toString() {
PluginDebug.debug("JSObject.toString");
- return PluginAppletViewer.javascriptToString(internal);
+ return PluginApplet3Viewer.javascriptToString(internal);
}
// should use some sort of identifier rather than String
@@ -255,8 +255,7 @@ public final class JSObject {
PluginDebug.debug("JSObject.getWindow");
// FIXME: handle long case as well.
long internal = 0;
- internal = ((PluginAppletViewer)
- applet.getAppletContext()).getWindow();
+ internal = ((PluginApplet3Viewer)applet.getAppletContext()).getWindow();
PluginDebug.debug("GOT IT: ", internal);
return new JSObject(internal);
}
@@ -272,6 +271,6 @@ public final class JSObject {
return;
PluginDebug.debug("JSObject.finalize ");
- PluginAppletViewer.JavaScriptFinalize(internal);
+ PluginApplet3Viewer.JavaScriptFinalize(internal);
}
}