Fixed indentation and spacing for all .java files.

Added a new .settings directory which contains Eclipse
preferences for code style.

1 files changed, 290 insertions, 295 deletions

diff --git a/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java b/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
index eb5b11a..bd95493 100644
--- a/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
+++ b/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
@@ -35,7 +35,6 @@ 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 sun.applet;
 
 import java.io.BufferedReader;
@@ -54,234 +53,232 @@ import java.util.LinkedList;
 
 import javax.swing.SwingUtilities;
 
-
 public class PluginStreamHandler {
 
     private BufferedReader pluginInputReader;
     private StreamTokenizer pluginInputTokenizer;
     private BufferedWriter pluginOutputWriter;
-    
+
     private RequestQueue queue = new RequestQueue();
-    
+
     private JavaConsole console = new JavaConsole();
 
-	LinkedList<String> writeQueue = new LinkedList<String>();
-
-	PluginMessageConsumer consumer;
-	Boolean shuttingDown = false;
-	
-	PluginAppletViewer pav;
-	
-	static Date d = new Date();
-	static long startTime = d.getTime();
-	static long totalWait = 0;
-	
+    LinkedList<String> writeQueue = new LinkedList<String>();
+
+    PluginMessageConsumer consumer;
+    Boolean shuttingDown = false;
+
+    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
-    {
-
-    	PluginDebug.debug("Current context CL=" + Thread.currentThread().getContextClassLoader());
-    	try {
-			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();
-		}
-
-    	PluginDebug.debug("Creating consumer...");
-    	consumer = new PluginMessageConsumer(this);
-
-    	// Set up input and output pipes.  Use UTF-8 encoding.
-    	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) {
+            throws MalformedURLException, IOException {
+
+        PluginDebug.debug("Current context CL=" + Thread.currentThread().getContextClassLoader());
+        try {
+            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();
+        }
+
+        PluginDebug.debug("Creating consumer...");
+        consumer = new PluginMessageConsumer(this);
+
+        // Set up input and output pipes.  Use UTF-8 encoding.
+        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() {
 
-    	Thread listenerThread = new Thread() {
-
-    		public void run() {
-    			
-    			while (true) {
-
-    				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 {
-    					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);
-    				}
-    				
-/*    				
-    				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);
-    				}
-*/
-    			}
-    		}
-    	};
-    	
-    	listenerThread.start();
+        Thread listenerThread = new Thread() {
+
+            public void run() {
+
+                while (true) {
+
+                    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 {
+                        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);
+                    }
+
+                    /*    				
+                        				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);
+                        				}
+                    */
+                }
+            }
+        };
+
+        listenerThread.start();
     }
-    
+
     public void handleMessage(String message) throws PluginException {
 
-    	int nextIndex = 0;
-    	int reference = -1;
-    	String src = null;
-    	String[] privileges = null;
-    	String rest = "";
+        int nextIndex = 0;
+        int reference = -1;
+        String src = null;
+        String[] privileges = null;
+        String rest = "";
+
+        String[] msgComponents = message.split(" ");
 
-    	String[] msgComponents = message.split(" ");
-    
-		if (msgComponents.length < 2)
-			return;
+        if (msgComponents.length < 2)
+            return;
 
         if (msgComponents[0].startsWith("plugin")) {
             handlePluginMessage(message);
             return;
         }
 
-    	// type and identifier are guaranteed to be there
-    	String type = msgComponents[0];
-    	final int identifier = Integer.parseInt(msgComponents[1]);
-    	nextIndex = 2;
-    	
-    	// reference, src and privileges are optional components, 
-    	// and are guaranteed to be in that order, if they occur
-
-    	// is there a reference ?
-    	if (msgComponents[nextIndex].equals("reference")) {
-    		reference = Integer.parseInt(msgComponents[nextIndex+1]);
-    		nextIndex += 2;
-    	}
-
-    	// is there a src?
-    	if (msgComponents[nextIndex].equals("src")) {
-    		src = msgComponents[nextIndex+1];
-    		nextIndex += 2;
-    	}
-
-    	// is there a privileges?
-    	if (msgComponents[nextIndex].equals("privileges")) {
-    		String privs = msgComponents[nextIndex+1];
-    		privileges = privs.split(",");
-    		nextIndex += 2;
-    	}
-
-    	// rest
-    	for (int i=nextIndex; i < msgComponents.length; i++) {
-    		rest += msgComponents[i];
-    		rest += " ";
-    	}
-
-    	rest = rest.trim();
-
-    	try {
-
-    		PluginDebug.debug("Breakdown -- type: " + type + " identifier: " + identifier + " reference: " + reference + " src: " + src + " privileges: " + privileges + " rest: \"" + rest + "\"");
-
-    		if (rest.contains("JavaScriptGetWindow")
-    				|| rest.contains("JavaScriptGetMember")
-    				|| rest.contains("JavaScriptSetMember")
-    				|| rest.contains("JavaScriptGetSlot")
-    				|| rest.contains("JavaScriptSetSlot")
-    				|| rest.contains("JavaScriptEval")
-    				|| rest.contains("JavaScriptRemoveMember")
-    				|| rest.contains("JavaScriptCall")
-    				|| rest.contains("JavaScriptFinalize")
-    				|| rest.contains("JavaScriptToString")) {
-    			
-				finishCallRequest("reference " + reference + " " + rest);
-    			return;
-    		}
-
-    		final int freference = reference;
-    		final String frest = rest;
-
-    		if (type.equals("instance")) {
-    			PluginAppletViewer.handleMessage(identifier, freference,frest);
-    		} else if (type.equals("context")) {
-    			PluginDebug.debug("Sending to PASC: " + identifier + "/" + reference + " and " + rest);
-    			AppletSecurityContextManager.handleMessage(identifier, reference, src, privileges, rest);
-    		}
-    	} catch (Exception e) {
-    		throw new PluginException(this, identifier, reference, e);
-    	}
+        // type and identifier are guaranteed to be there
+        String type = msgComponents[0];
+        final int identifier = Integer.parseInt(msgComponents[1]);
+        nextIndex = 2;
+
+        // reference, src and privileges are optional components, 
+        // and are guaranteed to be in that order, if they occur
+
+        // is there a reference ?
+        if (msgComponents[nextIndex].equals("reference")) {
+            reference = Integer.parseInt(msgComponents[nextIndex + 1]);
+            nextIndex += 2;
+        }
+
+        // is there a src?
+        if (msgComponents[nextIndex].equals("src")) {
+            src = msgComponents[nextIndex + 1];
+            nextIndex += 2;
+        }
+
+        // is there a privileges?
+        if (msgComponents[nextIndex].equals("privileges")) {
+            String privs = msgComponents[nextIndex + 1];
+            privileges = privs.split(",");
+            nextIndex += 2;
+        }
+
+        // rest
+        for (int i = nextIndex; i < msgComponents.length; i++) {
+            rest += msgComponents[i];
+            rest += " ";
+        }
+
+        rest = rest.trim();
+
+        try {
+
+            PluginDebug.debug("Breakdown -- type: " + type + " identifier: " + identifier + " reference: " + reference + " src: " + src + " privileges: " + privileges + " rest: \"" + rest + "\"");
+
+            if (rest.contains("JavaScriptGetWindow")
+                    || rest.contains("JavaScriptGetMember")
+                    || rest.contains("JavaScriptSetMember")
+                    || rest.contains("JavaScriptGetSlot")
+                    || rest.contains("JavaScriptSetSlot")
+                    || rest.contains("JavaScriptEval")
+                    || rest.contains("JavaScriptRemoveMember")
+                    || rest.contains("JavaScriptCall")
+                    || rest.contains("JavaScriptFinalize")
+                    || rest.contains("JavaScriptToString")) {
+
+                finishCallRequest("reference " + reference + " " + rest);
+                return;
+            }
+
+            final int freference = reference;
+            final String frest = rest;
+
+            if (type.equals("instance")) {
+                PluginAppletViewer.handleMessage(identifier, freference, frest);
+            } else if (type.equals("context")) {
+                PluginDebug.debug("Sending to PASC: " + identifier + "/" + reference + " and " + rest);
+                AppletSecurityContextManager.handleMessage(identifier, reference, src, privileges, rest);
+            }
+        } catch (Exception e) {
+            throw new PluginException(this, identifier, reference, e);
+        }
     }
 
     private void handlePluginMessage(String message) {
         if (message.equals("plugin showconsole")) {
             showConsole();
         } else if (message.equals("plugin hideconsole")) {
-            hideConsole();            
+            hideConsole();
         } else {
             // else this is something that was specifically requested
             finishCallRequest(message);
@@ -289,60 +286,60 @@ public class PluginStreamHandler {
     }
 
     public void postCallRequest(PluginCallRequest request) {
-        synchronized(queue) {
-   			queue.post(request);
+        synchronized (queue) {
+            queue.post(request);
         }
     }
 
     private void finishCallRequest(String message) {
-    	PluginDebug.debug ("DISPATCHCALLREQUESTS 1");
-    	synchronized(queue) {
-    		PluginDebug.debug ("DISPATCHCALLREQUESTS 2");
-    		PluginCallRequest request = queue.pop();
-
-    		// make sure we give the message to the right request 
-    		// in the queue.. for the love of God, MAKE SURE!
-
-    		// first let's be efficient.. if there was only one 
-    		// request in queue, we're already set
-    		if (queue.size() != 0) {
-
-    			int size = queue.size();
-    			int count = 0;
-
-    			while (!request.serviceable(message)) {
-
-     				PluginDebug.debug(request + " cannot service " + message);
-    			    
-    				// something is very wrong.. we have a message to 
-    				// process, but no one to service it
-    				if (count >= size) {
-    					throw new RuntimeException("Unable to find processor for message " + message);
-    				}
-
-    				// post request at the end of the queue
-    				queue.post(request);
-
-    				// Look at the next request
-    				request = queue.pop();
-
-    				count++;
-    			}
-
-    		}
-
-    		PluginDebug.debug ("DISPATCHCALLREQUESTS 3");
-    		if (request != null) {
-    			PluginDebug.debug ("DISPATCHCALLREQUESTS 5");
-    			synchronized(request) {
-    				request.parseReturn(message);
-    				request.notifyAll();
-    			}
-    			PluginDebug.debug ("DISPATCHCALLREQUESTS 6");
-    			PluginDebug.debug ("DISPATCHCALLREQUESTS 7");
-    		}
-    	}
-    	PluginDebug.debug ("DISPATCHCALLREQUESTS 8");
+        PluginDebug.debug("DISPATCHCALLREQUESTS 1");
+        synchronized (queue) {
+            PluginDebug.debug("DISPATCHCALLREQUESTS 2");
+            PluginCallRequest request = queue.pop();
+
+            // make sure we give the message to the right request 
+            // in the queue.. for the love of God, MAKE SURE!
+
+            // first let's be efficient.. if there was only one 
+            // request in queue, we're already set
+            if (queue.size() != 0) {
+
+                int size = queue.size();
+                int count = 0;
+
+                while (!request.serviceable(message)) {
+
+                    PluginDebug.debug(request + " cannot service " + message);
+
+                    // something is very wrong.. we have a message to 
+                    // process, but no one to service it
+                    if (count >= size) {
+                        throw new RuntimeException("Unable to find processor for message " + message);
+                    }
+
+                    // post request at the end of the queue
+                    queue.post(request);
+
+                    // Look at the next request
+                    request = queue.pop();
+
+                    count++;
+                }
+
+            }
+
+            PluginDebug.debug("DISPATCHCALLREQUESTS 3");
+            if (request != null) {
+                PluginDebug.debug("DISPATCHCALLREQUESTS 5");
+                synchronized (request) {
+                    request.parseReturn(message);
+                    request.notifyAll();
+                }
+                PluginDebug.debug("DISPATCHCALLREQUESTS 6");
+                PluginDebug.debug("DISPATCHCALLREQUESTS 7");
+            }
+        }
+        PluginDebug.debug("DISPATCHCALLREQUESTS 8");
     }
 
     /**
@@ -352,16 +349,15 @@ public class PluginStreamHandler {
      *
      * @exception IOException if an error occurs
      */
-    private String read()
-    {
-    	String message = null;
+    private String read() {
+        String message = null;
 
-    	try {
-    		message = pluginInputReader.readLine();
-    		PluginDebug.debug("  PIPE: appletviewer read: " + message);
+        try {
+            message = pluginInputReader.readLine();
+            PluginDebug.debug("  PIPE: appletviewer read: " + message);
 
             if (message == null || message.equals("shutdown")) {
-                synchronized(shuttingDown) {
+                synchronized (shuttingDown) {
                     shuttingDown = true;
                 }
                 try {
@@ -376,13 +372,13 @@ public class PluginStreamHandler {
                 PluginDebug.debug("APPLETVIEWER: exiting appletviewer");
                 System.exit(0);
             }
-    	} catch (IOException e) {
-    	       e.printStackTrace();
-    	}
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
 
-    	return message;
+        return message;
     }
-    
+
     /**
      * Write string to plugin.
      * 
@@ -390,52 +386,51 @@ public class PluginStreamHandler {
      *
      * @exception IOException if an error occurs
      */
-    public void write(String message)
-    {
-
-    	PluginDebug.debug("  PIPE: appletviewer wrote: " + message);
-        synchronized(pluginOutputWriter) {
-        	try {
-        		pluginOutputWriter.write(message + "\n", 0, message.length());
-        		pluginOutputWriter.write(0);
-        		pluginOutputWriter.flush();
-        	} catch (IOException e) {
-        		// if we are shutting down, ignore write failures as 
-        		// pipe may have closed
-        		synchronized(shuttingDown) {
-        			if (!shuttingDown) {
-        				e.printStackTrace();
-        			}
-        		}
-
-        		// either ways, if the pipe is broken, there is nothing 
-        		// we can do anymore. Don't hang around.
-        		PluginDebug.debug("Unable to write to PIPE. APPLETVIEWER exiting");        		
-        		System.exit(1);
-        	}
-		}
+    public void write(String message) {
+
+        PluginDebug.debug("  PIPE: appletviewer wrote: " + message);
+        synchronized (pluginOutputWriter) {
+            try {
+                pluginOutputWriter.write(message + "\n", 0, message.length());
+                pluginOutputWriter.write(0);
+                pluginOutputWriter.flush();
+            } catch (IOException e) {
+                // if we are shutting down, ignore write failures as 
+                // pipe may have closed
+                synchronized (shuttingDown) {
+                    if (!shuttingDown) {
+                        e.printStackTrace();
+                    }
+                }
+
+                // either ways, if the pipe is broken, there is nothing 
+                // we can do anymore. Don't hang around.
+                PluginDebug.debug("Unable to write to PIPE. APPLETVIEWER exiting");
+                System.exit(1);
+            }
+        }
 
-		return;
-    /*	
-    	synchronized(writeQueue) {
-            writeQueue.add(message);
-            PluginDebug.debug("  PIPE: appletviewer wrote: " + message);
-    	}
-	*/
+        return;
+        /*	
+        	synchronized(writeQueue) {
+                writeQueue.add(message);
+                PluginDebug.debug("  PIPE: appletviewer wrote: " + message);
+        	}
+        */
 
     }
 
     public boolean messageAvailable() {
-    	return writeQueue.size() != 0;
+        return writeQueue.size() != 0;
     }
 
     public String getMessage() {
-    	synchronized(writeQueue) {
-			String ret = writeQueue.size() > 0 ? writeQueue.poll() : "";
-    		return ret;
-    	}
+        synchronized (writeQueue) {
+            String ret = writeQueue.size() > 0 ? writeQueue.poll() : "";
+            return ret;
+        }
     }
-    
+
     private void showConsole() {
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
@@ -443,7 +438,7 @@ public class PluginStreamHandler {
             }
         });
     }
-    
+
     private void hideConsole() {
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {