--- 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-23  Deepak Bhole  <dbhole@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@redhat.com>
 
 	* AUTHORS: Added Marc Schoenefeld.

--- 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_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 @@
 # 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 \

--- 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/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 @@
  $(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) {
++		appletClose();
++	    }
++
++	    public void windowIconified(WindowEvent evt) {
++		appletStop();
++	    }
++
++	    public void windowDeiconified(WindowEvent evt) {
++		appletStart();
++	    }
++	};
++
++	class AppletEventListener implements AppletListener  
++	{
++	    final Frame frame;
++
++	    public AppletEventListener(Frame frame)
++	    {
++		this.frame = frame;
++	    }
++
++	    public void appletStateChanged(AppletEvent evt) 
++	    {
++		AppletPanel src = (AppletPanel)evt.getSource();
++
++		switch (evt.getID()) {
++                    case AppletPanel.APPLET_RESIZE: {
++			if(src != null) {
++			    resize(preferredSize());
++			    validate();
++                        }
++			break;
++		    }
++		    case AppletPanel.APPLET_LOADING_COMPLETED: {
++			Applet a = src.getApplet(); // sun.applet.AppletPanel
++			
++			// Fixed #4754451: Applet can have methods running on main
++			// thread event queue. 
++			// 
++			// The cause of this bug is that the frame of the applet 
++			// is created in main thread group. Thus, when certain 
++			// AWT/Swing events are generated, the events will be
++			// dispatched through the wrong event dispatch thread.
++			//
++			// To fix this, we rearrange the AppContext with the frame,
++			// so the proper event queue will be looked up.
++			//
++			// Swing also maintains a Frame list for the AppContext,
++			// so we will have to rearrange it as well.
++			//
++			if (a != null)
++			    AppletPanel.changeFrameAppContext(frame, SunToolkit.targetToAppContext(a));
++			else
++			    AppletPanel.changeFrameAppContext(frame, AppContext.getAppContext());
++
++			break;
++		    }
++		}
++	    }
++	};
++
++	ComponentListener componentListener = new ComponentAdapter() {
++		public void componentResized(ComponentEvent event)
++  		{
++		    if (panel != null)
++		      {
++		        ComponentListener[] l = panel.getComponentListeners();
++		        for (int i = 0; i < l.length; i++)
++		          l[i].componentResized(event);
++			panel.validate();
++		      }
++		  }
++
++		public void componentMoved(ComponentEvent event)
++		  {
++		    if (panel != null)
++		      {
++		        ComponentListener[] l = panel.getComponentListeners();
++		        for (int i = 0; i < l.length; i++)
++		          l[i].componentMoved(event);
++			panel.validate();
++		      }
++		  }
++        };
++
++	HierarchyBoundsListener hierarchyBoundsListener = new HierarchyBoundsAdapter() {
++		public void ancestorMoved(HierarchyEvent e)
++		  {
++		     if (panel != null)
++                      {
++		        HierarchyBoundsListener[] l = panel.getHierarchyBoundsListeners();
++		        for (int i = 0; i < l.length; i++)
++		          l[i].ancestorMoved(e);
++			panel.validate();
++		      }
++		  }
++
++		public void ancestorResized(HierarchyEvent e)
++		  {
++		    if (panel != null)
++		      {
++		        HierarchyBoundsListener[] l = panel.getHierarchyBoundsListeners();
++		        for (int i = 0; i < l.length; i++)
++		          l[i].ancestorResized(e);
++			panel.validate();
++		      }
++		  }
++	};
++
++	addWindowListener(windowEventListener);
++        addComponentListener(componentListener);
++        addHierarchyBoundsListener(hierarchyBoundsListener);
++	panel.addAppletListener(new AppletEventListener(this));
++
++	// Start the applet
++        showStatus(amh.getMessage("status.start"));
++	initEventQueue();
++    }
++
++    /**
++     * Send the initial set of events to the appletviewer event queue.
++     * On start-up the current behaviour is to load the applet and call
++     * Applet.init() and Applet.start().
++     */
++    private void initEventQueue() {
++	// appletviewer.send.event is an undocumented and unsupported system
++	// property which is used exclusively for testing purposes.
++	String eventList = System.getProperty("appletviewer.send.event");
++
++	if (eventList == null) {
++	    // Add the standard events onto the event queue.
++	    panel.sendEvent(AppletPanel.APPLET_LOAD);
++	    panel.sendEvent(AppletPanel.APPLET_INIT);
++	    panel.sendEvent(AppletPanel.APPLET_START);
++	} else {
++	    // We're testing AppletViewer.  Force the specified set of events
++	    // onto the event queue, wait for the events to be processed, and
++	    // exit.
++
++	    // The list of events that will be executed is provided as a
++	    // ","-separated list.  No error-checking will be done on the list.
++  	    String [] events = splitSeparator(",", eventList);
++
++ 	    for (int i = 0; i < events.length; i++) {
++ 		System.out.println("Adding event to queue: " + events[i]);
++ 		if (events[i].equals("dispose"))
++ 		    panel.sendEvent(AppletPanel.APPLET_DISPOSE);
++ 		else if (events[i].equals("load"))
++ 		    panel.sendEvent(AppletPanel.APPLET_LOAD);
++ 		else if (events[i].equals("init"))
++ 		    panel.sendEvent(AppletPanel.APPLET_INIT);
++ 		else if (events[i].equals("start"))
++ 		    panel.sendEvent(AppletPanel.APPLET_START);
++ 		else if (events[i].equals("stop"))
++ 		    panel.sendEvent(AppletPanel.APPLET_STOP);
++ 		else if (events[i].equals("destroy"))
++ 		    panel.sendEvent(AppletPanel.APPLET_DESTROY);
++ 		else if (events[i].equals("quit"))
++ 		    panel.sendEvent(AppletPanel.APPLET_QUIT);
++ 		else if (events[i].equals("error"))
++ 		    panel.sendEvent(AppletPanel.APPLET_ERROR);
++ 		else
++		    // non-fatal error if we get an unrecognized event
++ 		    System.out.println("Unrecognized event name: " + events[i]);
++ 	    }
++
++  	    while (!panel.emptyEventQueue()) ;
++ 	    appletSystemExit();
++	}
++    }
++
++    /**
++     * Split a string based on the presence of a specified separator.  Returns
++     * an array of arbitrary length.  The end of each element in the array is
++     * indicated by the separator of the end of the string.  If there is a
++     * separator immediately before the end of the string, the final element
++     * will be empty.  None of the strings will contain the separator.  Useful
++     * when separating strings such as "foo/bar/bas" using separator "/".
++     *
++     * @param sep  The separator.
++     * @param s    The string to split.
++     * @return     An array of strings.  Each string in the array is determined
++     *             by the location of the provided sep in the original string,
++     *             s.  Whitespace not stripped.
++     */
++    private String [] splitSeparator(String sep, String s) {
++ 	Vector v = new Vector();
++	int tokenStart = 0;
++	int tokenEnd   = 0;
++
++	while ((tokenEnd = s.indexOf(sep, tokenStart)) != -1) {
++	    v.addElement(s.substring(tokenStart, tokenEnd));
++	    tokenStart = tokenEnd+1;
++	}
++	// Add the final element.
++	v.addElement(s.substring(tokenStart));
++
++	String [] retVal = new String[v.size()];
++	v.copyInto(retVal);
++ 	return retVal;
++    }
++
++    /*
++     * Methods for java.applet.AppletContext
++     */
++
++    private static Map audioClips = new HashMap();
++
++    /**
++     * Get an audio clip.
++     */
++    public AudioClip getAudioClip(URL url) {
++	checkConnect(url);
++	synchronized (audioClips) {
++	    AudioClip clip = (AudioClip)audioClips.get(url);
++	    if (clip == null) {
++		audioClips.put(url, clip = new AppletAudioClip(url));
++	    }
++	    return clip;
++	}
++    }
++
++    private static Map imageRefs = new HashMap();
++
++    /**
++     * Get an image.
++     */
++    public Image getImage(URL url) {
++	return getCachedImage(url);
++    }
++
++    static Image getCachedImage(URL url) {
++	// System.getSecurityManager().checkConnection(url.getHost(), url.getPort());
++	return (Image)getCachedImageRef(url).get();
++    }
++
++    /**
++     * Get an image ref.
++     */
++    static Ref getCachedImageRef(URL url) {
++	synchronized (imageRefs) {
++	    AppletImageRef ref = (AppletImageRef)imageRefs.get(url);
++	    if (ref == null) {
++		ref = new AppletImageRef(url);
++		imageRefs.put(url, ref);
++	    }
++	    return ref;
++	}
++    }
++
++    /**
++     * Flush the image cache.
++     */
++    static void flushImageCache() {
++	imageRefs.clear();
++    }
++
++    static Vector appletPanels = new Vector();
++
++    /**
++     * Get an applet by name.
++     */
++    public Applet getApplet(String name) {
++	AppletSecurity security = (AppletSecurity)System.getSecurityManager();
++	name = name.toLowerCase();
++	SocketPermission panelSp =
++	    new SocketPermission(panel.getCodeBase().getHost(), "connect");
++	for (Enumeration e = appletPanels.elements() ; e.hasMoreElements() ;) {
++	    AppletPanel p = (AppletPanel)e.nextElement();
++	    String param = p.getParameter("name");
++	    if (param != null) {
++		param = param.toLowerCase();
++	    }
++	    if (name.equals(param) &&
++		p.getDocumentBase().equals(panel.getDocumentBase())) {
++
++		SocketPermission sp =
++		    new SocketPermission(p.getCodeBase().getHost(), "connect");
++
++		if (panelSp.implies(sp)) {
++		    return p.applet;
++		}
++	    }
++	}
++	return null;
++    }
++
++    /**
++     * Return an enumeration of all the accessible
++     * applets on this page.
++     */
++    public Enumeration getApplets() {
++	AppletSecurity security = (AppletSecurity)System.getSecurityManager();
++	Vector v = new Vector();
++	SocketPermission panelSp =
++	    new SocketPermission(panel.getCodeBase().getHost(), "connect");
++
++	for (Enumeration e = appletPanels.elements() ; e.hasMoreElements() ;) {
++	    AppletPanel p = (AppletPanel)e.nextElement();
++	    if (p.getDocumentBase().equals(panel.getDocumentBase())) {
++
++		SocketPermission sp =
++		    new SocketPermission(p.getCodeBase().getHost(), "connect");
++		if (panelSp.implies(sp)) {
++		    v.addElement(p.applet);
++		}
++	    }
++	}
++	return v.elements();
++    }
++
++    /**
++     * Ignore.
++     */
++    public void showDocument(URL url) {
++	showDocument(url, "_self");
++    }
++
++    /**
++     * Ignore.
++     */
++    public void showDocument(URL url, String target) {
++	try {
++	    PluginMain.write("url " + url + " " + target);
++	} catch (IOException exception) {
++	    // Deliberately ignore IOException.  showDocument may be
++	    // called from threads other than the main thread after
++	    // PluginMain.pluginOutputStream has been closed.
++	}
++    }
++
++    /**
++     * Show status.
++     */
++    public void showStatus(String status) {
++	try {
++	    PluginMain.write("status " + status);
++	} catch (IOException exception) {
++	    // Deliberately ignore IOException.  showStatus may be
++	    // called from threads other than the main thread after
++	    // PluginMain.pluginOutputStream has been closed.
++	}
++    }
++
++    public void setStream(String key, InputStream stream)throws IOException{
++	// We do nothing.
++    }
++
++    public InputStream getStream(String key){
++	// We do nothing.
++	return null;
++    }
++
++    public Iterator getStreamKeys(){
++	// We do nothing.
++	return null;
++    }
++
++    /**
++     * System parameters.
++     */
++    static Hashtable systemParam = new Hashtable();
++
++    static {
++	systemParam.put("codebase", "codebase");
++	systemParam.put("code", "code");
++	systemParam.put("alt", "alt");
++	systemParam.put("width", "width");
++	systemParam.put("height", "height");
++	systemParam.put("align", "align");
++	systemParam.put("vspace", "vspace");
++	systemParam.put("hspace", "hspace");
++    }
++
++    /**
++     * Print the HTML tag.
++     */
++    public static void printTag(PrintStream out, Hashtable atts) {
++	out.print("<applet");
++
++	String v = (String)atts.get("codebase");
++	if (v != null) {
++	    out.print(" codebase=\"" + v + "\"");
++	}
++
++	v = (String)atts.get("code");
++	if (v == null) {
++	    v = "applet.class";
++	}
++	out.print(" code=\"" + v + "\"");
++	v = (String)atts.get("width");
++	if (v == null) {
++	    v = "150";
++	}
++	out.print(" width=" + v);
++
++	v = (String)atts.get("height");
++	if (v == null) {
++	    v = "100";
++	}
++	out.print(" height=" + v);
++
++	v = (String)atts.get("name");
++	if (v != null) {
++	    out.print(" name=\"" + v + "\"");
++	}
++	out.println(">");
++
++	// A very slow sorting algorithm
++	int len = atts.size();
++	String params[] = new String[len];
++	len = 0;
++	for (Enumeration e = atts.keys() ; e.hasMoreElements() ;) {
++	    String param = (String)e.nextElement();
++	    int i = 0;
++	    for (; i < len ; i++) {
++		if (params[i].compareTo(param) >= 0) {
++		    break;
++		}
++	    }
++	    System.arraycopy(params, i, params, i + 1, len - i);
++	    params[i] = param;
++	    len++;
++	}
++
++	for (int i = 0 ; i < len ; i++) {
++	    String param = params[i];
++	    if (systemParam.get(param) == null) {
++		out.println("<param name=" + param +
++			    " value=\"" + atts.get(param) + "\">");
++	    }
++	}
++	out.println("</applet>");
++    }
++
++    /**
++     * Make sure the attributes are up-to-date.
++     */
++    public void updateAtts(int width, int height) {
++	panel.atts.remove("width");
++	panel.atts.remove("height");
++	panel.atts.put("width", new Integer(width).toString());
++	panel.atts.put("height", new Integer(height).toString());
++    }
++
++    /**
++     * Restart the applet.
++     */
++    void appletRestart() {
++	panel.sendEvent(AppletPanel.APPLET_STOP);
++	panel.sendEvent(AppletPanel.APPLET_DESTROY);
++	panel.sendEvent(AppletPanel.APPLET_INIT);
++	panel.sendEvent(AppletPanel.APPLET_START);
++    }
++
++    /**
++     * Reload the applet.
++     */
++    void appletReload() {
++	panel.sendEvent(AppletPanel.APPLET_STOP);
++	panel.sendEvent(AppletPanel.APPLET_DESTROY);
++	panel.sendEvent(AppletPanel.APPLET_DISPOSE);
++
++	/**
++	 * Fixed #4501142: Classlaoder sharing policy doesn't 
++	 * take "archive" into account. This will be overridden
++	 * by Java Plug-in.			[stanleyh]
++	 */
++	AppletPanel.flushClassLoader(panel.getClassLoaderCacheKey());
++
++        /*
++         * Make sure we don't have two threads running through the event queue
++         * at the same time.
++         */
++        try {
++            panel.joinAppletThread();
++	    panel.release();
++        } catch (InterruptedException e) {
++            return;   // abort the reload
++        }
++
++        panel.createAppletThread();
++	panel.sendEvent(AppletPanel.APPLET_LOAD);
++	panel.sendEvent(AppletPanel.APPLET_INIT);
++	panel.sendEvent(AppletPanel.APPLET_START);
++    }
++
++    public int print(Graphics graphics, PageFormat pf, int pageIndex) {
++        return Printable.NO_SUCH_PAGE;
++    }
++
++    /**
++     * Start the applet.
++     */
++    void appletStart() {
++	panel.sendEvent(AppletPanel.APPLET_START);
++    }
++
++    /**
++     * Stop the applet.
++     */
++    void appletStop() {
++	panel.sendEvent(AppletPanel.APPLET_STOP);
++    }
++
++    /**
++     * Shutdown a viewer.
++     * Stop, Destroy, Dispose and Quit a viewer
++     */
++    private void appletShutdown(AppletPanel p) {
++	p.sendEvent(AppletPanel.APPLET_STOP);
++	p.sendEvent(AppletPanel.APPLET_DESTROY);
++	p.sendEvent(AppletPanel.APPLET_DISPOSE);
++	p.sendEvent(AppletPanel.APPLET_QUIT);
++    }
++
++    /**
++     * Close this viewer.
++     * Stop, Destroy, Dispose and Quit an AppletView, then
++     * reclaim resources and exit the program if this is
++     * the last applet.
++     */
++    void appletClose() {
++
++	// The caller thread is event dispatch thread, so
++	// spawn a new thread to avoid blocking the event queue
++	// when calling appletShutdown.
++	//
++	final AppletPanel p = panel;
++
++	new Thread(new Runnable()
++	{
++	    public void run()
++	    {
++    		appletShutdown(p);
++		appletPanels.removeElement(p);
++		dispose();
++
++		if (countApplets() == 0) {
++		    appletSystemExit();
++		}
++	    }
++	}).start();
++    }
++
++    /**
++     * Exit the program.
++     * Exit from the program (if not stand alone) - do no clean-up
++     */
++    private void appletSystemExit() {
++	if (factory.isStandalone())
++	    System.exit(0);
++    }
++
++    /**
++     * How many applets are running?
++     */
++
++    public static int countApplets() {
++	return appletPanels.size();
++    }
++
++
++    /**
++     * The current character.
++     */
++    static int c;
++
++    /**
++     * Scan spaces.
++     */
++    public static void skipSpace(Reader in) throws IOException {
++        while ((c >= 0) &&
++	       ((c == ' ') || (c == '\t') || (c == '\n') || (c == '\r'))) {
++	    c = in.read();
++	}
++    }
++
++    /**
++     * Scan identifier
++     */
++    public static String scanIdentifier(Reader in) throws IOException {
++	StringBuffer buf = new StringBuffer();
++	while (true) {
++	    if (((c >= 'a') && (c <= 'z')) ||
++		((c >= 'A') && (c <= 'Z')) ||
++		((c >= '0') && (c <= '9')) || (c == '_')) {
++		buf.append((char)c);
++		c = in.read();
++	    } else {
++		return buf.toString();
++	    }
++	}
++    }
++
++    /**
++     * Scan tag
++     */
++    public static Hashtable scanTag(Reader in) throws IOException {
++	Hashtable atts = new Hashtable();
++	skipSpace(in);
++        while (c >= 0 && c != '>') {
++	    String att = scanIdentifier(in);
++	    String val = "";
++	    skipSpace(in);
++	    if (c == '=') {
++		int quote = -1;
++		c = in.read();
++		skipSpace(in);
++		if ((c == '\'') || (c == '\"')) {
++		    quote = c;
++		    c = in.read();
++		}
++		StringBuffer buf = new StringBuffer();
++                while ((c > 0) &&
++		       (((quote < 0) && (c != ' ') && (c != '\t') &&
++                         (c != '\n') && (c != '\r') && (c != '>'))
++			|| ((quote >= 0) && (c != quote)))) {
++		    buf.append((char)c);
++		    c = in.read();
++		}
++		if (c == quote) {
++		    c = in.read();
++		}
++		skipSpace(in);
++		val = buf.toString();
++	    }
++	    //statusMsgStream.println("PUT " + att + " = '" + val + "'");
++	    if (! val.equals("")) {
++		atts.put(att.toLowerCase(java.util.Locale.ENGLISH), val);
++	    }
++            while (true) {
++                if ((c == '>') || (c < 0) ||
++                    ((c >= 'a') && (c <= 'z')) ||
++                    ((c >= 'A') && (c <= 'Z')) ||
++                    ((c >= '0') && (c <= '9')) || (c == '_'))
++                    break;
++                c = in.read();
++            }
++            //skipSpace(in);
++	}
++	return atts;
++    }
++
++    /* values used for placement of AppletViewer's frames */
++    private static int x = 0;
++    private static int y = 0;
++    private static final int XDELTA = 30;
++    private static final int YDELTA = XDELTA;
++
++    static String encoding = null;
++
++    static private Reader makeReader(InputStream is) {
++	if (encoding != null) {
++	    try {
++		return new BufferedReader(new InputStreamReader(is, encoding));
++	    } catch (IOException x) { }
++	}
++	InputStreamReader r = new InputStreamReader(is);
++	encoding = r.getEncoding();
++	return new BufferedReader(r);
++    }
++
++    /**
++     * Scan an html file for <applet> tags
++     */
++    public static void parse(long handle, Reader in, URL url, String enc)
++        throws IOException {
++        encoding = enc;
++        parse(handle, 1, 1, in, url, System.out, new PluginAppletViewerFactory());
++    }
++
++    public static void parse(long handle, int width, int height, Reader in, URL url)
++        throws IOException {
++        parse(handle, width, height,
++		in, url, System.out, new PluginAppletViewerFactory());
++    }
++
++    public static void parse(long handle, int width, int height, Reader in, 
++				URL url,
++	                        PrintStream statusMsgStream,
++        	                PluginAppletViewerFactory factory)
++        throws IOException
++    {
++        // <OBJECT> <EMBED> tag flags
++        boolean isAppletTag = false;
++        boolean isObjectTag = false;
++        boolean isEmbedTag = false;
++
++	// warning messages
++        String requiresNameWarning = amh.getMessage("parse.warning.requiresname");
++        String paramOutsideWarning = amh.getMessage("parse.warning.paramoutside");
++        String appletRequiresCodeWarning = amh.getMessage("parse.warning.applet.requirescode");
++        String appletRequiresHeightWarning = amh.getMessage("parse.warning.applet.requiresheight");
++        String appletRequiresWidthWarning = amh.getMessage("parse.warning.applet.requireswidth");
++        String objectRequiresCodeWarning = amh.getMessage("parse.warning.object.requirescode");
++        String objectRequiresHeightWarning = amh.getMessage("parse.warning.object.requiresheight");
++        String objectRequiresWidthWarning = amh.getMessage("parse.warning.object.requireswidth");
++        String embedRequiresCodeWarning = amh.getMessage("parse.warning.embed.requirescode");
++        String embedRequiresHeightWarning = amh.getMessage("parse.warning.embed.requiresheight");
++        String embedRequiresWidthWarning = amh.getMessage("parse.warning.embed.requireswidth");
++        String appNotLongerSupportedWarning = amh.getMessage("parse.warning.appnotLongersupported");
++
++	java.net.URLConnection conn = url.openConnection();
++	/* The original URL may have been redirected - this
++	 * sets it to whatever URL/codebase we ended up getting
++	 */
++	url = conn.getURL();
++
++	int ydisp = 1;
++	Hashtable atts = null;
++
++        while(true) {
++	    c = in.read();
++	    if (c == -1)
++		break;
++
++	    if (c == '<') {
++		c = in.read();
++		if (c == '/') {
++		    c = in.read();
++		    String nm = scanIdentifier(in);
++		    if (nm.equalsIgnoreCase("applet") ||
++                        nm.equalsIgnoreCase("object") ||
++                        nm.equalsIgnoreCase("embed")) {
++
++                        // We can't test for a code tag until </OBJECT>
++                        // because it is a parameter, not an attribute.
++                        if(isObjectTag) {
++                            if (atts.get("code") == null && atts.get("object") == null) {
++                                statusMsgStream.println(objectRequiresCodeWarning);
++                                atts = null;
++                            }
++                        }
++
++			if (atts != null) {
++			    atts.remove("width");
++			    atts.remove("height");
++			    atts.put("width", new Integer(width).toString());
++			    atts.put("height", new Integer(height).toString());
++
++			    // XXX 5/18 In general this code just simply
++			    // shouldn't be part of parsing.  It's presence
++			    // causes things to be a little too much of a
++			    // hack.
++                            factory.createAppletViewer(handle, x, y, url, atts);
++			    x += XDELTA;
++			    y += YDELTA;
++			    // make sure we don't go too far!
++			    Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
++			    if ((x > d.width - 300) || (y > d.height - 300)) {
++				x = 0;
++				y = 2 * ydisp * YDELTA;
++				ydisp++;
++			    }
++			}
++			atts = null;
++                        isAppletTag = false;
++                        isObjectTag = false;
++                        isEmbedTag = false;
++		    }
++		}
++		else {
++		    String nm = scanIdentifier(in);
++		    if (nm.equalsIgnoreCase("param")) {
++			Hashtable t = scanTag(in);
++			String att = (String)t.get("name");
++			if (att == null) {
++			    statusMsgStream.println(requiresNameWarning);
++			} else {
++			    String val = (String)t.get("value");
++			    if (val == null) {
++				statusMsgStream.println(requiresNameWarning);
++			    } else if (atts != null) {
++				String name = att.toLowerCase();
++				atts.put(name, val);
++			    } else {
++				statusMsgStream.println(paramOutsideWarning);
++			    }
++			}
++		    }
++		    else if (nm.equalsIgnoreCase("applet")) {
++                        isAppletTag = true;
++			atts = scanTag(in);
++			if (atts.get("code") == null && atts.get("object") == null) {
++			    statusMsgStream.println(appletRequiresCodeWarning);
++			    atts = null;
++			} else if (atts.get("width") == null) {
++			    statusMsgStream.println(appletRequiresWidthWarning);
++			    atts = null;
++			} else if (atts.get("height") == null) {
++			    statusMsgStream.println(appletRequiresHeightWarning);
++			    atts = null;
++			}
++		    }
++		    else if (nm.equalsIgnoreCase("object")) {
++                        isObjectTag = true;
++			atts = scanTag(in);
++                        // The <OBJECT> attribute codebase isn't what
++                        // we want. If its defined, remove it.
++                        if(atts.get("codebase") != null) {
++                            atts.remove("codebase");
++                        }
++
++                        if (atts.get("width") == null) {
++			    statusMsgStream.println(objectRequiresWidthWarning);
++			    atts = null;
++			} else if (atts.get("height") == null) {
++			    statusMsgStream.println(objectRequiresHeightWarning);
++			    atts = null;
++			}
++		    }
++		    else if (nm.equalsIgnoreCase("embed")) {
++                        isEmbedTag = true;
++			atts = scanTag(in);
++
++			if (atts.get("code") == null && atts.get("object") == null) {
++			    statusMsgStream.println(embedRequiresCodeWarning);
++			    atts = null;
++			} else if (atts.get("width") == null) {
++			    statusMsgStream.println(embedRequiresWidthWarning);
++			    atts = null;
++			} else if (atts.get("height") == null) {
++			    statusMsgStream.println(embedRequiresHeightWarning);
++			    atts = null;
++			}
++		    }
++		    else if (nm.equalsIgnoreCase("app")) {
++			statusMsgStream.println(appNotLongerSupportedWarning);
++			Hashtable atts2 = scanTag(in);
++			nm = (String)atts2.get("class");
++			if (nm != null) {
++			    atts2.remove("class");
++			    atts2.put("code", nm + ".class");
++			}
++			nm = (String)atts2.get("src");
++			if (nm != null) {
++			    atts2.remove("src");
++			    atts2.put("codebase", nm);
++			}
++			if (atts2.get("width") == null) {
++			    atts2.put("width", "100");
++			}
++			if (atts2.get("height") == null) {
++			    atts2.put("height", "100");
++			}
++			printTag(statusMsgStream, atts2);
++			statusMsgStream.println();
++		    }
++		}
++	    }
++	}
++	in.close();
++    }
++
++    /**
++     * Old main entry point.
++     *
++     * @deprecated
++     */
++    @Deprecated
++    public static void main(String args[]) throws IOException {
++        PluginMain.main(args);
++    }
++
++    private static AppletMessageHandler amh = new AppletMessageHandler("appletviewer");
++
++    private static void checkConnect(URL url)
++    {
++	SecurityManager security = System.getSecurityManager();
++	if (security != null) {
++	    try {
++		java.security.Permission perm =
++		    url.openConnection().getPermission();
++		if (perm != null)
++		    security.checkPermission(perm);
++		else
++		    security.checkConnect(url.getHost(), url.getPort());
++	    } catch (java.io.IOException ioe) {
++		    security.checkConnect(url.getHost(), url.getPort());
++	    }
++	}
++    }
++}

--- a/plugin/gcj/java/src/main/sun/applet/PluginAppletViewer.java	Tue Sep 23 16:33:17 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1008 +0,0 @@
-/*
- * 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) {
-		appletClose();
-	    }
-
-	    public void windowIconified(WindowEvent evt) {
-		appletStop();
-	    }
-
-	    public void windowDeiconified(WindowEvent evt) {
-		appletStart();
-	    }
-	};
-
-	class AppletEventListener implements AppletListener  
-	{
-	    final Frame frame;
-
-	    public AppletEventListener(Frame frame)
-	    {
-		this.frame = frame;
-	    }
-
-	    public void appletStateChanged(AppletEvent evt) 
-	    {
-		AppletPanel src = (AppletPanel)evt.getSource();
-
-		switch (evt.getID()) {
-                    case AppletPanel.APPLET_RESIZE: {
-			if(src != null) {
-			    resize(preferredSize());
-			    validate();
-                        }
-			break;
-		    }
-		    case AppletPanel.APPLET_LOADING_COMPLETED: {
-			Applet a = src.getApplet(); // sun.applet.AppletPanel
-			
-			// Fixed #4754451: Applet can have methods running on main
-			// thread event queue. 
-			// 
-			// The cause of this bug is that the frame of the applet 
-			// is created in main thread group. Thus, when certain 
-			// AWT/Swing events are generated, the events will be
-			// dispatched through the wrong event dispatch thread.
-			//
-			// To fix this, we rearrange the AppContext with the frame,
-			// so the proper event queue will be looked up.
-			//
-			// Swing also maintains a Frame list for the AppContext,
-			// so we will have to rearrange it as well.
-			//
-			if (a != null)
-			    AppletPanel.changeFrameAppContext(frame, SunToolkit.targetToAppContext(a));
-			else
-			    AppletPanel.changeFrameAppContext(frame, AppContext.getAppContext());
-
-			break;
-		    }
-		}
-	    }
-	};
-
-	ComponentListener componentListener = new ComponentAdapter() {
-		public void componentResized(ComponentEvent event)
-  		{
-		    if (panel != null)
-		      {
-		        ComponentListener[] l = panel.getComponentListeners();
-		        for (int i = 0; i < l.length; i++)
-		          l[i].componentResized(event);
-			panel.validate();
-		      }
-		  }
-
-		public void componentMoved(ComponentEvent event)
-		  {
-		    if (panel != null)
-		      {
-		        ComponentListener[] l = panel.getComponentListeners();
-		        for (int i = 0; i < l.length; i++)
-		          l[i].componentMoved(event);
-			panel.validate();
-		      }
-		  }
-        };
-
-	HierarchyBoundsListener hierarchyBoundsListener = new HierarchyBoundsAdapter() {
-		public void ancestorMoved(HierarchyEvent e)
-		  {
-		     if (panel != null)
-                      {
-		        HierarchyBoundsListener[] l = panel.getHierarchyBoundsListeners();
-		        for (int i = 0; i < l.length; i++)
-		          l[i].ancestorMoved(e);
-			panel.validate();
-		      }
-		  }
-
-		public void ancestorResized(HierarchyEvent e)
-		  {
-		    if (panel != null)
-		      {
-		        HierarchyBoundsListener[] l = panel.getHierarchyBoundsListeners();
-		        for (int i = 0; i < l.length; i++)
-		          l[i].ancestorResized(e);
-			panel.validate();
-		      }
-		  }
-	};
-
-	addWindowListener(windowEventListener);
-        addComponentListener(componentListener);
-        addHierarchyBoundsListener(hierarchyBoundsListener);
-	panel.addAppletListener(new AppletEventListener(this));
-
-	// Start the applet
-        showStatus(amh.getMessage("status.start"));
-	initEventQueue();
-    }
-
-    /**
-     * Send the initial set of events to the appletviewer event queue.
-     * On start-up the current behaviour is to load the applet and call
-     * Applet.init() and Applet.start().
-     */
-    private void initEventQueue() {
-	// appletviewer.send.event is an undocumented and unsupported system
-	// property which is used exclusively for testing purposes.
-	String eventList = System.getProperty("appletviewer.send.event");
-
-	if (eventList == null) {
-	    // Add the standard events onto the event queue.
-	    panel.sendEvent(AppletPanel.APPLET_LOAD);
-	    panel.sendEvent(AppletPanel.APPLET_INIT);
-	    panel.sendEvent(AppletPanel.APPLET_START);
-	} else {
-	    // We're testing AppletViewer.  Force the specified set of events
-	    // onto the event queue, wait for the events to be processed, and
-	    // exit.
-
-	    // The list of events that will be executed is provided as a
-	    // ","-separated list.  No error-checking will be done on the list.
-  	    String [] events = splitSeparator(",", eventList);
-
- 	    for (int i = 0; i < events.length; i++) {
- 		System.out.println("Adding event to queue: " + events[i]);
- 		if (events[i].equals("dispose"))
- 		    panel.sendEvent(AppletPanel.APPLET_DISPOSE);
- 		else if (events[i].equals("load"))
- 		    panel.sendEvent(AppletPanel.APPLET_LOAD);
- 		else if (events[i].equals("init"))
- 		    panel.sendEvent(AppletPanel.APPLET_INIT);
- 		else if (events[i].equals("start"))
- 		    panel.sendEvent(AppletPanel.APPLET_START);
- 		else if (events[i].equals("stop"))
- 		    panel.sendEvent(AppletPanel.APPLET_STOP);
- 		else if (events[i].equals("destroy"))
- 		    panel.sendEvent(AppletPanel.APPLET_DESTROY);
- 		else if (events[i].equals("quit"))
- 		    panel.sendEvent(AppletPanel.APPLET_QUIT);
- 		else if (events[i].equals("error"))
- 		    panel.sendEvent(AppletPanel.APPLET_ERROR);
- 		else
-		    // non-fatal error if we get an unrecognized event
- 		    System.out.println("Unrecognized event name: " + events[i]);
- 	    }
-
-  	    while (!panel.emptyEventQueue()) ;
- 	    appletSystemExit();
-	}
-    }
-
-    /**
-     * Split a string based on the presence of a specified separator.  Returns
-     * an array of arbitrary length.  The end of each element in the array is
-     * indicated by the separator of the end of the string.  If there is a
-     * separator immediately before the end of the string, the final element
-     * will be empty.  None of the strings will contain the separator.  Useful
-     * when separating strings such as "foo/bar/bas" using separator "/".
-     *
-     * @param sep  The separator.
-     * @param s    The string to split.
-     * @return     An array of strings.  Each string in the array is determined
-     *             by the location of the provided sep in the original string,
-     *             s.  Whitespace not stripped.
-     */
-    private String [] splitSeparator(String sep, String s) {
- 	Vector v = new Vector();
-	int tokenStart = 0;
-	int tokenEnd   = 0;
-
-	while ((tokenEnd = s.indexOf(sep, tokenStart)) != -1) {
-	    v.addElement(s.substring(tokenStart, tokenEnd));
-	    tokenStart = tokenEnd+1;
-	}
-	// Add the final element.
-	v.addElement(s.substring(tokenStart));
-
-	String [] retVal = new String[v.size()];
-	v.copyInto(retVal);
- 	return retVal;
-    }
-
-    /*
-     * Methods for java.applet.AppletContext
-     */
-
-    private static Map audioClips = new HashMap();
-
-    /**
-     * Get an audio clip.
-     */
-    public AudioClip getAudioClip(URL url) {
-	checkConnect(url);
-	synchronized (audioClips) {
-	    AudioClip clip = (AudioClip)audioClips.get(url);
-	    if (clip == null) {
-		audioClips.put(url, clip = new AppletAudioClip(url));
-	    }
-	    return clip;
-	}
-    }
-
-    private static Map imageRefs = new HashMap();
-
-    /**
-     * Get an image.
-     */
-    public Image getImage(URL url) {
-	return getCachedImage(url);
-    }
-
-    static Image getCachedImage(URL url) {
-	// System.getSecurityManager().checkConnection(url.getHost(), url.getPort());
-	return (Image)getCachedImageRef(url).get();
-    }
-
-    /**
-     * Get an image ref.
-     */
-    static Ref getCachedImageRef(URL url) {
-	synchronized (imageRefs) {
-	    AppletImageRef ref = (AppletImageRef)imageRefs.get(url);
-	    if (ref == null) {
-		ref = new AppletImageRef(url);
-		imageRefs.put(url, ref);
-	    }
-	    return ref;
-	}
-    }
-
-    /**
-     * Flush the image cache.
-     */
-    static void flushImageCache() {
-	imageRefs.clear();
-    }
-
-    static Vector appletPanels = new Vector();
-
-    /**
-     * Get an applet by name.
-     */
-    public Applet getApplet(String name) {
-	AppletSecurity security = (AppletSecurity)System.getSecurityManager();
-	name = name.toLowerCase();
-	SocketPermission panelSp =
-	    new SocketPermission(panel.getCodeBase().getHost(), "connect");
-	for (Enumeration e = appletPanels.elements() ; e.hasMoreElements() ;) {
-	    AppletPanel p = (AppletPanel)e.nextElement();
-	    String param = p.getParameter("name");
-	    if (param != null) {
-		param = param.toLowerCase();
-	    }
-	    if (name.equals(param) &&
-		p.getDocumentBase().equals(panel.getDocumentBase())) {
-
-		SocketPermission sp =
-		    new SocketPermission(p.getCodeBase().getHost(), "connect");
-
-		if (panelSp.implies(sp)) {
-		    return p.applet;
-		}
-	    }
-	}
-	return null;
-    }
-
-    /**
-     * Return an enumeration of all the accessible
-     * applets on this page.
-     */
-    public Enumeration getApplets() {
-	AppletSecurity security = (AppletSecurity)System.getSecurityManager();
-	Vector v = new Vector();
-	SocketPermission panelSp =
-	    new SocketPermission(panel.getCodeBase().getHost(), "connect");
-
-	for (Enumeration e = appletPanels.elements() ; e.hasMoreElements() ;) {
-	    AppletPanel p = (AppletPanel)e.nextElement();
-	    if (p.getDocumentBase().equals(panel.getDocumentBase())) {
-
-		SocketPermission sp =
-		    new SocketPermission(p.getCodeBase().getHost(), "connect");
-		if (panelSp.implies(sp)) {
-		    v.addElement(p.applet);
-		}
-	    }
-	}
-	return v.elements();
-    }
-
-    /**
-     * Ignore.
-     */
-    public void showDocument(URL url) {
-	showDocument(url, "_self");
-    }
-
-    /**
-     * Ignore.
-     */
-    public void showDocument(URL url, String target) {
-	try {
-	    PluginMain.write("url " + url + " " + target);
-	} catch (IOException exception) {
-	    // Deliberately ignore IOException.  showDocument may be
-	    // called from threads other than the main thread after
-	    // PluginMain.pluginOutputStream has been closed.
-	}
-    }
-
-    /**
-     * Show status.
-     */
-    public void showStatus(String status) {
-	try {
-	    PluginMain.write("status " + status);
-	} catch (IOException exception) {
-	    // Deliberately ignore IOException.  showStatus may be
-	    // called from threads other than the main thread after
-	    // PluginMain.pluginOutputStream has been closed.
-	}
-    }
-
-    public void setStream(String key, InputStream stream)throws IOException{
-	// We do nothing.
-    }
-
-    public InputStream getStream(String key){
-	// We do nothing.
-	return null;
-    }
-
-    public Iterator getStreamKeys(){
-	// We do nothing.
-	return null;
-    }
-
-    /**
-     * System parameters.
-     */
-    static Hashtable systemParam = new Hashtable();
-
-    static {
-	systemParam.put("codebase", "codebase");
-	systemParam.put("code", "code");
-	systemParam.put("alt", "alt");
-	systemParam.put("width", "width");
-	systemParam.put("height", "height");
-	systemParam.put("align", "align");
-	systemParam.put("vspace", "vspace");
-	systemParam.put("hspace", "hspace");
-    }
-
-    /**
-     * Print the HTML tag.
-     */
-    public static void printTag(PrintStream out, Hashtable atts) {
-	out.print("<applet");
-
-	String v = (String)atts.get("codebase");
-	if (v != null) {
-	    out.print(" codebase=\"" + v + "\"");
-	}
-
-	v = (String)atts.get("code");
-	if (v == null) {
-	    v = "applet.class";
-	}
-	out.print(" code=\"" + v + "\"");
-	v = (String)atts.get("width");
-	if (v == null) {
-	    v = "150";
-	}
-	out.print(" width=" + v);
-
-	v = (String)atts.get("height");
-	if (v == null) {
-	    v = "100";
-	}
-	out.print(" height=" + v);
-
-	v = (String)atts.get("name");
-	if (v != null) {
-	    out.print(" name=\"" + v + "\"");
-	}
-	out.println(">");
-
-	// A very slow sorting algorithm
-	int len = atts.size();
-	String params[] = new String[len];
-	len = 0;
-	for (Enumeration e = atts.keys() ; e.hasMoreElements() ;) {
-	    String param = (String)e.nextElement();
-	    int i = 0;
-	    for (; i < len ; i++) {
-		if (params[i].compareTo(param) >= 0) {
-		    break;
-		}
-	    }
-	    System.arraycopy(params, i, params, i + 1, len - i);
-	    params[i] = param;
-	    len++;
-	}
-
-	for (int i = 0 ; i < len ; i++) {
-	    String param = params[i];
-	    if (systemParam.get(param) == null) {
-		out.println("<param name=" + param +
-			    " value=\"" + atts.get(param) + "\">");
-	    }
-	}
-	out.println("</applet>");
-    }
-
-    /**
-     * Make sure the attributes are up-to-date.
-     */
-    public void updateAtts(int width, int height) {
-	panel.atts.remove("width");
-	panel.atts.remove("height");
-	panel.atts.put("width", new Integer(width).toString());
-	panel.atts.put("height", new Integer(height).toString());
-    }
-
-    /**
-     * Restart the applet.
-     */
-    void appletRestart() {
-	panel.sendEvent(AppletPanel.APPLET_STOP);
-	panel.sendEvent(AppletPanel.APPLET_DESTROY);
-	panel.sendEvent(AppletPanel.APPLET_INIT);
-	panel.sendEvent(AppletPanel.APPLET_START);
-    }
-
-    /**
-     * Reload the applet.
-     */
-    void appletReload() {
-	panel.sendEvent(AppletPanel.APPLET_STOP);
-	panel.sendEvent(AppletPanel.APPLET_DESTROY);
-	panel.sendEvent(AppletPanel.APPLET_DISPOSE);
-
-	/**
-	 * Fixed #4501142: Classlaoder sharing policy doesn't 
-	 * take "archive" into account. This will be overridden
-	 * by Java Plug-in.			[stanleyh]
-	 */
-	AppletPanel.flushClassLoader(panel.getClassLoaderCacheKey());
-
-        /*
-         * Make sure we don't have two threads running through the event queue
-         * at the same time.
-         */
-        try {
-            panel.joinAppletThread();
-	    panel.release();
-        } catch (InterruptedException e) {
-            return;   // abort the reload
-        }
-
-        panel.createAppletThread();
-	panel.sendEvent(AppletPanel.APPLET_LOAD);
-	panel.sendEvent(AppletPanel.APPLET_INIT);
-	panel.sendEvent(AppletPanel.APPLET_START);
-    }
-
-    public int print(Graphics graphics, PageFormat pf, int pageIndex) {
-        return Printable.NO_SUCH_PAGE;
-    }
-
-    /**
-     * Start the applet.
-     */
-    void appletStart() {
-	panel.sendEvent(AppletPanel.APPLET_START);
-    }
-
-    /**
-     * Stop the applet.
-     */
-    void appletStop() {
-	panel.sendEvent(AppletPanel.APPLET_STOP);
-    }
-
-    /**
-     * Shutdown a viewer.
-     * Stop, Destroy, Dispose and Quit a viewer
-     */
-    private void appletShutdown(AppletPanel p) {
-	p.sendEvent(AppletPanel.APPLET_STOP);
-	p.sendEvent(AppletPanel.APPLET_DESTROY);
-	p.sendEvent(AppletPanel.APPLET_DISPOSE);
-	p.sendEvent(AppletPanel.APPLET_QUIT);
-    }
-
-    /**
-     * Close this viewer.
-     * Stop, Destroy, Dispose and Quit an AppletView, then
-     * reclaim resources and exit the program if this is
-     * the last applet.
-     */
-    void appletClose() {
-
-	// The caller thread is event dispatch thread, so
-	// spawn a new thread to avoid blocking the event queue
-	// when calling appletShutdown.
-	//
-	final AppletPanel p = panel;
-
-	new Thread(new Runnable()
-	{
-	    public void run()
-	    {
-    		appletShutdown(p);
-		appletPanels.removeElement(p);
-		dispose();
-
-		if (countApplets() == 0) {
-		    appletSystemExit();
-		}
-	    }
-	}).start();
-    }
-
-    /**
-     * Exit the program.
-     * Exit from the program (if not stand alone) - do no clean-up
-     */
-    private void appletSystemExit() {
-	if (factory.isStandalone())
-	    System.exit(0);
-    }
-
-    /**
-     * How many applets are running?
-     */
-
-    public static int countApplets() {
-	return appletPanels.size();
-    }
-
-
-    /**
-     * The current character.
-     */
-    static int c;
-
-    /**
-     * Scan spaces.
-     */
-    public static void skipSpace(Reader in) throws IOException {
-        while ((c >= 0) &&
-	       ((c == ' ') || (c == '\t') || (c == '\n') || (c == '\r'))) {
-	    c = in.read();
-	}
-    }
-
-    /**
-     * Scan identifier
-     */
-    public static String scanIdentifier(Reader in) throws IOException {
-	StringBuffer buf = new StringBuffer();
-	while (true) {
-	    if (((c >= 'a') && (c <= 'z')) ||
-		((c >= 'A') && (c <= 'Z')) ||
-		((c >= '0') && (c <= '9')) || (c == '_')) {
-		buf.append((char)c);
-		c = in.read();
-	    } else {
-		return buf.toString();
-	    }
-	}
-    }
-
-    /**
-     * Scan tag
-     */
-    public static Hashtable scanTag(Reader in) throws IOException {
-	Hashtable atts = new Hashtable();
-	skipSpace(in);
-        while (c >= 0 && c != '>') {
-	    String att = scanIdentifier(in);
-	    String val = "";
-	    skipSpace(in);
-	    if (c == '=') {
-		int quote = -1;
-		c = in.read();
-		skipSpace(in);
-		if ((c == '\'') || (c == '\"')) {
-		    quote = c;
-		    c = in.read();
-		}
-		StringBuffer buf = new StringBuffer();
-                while ((c > 0) &&
-		       (((quote < 0) && (c != ' ') && (c != '\t') &&
-                         (c != '\n') && (c != '\r') && (c != '>'))
-			|| ((quote >= 0) && (c != quote)))) {
-		    buf.append((char)c);
-		    c = in.read();
-		}
-		if (c == quote) {
-		    c = in.read();
-		}
-		skipSpace(in);
-		val = buf.toString();
-	    }
-	    //statusMsgStream.println("PUT " + att + " = '" + val + "'");
-	    if (! val.equals("")) {
-		atts.put(att.toLowerCase(java.util.Locale.ENGLISH), val);
-	    }
-            while (true) {
-                if ((c == '>') || (c < 0) ||
-                    ((c >= 'a') && (c <= 'z')) ||
-                    ((c >= 'A') && (c <= 'Z')) ||
-                    ((c >= '0') && (c <= '9')) || (c == '_'))
-                    break;
-                c = in.read();
-            }
-            //skipSpace(in);
-	}
-	return atts;
-    }
-
-    /* values used for placement of AppletViewer's frames */
-    private static int x = 0;
-    private static int y = 0;
-    private static final int XDELTA = 30;
-    private static final int YDELTA = XDELTA;
-
-    static String encoding = null;
-
-    static private Reader makeReader(InputStream is) {
-	if (encoding != null) {
-	    try {
-		return new BufferedReader(new InputStreamReader(is, encoding));
-	    } catch (IOException x) { }
-	}
-	InputStreamReader r = new InputStreamReader(is);
-	encoding = r.getEncoding();
-	return new BufferedReader(r);
-    }
-
-    /**
-     * Scan an html file for <applet> tags
-     */
-    public static void parse(long handle, Reader in, URL url, String enc)
-        throws IOException {
-        encoding = enc;
-        parse(handle, 1, 1, in, url, System.out, new PluginAppletViewerFactory());
-    }
-
-    public static void parse(long handle, int width, int height, Reader in, URL url)
-        throws IOException {
-        parse(handle, width, height,
-		in, url, System.out, new PluginAppletViewerFactory());
-    }
-
-    public static void parse(long handle, int width, int height, Reader in, 
-				URL url,
-	                        PrintStream statusMsgStream,
-        	                PluginAppletViewerFactory factory)
-        throws IOException
-    {
-        // <OBJECT> <EMBED> tag flags
-        boolean isAppletTag = false;
-        boolean isObjectTag = false;
-        boolean isEmbedTag = false;
-
-	// warning messages
-        String requiresNameWarning = amh.getMessage("parse.warning.requiresname");
-        String paramOutsideWarning = amh.getMessage("parse.warning.paramoutside");
-        String appletRequiresCodeWarning = amh.getMessage("parse.warning.applet.requirescode");
-        String appletRequiresHeightWarning = amh.getMessage("parse.warning.applet.requiresheight");
-        String appletRequiresWidthWarning = amh.getMessage("parse.warning.applet.requireswidth");
-        String objectRequiresCodeWarning = amh.getMessage("parse.warning.object.requirescode");
-        String objectRequiresHeightWarning = amh.getMessage("parse.warning.object.requiresheight");
-        String objectRequiresWidthWarning = amh.getMessage("parse.warning.object.requireswidth");
-        String embedRequiresCodeWarning = amh.getMessage("parse.warning.embed.requirescode");
-        String embedRequiresHeightWarning = amh.getMessage("parse.warning.embed.requiresheight");
-        String embedRequiresWidthWarning = amh.getMessage("parse.warning.embed.requireswidth");
-        String appNotLongerSupportedWarning = amh.getMessage("parse.warning.appnotLongersupported");
-
-	java.net.URLConnection conn = url.openConnection();
-	/* The original URL may have been redirected - this
-	 * sets it to whatever URL/codebase we ended up getting
-	 */
-	url = conn.getURL();
-
-	int ydisp = 1;
-	Hashtable atts = null;
-
-        while(true) {
-	    c = in.read();
-	    if (c == -1)
-		break;
-
-	    if (c == '<') {
-		c = in.read();
-		if (c == '/') {
-		    c = in.read();
-		    String nm = scanIdentifier(in);
-		    if (nm.equalsIgnoreCase("applet") ||
-                        nm.equalsIgnoreCase("object") ||
-                        nm.equalsIgnoreCase("embed")) {
-
-                        // We can't test for a code tag until </OBJECT>
-                        // because it is a parameter, not an attribute.
-                        if(isObjectTag) {
-                            if (atts.get("code") == null && atts.get("object") == null) {
-                                statusMsgStream.println(objectRequiresCodeWarning);
-                                atts = null;
-                            }
-                        }
-
-			if (atts != null) {
-			    atts.remove("width");
-			    atts.remove("height");
-			    atts.put("width", new Integer(width).toString());
-			    atts.put("height", new Integer(height).toString());
-
-			    // XXX 5/18 In general this code just simply
-			    // shouldn't be part of parsing.  It's presence
-			    // causes things to be a little too much of a
-			    // hack.
-                            factory.createAppletViewer(handle, x, y, url, atts);
-			    x += XDELTA;
-			    y += YDELTA;
-			    // make sure we don't go too far!
-			    Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
-			    if ((x > d.width - 300) || (y > d.height - 300)) {
-				x = 0;
-				y = 2 * ydisp * YDELTA;
-				ydisp++;
-			    }
-			}
-			atts = null;
-                        isAppletTag = false;
-                        isObjectTag = false;
-                        isEmbedTag = false;
-		    }
-		}
-		else {
-		    String nm = scanIdentifier(in);
-		    if (nm.equalsIgnoreCase("param")) {
-			Hashtable t = scanTag(in);
-			String att = (String)t.get("name");
-			if (att == null) {
-			    statusMsgStream.println(requiresNameWarning);
-			} else {
-			    String val = (String)t.get("value");
-			    if (val == null) {
-				statusMsgStream.println(requiresNameWarning);
-			    } else if (atts != null) {
-				String name = att.toLowerCase();
-				atts.put(name, val);
-			    } else {
-				statusMsgStream.println(paramOutsideWarning);
-			    }
-			}
-		    }
-		    else if (nm.equalsIgnoreCase("applet")) {
-                        isAppletTag = true;
-			atts = scanTag(in);
-			if (atts.get("code") == null && atts.get("object") == null) {
-			    statusMsgStream.println(appletRequiresCodeWarning);
-			    atts = null;
-			} else if (atts.get("width") == null) {
-			    statusMsgStream.println(appletRequiresWidthWarning);
-			    atts = null;
-			} else if (atts.get("height") == null) {
-			    statusMsgStream.println(appletRequiresHeightWarning);
-			    atts = null;
-			}
-		    }
-		    else if (nm.equalsIgnoreCase("object")) {
-                        isObjectTag = true;
-			atts = scanTag(in);
-                        // The <OBJECT> attribute codebase isn't what
-                        // we want. If its defined, remove it.
-                        if(atts.get("codebase") != null) {
-                            atts.remove("codebase");
-                        }
-
-                        if (atts.get("width") == null) {
-			    statusMsgStream.println(objectRequiresWidthWarning);
-			    atts = null;
-			} else if (atts.get("height") == null) {
-			    statusMsgStream.println(objectRequiresHeightWarning);
-			    atts = null;
-			}
-		    }
-		    else if (nm.equalsIgnoreCase("embed")) {
-                        isEmbedTag = true;
-			atts = scanTag(in);
-
-			if (atts.get("code") == null && atts.get("object") == null) {
-			    statusMsgStream.println(embedRequiresCodeWarning);
-			    atts = null;
-			} else if (atts.get("width") == null) {
-			    statusMsgStream.println(embedRequiresWidthWarning);
-			    atts = null;
-			} else if (atts.get("height") == null) {
-			    statusMsgStream.println(embedRequiresHeightWarning);
-			    atts = null;
-			}
-		    }
-		    else if (nm.equalsIgnoreCase("app")) {
-			statusMsgStream.println(appNotLongerSupportedWarning);
-			Hashtable atts2 = scanTag(in);
-			nm = (String)atts2.get("class");
-			if (nm != null) {
-			    atts2.remove("class");
-			    atts2.put("code", nm + ".class");
-			}
-			nm = (String)atts2.get("src");
-			if (nm != null) {
-			    atts2.remove("src");
-			    atts2.put("codebase", nm);
-			}
-			if (atts2.get("width") == null) {
-			    atts2.put("width", "100");
-			}
-			if (atts2.get("height") == null) {
-			    atts2.put("height", "100");
-			}
-			printTag(statusMsgStream, atts2);
-			statusMsgStream.println();
-		    }
-		}
-	    }
-	}
-	in.close();
-    }
-
-    /**
-     * Old main entry point.
-     *
-     * @deprecated
-     */
-    @Deprecated
-    public static void main(String args[]) throws IOException {
-        PluginMain.main(args);
-    }
-
-    private static AppletMessageHandler amh = new AppletMessageHandler("appletviewer");
-
-    private static void checkConnect(URL url)
-    {
-	SecurityManager security = System.getSecurityManager();
-	if (security != null) {
-	    try {
-		java.security.Permission perm =
-		    url.openConnection().getPermission();
-		if (perm != null)
-		    security.checkPermission(perm);
-		else
-		    security.checkConnect(url.getHost(), url.getPort());
-	    } catch (java.io.IOException ioe) {
-		    security.checkConnect(url.getHost(), url.getPort());
-	    }
-	}
-    }
-}

--- a/plugin/gcj/java/src/main/sun/applet/PluginMain.java	Tue Sep 23 16:33:17 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,274 +0,0 @@
-/*
- * 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;
-    }
-}

--- a/plugin/icedtea/java/src/main/netscape/javascript/JSException.java	Tue Sep 23 16:33:17 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-/* -*- 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;
-    }
-
-}
-

--- a/plugin/icedtea/java/src/main/netscape/javascript/JSObject.java	Tue Sep 23 16:33:17 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,258 +0,0 @@
-/* -*- 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 java.io.IOException;
-import sun.applet.PluginAppletViewer;
-
-/**
- * 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 int                               internal;
-    private long                              long_internal;
-
-    /**
-     * initialize
-     */
-    private static void initClass() {
-        System.err.println ("JSObject.initClass");
-    }
-
-    static {
-        System.err.println ("JSObject INITIALIZER");
-    }
-
-    /**
-     * it is illegal to construct a JSObject manually
-     */
-    // FIXME: make private!
-    public JSObject(int jsobj_addr) {
-        System.err.println ("JSObject int CONSTRUCTOR");
-        internal = jsobj_addr;
-    }
-
-    private JSObject(long jsobj_addr) {
-        System.err.println ("JSObject long CONSTRUCTOR");
-        long_internal = jsobj_addr;
-    }
-
-    /**
-     * Retrieves a named member of a JavaScript object. 
-     * Equivalent to "this.<i>name</i>" in JavaScript.
-     */
-    public Object	getMember(String name)
-    {
-        System.err.println ("JSObject.getMember " + name);
-
-        Object o = PluginAppletViewer.getMember(internal, name);
-        System.out.println ("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)
-    {
-        System.err.println ("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)
-    {
-        System.err.println ("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)
-    {
-        System.err.println ("JSObject.setSlot " + index + " " + value);
-
-        PluginAppletViewer.setSlot(internal, index, value);
-    }
-
-
-    // TODO: toString, finalize.
-
-    /**
-     * Removes a named member of a JavaScript object.
-     */
-    public void 		removeMember(String name)
-    {
-        System.err.println ("JSObject.removeMember " + name);
-
-        PluginAppletViewer.removeMember(internal, name);
-    }
-
-
-    /**
-     * Calls a JavaScript method.
-     * Equivalent to "this.<i>methodName</i>(<i>args</i>[0], <i>args</i>[1], ...)" in JavaScript.
-     */
-    public Object	call(String methodName, Object args[])
-    {
-        System.err.print ("JSObject.call " + methodName);
-        for (int i = 0; i < args.length; i++)
-            System.err.print (" " + args[i]);
-        System.err.println("");
-        return PluginAppletViewer.call(internal, methodName, args);
-    }
-
-
-    /**
-     * Evaluates a JavaScript expression. The expression is a string 
-     * of JavaScript source code which will be evaluated in the context
-     * given by "this".
-     */
-    public Object	eval(String s)
-    {
-        System.err.println("JSObject.eval " + s);
-        return PluginAppletViewer.eval(internal, s);
-    }
-
-
-    /**
-     * Converts a JSObject to a String.
-     */
-    public String        toString()
-    {
-        System.err.println("JSObject.toString");
-        return PluginAppletViewer.javascriptToString(internal);
-    }
-
-
-    // should use some sort of identifier rather than String
-    // is "property" the right word?
-    //    native String[]                         listProperties();
-
-
-    /**
-     * get a JSObject for the window containing the given applet
-     */
-    public static JSObject	getWindow(Applet applet)
-    {
-        System.err.println("JSObject.getWindow");
-        // FIXME: handle long case as well.
-        int internal = 0;
-        internal = ((PluginAppletViewer)
-                    applet.getAppletContext()).getWindow();
-        System.out.println ("GOT IT: " + internal);
-        return new JSObject(internal);
-    }
-
-
-    /**
-     * Finalization decrements the reference count on the corresponding
-     * JavaScript object.
-     */
-    protected void	finalize()
-    {
-        System.err.println("JSObject.finalize ");
-        PluginAppletViewer.JavaScriptFinalize(internal);
-    }
-
-
-    /**
-     * Override java.lang.Object.equals() because identity is not preserved
-     * with instances of JSObject.
-     */
-    public boolean equals(Object obj)
-    {
-        System.err.println("JSObject.equals " + obj);
-
-        return false;
-    }
-
-}

--- a/plugin/icedtea/java/src/main/netscape/javascript/JSProxy.java	Tue Sep 23 16:33:17 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** 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 ***** */
-
-/**
- * The JSProxy interface allows applets and plugins to
- * share javascript contexts.
- */
-
-package netscape.javascript;
-import java.applet.Applet;
-
-public interface JSProxy {
-    Object  getMember(JSObject jso, String name);
-    Object  getSlot(JSObject jso, int index);
-    void    setMember(JSObject jso, String name, Object value);
-    void    setSlot(JSObject jso, int index, Object value);
-    void    removeMember(JSObject jso, String name);
-    Object  call(JSObject jso, String methodName, Object args[]);
-    Object  eval(JSObject jso, String s);
-    String      toString(JSObject jso);
-    JSObject    getWindow(Applet applet);
-}

--- a/plugin/icedtea/java/src/main/netscape/javascript/JSRunnable.java	Tue Sep 23 16:33:17 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/* -*- 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;
-
-/**
- * Runs a JavaScript object with a run() method in a separate thread.
- */
-public class JSRunnable implements Runnable {
-	private JSObject runnable;
-
-	public JSRunnable(JSObject runnable) {
-		this.runnable = runnable;
-		synchronized(this) {
-			new Thread(this).start();
-			try {
-				this.wait();
-			} catch (InterruptedException ie) {
-			}
-		}
-	}
-	
-	public void run() {
-		try {
-			runnable.call("run", null);
-			synchronized(this) {
-				notifyAll();
-			}
-		} catch (Throwable t) {
-			System.err.println(t);
-			t.printStackTrace(System.err);
-		}
-	}
-}

--- a/plugin/icedtea/java/src/main/netscape/javascript/JSUtil.java	Tue Sep 23 16:33:17 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/* -*- 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;
-import java.io.*;
-
-public class JSUtil {
-
-    /* Return the stack trace of an exception or error as a String */
-    public static String getStackTrace(Throwable t) {
-	ByteArrayOutputStream captureStream;
-	PrintWriter p;
-	
-	captureStream = new ByteArrayOutputStream();
-	p = new PrintWriter(captureStream);
-
-	t.printStackTrace(p);
-	p.flush();
-
-	return captureStream.toString();
-    }
-}

--- a/plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/GetMemberPluginCallRequest.java	Tue Sep 23 16:33:17 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/* GetMemberPluginCallRequest -- represent Java-to-JavaScript requests
-   Copyright (C) 2008  Red Hat
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-IcedTea 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package org.classpath.icedtea.plugin;
-
-import sun.applet.AppletSecurityContextManager;
-import sun.applet.PluginCallRequest;
-
-public class GetMemberPluginCallRequest extends PluginCallRequest {
-    Object object = null;
-
-    public GetMemberPluginCallRequest(String message, String returnString) {
-        super(message, returnString);
-        System.out.println ("GetMEMBerPLUGINCAlL " + message + " " + returnString);
-    }
-
-    public void parseReturn(String message) {
-        System.out.println ("GetMEMBerparseReturn GOT: " + message);
-        String[] args = message.split(" ");
-        // FIXME: add thread ID to messages to support multiple
-        // threads using the netscape.javascript package.
-        object = AppletSecurityContextManager.getSecurityContext(0).getObject(Integer.parseInt(args[1]));
-        setDone(true);
-    }
-
-    /**
-     * Returns whether the given message is serviceable by this object
-     * 
-     * @param message The message to service
-     * @return boolean indicating if message is serviceable
-     */
-    public boolean serviceable(String message) {
-    	return message.contains("JavaScriptCall") ||
-    			message.contains("JavaScriptEval") ||
-    			message.contains("JavaScriptGetMember") ||
-    			message.contains("JavaScriptGetSlot") ||
-    			message.contains("JavaScriptToString");
-    }
-    
-    public Object getObject() {
-    	return this.object;
-    }
-}
-

--- a/plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/GetWindowPluginCallRequest.java	Tue Sep 23 16:33:17 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/* GetWindowPluginCallRequest -- represent Java-to-JavaScript requests
-   Copyright (C) 2008  Red Hat
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-IcedTea 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package org.classpath.icedtea.plugin;
-
-import java.security.AccessControlContext;
-import java.security.ProtectionDomain;
-
-import sun.applet.PluginCallRequest;
-
-
-public class GetWindowPluginCallRequest extends PluginCallRequest {
-    // FIXME: look into int vs long JavaScript internal values.
-    int internal;
-
-    public GetWindowPluginCallRequest(String message, String returnString) {
-        super(message, returnString);
-    }
-
-    public void parseReturn(String message) {
-        System.out.println ("GetWINDOWparseReturn GOT: " + message);
-        String[] args = message.split(" ");
-        // FIXME: add thread ID to messages to support multiple
-        // threads using the netscape.javascript package.
-        internal = Integer.parseInt(args[1]);
-        setDone(true);
-    }
-    
-    /**
-     * Returns whether the given message is serviceable by this object
-     * 
-     * @param message The message to service
-     * @return boolean indicating if message is serviceable
-     */
-    public boolean serviceable(String message) {
-    	return message.contains("JavaScriptGetWindow");
-    }
-
-    public Integer getObject() {
-    	return this.internal;
-    }
-}

--- a/plugin/icedtea/java/src/main/org/classpath/icedtea/plugin/PluginAppletSecurityContext.java	Tue Sep 23 16:33:17 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,855 +0,0 @@
-/* PluginAppletSecurityContext -- execute plugin JNI messages
-   Copyright (C) 2008  Red Hat
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-IcedTea 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 for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package org.classpath.icedtea.plugin;
-
-import java.io.FilePermission;
-import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import sun.applet.AppletSecurityContext;
-import sun.applet.PluginDebug;
-import sun.applet.PluginException;
-
-
-class Signature {
-	private String signature;
-	private int currentIndex;
-	private List<Class> typeList;
-	private static final char ARRAY = '[';
-	private static final char OBJECT = 'L';
-	private static final char SIGNATURE_ENDCLASS = ';';
-	private static final char SIGNATURE_FUNC = '(';
-	private static final char SIGNATURE_ENDFUNC = ')';
-	private static final char VOID = 'V';
-	private static final char BOOLEAN = 'Z';
-	private static final char BYTE = 'B';
-	private static final char CHARACTER = 'C';
-	private static final char SHORT = 'S';
-	private static final char INTEGER = 'I';
-	private static final char LONG = 'J';
-	private static final char FLOAT = 'F';
-	private static final char DOUBLE = 'D';
-
-	private String nextTypeName() {
-		char key = signature.charAt(currentIndex++);
-
-		switch (key) {
-		case ARRAY:
-			return nextTypeName() + "[]";
-
-		case OBJECT:
-			int endClass = signature.indexOf(SIGNATURE_ENDCLASS, currentIndex);
-			String retVal = signature.substring(currentIndex, endClass);
-			retVal = retVal.replace('/', '.');
-			currentIndex = endClass + 1;
-			return retVal;
-
-			// FIXME: generated bytecode with classes named after
-			// primitives will not work in this scheme -- those
-			// classes will be incorrectly treated as primitive
-			// types.
-		case VOID:
-			return "void";
-		case BOOLEAN:
-			return "boolean";
-		case BYTE:
-			return "byte";
-		case CHARACTER:
-			return "char";
-		case SHORT:
-			return "short";
-		case INTEGER:
-			return "int";
-		case LONG:
-			return "long";
-		case FLOAT:
-			return "float";
-		case DOUBLE:
-			return "double";
-
-		case SIGNATURE_ENDFUNC:
-		case SIGNATURE_FUNC:
-			return nextTypeName();
-
-		default:
-			throw new IllegalArgumentException(
-					"Invalid JNI signature character '" + key + "'");
-		}
-	}
-
-	public Signature(String signature, String src) {
-		this.signature = signature;
-		currentIndex = 0;
-		typeList = new ArrayList<Class>(10);
-
-		String elem;
-		while (currentIndex < signature.length()) {
-			elem = nextTypeName();
-			// System.out.println ("NEXT TYPE: " + elem);
-			Class primitive = primitiveNameToType(elem);
-			if (primitive != null)
-				typeList.add(primitive);
-			else {
-				// System.out.println ("HERE1");
-				int dimsize = 0;
-				int n = elem.indexOf('[');
-				if (n != -1) {
-					// System.out.println ("HERE2");
-					String arrayType = elem.substring(0, n);
-					dimsize++;
-					n = elem.indexOf('[', n + 1);
-					// System.out.println ("HERE2.5");
-					while (n != -1) {
-						dimsize++;
-						n = elem.indexOf('[', n + 1);
-						// System.out.println ("HERE2.8");
-					}
-					int[] dims = new int[dimsize];
-					primitive = primitiveNameToType(arrayType);
-					// System.out.println ("HERE3");
-					if (primitive != null) {
-						typeList.add(Array.newInstance(primitive, dims)
-								.getClass());
-						// System.out.println ("HERE4");
-					} else
-						typeList.add(Array.newInstance(
-								getClass(arrayType, src), dims).getClass());
-				} else {
-					typeList.add(getClass(elem, src));
-				}
-			}
-		}
-		if (typeList.size() == 0) {
-			throw new IllegalArgumentException("Invalid JNI signature '"
-					+ signature + "'");
-		}
-	}
-
-	public static Class getClass(String name, String src) {
-
-		Class c = null;
-		
-		try {
-			c = Class.forName(name);
-		} catch (ClassNotFoundException cnfe) {
-
-			StringTokenizer st = new StringTokenizer(src, ",");
-
-			while (st.hasMoreTokens()) {
-
-				String tok = st.nextToken();
-				System.err.println("Searching for " + name  + " at key " + tok);
-
-				try {
-					c = PluginAppletSecurityContext.classLoaders.get(tok).loadClass(name);
-				} catch (ClassNotFoundException e) {
-					// do nothing .. thrown below
-				}
-
-				if (c != null)
-					break;
-			}
-		}
-
-		if (c == null) {
-			throw (new RuntimeException(new ClassNotFoundException("Unable to find class " + name)));
-		}
-
-		return c;
-	}
-	
-	public static Class primitiveNameToType(String name) {
-		if (name.equals("void"))
-			return Void.TYPE;
-		else if (name.equals("boolean"))
-			return Boolean.TYPE;
-		else if (name.equals("byte"))
-			return Byte.TYPE;
-		else if (name.equals("char"))
-			return Character.TYPE;
-		else if (name.equals("short"))
-			return Short.TYPE;
-		else if (name.equals("int"))
-			return Integer.TYPE;
-		else if (name.equals("long"))
-			return Long.TYPE;
-		else if (name.equals("float"))
-			return Float.TYPE;
-		else if (name.equals("double"))
-			return Double.TYPE;
-		else
-			return null;
-	}
-
-	public Class[] getClassArray() {
-		return typeList.subList(0, typeList.size() - 1).toArray(new Class[] {});
-	}
-}
-
-public class PluginAppletSecurityContext extends AppletSecurityContext {
-	
-	public static HashMap<String, ClassLoader> classLoaders = new HashMap<String, ClassLoader>();
-
-	// FIXME: make private
-	public PluginObjectStore store = new PluginObjectStore();
-	private Throwable throwable = null;
-	private ClassLoader liveconnectLoader = ClassLoader.getSystemClassLoader();
-	int identifier = 0;
-
-	public PluginAppletSecurityContext(int identifier) {
-		this.identifier = identifier;
-	}
-
-	private static <V> V parseCall(String s, String src, Class<V> c) {
-		if (c == Integer.class)
-			return (V) new Integer(s);
-		else if (c == String.class)
-			return (V) new String(s);
-		else if (c == Signature.class)
-			return (V) new Signature(s, src);
-		else
-			throw new RuntimeException("Unexpected call value.");
-	}
-
-	private Object parseArgs(String s, Class c) {
-		if (c == Boolean.TYPE || c == Boolean.class)
-			return new Boolean(s);
-		else if (c == Byte.TYPE || c == Byte.class)
-			return new Byte(s);
-		else if (c == Character.TYPE || c == Character.class) {
-			String[] bytes = s.split("_");
-			int low = Integer.parseInt(bytes[0]);
-			int high = Integer.parseInt(bytes[1]);
-			int full = ((high << 8) & 0x0ff00) | (low & 0x0ff);
-			return new Character((char) full);
-		} else if (c == Short.TYPE || c == Short.class)
-			return new Short(s);
-		else if (c == Integer.TYPE || c == Integer.class)
-			return new Integer(s);
-		else if (c == Long.TYPE || c == Long.class)
-			return new Long(s);
-		else if (c == Float.TYPE || c == Float.class)
-			return new Float(s);
-		else if (c == Double.TYPE || c == Double.class)
-			return new Double(s);
-		else
-			return store.getObject(new Integer(s));
-	}
-
-	public void addClassLoader(String id, ClassLoader cl) {
-		this.classLoaders.put(id, cl);
-	}
-	
-	public void handleMessage(String src, int reference, String message) {
-
-		try {
-			if (message.startsWith("FindClass")) {
-				ClassLoader cl = null;
-				Class c = null;
-				cl = liveconnectLoader;
-				String className = message.substring("FindClass".length() + 1)
-						.replace('/', '.');
-
-				try {
-					c = cl.loadClass(className);
-					store.reference(c);
-					write(reference, "FindClass " + store.getIdentifier(c));
-				} catch (ClassNotFoundException cnfe) {
-					write(reference, "FindClass 0");
-				}
-
-			} else if (message.startsWith("GetStaticMethodID")
-					|| message.startsWith("GetMethodID")) {
-				String[] args = message.split(" ");
-				Integer classID = parseCall(args[1], src, Integer.class);
-				String methodName = parseCall(args[2], src, String.class);
-				Signature signature = parseCall(args[3], src, Signature.class);
-				Object[] a = signature.getClassArray();
-
-				Class c = (Class) store.getObject(classID);
-				Method m = null;
-				Constructor cs = null;
-				Object o = null;
-				if (methodName.equals("<init>")
-						|| methodName.equals("<clinit>")) {
-					o = cs = c.getConstructor(signature.getClassArray());
-					store.reference(cs);
-				} else {
-					o = m = c.getMethod(methodName, signature.getClassArray());
-					store.reference(m);
-				}
-				PluginDebug.debug(o + " has id " + store.getIdentifier(o));
-				write(reference, args[0] + " " + store.getIdentifier(o));
-			} else if (message.startsWith("GetStaticFieldID")
-					|| message.startsWith("GetFieldID")) {
-				String[] args = message.split(" ");
-				Integer classID = parseCall(args[1], src, Integer.class);
-				String fieldName = parseCall(args[2], src, String.class);
-				Signature signature = parseCall(args[3], src, Signature.class);
-
-				Class c = (Class) store.getObject(classID);
-				Field f = null;
-				f = c.getField(fieldName);
-
-				store.reference(f);
-
-				write(reference, "GetStaticFieldID " + store.getIdentifier(f));
-			} else if (message.startsWith("GetStaticField")) {
-				String[] args = message.split(" ");
-				String type = parseCall(args[1], src, String.class);
-				Integer classID = parseCall(args[1], src, Integer.class);
-				Integer fieldID = parseCall(args[2], src, Integer.class);
-
-				Class c = (Class) store.getObject(classID);
-				Field f = (Field) store.getObject(fieldID);
-
-				Object ret = null;
-				ret = f.get(c);
-
-				// System.out.println ("FIELD VALUE: " + ret);
-				if (ret == null) {
-					write(reference, "GetStaticField 0");
-				} else if (f.getType() == Boolean.TYPE
-						|| f.getType() == Byte.TYPE
-						|| f.getType() == Character.TYPE
-						|| f.getType() == Short.TYPE
-						|| f.getType() == Integer.TYPE
-						|| f.getType() == Long.TYPE
-						|| f.getType() == Float.TYPE
-						|| f.getType() == Double.TYPE) {
-					write(reference, "GetStaticField " + ret);
-				} else {
-					// Track returned object.
-					store.reference(ret);
-					write(reference, "GetStaticField "
-							+ store.getIdentifier(ret));
-				}
-			} else if (message.startsWith("SetStaticField")) {
-				String[] args = message.split(" ");
-				String type = parseCall(args[1], src, String.class);
-				Integer classID = parseCall(args[2], src, Integer.class);
-				Integer fieldID = parseCall(args[3], src, Integer.class);
-
-				Object value = null;
-				if (Signature.primitiveNameToType(type) != null) {
-					value = parseArgs(args[4], Signature
-							.primitiveNameToType(type));
-					// System.out.println ("HERE1: " + value);
-				} else {
-					value = parseArgs(args[3], Object.class);
-					// System.out.println ("HERE2: " + value);
-				}
-
-				Class c = (Class) store.getObject(classID);
-				Field f = (Field) store.getObject(fieldID);
-
-				f.set(c, value);
-
-				write(reference, "SetStaticField");
-			} else if (message.startsWith("SetField")) {
-				String[] args = message.split(" ");
-				String type = parseCall(args[1], src, String.class);
-				Integer objectID = parseCall(args[2], src, Integer.class);
-				Integer fieldID = parseCall(args[3], src, Integer.class);
-
-				Object value = null;
-				if (Signature.primitiveNameToType(type) != null) {
-					value = parseArgs(args[4], Signature
-							.primitiveNameToType(type));
-					// System.out.println ("HERE1: " + value);
-				} else {
-					value = parseArgs(args[3], Object.class);
-					// System.out.println ("HERE2: " + value);
-				}
-
-				Object o = (Object) store.getObject(objectID);
-				Field f = (Field) store.getObject(fieldID);
-
-				f.set(o, value);
-
-				write(reference, "SetField");
-			} else if (message.startsWith("GetObjectArrayElement")) {
-				String[] args = message.split(" ");
-				Integer arrayID = parseCall(args[1], src, Integer.class);
-				Integer index = parseCall(args[2], src, Integer.class);
-
-				Object[] o = (Object[]) store.getObject(arrayID);
-				Object ret = null;
-
-				ret = o[index];
-
-				// Track returned object.
-				store.reference(ret);
-				// System.out.println ("array element: " + index + " " + ret);
-				write(reference, "GetObjectArrayElement "
-						+ store.getIdentifier(ret));
-			} else if (message.startsWith("SetObjectArrayElement")) {
-				String[] args = message.split(" ");
-				Integer arrayID = parseCall(args[1], src, Integer.class);
-				Integer index = parseCall(args[2], src, Integer.class);
-				Integer objectID = parseCall(args[3], src, Integer.class);
-
-				Object[] o = (Object[]) store.getObject(arrayID);
-				Object toSet = (Object) store.getObject(objectID);
-
-				o[index] = toSet;
-
-				write(reference, "SetObjectArrayElement");
-			} else if (message.startsWith("GetArrayLength")) {
-				String[] args = message.split(" ");
-				Integer arrayID = parseCall(args[1], src, Integer.class);
-
-				System.out.println("ARRAYID: " + arrayID);
-				Object o = (Object) store.getObject(arrayID);
-				int len = 0;
-				len = Array.getLength(o);
-				// System.out.println ("Returning array length: " + len);
-
-				// System.out.println ("array length: " + o + " " + len);
-				write(reference, "GetArrayLength " + Array.getLength(o));
-			} else if (message.startsWith("GetField")) {
-				String[] args = message.split(" ");
-				String type = parseCall(args[1], src, String.class);
-				Integer objectID = parseCall(args[1], src, Integer.class);
-				Integer fieldID = parseCall(args[2], src, Integer.class);
-
-				Object o = (Object) store.getObject(objectID);
-				Field f = (Field) store.getObject(fieldID);
-
-				Object ret = null;
-				ret = f.get(o);
-
-				// System.out.println ("FIELD VALUE: " + ret);
-				if (ret == null) {
-					write(reference, "GetField 0");
-				} else if (f.getType() == Boolean.TYPE
-						|| f.getType() == Byte.TYPE
-						|| f.getType() == Character.TYPE
-						|| f.getType() == Short.TYPE
-						|| f.getType() == Integer.TYPE
-						|| f.getType() == Long.TYPE
-						|| f.getType() == Float.TYPE
-						|| f.getType() == Double.TYPE) {
-					write(reference, "GetField " + ret);
-				} else {
-					// Track returned object.
-					store.reference(ret);
-					write(reference, "GetField " + store.getIdentifier(ret));
-				}
-			} else if (message.startsWith("GetObjectClass")) {
-				int oid = Integer.parseInt(message.substring("GetObjectClass"
-						.length() + 1));
-				// System.out.println ("GETTING CLASS FOR: " + oid);
-				Class c = store.getObject(oid).getClass();
-				// System.out.println (" OBJ: " + store.getObject(oid));
-				// System.out.println (" CLS: " + c);
-				store.reference(c);
-
-				write(reference, "GetObjectClass " + store.getIdentifier(c));
-			} else if (message.startsWith("CallStaticMethod")) {
-				String[] args = message.split(" ");
-				Integer classID = parseCall(args[1], src, Integer.class);
-				Integer methodID = parseCall(args[2], src, Integer.class);
-
-				System.out.println("GETTING: " + methodID);
-				Method m = (Method) store.getObject(methodID);
-				System.out.println("GOT: " + m);
-				Class[] argTypes = m.getParameterTypes();
-
-				Object[] arguments = new Object[argTypes.length];
-				for (int i = 0; i < argTypes.length; i++) {
-					arguments[i] = parseArgs(args[3 + i], argTypes[i]);
-					// System.out.println ("GOT ARG: " + argTypes[i] + " " +
-					// arguments[i]);
-				}
-
-				// System.out.println ("Calling " + m);
-				Object ret = null;
-				ret = m.invoke(null, arguments);
-
-				// if (ret != null)
-				// System.out.println ("RETURN VALUE: " + ret + " " +
-				// ret.getClass());
-				// else
-				// System.out.println ("RETURN VALUE: " + ret);
-				if (ret == null) {
-					write(reference, "CallStaticMethod void");
-				} else if (m.getReturnType() == Boolean.TYPE
-						|| m.getReturnType() == Byte.TYPE
-						|| m.getReturnType() == Short.TYPE
-						|| m.getReturnType() == Integer.TYPE
-						|| m.getReturnType() == Long.TYPE
-						|| m.getReturnType() == Float.TYPE
-						|| m.getReturnType() == Double.TYPE) {
-					write(reference, "CallStaticMethod " + ret);
-				} else if (m.getReturnType() == Character.TYPE) {
-					char ch = (Character) ret;
-					int high = (((int) ch) >> 8) & 0x0ff;
-					int low = ((int) ch) & 0x0ff;
-					write(reference, "CallStaticMethod " + low + "_" + high);
-				} else {
-					// Track returned object.
-					store.reference(ret);
-					write(reference, "CallStaticMethod "
-							+ store.getIdentifier(ret));
-				}
-			} else if (message.startsWith("CallMethod")) {
-				String[] args = message.split(" ");
-				Integer objectID = parseCall(args[1], src, Integer.class);
-				Integer methodID = parseCall(args[2], src, Integer.class);
-
-				Object o = (Object) store.getObject(objectID);
-				Method m = (Method) store.getObject(methodID);
-				Class[] argTypes = m.getParameterTypes();
-
-				Object[] arguments = new Object[argTypes.length];
-				for (int i = 0; i < argTypes.length; i++) {
-					arguments[i] = parseArgs(args[3 + i], argTypes[i]);
-					PluginDebug.debug("GOT ARG: " + argTypes[i] + " "
-							+ arguments[i]);
-				}
-
-				String collapsedArgs = "";
-				for (String s : args) {
-					collapsedArgs += " " + s;
-				}
-
-				PluginDebug.debug("Calling method " + m + " on object " + o
-						+ " with " + arguments);
-				Object ret = null;
-				ret = m.invoke(o, arguments);
-
-				String retO;
-				if (ret == null) {
-					retO = "null";
-				} else {
-					retO = ret.getClass().toString();
-				}
-
-				PluginDebug.debug("Calling " + m + " on " + o + " with "
-						+ collapsedArgs + " and that returned: " + ret
-						+ " of type " + retO);
-
-				if (ret == null) {
-					write(reference, "CallMethod void");
-				} else if (m.getReturnType() == Boolean.TYPE
-						|| m.getReturnType() == Byte.TYPE
-						|| m.getReturnType() == Short.TYPE
-						|| m.getReturnType() == Integer.TYPE
-						|| m.getReturnType() == Long.TYPE
-						|| m.getReturnType() == Float.TYPE
-						|| m.getReturnType() == Double.TYPE) {
-					write(reference, "CallMethod " + ret);
-				} else if (m.getReturnType() == Character.TYPE) {
-					char ch = (Character) ret;
-					int high = (((int) ch) >> 8) & 0x0ff;
-					int low = ((int) ch) & 0x0ff;
-					write(reference, "CallMethod " + low + "_" + high);
-				} else {
-					// Track returned object.
-					store.reference(ret);
-					write(reference, "CallMethod " + store.getIdentifier(ret));
-				}
-			} else if (message.startsWith("GetSuperclass")) {
-				String[] args = message.split(" ");
-				Integer classID = parseCall(args[1], src, Integer.class);
-				Class c = null;
-				Class ret = null;
-
-				c = (Class) store.getObject(classID);
-				ret = c.getSuperclass();
-				store.reference(ret);
-
-				write(reference, "GetSuperclass " + store.getIdentifier(ret));
-			} else if (message.startsWith("IsAssignableFrom")) {
-				String[] args = message.split(" ");
-				Integer classID = parseCall(args[1], src, Integer.class);
-				Integer superclassID = parseCall(args[2], src, Integer.class);
-
-				boolean result = false;
-				Class clz = (Class) store.getObject(classID);
-				Class sup = (Class) store.getObject(superclassID);
-
-				result = sup.isAssignableFrom(clz);
-
-				write(reference, "IsAssignableFrom " + (result ? "1" : "0"));
-			} else if (message.startsWith("IsInstanceOf")) {
-				String[] args = message.split(" ");
-				Integer objectID = parseCall(args[1], src, Integer.class);
-				Integer classID = parseCall(args[2], src, Integer.class);
-
-				boolean result = false;
-				Object o = (Object) store.getObject(objectID);
-				Class c = (Class) store.getObject(classID);
-
-				result = c.isInstance(o);
-
-				write(reference, "IsInstanceOf " + (result ? "1" : "0"));
-			} else if (message.startsWith("GetStringUTFLength")) {
-				String[] args = message.split(" ");
-				Integer stringID = parseCall(args[1], src, Integer.class);
-
-				String o = null;
-				byte[] b = null;
-				o = (String) store.getObject(stringID);
-				b = o.getBytes("UTF-8");
-				// System.out.println ("STRING UTF-8 LENGTH: " + o + " " +
-				// b.length);
-
-				write(reference, "GetStringUTFLength " + o.length());
-			} else if (message.startsWith("GetStringLength")) {
-				String[] args = message.split(" ");
-				Integer stringID = parseCall(args[1], src, Integer.class);
-
-				String o = null;
-				byte[] b = null;
-				o = (String) store.getObject(stringID);
-				b = o.getBytes("UTF-16LE");
-				// System.out.println ("STRING UTF-16 LENGTH: " + o + " " +
-				// b.length);
-
-				// System.out.println ("Java: GetStringLength " + b.length);
-				write(reference, "GetStringLength " + o.length());
-			} else if (message.startsWith("GetStringUTFChars")) {
-				String[] args = message.split(" ");
-				Integer stringID = parseCall(args[1], src, Integer.class);
-
-				String o = null;
-				byte[] b = null;
-				StringBuffer buf = null;
-				o = (String) store.getObject(stringID);
-				b = o.getBytes("UTF-8");
-				buf = new StringBuffer(b.length * 2);
-				buf.append(b.length);
-				for (int i = 0; i < b.length; i++)
-					buf
-							.append(" "
-									+ Integer
-											.toString(((int) b[i]) & 0x0ff, 16));
-
-				// System.out.println ("Java: GetStringUTFChars: " + o);
-				// //System.out.println ("String UTF BYTES: " + buf);
-				write(reference, "GetStringUTFChars " + buf);
-			} else if (message.startsWith("GetStringChars")) {
-				String[] args = message.split(" ");
-				Integer stringID = parseCall(args[1], src, Integer.class);
-
-				String o = null;
-				byte[] b = null;
-				StringBuffer buf = null;
-				o = (String) store.getObject(stringID);
-				// FIXME: LiveConnect uses UCS-2.
-				b = o.getBytes("UTF-16LE");
-				buf = new StringBuffer(b.length * 2);
-				buf.append(b.length);
-				for (int i = 0; i < b.length; i++)
-					buf
-							.append(" "
-									+ Integer
-											.toString(((int) b[i]) & 0x0ff, 16));
-
-				System.out.println("Java: GetStringChars: " + o);
-				System.out.println("  String BYTES: " + buf);
-				write(reference, "GetStringChars " + buf);
-			} else if (message.startsWith("NewArray")) {
-				String[] args = message.split(" ");
-				String type = parseCall(args[1], src, String.class);
-				Integer length = parseCall(args[2], src, Integer.class);
-
-				// System.out.println ("CALLING: NewArray: " + type + " " +
-				// length + " "
-				// + Signature.primitiveNameToType(type));
-
-				Object newArray = null;
-				newArray = Array.newInstance(Signature
-						.primitiveNameToType(type), length);
-
-				store.reference(newArray);
-				write(reference, "NewArray " + store.getIdentifier(newArray));
-			} else if (message.startsWith("NewObjectArray")) {
-				String[] args = message.split(" ");
-				Integer length = parseCall(args[1], src, Integer.class);
-				Integer classID = parseCall(args[2], src, Integer.class);
-				Integer objectID = parseCall(args[3], src, Integer.class);
-
-				// System.out.println ("CALLING: NewObjectArray: " +
-				// classID + " " + length + " "
-				// + objectID);
-
-				Object newArray = null;
-				newArray = Array.newInstance((Class) store.getObject(classID),
-						length);
-
-				Object[] array = (Object[]) newArray;
-				for (int i = 0; i < array.length; i++)
-					array[i] = store.getObject(objectID);
-				store.reference(newArray);
-				write(reference, "NewObjectArray "
-						+ store.getIdentifier(newArray));
-			} else if (message.startsWith("NewObject")) {
-				String[] args = message.split(" ");
-				Integer classID = parseCall(args[1], src, Integer.class);
-				Integer methodID = parseCall(args[2], src, Integer.class);
-
-				final Constructor m = (Constructor) store.getObject(methodID);
-				Class[] argTypes = m.getParameterTypes();
-
-				// System.out.println ("NEWOBJ: HERE1");
-				final Object[] arguments = new Object[argTypes.length];
-				// System.out.println ("NEWOBJ: HERE2");
-				for (int i = 0; i < argTypes.length; i++) {
-					arguments[i] = parseArgs(args[3 + i], argTypes[i]);
-					// System.out.println ("NEWOBJ: GOT ARG: " + arguments[i]);
-				}
-				
-				Object ret = m.newInstance(arguments);
-				store.reference(ret);
-
-				write(reference, "NewObject " + store.getIdentifier(ret));
-				
-			} else if (message.startsWith("NewString")) {
-				System.out.println("MESSAGE: " + message);
-				String[] args = message.split(" ");
-				Integer strlength = parseCall(args[1], src, Integer.class);
-				int bytelength = 2 * strlength;
-				byte[] byteArray = new byte[bytelength];
-				String ret = null;
-				for (int i = 0; i < strlength; i++) {
-					int c = parseCall(args[2 + i], src, Integer.class);
-					System.out.println("char " + i + " " + c);
-					// Low.
-					byteArray[2 * i] = (byte) (c & 0x0ff);
-					// High.
-					byteArray[2 * i + 1] = (byte) ((c >> 8) & 0x0ff);
-				}
-				ret = new String(byteArray, 0, bytelength, "UTF-16LE");
-				System.out.println("NEWSTRING: " + ret);
-
-				// System.out.println ("NEWOBJ: CALLED: " + ret);
-				// System.out.println ("NEWOBJ: CALLED: " +
-				// store.getObject(ret));
-				store.reference(ret);
-				write(reference, "NewString " + store.getIdentifier(ret));
-			} else if (message.startsWith("NewStringUTF")) {
-				System.out.println("MESSAGE: " + message);
-				String[] args = message.split(" ");
-				byte[] byteArray = new byte[60];
-				String ret = null;
-				int i = 0;
-				int c = 0;
-				while (((byte) c) != 0) {
-					c = parseCall(args[1 + i], src, Integer.class);
-					byteArray[i] = (byte) c;
-					i++;
-					if (i == byteArray.length) {
-						byte[] newByteArray = new byte[2 * byteArray.length];
-						System.arraycopy(byteArray, 0, newByteArray, 0,
-								byteArray.length);
-						byteArray = newByteArray;
-					}
-				}
-				byteArray[i] = (byte) 0;
-				ret = new String(byteArray, "UTF-8");
-				System.out.println("NEWSTRINGUTF: " + ret);
-
-				store.reference(ret);
-				write(reference, "NewStringUTF " + store.getIdentifier(ret));
-			} else if (message.startsWith("ExceptionOccurred")) {
-				System.out.println("EXCEPTION: " + throwable);
-				if (throwable != null)
-					store.reference(throwable);
-				write(reference, "ExceptionOccurred "
-						+ store.getIdentifier(throwable));
-			} else if (message.startsWith("ExceptionClear")) {
-				if (throwable != null)
-					store.unreference(store.getIdentifier(throwable));
-				throwable = null;
-				write(reference, "ExceptionClear");
-			} else if (message.startsWith("DeleteGlobalRef")) {
-				String[] args = message.split(" ");
-				Integer id = parseCall(args[1], src, Integer.class);
-				store.unreference(id);
-				write(reference, "DeleteGlobalRef");
-			} else if (message.startsWith("DeleteLocalRef")) {
-				String[] args = message.split(" ");
-				Integer id = parseCall(args[1], src, Integer.class);
-				store.unreference(id);
-				write(reference, "DeleteLocalRef");
-			} else if (message.startsWith("NewGlobalRef")) {
-				String[] args = message.split(" ");
-				Integer id = parseCall(args[1], src, Integer.class);
-				store.reference(store.getObject(id));
-				write(reference, "NewGlobalRef " + id);
-			}
-		} catch (Throwable t) {
-			t.printStackTrace();
-			throwable = t;
-			PluginException p = new PluginException(this.streamhandler, identifier, reference, t);
-		}
-	}
-
-	private void write(int reference, String message) {
-		PluginDebug.debug("appletviewer writing " + message);
-		streamhandler.write("context " + identifier + " reference " + reference
-				+ " " + message);
-	}
-	
-	public void dumpStore() {
-		store.dump();
-	}
-
-	public Object getObject(int identifier) {
-		return store.getObject(identifier);		
-	}
-
-	public int getIdentifier(Object o) {
-		return store.getIdentifier(o);
-	}
-
-	public void store(Object o) {
-		store.reference(o);
-	}
-}