Chrome-Java6-Patch.txt
author Eugene Ostroukhov <eostroukhov@gmail.com>
Thu, 28 Jan 2010 11:27:14 -0800
changeset 56 22f918ed49f7
permissions -rw-r--r--
Java5 is now supported

diff -r bb6160d0b6f2 org.chromium.debug.core/META-INF/MANIFEST.MF
--- a/org.chromium.debug.core/META-INF/MANIFEST.MF	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.debug.core/META-INF/MANIFEST.MF	Thu Jan 28 11:23:45 2010 -0800
@@ -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
diff -r bb6160d0b6f2 org.chromium.debug.ui/META-INF/MANIFEST.MF
--- a/org.chromium.debug.ui/META-INF/MANIFEST.MF	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.debug.ui/META-INF/MANIFEST.MF	Thu Jan 28 11:23:45 2010 -0800
@@ -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
diff -r bb6160d0b6f2 org.chromium.sdk/META-INF/MANIFEST.MF
--- a/org.chromium.sdk/META-INF/MANIFEST.MF	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.sdk/META-INF/MANIFEST.MF	Thu Jan 28 11:23:45 2010 -0800
@@ -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
diff -r bb6160d0b6f2 org.chromium.sdk/src/org/chromium/sdk/internal/BrowserImpl.java
--- a/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserImpl.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserImpl.java	Thu Jan 28 11:23:45 2010 -0800
@@ -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();
diff -r bb6160d0b6f2 org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java
--- a/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java	Thu Jan 28 11:23:45 2010 -0800
@@ -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);
diff -r bb6160d0b6f2 org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java
--- a/org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java	Thu Jan 28 11:23:45 2010 -0800
@@ -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();
diff -r bb6160d0b6f2 org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java
--- a/org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java	Thu Jan 28 11:23:45 2010 -0800
@@ -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");