[RFC][IcedTea-Web]: Removing dead unused commented code
Dr Andrew John Hughes
ahughes at redhat.com
Thu Jan 13 15:31:24 PST 2011
On 18:19 Thu 13 Jan , Andrew Su wrote:
> Hello,
>
> This patch is an attempt to remove dead, unused or commented code from the plugin directory in icedtea-web.
>
> (I have provided the patch for each file separately for easier reading.)
>
> Some comments though..
> General Note:
> Changed the copyright to be 2011 for all the modified files.
>
The copyright updates should extend the range, not remove the original.
So:
> - Copyright (C) 2008 Red Hat
> + Copyright (C) 2011 Red Hat
becomes
- Copyright (C) 2008 Red Hat
+ Copyright (C) 2008, 2011 Red Hat
Also I'm not sure removing code is worth a copyright update.
> These are the methods that will be removed with the patch (unused private methods)
> PluginMessageConsumer.java:getReference(String[])
> PluginMessageConsumer.java:isInInit(Integer)
> PluginMessageConsumer.java:dumpWorkerStatus()
> PluginAppletViewer.java:makeReader(InputStream)
> PluginMessageConsumer.java:getReference(String[])
> PluginMessageConsumer.java:isInInit(Integer)
> PluginMessageConsumer.java:dumpWorkerStatus()
>
> In the following method, will we be needing this block of commented out conditions in the future?
> PluginAppletSecurityContext.java:getAccessControlContext(String[], String)
>
>
> I have tried building it and that succeeds. Tested running some simple applets and those seem to work as well.
>
> Questions comments concerns?
>
> Regards,
> Andrew
> diff -r 4e84e06b54e9 plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java
> --- a/plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java Wed Jan 12 12:50:13 2011 -0500
> +++ b/plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java Thu Jan 13 18:02:32 2011 -0500
> @@ -1,5 +1,5 @@
> /* GetWindowPluginCallRequest -- represent Java-to-JavaScript requests
> - Copyright (C) 2008 Red Hat
> + Copyright (C) 2011 Red Hat
>
> This file is part of IcedTea.
>
> @@ -37,9 +37,6 @@
>
> package sun.applet;
>
> -import java.security.AccessControlContext;
> -import java.security.ProtectionDomain;
> -
> public class GetWindowPluginCallRequest extends PluginCallRequest {
> // FIXME: look into int vs long JavaScript internal values.
> long internal;
> diff -r 4e84e06b54e9 plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java
> --- a/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java Wed Jan 12 12:50:13 2011 -0500
> +++ b/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java Thu Jan 13 18:02:32 2011 -0500
> @@ -1,5 +1,5 @@
> /* MethodOverloadResolver -- Resolves overloaded methods
> - Copyright (C) 2009 Red Hat
> + Copyright (C) 2011 Red Hat
>
> This file is part of IcedTea.
>
> @@ -175,8 +175,6 @@
>
> int lowestCost = Integer.MAX_VALUE;
>
> - ArrayList<Object> paramList = new ArrayList<Object>();
> -
> for (Method matchingMethod : matchingMethods) {
>
> int methodCost = 0;
> @@ -240,8 +238,6 @@
>
> int lowestCost = Integer.MAX_VALUE;
>
> - ArrayList<Object> paramList = new ArrayList<Object>();
> -
> for (Constructor matchingConstructor : matchingConstructors) {
>
> int constructorCost = 0;
> diff -r 4e84e06b54e9 plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
> --- a/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java Wed Jan 12 12:50:13 2011 -0500
> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java Thu Jan 13 18:02:32 2011 -0500
> @@ -1,5 +1,5 @@
> /* PluginAppletSecurityContext -- execute plugin JNI messages
> - Copyright (C) 2008, 2010 Red Hat
> + Copyright (C) 2008, 2010, 2011 Red Hat
>
> This file is part of IcedTea.
>
> @@ -37,7 +37,6 @@
>
> package sun.applet;
>
> -import java.io.File;
> import java.lang.reflect.Array;
> import java.lang.reflect.Constructor;
> import java.lang.reflect.Field;
> @@ -53,14 +52,11 @@
> import java.security.Permissions;
> import java.security.PrivilegedAction;
> import java.security.ProtectionDomain;
> -import java.text.DecimalFormat;
> import java.util.ArrayList;
> import java.util.Hashtable;
> import java.util.List;
> import java.util.Map;
>
> -import javax.swing.text.html.HTMLDocument.HTMLReader.IsindexAction;
> -
> import net.sourceforge.jnlp.runtime.JNLPRuntime;
> import netscape.javascript.JSObjectCreatePermission;
>
> @@ -144,32 +140,25 @@
> if (elem == null) // end of signature
> continue;
>
> - // 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, cl), dims).getClass());
> @@ -557,11 +546,6 @@
> // Cast the object to appropriate type before insertion
> value = MethodOverloadResolver.getCostAndCastedObject(value, store.getObject(arrayID).getClass().getComponentType())[1];
>
> - //if (value == null &&
> - // store.getObject(arrayID).getClass().getComponentType().isPrimitive()) {
> - // value = 0;
> - //}
> -
> Array.set(store.getObject(arrayID), index, value);
>
> write(reference, "SetObjectArrayElement");
> @@ -569,13 +553,10 @@
> String[] args = message.split(" ");
> Integer arrayID = parseCall(args[1], null, Integer.class);
>
> - //System.out.println("ARRAYID: " + arrayID);
> Object o = 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(" ");
> @@ -624,10 +605,7 @@
> } 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));
> @@ -773,8 +751,6 @@
> 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")) {
> @@ -785,10 +761,7 @@
> 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(" ");
> @@ -807,8 +780,6 @@
> + 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(" ");
> @@ -854,10 +825,6 @@
> String type = parseCall(args[1], null, String.class);
> Integer length = parseCall(args[2], null, Integer.class);
>
> - // System.out.println ("CALLING: NewArray: " + type + " " +
> - // length + " "
> - // + Signature.primitiveNameToType(type));
> -
> Object newArray = null;
>
> Class c;
> @@ -939,10 +906,6 @@
> Integer classID = parseCall(args[2], null, Integer.class);
> Integer objectID = parseCall(args[3], null, Integer.class);
>
> - // System.out.println ("CALLING: NewObjectArray: " +
> - // classID + " " + length + " "
> - // + objectID);
> -
> Object newArray = null;
> newArray = Array.newInstance((Class) store.getObject(classID),
> length);
> @@ -962,12 +925,9 @@
> final Constructor m = (Constructor) store.getObject(methodID);
> Class[] argTypes = m.getParameterTypes();
>
> - // System.out.println ("NEWOBJ: HERE1");
> 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]);
> }
>
> final Object[] fArguments = arguments;
> @@ -1090,9 +1050,6 @@
> ret = new String(byteArray, 0, bytelength, "UTF-16LE");
> PluginDebug.debug("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));
>
> @@ -1336,106 +1293,6 @@
>
> public AccessControlContext getAccessControlContext(String[] nsPrivilegeList, String src) {
>
> - /*
> - for (int i=0; i < nsPrivilegeList.length; i++) {
> - String privilege = nsPrivilegeList[i];
> -
> - if (privilege.equals("UniversalAccept")) {
> - SocketPermission sp = new SocketPermission("*", "accept,resolve");
> - grantedPermissions.add(sp);
> - } else if (privilege.equals("UniversalAwtEventQueueAccess")) {
> - AWTPermission awtp = new AWTPermission("accessEventQueue");
> - grantedPermissions.add(awtp);
> - } else if (privilege.equals("UniversalConnect")) {
> - SocketPermission sp = new SocketPermission("*", "connect,resolve");
> - grantedPermissions.add(sp);
> - } else if (privilege.equals("UniversalListen")) {
> - SocketPermission sp = new SocketPermission("*", "listen,resolve");
> - grantedPermissions.add(sp);
> - } else if (privilege.equals("UniversalExecAccess")) {
> - FilePermission fp = new FilePermission("<<ALL FILES>>", "execute");
> - RuntimePermission rtp = new RuntimePermission("setIO");
> - grantedPermissions.add(fp);
> - grantedPermissions.add(rtp);
> - } else if (privilege.equals("UniversalExitAccess")) {
> - // Doesn't matter what the permissions are. Do not allow VM to exit.. we
> - // use a single VM for the entire browser lifecycle once invoked, we
> - // cannot let it exit
> -
> - //RuntimePermission rtp = new RuntimePermission("exitVM.*");
> - //grantedPermissions.add(rtp);
> - } else if (privilege.equals("UniversalFileDelete")) {
> - FilePermission fp = new FilePermission("<<ALL FILES>>", "delete");
> - grantedPermissions.add(fp);
> - } else if (privilege.equals("UniversalFileRead")) {
> - FilePermission fp = new FilePermission("<<ALL FILES>>", "read");
> - grantedPermissions.add(fp);
> - } else if (privilege.equals("UniversalFileWrite")) {
> - FilePermission fp = new FilePermission("<<ALL FILES>>", "write");
> - grantedPermissions.add(fp);
> - } else if (privilege.equals("UniversalFdRead")) {
> - RuntimePermission rtp = new RuntimePermission("readFileDescriptor");
> - grantedPermissions.add(rtp);
> - } else if (privilege.equals("UniversalFdWrite")) {
> - RuntimePermission rtp = new RuntimePermission("writeFileDescriptor");
> - grantedPermissions.add(rtp);
> - } else if (privilege.equals("UniversalLinkAccess")) {
> - RuntimePermission rtp = new RuntimePermission("loadLibrary.*");
> - grantedPermissions.add(rtp);
> - } else if (privilege.equals("UniversalListen")) {
> - SocketPermission sp = new SocketPermission("*", "listen");
> - grantedPermissions.add(sp);
> - } else if (privilege.equals("UniversalMulticast")) {
> - SocketPermission sp = new SocketPermission("*", "accept,connect,resolve");
> - grantedPermissions.add(sp);
> - } else if (privilege.equals("UniversalPackageAccess")) {
> - RuntimePermission rtp = new RuntimePermission("defineClassInPackage.*");
> - grantedPermissions.add(rtp);
> - } else if (privilege.equals("UniversalPackageDefinition")) {
> - RuntimePermission rtp = new RuntimePermission("accessClassInPackage.*");
> - grantedPermissions.add(rtp);
> - } else if (privilege.equals("UniversalPrintJobAccess")) {
> - RuntimePermission rtp = new RuntimePermission("queuePrintJob");
> - grantedPermissions.add(rtp);
> - } else if (privilege.equals("UniversalPropertyRead")) {
> - PropertyPermission pp = new PropertyPermission("*", "read");
> - grantedPermissions.add(pp);
> - } else if (privilege.equals("UniversalPropertyWrite")) {
> - PropertyPermission pp = new PropertyPermission("*", "write");
> - grantedPermissions.add(pp);
> - } else if (privilege.equals("UniversalSetFactory")) {
> - RuntimePermission rtp = new RuntimePermission("setFactory");
> - grantedPermissions.add(rtp);
> - } else if (privilege.equals("UniversalSystemClipboardAccess")) {
> - AWTPermission awtp = new AWTPermission("accessClipboard");
> - grantedPermissions.add(awtp);
> - } else if (privilege.equals("UniversalThreadAccess")) {
> - RuntimePermission rtp1 = new RuntimePermission("modifyThread");
> - RuntimePermission rtp2 = new RuntimePermission("stopThread");
> - grantedPermissions.add(rtp1);
> - grantedPermissions.add(rtp2);
> - } else if (privilege.equals("UniversalThreadGroupAccess")) {
> - RuntimePermission rtp1 = new RuntimePermission("modifyThreadGroup");
> - RuntimePermission rtp2 = new RuntimePermission("modifyThread");
> - RuntimePermission rtp3 = new RuntimePermission("stopThread");
> - grantedPermissions.add(rtp1);
> - grantedPermissions.add(rtp2);
> - grantedPermissions.add(rtp3);
> - } else if (privilege.equals("UniversalTopLevelWindow")) {
> - AWTPermission awtp = new AWTPermission("topLevelWindow");
> - grantedPermissions.add(awtp);
> - } else if (privilege.equals("UniversalBrowserRead")) {
> - BrowserReadPermission bp = new BrowserReadPermission();
> - grantedPermissions.add(bp);
> - } else if (privilege.equals("UniversalJavaPermissions")) {
> - AllPermission ap = new AllPermission();
> - grantedPermissions.add(ap);
> - }
> - }
> -
> - // what to do with these is unknown: UniversalConnectWithRedirect, UniversalDialogModality, UniversalSendMail, LimitedInstall, FullInstall, SilentInstall
> - */
> -
> Permissions grantedPermissions = new Permissions();
>
> for (int i = 0; i < nsPrivilegeList.length; i++) {
> diff -r 4e84e06b54e9 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed Jan 12 12:50:13 2011 -0500
> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Jan 13 18:02:32 2011 -0500
> @@ -836,7 +836,6 @@
> }
>
> private Image getCachedImage(URL url) {
> - // System.getSecurityManager().checkConnection(url.getHost(), url.getPort());
> return (Image) getCachedImageRef(url).get();
> }
>
> @@ -1825,18 +1824,6 @@
>
> 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
> */
> @@ -1869,10 +1856,7 @@
> PrintStream statusMsgStream,
> PluginAppletPanelFactory factory)
> throws IOException {
> - // <OBJECT> <EMBED> tag flags
> - boolean isAppletTag = false;
> boolean isObjectTag = false;
> - boolean isEmbedTag = false;
> boolean objectTagAlreadyParsed = false;
>
> // The current character
> @@ -1948,9 +1932,7 @@
> }
> }
> atts = null;
> - isAppletTag = false;
> isObjectTag = false;
> - isEmbedTag = false;
> }
> } else {
> String nm = scanIdentifier(c, in);
> @@ -1967,15 +1949,12 @@
> String val = t.get("value");
> if (val == null) {
> statusMsgStream.println(requiresNameWarning);
> - } else if (atts != null) {
> + } else {
> PluginDebug.debug("PUT " + att + " = " + val);
> atts.put(att.toLowerCase(), val);
> - } else {
> - statusMsgStream.println(paramOutsideWarning);
> }
> }
> } else if (nm.equalsIgnoreCase("applet")) {
> - isAppletTag = true;
> atts = scanTag(c, in);
>
> // If there is a classid and no code tag present, transform it to code tag
> @@ -2055,7 +2034,6 @@
> atts.put("height", height);
> }
> } else if (nm.equalsIgnoreCase("embed")) {
> - isEmbedTag = true;
> atts = scanTag(c, in);
>
> // If there is a classid and no code tag present, transform it to code tag
> diff -r 4e84e06b54e9 plugin/icedteanp/java/sun/applet/PluginCallRequest.java
> --- a/plugin/icedteanp/java/sun/applet/PluginCallRequest.java Wed Jan 12 12:50:13 2011 -0500
> +++ b/plugin/icedteanp/java/sun/applet/PluginCallRequest.java Thu Jan 13 18:02:32 2011 -0500
> @@ -1,5 +1,5 @@
> /* PluginCallRequest -- represent Java-to-JavaScript requests
> - Copyright (C) 2008 Red Hat
> + Copyright (C) 2011 Red Hat
>
> This file is part of IcedTea.
>
> @@ -37,9 +37,6 @@
>
> package sun.applet;
>
> -import java.security.AccessControlContext;
> -import java.security.ProtectionDomain;
> -
> // FIXME: for each type of request extend a new (anonymous?)
> // PluginCallRequest.
> public abstract class PluginCallRequest {
> diff -r 4e84e06b54e9 plugin/icedteanp/java/sun/applet/PluginDebug.java
> --- a/plugin/icedteanp/java/sun/applet/PluginDebug.java Wed Jan 12 12:50:13 2011 -0500
> +++ b/plugin/icedteanp/java/sun/applet/PluginDebug.java Thu Jan 13 18:02:32 2011 -0500
> @@ -1,5 +1,5 @@
> /* VoidPluginCallRequest -- represent Java-to-JavaScript requests
> - Copyright (C) 2008 Red Hat
> + Copyright (C) 2011 Red Hat
>
> This file is part of IcedTea.
>
> @@ -37,8 +37,6 @@
>
> package sun.applet;
>
> -import java.io.*;
> -
> public class PluginDebug {
>
> static final boolean DEBUG = System.getenv().containsKey("ICEDTEAPLUGIN_DEBUG");
> diff -r 4e84e06b54e9 plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java
> --- a/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Wed Jan 12 12:50:13 2011 -0500
> +++ b/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Thu Jan 13 18:02:32 2011 -0500
> @@ -1,5 +1,5 @@
> /* VoidPluginCallRequest -- represent Java-to-JavaScript requests
> - Copyright (C) 2008 Red Hat
> + Copyright (C) 2011 Red Hat
>
> This file is part of IcedTea.
>
> @@ -41,7 +41,6 @@
> import java.util.Hashtable;
> import java.util.Iterator;
> import java.util.LinkedList;
> -import java.util.Set;
>
> class PluginMessageConsumer {
>
> @@ -107,17 +106,6 @@
> }
> }
>
> - /**
> - * Returns the reference for this message. This method assumes that
> - * the message has a reference number.
> - *
> - * @param The message
> - * @return the reference number
> - */
> - private Long getReference(String[] msgParts) {
> - return Long.parseLong(msgParts[3]);
> - }
> -
> public PluginMessageConsumer(PluginStreamHandler streamHandler) {
>
> as = new AppletSecurity();
> @@ -144,10 +132,6 @@
> return null;
> }
>
> - private boolean isInInit(Integer instanceNum) {
> - return initWorkers.containsKey(instanceNum);
> - }
> -
> private void addToInitWorkers(Integer instanceNum, PluginMessageHandlerWorker worker) {
> synchronized (initWorkers) {
> initWorkers.put(instanceNum, worker);
> @@ -291,10 +275,4 @@
> // No workers available. Better luck next time!
> return null;
> }
> -
> - private void dumpWorkerStatus() {
> - for (PluginMessageHandlerWorker worker : workers) {
> - PluginDebug.debug(worker.toString());
> - }
> - }
> }
> diff -r 4e84e06b54e9 plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java
> --- a/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Wed Jan 12 12:50:13 2011 -0500
> +++ b/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Thu Jan 13 18:02:32 2011 -0500
> @@ -1,5 +1,5 @@
> /* VoidPluginCallRequest -- represent Java-to-JavaScript requests
> - Copyright (C) 2008 Red Hat
> + Copyright (C) 2011 Red Hat
>
> This file is part of IcedTea.
>
> @@ -43,7 +43,6 @@
> private boolean isPriorityWorker = false;
> private int id;
> private String message = null;
> - private SecurityManager sm;
> PluginStreamHandler streamHandler = null;
> PluginMessageConsumer consumer = null;
>
> @@ -54,7 +53,6 @@
>
> this.id = id;
> this.streamHandler = streamHandler;
> - this.sm = sm;
> this.isPriorityWorker = isPriorityWorker;
> this.consumer = consumer;
>
> diff -r 4e84e06b54e9 plugin/icedteanp/java/sun/applet/PluginObjectStore.java
> --- a/plugin/icedteanp/java/sun/applet/PluginObjectStore.java Wed Jan 12 12:50:13 2011 -0500
> +++ b/plugin/icedteanp/java/sun/applet/PluginObjectStore.java Thu Jan 13 18:02:32 2011 -0500
> @@ -1,5 +1,5 @@
> /* PluginObjectStore -- manage identifier-to-object mapping
> - Copyright (C) 2008 Red Hat
> + Copyright (C) 2011 Red Hat
>
> This file is part of IcedTea.
>
> @@ -38,8 +38,6 @@
> package sun.applet;
>
> import java.util.*;
> -import java.lang.reflect.*;
> -import java.io.*;
>
> public class PluginObjectStore {
> private static HashMap<Integer, Object> objects = new HashMap<Integer, Object>();
> @@ -87,36 +85,24 @@
> objects.put(nextUniqueIdentifier, object);
> counts.put(nextUniqueIdentifier, 1);
> identifiers.put(object, nextUniqueIdentifier);
> - //System.out.println("JAVA ADDED: " + nextUniqueIdentifier);
> - //System.out.println("JAVA REFERENCED: " + nextUniqueIdentifier
> - // + " to: 1");
> nextUniqueIdentifier++;
> } else {
> counts.put(identifier, counts.get(identifier) + 1);
> - //System.out.println("JAVA REFERENCED: " + identifier +
> - // " to: " + counts.get(identifier));
> }
> }
>
> public void unreference(int identifier) {
> Integer currentCount = counts.get(identifier);
> if (currentCount == null) {
> - //System.out.println("ERROR UNREFERENCING: " + identifier);
> return;
> }
> if (currentCount == 1) {
> - //System.out.println("JAVA DEREFERENCED: " + identifier
> - // + " to: 0");
> Object object = objects.get(identifier);
> objects.remove(identifier);
> counts.remove(identifier);
> identifiers.remove(object);
> - //System.out.println("JAVA REMOVED: " + identifier);
> } else {
> counts.put(identifier, currentCount - 1);
> - //System.out.println("JAVA DEREFERENCED: " +
> - // identifier + " to: " +
> - // counts.get(identifier));
> }
> }
>
> diff -r 4e84e06b54e9 plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java
> --- a/plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java Wed Jan 12 12:50:13 2011 -0500
> +++ b/plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java Thu Jan 13 18:02:32 2011 -0500
> @@ -1,5 +1,5 @@
> /* PluginProxyInfoRequest -- Object representing a request for proxy information from the browser
> - Copyright (C) 2009 Red Hat
> + Copyright (C) 2011 Red Hat
>
> This file is part of IcedTea.
>
> @@ -37,7 +37,6 @@
>
> package sun.applet;
>
> -import java.net.MalformedURLException;
> import java.net.URI;
>
> /**
> diff -r 4e84e06b54e9 plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
> --- a/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java Wed Jan 12 12:50:13 2011 -0500
> +++ b/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java Thu Jan 13 18:02:32 2011 -0500
> @@ -1,5 +1,5 @@
> /* VoidPluginCallRequest -- represent Java-to-JavaScript requests
> - Copyright (C) 2008 Red Hat
> + Copyright (C) 2011 Red Hat
>
> This file is part of IcedTea.
>
> @@ -39,13 +39,11 @@
>
> import java.io.BufferedReader;
> import java.io.BufferedWriter;
> -import java.io.FileWriter;
> import java.io.IOException;
> import java.io.InputStream;
> import java.io.InputStreamReader;
> import java.io.OutputStream;
> import java.io.OutputStreamWriter;
> -import java.io.StreamTokenizer;
> import java.net.MalformedURLException;
> import java.nio.charset.Charset;
> import java.util.Date;
> @@ -56,7 +54,6 @@
> public class PluginStreamHandler {
>
> private BufferedReader pluginInputReader;
> - private StreamTokenizer pluginInputTokenizer;
> private BufferedWriter pluginOutputWriter;
>
> private RequestQueue queue = new RequestQueue();
> @@ -70,10 +67,6 @@
>
> PluginAppletViewer pav;
>
> - static Date d = new Date();
> - static long startTime = d.getTime();
> - static long totalWait = 0;
> -
> public PluginStreamHandler(InputStream inputstream, OutputStream outputstream)
> throws MalformedURLException, IOException {
>
> @@ -82,13 +75,10 @@
> pav = (PluginAppletViewer) ClassLoader.getSystemClassLoader().loadClass("sun.applet.PluginAppletViewer").newInstance();
> PluginDebug.debug("Loaded: " + pav + " CL=" + pav.getClass().getClassLoader());
> } catch (InstantiationException e) {
> - // TODO Auto-generated catch block
> e.printStackTrace();
> } catch (IllegalAccessException e) {
> - // TODO Auto-generated catch block
> e.printStackTrace();
> } catch (ClassNotFoundException e) {
> - // TODO Auto-generated catch block
> e.printStackTrace();
> }
>
> @@ -99,23 +89,9 @@
> pluginInputReader =
> new BufferedReader(new InputStreamReader(inputstream,
> Charset.forName("UTF-8")));
> - /*pluginInputTokenizer = new StreamTokenizer(pluginInputReader);
> - pluginInputTokenizer.resetSyntax();
> - pluginInputTokenizer.whitespaceChars('\u0000', '\u0000');
> - pluginInputTokenizer.wordChars('\u0001', '\u00FF');*/
> pluginOutputWriter =
> new BufferedWriter(new OutputStreamWriter
> (outputstream, Charset.forName("UTF-8")));
> -
> - /*
> - while(true) {
> - String message = read();
> - PluginDebug.debug(message);
> - handleMessage(message);
> - // TODO:
> - // write(queue.peek());
> - }
> - */
> }
>
> public void startProcessing() {
> @@ -128,15 +104,8 @@
>
> PluginDebug.debug("Waiting for data...");
>
> - long b4 = new Date().getTime();
> -
> String s = read();
>
> - long after = new Date().getTime();
> -
> - totalWait += (after - b4);
> - //System.err.println("Total wait time: " + totalWait);
> -
> if (s != null) {
> consumer.queue(s);
> } else {
> @@ -152,35 +121,6 @@
> PluginDebug.debug("APPLETVIEWER: exiting appletviewer");
> System.exit(0);
> }
> -
> - /*
> - int readChar = -1;
> - // blocking read, discard first character
> - try {
> - readChar = pluginInputReader.read();
> - } catch (IOException ioe) {
> - // plugin may have detached
> - }
> -
> - // if not disconnected
> - if (readChar != -1) {
> - String s = read();
> - PluginDebug.debug("Got data, consuming " + s);
> - consumer.consume(s);
> - } else {
> - try {
> - // Close input/output channels to plugin.
> - pluginInputReader.close();
> - pluginOutputWriter.close();
> - } catch (IOException exception) {
> - // Deliberately ignore IOException caused by broken
> - // pipe since plugin may have already detached.
> - }
> - AppletSecurityContextManager.dumpStore(0);
> - PluginDebug.debug("APPLETVIEWER: exiting appletviewer");
> - System.exit(0);
> - }
> - */
> }
> }
> };
> @@ -411,13 +351,6 @@
> }
>
> return;
> - /*
> - synchronized(writeQueue) {
> - writeQueue.add(message);
> - PluginDebug.debug(" PIPE: appletviewer wrote: " + message);
> - }
> - */
> -
> }
>
> public boolean messageAvailable() {
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
More information about the distro-pkg-dev
mailing list