Chrome-Java5-Patch.txt
changeset 57 53a5a8929d21
parent 56 22f918ed49f7
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Chrome-Java5-Patch.txt	Thu Jan 28 13:01:09 2010 -0800
@@ -0,0 +1,181 @@
+### Eclipse Workspace Patch 1.0
+#P org.chromium.sdk
+Index: src/org/chromium/sdk/ChromiumIOException.java
+===================================================================
+--- src/org/chromium/sdk/ChromiumIOException.java	(revision 0)
++++ src/org/chromium/sdk/ChromiumIOException.java	(revision 0)
+@@ -0,0 +1,23 @@
++package org.chromium.sdk;
++
++import java.io.IOException;
++
++public class ChromiumIOException extends IOException {
++	private static final long serialVersionUID = 3412049732071131594L;
++	private final Throwable cause;
++
++	public ChromiumIOException(Throwable cause) {
++		super();
++		this.cause = cause;
++	}
++	
++	public ChromiumIOException(String message, Throwable cause) {
++		super(message);
++		this.cause = cause;
++	}
++	
++	@Override
++	public Throwable getCause() {
++		return cause;
++	}
++}
+Index: src/org/chromium/sdk/internal/BrowserImpl.java
+===================================================================
+--- src/org/chromium/sdk/internal/BrowserImpl.java	(revision 306)
++++ src/org/chromium/sdk/internal/BrowserImpl.java	(working copy)
+@@ -17,6 +17,7 @@
+ 
+ import org.chromium.sdk.Browser;
+ import org.chromium.sdk.BrowserTab;
++import org.chromium.sdk.ChromiumIOException;
+ import org.chromium.sdk.TabDebugEventListener;
+ import org.chromium.sdk.UnsupportedVersionException;
+ import org.chromium.sdk.Version;
+@@ -102,7 +103,7 @@
+       try {
+         serverVersionString = devToolsHandler.version(OPERATION_TIMEOUT_MS);
+       } catch (TimeoutException e) {
+-        throw new IOException("Failed to get protocol version from remote", e);
++        throw new ChromiumIOException("Failed to get protocol version from remote", e);
+       }
+       if (serverVersionString == null) {
+         throw new UnsupportedVersionException(BrowserImpl.PROTOCOL_VERSION, null);
+@@ -291,7 +292,7 @@
+         ticket = connectInternal();
+       } catch (UnsupportedVersionException e) {
+         // This exception should have happened on tab fetcher creation.
+-        throw new IOException("Unexpected version problem", e);
++        throw new ChromiumIOException("Unexpected version problem", e);
+       }
+ 
+       Session session = ticket.getSession();
+Index: META-INF/MANIFEST.MF
+===================================================================
+--- META-INF/MANIFEST.MF	(revision 306)
++++ META-INF/MANIFEST.MF	(working copy)
+@@ -13,4 +13,5 @@
+  org.chromium.sdk.internal.tools.v8.processor;x-internal:=true,
+  org.chromium.sdk.internal.tools.v8.request;x-internal:=true,
+  org.chromium.sdk.internal.transport;x-internal:=true
+-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
++Bundle-RequiredExecutionEnvironment: J2SE-1.5,
++ JavaSE-1.6
+Index: src/org/chromium/sdk/internal/BrowserTabImpl.java
+===================================================================
+--- src/org/chromium/sdk/internal/BrowserTabImpl.java	(revision 306)
++++ src/org/chromium/sdk/internal/BrowserTabImpl.java	(working copy)
+@@ -8,6 +8,7 @@
+ 
+ import org.chromium.sdk.Browser;
+ import org.chromium.sdk.BrowserTab;
++import org.chromium.sdk.ChromiumIOException;
+ import org.chromium.sdk.DebugEventListener;
+ import org.chromium.sdk.TabDebugEventListener;
+ import org.chromium.sdk.internal.tools.ToolHandler;
+@@ -89,7 +90,7 @@
+       try {
+         result = devToolSessionManager.attachToTab();
+       } catch (AttachmentFailureException e) {
+-        throw new IOException(e);
++        throw new ChromiumIOException(e);
+       }
+       if (Result.OK != result) {
+         throw new IOException("Failed to attach with result: " + result);
+Index: src/org/chromium/sdk/internal/StandaloneVmImpl.java
+===================================================================
+--- src/org/chromium/sdk/internal/StandaloneVmImpl.java	(revision 306)
++++ src/org/chromium/sdk/internal/StandaloneVmImpl.java	(working copy)
+@@ -12,6 +12,7 @@
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+ 
++import org.chromium.sdk.ChromiumIOException;
+ import org.chromium.sdk.DebugEventListener;
+ import org.chromium.sdk.StandaloneVm;
+ import org.chromium.sdk.UnsupportedVersionException;
+@@ -121,9 +122,9 @@
+     } catch (InterruptedException e) {
+       throw new RuntimeException(e);
+     } catch (ExecutionException e) {
+-      throw new IOException("Failed to get version", e);
++      throw new ChromiumIOException("Failed to get version", e);
+     } catch (TimeoutException e) {
+-      throw new IOException("Timed out waiting for version", e);
++      throw new ChromiumIOException("Timed out waiting for version", e);
+     }
+ 
+     String versionString = remoteInfo.getProtocolVersion();
+Index: src/org/chromium/sdk/internal/transport/Handshaker.java
+===================================================================
+--- src/org/chromium/sdk/internal/transport/Handshaker.java	(revision 306)
++++ src/org/chromium/sdk/internal/transport/Handshaker.java	(working copy)
+@@ -10,8 +10,8 @@
+ import java.util.concurrent.ExecutionException;
+ import java.util.concurrent.Future;
+ import java.util.concurrent.FutureTask;
+-import java.util.concurrent.RunnableFuture;
+ 
++import org.chromium.sdk.ChromiumIOException;
+ import org.chromium.sdk.LineReader;
+ import org.chromium.sdk.internal.transport.Message.MalformedMessageException;
+ 
+@@ -85,7 +85,7 @@
+       return runnableFuture;
+     }
+ 
+-    private final RunnableFuture<RemoteInfo> runnableFuture =
++    private final FutureTask<RemoteInfo> runnableFuture =
+         new FutureTask<RemoteInfo>(new HandshakeTaks());
+ 
+     private LineReader input = null;
+@@ -100,7 +100,7 @@
+       } catch (InterruptedException e) {
+         throw new RuntimeException(e);
+       } catch (ExecutionException e) {
+-        throw new IOException("Failed to perform handshake", e);
++        throw new ChromiumIOException("Failed to perform handshake", e);
+       }
+ 
+     }
+@@ -111,7 +111,7 @@
+         try {
+           message = Message.fromBufferedReader(input);
+         } catch (MalformedMessageException e) {
+-          throw new IOException("Unrecognized handshake message from remote", e);
++          throw new ChromiumIOException("Unrecognized handshake message from remote", e);
+         }
+         if (message == null) {
+           throw new IOException("End of stream");
+#P org.chromium.debug.core
+Index: META-INF/MANIFEST.MF
+===================================================================
+--- META-INF/MANIFEST.MF	(revision 306)
++++ META-INF/MANIFEST.MF	(working copy)
+@@ -20,4 +20,5 @@
+  org.chromium.debug.core.model,
+  org.chromium.debug.core.util
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
++Bundle-RequiredExecutionEnvironment: J2SE-1.5,
++ JavaSE-1.6
+#P org.chromium.debug.ui
+Index: META-INF/MANIFEST.MF
+===================================================================
+--- META-INF/MANIFEST.MF	(revision 306)
++++ META-INF/MANIFEST.MF	(working copy)
+@@ -16,4 +16,5 @@
+  org.chromium.debug.core;bundle-version="0.1.5",
+  org.chromium.sdk;bundle-version="0.1.5"
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
++Bundle-RequiredExecutionEnvironment: J2SE-1.5,
++ JavaSE-1.6