changeset in /hg/icedtea6: Clean up directory structure of .java...
Deepak Bhole
dbhole at redhat.com
Tue Jul 14 09:59:38 PDT 2009
changeset dae4c1447578 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=dae4c1447578
description:
Clean up directory structure of .java files before any significant amount of
history gets written.
This change does not alter any of the java code, just moves it around to a
cleaner location. The only code change is in Makefile.am to adapt to the new
location, and another minor change that affects only np plugin build.
diffstat:
60 files changed, 7066 insertions(+), 6995 deletions(-)
ChangeLog | 68
Makefile.am | 37
plugin/icedteanp/java/netscape/javascript/JSException.java | 140
plugin/icedteanp/java/netscape/javascript/JSObject.java | 263 +
plugin/icedteanp/java/netscape/javascript/JSProxy.java | 58
plugin/icedteanp/java/netscape/javascript/JSRunnable.java | 72
plugin/icedteanp/java/netscape/javascript/JSUtil.java | 59
plugin/icedteanp/java/sun/applet/AppletSecurityContextManager.java | 71
plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java | 76
plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java | 75
plugin/icedteanp/java/sun/applet/JavaConsole.java | 365 +
plugin/icedteanp/java/sun/applet/PasswordAuthenticationDialog.java | 241 +
plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java | 1307 ++++++
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 1988 ++++++++++
plugin/icedteanp/java/sun/applet/PluginCallRequest.java | 85
plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java | 62
plugin/icedteanp/java/sun/applet/PluginClassLoader.java | 51
plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java | 122
plugin/icedteanp/java/sun/applet/PluginCookieStore.java | 73
plugin/icedteanp/java/sun/applet/PluginDebug.java | 51
plugin/icedteanp/java/sun/applet/PluginException.java | 53
plugin/icedteanp/java/sun/applet/PluginMain.java | 319 +
plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java | 119
plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java | 121
plugin/icedteanp/java/sun/applet/PluginObjectStore.java | 132
plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java | 85
plugin/icedteanp/java/sun/applet/PluginProxySelector.java | 195
plugin/icedteanp/java/sun/applet/PluginStreamHandler.java | 479 ++
plugin/icedteanp/java/sun/applet/RequestQueue.java | 77
plugin/icedteanp/java/sun/applet/TestEnv.java | 172
plugin/icedteanp/java/sun/applet/VoidPluginCallRequest.java | 67
plugin/icedteanp/netscape/javascript/JSException.java | 140
plugin/icedteanp/netscape/javascript/JSObject.java | 263 -
plugin/icedteanp/netscape/javascript/JSProxy.java | 58
plugin/icedteanp/netscape/javascript/JSRunnable.java | 72
plugin/icedteanp/netscape/javascript/JSUtil.java | 59
plugin/icedteanp/sun/applet/AppletSecurityContextManager.java | 71
plugin/icedteanp/sun/applet/GetMemberPluginCallRequest.java | 76
plugin/icedteanp/sun/applet/GetWindowPluginCallRequest.java | 75
plugin/icedteanp/sun/applet/JavaConsole.java | 365 -
plugin/icedteanp/sun/applet/PasswordAuthenticationDialog.java | 241 -
plugin/icedteanp/sun/applet/PluginAppletSecurityContext.java | 1307 ------
plugin/icedteanp/sun/applet/PluginAppletViewer.java | 1988 ----------
plugin/icedteanp/sun/applet/PluginCallRequest.java | 85
plugin/icedteanp/sun/applet/PluginCallRequestFactory.java | 62
plugin/icedteanp/sun/applet/PluginClassLoader.java | 51
plugin/icedteanp/sun/applet/PluginCookieInfoRequest.java | 122
plugin/icedteanp/sun/applet/PluginCookieStore.java | 73
plugin/icedteanp/sun/applet/PluginDebug.java | 51
plugin/icedteanp/sun/applet/PluginException.java | 53
plugin/icedteanp/sun/applet/PluginMain.java | 319 -
plugin/icedteanp/sun/applet/PluginMessageConsumer.java | 119
plugin/icedteanp/sun/applet/PluginMessageHandlerWorker.java | 121
plugin/icedteanp/sun/applet/PluginObjectStore.java | 132
plugin/icedteanp/sun/applet/PluginProxyInfoRequest.java | 85
plugin/icedteanp/sun/applet/PluginProxySelector.java | 195
plugin/icedteanp/sun/applet/PluginStreamHandler.java | 479 --
plugin/icedteanp/sun/applet/RequestQueue.java | 77
plugin/icedteanp/sun/applet/TestEnv.java | 172
plugin/icedteanp/sun/applet/VoidPluginCallRequest.java | 67
diffs (truncated from 14375 to 500 lines):
diff -r b788f2c0fe74 -r dae4c1447578 ChangeLog
--- a/ChangeLog Tue Jul 14 12:55:48 2009 +0200
+++ b/ChangeLog Tue Jul 14 13:04:20 2009 -0400
@@ -1,3 +1,71 @@ 2009-07-14 Xerxes RÃ¥nby <xerxes at zafen
+2009-07-10 Deepak Bhole <dbhole at redhat.com>
+
+ * Makefile.am: Fix npplugin build.
+ * plugin/icedteanp/java/netscape/javascript/JSException.java: Moved from
+ the plugin/icedteanp/netscape/javascript/ hierarchy.
+ * plugin/icedteanp/java/netscape/javascript/JSObject.java: Same.
+ * plugin/icedteanp/java/netscape/javascript/JSProxy.java: Same.
+ * plugin/icedteanp/java/netscape/javascript/JSRunnable.java: Same.
+ * plugin/icedteanp/java/netscape/javascript/JSUtil.java: Same.
+ * plugin/icedteanp/java/sun/applet/AppletSecurityContextManager.java:
+ Moved from the plugin/icedteanp/sun/applet hierarchy.
+ * plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java: Same.
+ * plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java: Same.
+ * plugin/icedteanp/java/sun/applet/JavaConsole.java: Same.
+ * plugin/icedteanp/java/sun/applet/PasswordAuthenticationDialog.java:
+ Same.
+ * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginCallRequest.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginClassLoader.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginCookieStore.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginDebug.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginException.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginMain.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginObjectStore.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginProxySelector.java: Same.
+ * plugin/icedteanp/java/sun/applet/PluginStreamHandler.java: Same.
+ * plugin/icedteanp/java/sun/applet/RequestQueue.java: Same.
+ * plugin/icedteanp/java/sun/applet/TestEnv.java: Same.
+ * plugin/icedteanp/java/sun/applet/VoidPluginCallRequest.java: Same.
+ * plugin/icedteanp/netscape/javascript/JSException.java: Moved to
+ the plugin/icedteanp/java/netscape/javascript/ heirarchy.
+ * plugin/icedteanp/netscape/javascript/JSObject.java: Same.
+ * plugin/icedteanp/netscape/javascript/JSProxy.java: Same.
+ * plugin/icedteanp/netscape/javascript/JSRunnable.java: Same.
+ * plugin/icedteanp/netscape/javascript/JSUtil.java: Same.
+ * plugin/icedteanp/sun/applet/AppletSecurityContextManager.java: Moved to
+ the plugin/icedteanp/java/sun/applet/ heirarchy.
+ * plugin/icedteanp/sun/applet/GetMemberPluginCallRequest.java: Same.
+ * plugin/icedteanp/sun/applet/GetWindowPluginCallRequest.java: Same.
+ * plugin/icedteanp/sun/applet/JavaConsole.java: Same.
+ * plugin/icedteanp/sun/applet/PasswordAuthenticationDialog.java: Same.
+ * plugin/icedteanp/sun/applet/PluginAppletSecurityContext.java: Same.
+ * plugin/icedteanp/sun/applet/PluginAppletViewer.java: Same.
+ * plugin/icedteanp/sun/applet/PluginCallRequest.java: Same.
+ * plugin/icedteanp/sun/applet/PluginCallRequestFactory.java: Same.
+ * plugin/icedteanp/sun/applet/PluginClassLoader.java: Same.
+ * plugin/icedteanp/sun/applet/PluginCookieInfoRequest.java: Same.
+ * plugin/icedteanp/sun/applet/PluginCookieStore.java: Same.
+ * plugin/icedteanp/sun/applet/PluginDebug.java: Same.
+ * plugin/icedteanp/sun/applet/PluginException.java: Same.
+ * plugin/icedteanp/sun/applet/PluginMain.java: Same.
+ * plugin/icedteanp/sun/applet/PluginMessageConsumer.java: Same.
+ * plugin/icedteanp/sun/applet/PluginMessageHandlerWorker.java: Same.
+ * plugin/icedteanp/sun/applet/PluginObjectStore.java: Same.
+ * plugin/icedteanp/sun/applet/PluginProxyInfoRequest.java: Same.
+ * plugin/icedteanp/sun/applet/PluginProxySelector.java: Same.
+ * plugin/icedteanp/sun/applet/PluginStreamHandler.java: Same.
+ * plugin/icedteanp/sun/applet/RequestQueue.java: Same.
+ * plugin/icedteanp/sun/applet/TestEnv.java: Same.
+ * plugin/icedteanp/sun/applet/VoidPluginCallRequest.java: Same.
+
+
2009-07-14 Xerxes RÃ¥nby <xerxes at zafena.se>
* ports/hotspot/src/share/vm/shark/llvmValue.hpp
diff -r b788f2c0fe74 -r dae4c1447578 Makefile.am
--- a/Makefile.am Tue Jul 14 12:55:48 2009 +0200
+++ b/Makefile.am Tue Jul 14 13:04:20 2009 -0400
@@ -13,17 +13,20 @@ ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.s
ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so
PLUGIN_PATCH = patches/icedtea-liveconnect.patch
LIVECONNECT_DIR = -C lib/rt netscape
+NPPLUGIN_DIR=$(abs_top_srcdir)/plugin/icedteanp
else
if ENABLE_PLUGIN
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
PLUGIN_PATCH = patches/icedtea-liveconnect.patch
LIVECONNECT_DIR = -C lib/rt netscape
+NPPLUGIN_DIR =
else
ICEDTEAPLUGIN_CLEAN =
ICEDTEAPLUGIN_TARGET =
PLUGIN_PATCH =
LIVECONNECT_DIR =
+NPPLUGIN_DIR =
endif
endif
@@ -66,7 +69,7 @@ distclean-local: clean-copy clean-jtreg
rm -rf visualvm
rm -rf netbeans
if ENABLE_NPPLUGIN
- rm -f IcedTeaNPPlugin.o IcedTeaNPPlugin.so
+ rm -f $(NPPLUGIN_DIR)/*.o $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
else
if ENABLE_PLUGIN
rm -f IcedTeaPlugin.o IcedTeaPlugin.so
@@ -781,9 +784,9 @@ stamps/patch.stamp: stamps/patch-fsg.sta
fi
if ENABLE_NPPLUGIN
- cp -a $(abs_top_srcdir)/plugin/icedteanp/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
+ cp -a $(abs_top_srcdir)/plugin/icedteanp/java/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
mkdir -p rt
- cp -a $(abs_top_srcdir)/plugin/icedteanp/netscape rt/
+ cp -a $(abs_top_srcdir)/plugin/icedteanp/java/netscape rt/
else
if ENABLE_PLUGIN
cp -a $(abs_top_srcdir)/plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
@@ -1106,9 +1109,9 @@ stamps/icedtea.stamp: stamps/bootstrap-d
mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
if ENABLE_NPPLUGIN
- cp -pPRf IcedTeaNPPlugin.so \
+ cp -pPRf $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf IcedTeaNPPlugin.so \
+ cp -pPRf $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so \
$(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
else
if ENABLE_PLUGIN
@@ -1191,9 +1194,9 @@ stamps/icedtea-debug.stamp: stamps/boots
mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/ext
mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/ext
if ENABLE_NPPLUGIN
- cp -pPRf IcedTeaNPPlugin.so \
+ cp -pPRf $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf IcedTeaNPPlugin.so \
+ cp -pPRf $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
else
if ENABLE_PLUGIN
@@ -1614,7 +1617,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
IcedTeaPluginUtils.o
IcedTeaNPPlugin_objects:
- (cd plugin/icedteanp
+ cd $(NPPLUGIN_DIR); \
if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
fi ; \
@@ -1627,24 +1630,24 @@ IcedTeaNPPlugin_objects:
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(MOZILLA_CFLAGS) \
- -fPIC -c $(NPPLUGIN_SRC)
- )
+ -fPIC -c $(NPPLUGIN_SRC); \
+ cd ../
IcedTeaNPPlugin.so: IcedTeaNPPlugin_objects
- (cd plugin/icedteanp
+ cd $(NPPLUGIN_DIR); \
$(CXX) $(CXXFLAGS) \
$(NPPLUGIN_OBJECTS) \
$(GLIB_LIBS) \
$(GTK_LIBS) \
$(MOZILLA_LIBS)\
- -shared -o $@
- )
+ -shared -o $@; \
+ cd ../
clean-IcedTeaNPPlugin:
- (cd plugin/icedteanp
- rm -f $(NPPLUGIN_OBJECTS)
- rm -f IcedTeaNPPlugin.so
- )
+ cd $(NPPLUGIN_DIR);\
+ rm -f *.o; \
+ rm -f IcedTeaNPPlugin.so; \
+ cd ../
else
if ENABLE_PLUGIN
# IcedTeaPlugin.so.
diff -r b788f2c0fe74 -r dae4c1447578 plugin/icedteanp/java/netscape/javascript/JSException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugin/icedteanp/java/netscape/javascript/JSException.java Tue Jul 14 13:04:20 2009 -0400
@@ -0,0 +1,140 @@
+/* -*- Mode: Java; tab-width: 8; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package netscape.javascript;
+
+/**
+ * JSException is an exception which is thrown when JavaScript code
+ * returns an error.
+ */
+
+public
+class JSException extends RuntimeException {
+ public static final int EXCEPTION_TYPE_EMPTY = -1;
+ public static final int EXCEPTION_TYPE_VOID = 0;
+ public static final int EXCEPTION_TYPE_OBJECT = 1;
+ public static final int EXCEPTION_TYPE_FUNCTION = 2;
+ public static final int EXCEPTION_TYPE_STRING = 3;
+ public static final int EXCEPTION_TYPE_NUMBER = 4;
+ public static final int EXCEPTION_TYPE_BOOLEAN = 5;
+ public static final int EXCEPTION_TYPE_ERROR = 6;
+
+ public String filename;
+ public int lineno;
+ public String source;
+ public int tokenIndex;
+ public int wrappedExceptionType;
+ public Object wrappedException;
+
+ /**
+ * Constructs a JSException without a detail message.
+ * A detail message is a String that describes this particular exception.
+ *
+ * @deprecated Not for public use in future versions.
+ */
+ public JSException() {
+ super();
+ filename = "unknown";
+ lineno = 0;
+ source = "";
+ tokenIndex = 0;
+ wrappedExceptionType = EXCEPTION_TYPE_EMPTY;
+ }
+
+ /**
+ * Constructs a JSException with a detail message.
+ * A detail message is a String that describes this particular exception.
+ * @param s the detail message
+ *
+ * @deprecated Not for public use in future versions.
+ */
+ public JSException(String s) {
+ super(s);
+ filename = "unknown";
+ lineno = 0;
+ source = "";
+ tokenIndex = 0;
+ wrappedExceptionType = EXCEPTION_TYPE_EMPTY;
+ }
+
+ /**
+ * Constructs a JSException with a wrapped JavaScript exception object.
+ * This constructor needs to be public so that Java users can throw
+ * exceptions to JS cleanly.
+ */
+ public JSException(int wrappedExceptionType, Object wrappedException) {
+ super();
+ this.wrappedExceptionType = wrappedExceptionType;
+ this.wrappedException = wrappedException;
+ }
+
+ /**
+ * Constructs a JSException with a detail message and all the
+ * other info that usually comes with a JavaScript error.
+ * @param s the detail message
+ *
+ * @deprecated Not for public use in future versions.
+ */
+ public JSException(String s, String filename, int lineno,
+ String source, int tokenIndex) {
+ super(s);
+ this.filename = filename;
+ this.lineno = lineno;
+ this.source = source;
+ this.tokenIndex = tokenIndex;
+ wrappedExceptionType = EXCEPTION_TYPE_EMPTY;
+ }
+
+ /**
+ * Instance method getWrappedExceptionType returns the int mapping of the
+ * type of the wrappedException Object.
+ */
+ public int getWrappedExceptionType() {
+ return wrappedExceptionType;
+ }
+
+ /**
+ * Instance method getWrappedException.
+ */
+ public Object getWrappedException() {
+ return wrappedException;
+ }
+
+}
+
diff -r b788f2c0fe74 -r dae4c1447578 plugin/icedteanp/java/netscape/javascript/JSObject.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugin/icedteanp/java/netscape/javascript/JSObject.java Tue Jul 14 13:04:20 2009 -0400
@@ -0,0 +1,263 @@
+/* -*- Mode: Java; tab-width: 8; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/* more doc todo:
+ * threads
+ * gc
+ *
+ *
+ */
+
+package netscape.javascript;
+
+import java.applet.Applet;
+
+import sun.applet.PluginAppletViewer;
+import sun.applet.PluginDebug;
+
+
+
+/**
+ * JSObject allows Java to manipulate objects that are
+ * defined in JavaScript.
+ * Values passed from Java to JavaScript are converted as
+ * follows:<ul>
+ * <li>JSObject is converted to the original JavaScript object
+ * <li>Any other Java object is converted to a JavaScript wrapper,
+ * which can be used to access methods and fields of the java object.
+ * Converting this wrapper to a string will call the toString method
+ * on the original object, converting to a number will call the
+ * doubleValue method if possible and fail otherwise. Converting
+ * to a boolean will try to call the booleanValue method in the
+ * same way.
+ * <li>Java arrays are wrapped with a JavaScript object that understands
+ * array.length and array[index]
+ * <li>A Java boolean is converted to a JavaScript boolean
+ * <li>Java byte, char, short, int, long, float, and double are converted
+ * to JavaScript numbers
+ * </ul>
+ * Values passed from JavaScript to Java are converted as follows:<ul>
+ * <li>objects which are wrappers around java objects are unwrapped
+ * <li>other objects are wrapped with a JSObject
+ * <li>strings, numbers and booleans are converted to String, Double,
+ * and Boolean objects respectively
+ * </ul>
+ * This means that all JavaScript values show up as some kind
+ * of java.lang.Object in Java. In order to make much use of them,
+ * you will have to cast them to the appropriate subclass of Object,
+ * e.g. <code>(String) window.getMember("name");</code> or
+ * <code>(JSObject) window.getMember("document");</code>.
+ */
+public final class JSObject {
+ /* the internal object data */
+ private long internal;
+
+ /**
+ * initialize
+ */
+ private static void initClass() {
+ PluginDebug.debug ("JSObject.initClass");
+ }
+
+ static {
+ PluginDebug.debug ("JSObject INITIALIZER");
+ }
+
+ /**
+ * it is illegal to construct a JSObject manually
+ */
+ // FIXME: make private!
+ public JSObject(int jsobj_addr) {
+ PluginDebug.debug ("JSObject int CONSTRUCTOR");
+ internal = jsobj_addr;
+ }
+
+ public JSObject(long jsobj_addr) {
+ PluginDebug.debug ("JSObject long CONSTRUCTOR");
+ internal = jsobj_addr;
+ }
+
+ /**
+ * Retrieves a named member of a JavaScript object.
+ * Equivalent to "this.<i>name</i>" in JavaScript.
+ */
+ public Object getMember(String name)
+ {
+ PluginDebug.debug ("JSObject.getMember " + name);
+
+ Object o = PluginAppletViewer.getMember(internal, name);
+ PluginDebug.debug ("JSObject.getMember GOT " + o);
+ return o;
+ }
+
+
+ /**
+ * Retrieves an indexed member of a JavaScript object.
+ * Equivalent to "this[<i>index</i>]" in JavaScript.
+ */
+ // public Object getMember(int index) { return getSlot(index); }
+ public Object getSlot(int index)
+ {
+ PluginDebug.debug ("JSObject.getSlot " + index);
+
+ return PluginAppletViewer.getSlot(internal, index);
+ }
+
+
+ /**
+ * Sets a named member of a JavaScript object.
+ * Equivalent to "this.<i>name</i> = <i>value</i>" in JavaScript.
+ */
+ public void setMember(String name, Object value)
+ {
+ PluginDebug.debug ("JSObject.setMember " + name + " " + value);
+
+ PluginAppletViewer.setMember(internal, name, value);
+ }
+
+ /**
+ * Sets an indexed member of a JavaScript object.
+ * Equivalent to "this[<i>index</i>] = <i>value</i>" in JavaScript.
+ */
+ // public void setMember(int index, Object value) {
+ // setSlot(index, value);
+ // }
+ public void setSlot(int index, Object value)
+ {
+ PluginDebug.debug ("JSObject.setSlot " + index + " " + value);
+
+ PluginAppletViewer.setSlot(internal, index, value);
More information about the distro-pkg-dev
mailing list