changeset in /hg/icedtea6: More refactoring. Moved classes to a ...
Deepak Bhole
dbhole at redhat.com
Wed Sep 24 10:01:42 PDT 2008
changeset abdb5c94757d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=abdb5c94757d
description:
More refactoring. Moved classes to a shorter path, removed classes provided by
the JDK tarball (they were there by mistake).
diffstat:
76 files changed, 5756 insertions(+), 10252 deletions(-)
ChangeLog | 50
Makefile.am | 4
patches/icedtea-plugin.patch | 1294 ++++++++
plugin/gcj/java/src/main/sun/applet/PluginAppletViewer.java | 1008 ------
plugin/gcj/java/src/main/sun/applet/PluginMain.java | 274 -
plugin/icedtea/java/src/main/netscape/javascript/JSException.java | 140
plugin/icedtea/java/src/main/netscape/javascript/JSObject.java | 258 -
plugin/icedtea/java/src/main/netscape/javascript/JSProxy.java | 58
plugin/icedtea/java/src/main/netscape/javascript/JSRunnable.java | 70
plugin/icedtea/java/src/main/netscape/javascript/JSUtil.java | 59
plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/GetMemberPluginCallRequest.java | 78
plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/GetWindowPluginCallRequest.java | 76
plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/PluginAppletSecurityContext.java | 855 -----
plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/PluginCallRequestFactoryImpl.java | 22
plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/PluginMain.java | 193 -
plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/PluginMessageConsumer.java | 76
plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/PluginMessageHandlerWorker.java | 79
plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/PluginObjectStore.java | 119
plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/PluginStreamHandlerImpl.java | 362 --
plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/RequestQueue.java | 40
plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/TestEnv.java | 172 -
plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/VoidPluginCallRequest.java | 69
plugin/icedtea/java/src/main/sun/applet/AppletAudioClip.java | 151 -
plugin/icedtea/java/src/main/sun/applet/AppletClassLoader.java | 861 -----
plugin/icedtea/java/src/main/sun/applet/AppletEvent.java | 65
plugin/icedtea/java/src/main/sun/applet/AppletEventMulticaster.java | 127
plugin/icedtea/java/src/main/sun/applet/AppletIOException.java | 59
plugin/icedtea/java/src/main/sun/applet/AppletIllegalArgumentException.java | 48
plugin/icedtea/java/src/main/sun/applet/AppletImageRef.java | 54
plugin/icedtea/java/src/main/sun/applet/AppletListener.java | 39
plugin/icedtea/java/src/main/sun/applet/AppletMessageHandler.java | 113
plugin/icedtea/java/src/main/sun/applet/AppletObjectInputStream.java | 106
plugin/icedtea/java/src/main/sun/applet/AppletPanel.java | 1334 ---------
plugin/icedtea/java/src/main/sun/applet/AppletProps.java | 221 -
plugin/icedtea/java/src/main/sun/applet/AppletResourceLoader.java | 48
plugin/icedtea/java/src/main/sun/applet/AppletSecurity.java | 371 --
plugin/icedtea/java/src/main/sun/applet/AppletSecurityContext.java | 25
plugin/icedtea/java/src/main/sun/applet/AppletSecurityContextManager.java | 27
plugin/icedtea/java/src/main/sun/applet/AppletSecurityException.java | 65
plugin/icedtea/java/src/main/sun/applet/AppletThreadGroup.java | 64
plugin/icedtea/java/src/main/sun/applet/AppletViewerFactory.java | 41
plugin/icedtea/java/src/main/sun/applet/AppletViewerPanel.java | 254 -
plugin/icedtea/java/src/main/sun/applet/Main.java | 533 ---
plugin/icedtea/java/src/main/sun/applet/PluginAppletViewer.java | 1481 ----------
plugin/icedtea/java/src/main/sun/applet/PluginCallRequest.java | 85
plugin/icedtea/java/src/main/sun/applet/PluginCallRequestFactory.java | 7
plugin/icedtea/java/src/main/sun/applet/PluginClassLoader.java | 13
plugin/icedtea/java/src/main/sun/applet/PluginDebug.java | 13
plugin/icedtea/java/src/main/sun/applet/PluginException.java | 15
plugin/icedtea/java/src/main/sun/applet/PluginStreamHandler.java | 20
plugin/icedtea/netscape/javascript/JSException.java | 140
plugin/icedtea/netscape/javascript/JSObject.java | 258 +
plugin/icedtea/netscape/javascript/JSProxy.java | 58
plugin/icedtea/netscape/javascript/JSRunnable.java | 70
plugin/icedtea/netscape/javascript/JSUtil.java | 59
plugin/icedtea/org/classpath/icedtea/plugin/GetMemberPluginCallRequest.java | 78
plugin/icedtea/org/classpath/icedtea/plugin/GetWindowPluginCallRequest.java | 76
plugin/icedtea/org/classpath/icedtea/plugin/PluginAppletSecurityContext.java | 855 +++++
plugin/icedtea/org/classpath/icedtea/plugin/PluginCallRequestFactoryImpl.java | 22
plugin/icedtea/org/classpath/icedtea/plugin/PluginMain.java | 193 +
plugin/icedtea/org/classpath/icedtea/plugin/PluginMessageConsumer.java | 76
plugin/icedtea/org/classpath/icedtea/plugin/PluginMessageHandlerWorker.java | 79
plugin/icedtea/org/classpath/icedtea/plugin/PluginObjectStore.java | 119
plugin/icedtea/org/classpath/icedtea/plugin/PluginStreamHandlerImpl.java | 362 ++
plugin/icedtea/org/classpath/icedtea/plugin/RequestQueue.java | 40
plugin/icedtea/org/classpath/icedtea/plugin/TestEnv.java | 172 +
plugin/icedtea/org/classpath/icedtea/plugin/VoidPluginCallRequest.java | 69
plugin/icedtea/sun/applet/AppletSecurityContext.java | 25
plugin/icedtea/sun/applet/AppletSecurityContextManager.java | 27
plugin/icedtea/sun/applet/PluginAppletViewer.java | 1481 ++++++++++
plugin/icedtea/sun/applet/PluginCallRequest.java | 85
plugin/icedtea/sun/applet/PluginCallRequestFactory.java | 7
plugin/icedtea/sun/applet/PluginClassLoader.java | 13
plugin/icedtea/sun/applet/PluginDebug.java | 13
plugin/icedtea/sun/applet/PluginException.java | 15
plugin/icedtea/sun/applet/PluginStreamHandler.java | 20
diffs (truncated from 16340 to 500 lines):
diff -r 5cf4df1bc010 -r abdb5c94757d ChangeLog
--- a/ChangeLog Tue Sep 23 16:33:17 2008 -0400
+++ b/ChangeLog Tue Sep 23 16:52:24 2008 -0400
@@ -1,3 +1,53 @@ 2008-09-18 Lillian Angel <langel at redha
+2008-09-23 Deepak Bhole <dbhole at redhat.com>
+ * Makefile.am: Update to create new IcedTeaPlugin.jar
+ * patches/icedtea-liveconnect.patch: Update patch and remove all new .java
+ files
+ * plugin/icedtea/java/src/main/netscape/javascript/JSException.java: Moved
+ out of rt/ overlay.
+ * plugin/icedtea/java/src/main/netscape/javascript/JSObject.java: Same.
+ * plugin/icedtea/java/src/main/netscape/javascript/JSProxy.java: Same.
+ * plugin/icedtea/java/src/main/netscape/javascript/JSRunnable.java: Same.
+ * plugin/icedtea/java/src/main/netscape/javascript/JSUtil.java: Same.
+ * plugin/icedtea/org/classpath/icedtea/plugin/GetMemberPluginCallRequest.java:
+ Moved out of icedtea-liveconnect.patch and refactored.
+ * plugin/icedtea/org/classpath/icedtea/plugin/GetWindowPluginCallRequest.java:
+ Same.
+ * plugin/icedtea/org/classpath/icedtea/plugin/PluginAppletSecurityContext.java:
+ Same.
+ * plugin/icedtea/org/classpath/icedtea/plugin/PluginCallRequestFactoryImpl.java:
+ Same.
+ * plugin/icedtea/org/classpath/icedtea/plugin/PluginMain.java: Same.
+ * plugin/icedtea/org/classpath/icedtea/plugin/PluginMessageConsumer.java:
+ Same.
+ * plugin/icedtea/org/classpath/icedtea/plugin/PluginMessageHandlerWorker.java:
+ Same.
+ * plugin/icedtea/org/classpath/icedtea/plugin/PluginObjectStore.java:
+ Same.
+ * plugin/icedtea/org/classpath/icedtea/plugin/PluginStreamHandlerImpl.java:
+ Same.
+ * plugin/icedtea/org/classpath/icedtea/plugin/RequestQueue.java: Same.
+ * plugin/icedtea/org/classpath/icedtea/plugin/TestEnv.java: Same.
+ * plugin/icedtea/org/classpath/icedtea/plugin/VoidPluginCallRequest.java:
+ Same.
+ * plugin/icedtea/sun/applet/AppletSecurityContext.java: Same.
+ * plugin/icedtea/sun/applet/AppletSecurityContextManager.java: Same.
+ * plugin/icedtea/sun/applet/PluginAppletViewer.java: Same.
+ * plugin/icedtea/sun/applet/PluginCallRequest.java: Same.
+ * plugin/icedtea/sun/applet/PluginCallRequestFactory.java: Same.
+ * plugin/icedtea/sun/applet/PluginClassLoader.java: Same.
+ * plugin/icedtea/sun/applet/PluginDebug.java: Same.
+ * plugin/icedtea/sun/applet/PluginException.java: Same.
+ * plugin/icedtea/sun/applet/PluginStreamHandler.java: Same.
+ * rt/net/sourceforge/jnlp/Launcher.java: Print exception trace if launch
+ fails.
+ * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java: Set ServiceManagerStub
+ before SecurityManager is set.
+ * rt/netscape/javascript/JSException.java: Move to plugin/icedtea dir.
+ * rt/netscape/javascript/JSObject.java: Same.
+ * rt/netscape/javascript/JSProxy.java: Same.
+ * rt/netscape/javascript/JSRunnable.java: Same.
+ * rt/netscape/javascript/JSUtil.java: Same.
+
2008-09-18 Lillian Angel <langel at redhat.com>
* AUTHORS: Added Marc Schoenefeld.
diff -r 5cf4df1bc010 -r abdb5c94757d Makefile.am
--- a/Makefile.am Tue Sep 23 16:33:17 2008 -0400
+++ b/Makefile.am Tue Sep 23 16:52:24 2008 -0400
@@ -16,7 +16,7 @@ ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
ICEDTEAPLUGIN_JAR = IcedTeaPlugin.jar
PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT = $(abs_top_srcdir)/plugin/icedtea/java/src/main
+LIVECONNECT = $(abs_top_srcdir)/plugin/icedtea/
else
ICEDTEAPLUGIN_CLEAN =
ICEDTEAPLUGIN_TARGET =
@@ -1323,7 +1323,7 @@ IcedTeaPlugin.so: IcedTeaPlugin.o
# icedtea plugin jar for java-side classes
IcedTeaPlugin.jar:
mkdir -p $(BUILD_OUTPUT_DIR)/plugin/icedtea/classes
- (cd plugin/icedtea/java/src/main/; \
+ (cd plugin/icedtea/; \
$(ICEDTEA_BOOT_DIR)/bin/javac -g \
-d ../../../../../$(BUILD_OUTPUT_DIR)/plugin/icedtea/classes \
-bootclasspath $(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar \
diff -r 5cf4df1bc010 -r abdb5c94757d patches/icedtea-plugin.patch
--- a/patches/icedtea-plugin.patch Tue Sep 23 16:33:17 2008 -0400
+++ b/patches/icedtea-plugin.patch Tue Sep 23 16:52:24 2008 -0400
@@ -1,6 +1,6 @@ diff -urN openjdk.orig/jdk/make/launcher
diff -urN openjdk.orig/jdk/make/launchers/Makefile openjdk/jdk/make/launchers/Makefile
---- openjdk.orig/jdk/make/launchers/Makefile 2008-07-10 15:54:41.000000000 -0400
-+++ openjdk/jdk/make/launchers/Makefile 2008-09-18 14:21:46.000000000 -0400
+--- openjdk.orig/jdk/make/launchers/Makefile 2008-06-29 09:40:07.000000000 -0400
++++ openjdk/jdk/make/launchers/Makefile 2008-06-29 09:40:16.000000000 -0400
@@ -92,6 +92,7 @@
-J-Dcom.sun.CORBA.activation.Port=1049 \
-J-Dcom.sun.CORBA.POA.ORBServerId=1, )
@@ -9,3 +9,1293 @@ diff -urN openjdk.orig/jdk/make/launcher
$(call make-launcher, policytool, sun.security.tools.PolicyTool, , )
$(call make-launcher, rmic, sun.rmi.rmic.Main, , )
$(call make-launcher, rmid, sun.rmi.server.Activation, , )
+diff -urN openjdk.orig/jdk/src/share/classes/sun/applet/PluginMain.java openjdk/jdk/src/share/classes/sun/applet/PluginMain.java
+--- openjdk.orig/jdk/src/share/classes/sun/applet/PluginMain.java 1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/src/share/classes/sun/applet/PluginMain.java 2008-01-14 14:18:53.000000000 -0500
+@@ -0,0 +1,274 @@
++/*
++ * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Sun designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Sun in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++package sun.applet;
++
++import java.io.*;
++import java.lang.reflect.Method;
++import java.lang.reflect.InvocationTargetException;
++import java.net.*;
++import java.nio.charset.Charset;
++import java.util.*;
++import sun.net.www.ParseUtil;
++
++class PluginParseRequest
++{
++ long handle;
++ String tag;
++ String documentbase;
++ boolean alreadySent;
++}
++
++/**
++ * The main entry point into PluginAppletViewer.
++ */
++public class PluginMain
++{
++ // A mapping of instance IDs to PluginAppletViewers.
++ private static HashMap appletWindows = new HashMap();
++ private static HashMap parseRequests = new HashMap();
++ private static String currentKey;
++ private static PluginAppletViewer currentWindow;
++ private static PluginParseRequest currentRequest;
++ private static BufferedReader pluginInputStream;
++ private static BufferedWriter pluginOutputStream;
++ // This is used in init(). Getting rid of this is desirable but depends
++ // on whether the property that uses it is necessary/standard.
++ public static final String theVersion = System.getProperty("java.version");
++
++ /**
++ * The main entry point into AppletViewer.
++ */
++ public static void main(String args[])
++ throws IOException
++ {
++ if(args.length != 2) {
++ // Indicate to plugin that appletviewer is installed correctly.
++ System.exit(0);
++ }
++ // INSTALL THE SECURITY MANAGER
++ init();
++ start(new FileInputStream(args[0]), new FileOutputStream(args[1]));
++ System.exit(0);
++ }
++
++ private static void init() {
++ Properties avProps = new Properties();
++
++ // ADD OTHER RANDOM PROPERTIES
++ // XXX 5/18 need to revisit why these are here, is there some
++ // standard for what is available?
++
++ // Standard browser properties
++ avProps.put("browser", "sun.applet.AppletViewer");
++ avProps.put("browser.version", "1.06");
++ avProps.put("browser.vendor", "Sun Microsystems Inc.");
++ avProps.put("http.agent", "Java(tm) 2 SDK, Standard Edition v" + theVersion);
++
++ // Define which packages can be extended by applets
++ // XXX 5/19 probably not needed, not checked in AppletSecurity
++ avProps.put("package.restrict.definition.java", "true");
++ avProps.put("package.restrict.definition.sun", "true");
++
++ // Define which properties can be read by applets.
++ // A property named by "key" can be read only when its twin
++ // property "key.applet" is true. The following ten properties
++ // are open by default. Any other property can be explicitly
++ // opened up by the browser user by calling appletviewer with
++ // -J-Dkey.applet=true
++ avProps.put("java.version.applet", "true");
++ avProps.put("java.vendor.applet", "true");
++ avProps.put("java.vendor.url.applet", "true");
++ avProps.put("java.class.version.applet", "true");
++ avProps.put("os.name.applet", "true");
++ avProps.put("os.version.applet", "true");
++ avProps.put("os.arch.applet", "true");
++ avProps.put("file.separator.applet", "true");
++ avProps.put("path.separator.applet", "true");
++ avProps.put("line.separator.applet", "true");
++
++ // Read in the System properties. If something is going to be
++ // over-written, warn about it.
++ Properties sysProps = System.getProperties();
++ for (Enumeration e = sysProps.propertyNames(); e.hasMoreElements(); ) {
++ String key = (String) e.nextElement();
++ String val = (String) sysProps.getProperty(key);
++ avProps.setProperty(key, val);
++ }
++
++ // INSTALL THE PROPERTY LIST
++ System.setProperties(avProps);
++
++ // Create and install the security manager
++ System.setSecurityManager(new AppletSecurity());
++
++ // REMIND: Create and install a socket factory!
++ }
++
++ static void registerWindow(PluginAppletViewer pluginappletviewer)
++ {
++ appletWindows.put(currentKey, pluginappletviewer);
++ currentWindow = (PluginAppletViewer)appletWindows.get(currentKey);
++ }
++
++ private static void deregisterWindow(PluginAppletViewer pluginappletviewer)
++ {
++ appletWindows.remove(currentWindow);
++ currentWindow.dispose();
++ currentWindow = null;
++ }
++
++ static void start(InputStream inputstream, OutputStream outputstream)
++ throws MalformedURLException, IOException
++ {
++ // Set up input and output pipes. Use UTF-8 encoding.
++ pluginInputStream =
++ new BufferedReader(new InputStreamReader(inputstream,
++ Charset.forName("UTF-8")));
++ pluginOutputStream =
++ new BufferedWriter(new OutputStreamWriter
++ (outputstream, Charset.forName("UTF-8")));
++
++ write("running");
++
++ // Read first message.
++ String message = read();
++
++ while(true) {
++ if (message.startsWith("instance")) {
++ // Read applet instance identifier.
++ currentKey = message.substring("instance".length() + 1);
++ currentWindow =
++ (PluginAppletViewer)appletWindows.get(currentKey);
++ currentRequest = null;
++ if (currentWindow == null) {
++ if (!parseRequests.containsKey(currentKey))
++ parseRequests.put(currentKey, new PluginParseRequest());
++ currentRequest =
++ (PluginParseRequest)parseRequests.get(currentKey);
++ }
++ } else if (message.startsWith("tag")) {
++ if (currentRequest != null) {
++ int index = message.indexOf(' ', "tag".length() + 1);
++ currentRequest.documentbase =
++ message.substring("tag".length() + 1, index);
++ currentRequest.tag = message.substring(index + 1);
++ if (currentRequest.handle != 0
++ && !currentRequest.alreadySent) {
++ PluginAppletViewer.parse
++ (currentRequest.handle, 1, 1,
++ new StringReader(currentRequest.tag),
++ new URL(currentRequest.documentbase));
++ parseRequests.remove(currentKey);
++ }
++ }
++ } else if (message.startsWith("handle")) {
++ if (currentRequest != null) {
++ currentRequest.handle = Long.parseLong
++ (message.substring("handle".length() + 1,
++ message.indexOf("width") - 1));
++ int width = Integer.parseInt(message.substring
++ (message.indexOf("width") +
++ "width".length() + 1,
++ message.indexOf("height") - 1));
++ int height = Integer.parseInt(message.substring(
++ message.indexOf("height") +
++ "height".length() + 1));
++ if (currentRequest.tag != null
++ && !currentRequest.alreadySent) {
++ PluginAppletViewer.parse
++ (currentRequest.handle, width, height,
++ new StringReader(currentRequest.tag),
++ new URL(currentRequest.documentbase));
++ parseRequests.remove(currentKey);
++ }
++ }
++ } else if (message.startsWith("width")) {
++ int width =
++ Integer.parseInt(message.substring("width".length() + 1));
++ int height = currentWindow.getHeight();
++ currentWindow.updateAtts(width, height);
++ currentWindow.setSize(width, height);
++ } else if (message.startsWith("height")) {
++ int height =
++ Integer.parseInt(message.substring("height".length() + 1));
++ int width = currentWindow.getWidth();
++ currentWindow.updateAtts(width, height);
++ currentWindow.setSize(width, height);
++ } else if (message.startsWith("destroy")
++ && currentWindow != null) {
++ deregisterWindow(currentWindow);
++ }
++
++ // Read next message.
++ message = read();
++ }
++ }
++
++ /**
++ * Write string to plugin.
++ *
++ * @param message the message to write
++ *
++ * @exception IOException if an error occurs
++ */
++ static void write(String message)
++ throws IOException
++ {
++ pluginOutputStream.write(message, 0, message.length());
++ pluginOutputStream.newLine();
++ pluginOutputStream.flush();
++
++ System.err.println(" PIPE: appletviewer wrote: " + message);
++ }
++
++ /**
++ * Read string from plugin.
++ *
++ * @return the read string
++ *
++ * @exception IOException if an error occurs
++ */
++ static String read()
++ throws IOException
++ {
++ String message = pluginInputStream.readLine();
++ System.err.println(" PIPE: appletviewer read: " + message);
++ if (message == null || message.equals("shutdown")) {
++ try {
++ // Close input/output channels to plugin.
++ pluginInputStream.close();
++ pluginOutputStream.close();
++ } catch (IOException exception) {
++ // Deliberately ignore IOException caused by broken
++ // pipe since plugin may have already detached.
++ }
++
++ System.err.println("APPLETVIEWER: exiting appletviewer");
++ System.exit(0);
++ }
++ return message;
++ }
++}
+diff -urN openjdk.orig/jdk/src/share/classes/sun/applet/PluginAppletViewer.java openjdk/jdk/src/share/classes/sun/applet/PluginAppletViewer.java
+--- openjdk.orig/jdk/src/share/classes/sun/applet/PluginAppletViewer.java 2008-06-24 22:55:57.286013713 -0400
++++ openjdk/jdk/src/share/classes/sun/applet/PluginAppletViewer.java 2008-06-29 10:34:07.000000000 -0400
+@@ -0,0 +1,1008 @@
++/*
++ * Copyright 1995-2004 Sun Microsystems, Inc. All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Sun designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Sun in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++package sun.applet;
++
++import java.util.*;
++import java.io.*;
++import java.awt.*;
++import java.awt.event.*;
++import java.awt.print.*;
++import javax.print.attribute.*;
++import java.applet.*;
++import java.net.URL;
++import java.net.MalformedURLException;
++import java.net.SocketPermission;
++import sun.misc.Ref;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import sun.awt.SunToolkit;
++import sun.awt.AppContext;
++import sun.awt.X11.*;
++import java.lang.ref.WeakReference;
++import net.sourceforge.jnlp.NetxPanel;
++
++/**
++ * Lets us construct one using unix-style one shot behaviors
++ */
++
++class PluginAppletViewerFactory
++{
++ public PluginAppletViewer createAppletViewer(long handle, int x, int y,
++ URL doc, Hashtable atts) {
++ PluginAppletViewer pluginappletviewer = new PluginAppletViewer(handle, x, y, doc, atts, System.out, this);
++ PluginMain.registerWindow(pluginappletviewer);
++ return pluginappletviewer;
++ }
++
++ public boolean isStandalone()
++ {
++ return false;
++ }
++}
++
++/*
++ */
++public class PluginAppletViewer extends XEmbeddedFrame
++ implements AppletContext, Printable {
++ /**
++ * Some constants...
++ */
++ private static String defaultSaveFile = "Applet.ser";
++
++ /**
++ * The panel in which the applet is being displayed.
++ */
++ AppletViewerPanel panel;
++
++ /**
++ * The status line.
++ */
++ Label label;
++
++ /**
++ * output status messages to this stream
++ */
++
++ PrintStream statusMsgStream;
++
++ /**
++ * For cloning
++ */
++ PluginAppletViewerFactory factory;
++
++ /**
++ * Create the applet viewer
++ */
++ public PluginAppletViewer(long handle, int x, int y, final URL doc,
++ final Hashtable atts, PrintStream statusMsgStream,
++ PluginAppletViewerFactory factory) {
++ super(handle, true);
++ this.factory = factory;
++ this.statusMsgStream = statusMsgStream;
++
++ try {
++ panel = new NetxPanel(doc, atts);
++ AppletViewerPanel.debug("Using NetX panel");
++ } catch (Exception ex) {
++ AppletViewerPanel.debug("Unable to start NetX applet - defaulting to Sun applet", ex);
++ panel = new AppletViewerPanel(doc, atts);
++ }
++ add("Center", panel);
++ panel.init();
++ appletPanels.addElement(panel);
++
++ pack();
++ setVisible(true);
++
++ WindowListener windowEventListener = new WindowAdapter() {
++
++ public void windowClosing(WindowEvent evt) {
More information about the distro-pkg-dev
mailing list