1 diff -r bb6160d0b6f2 org.chromium.debug.core/META-INF/MANIFEST.MF |
|
2 --- a/org.chromium.debug.core/META-INF/MANIFEST.MF Thu Jan 28 10:18:04 2010 -0800 |
|
3 +++ b/org.chromium.debug.core/META-INF/MANIFEST.MF Thu Jan 28 11:23:45 2010 -0800 |
|
4 @@ -20,4 +20,5 @@ |
|
5 org.chromium.debug.core.model, |
|
6 org.chromium.debug.core.util |
|
7 Eclipse-LazyStart: true |
|
8 -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 |
|
9 +Bundle-RequiredExecutionEnvironment: J2SE-1.5, |
|
10 + JavaSE-1.6 |
|
11 diff -r bb6160d0b6f2 org.chromium.debug.ui/META-INF/MANIFEST.MF |
|
12 --- a/org.chromium.debug.ui/META-INF/MANIFEST.MF Thu Jan 28 10:18:04 2010 -0800 |
|
13 +++ b/org.chromium.debug.ui/META-INF/MANIFEST.MF Thu Jan 28 11:23:45 2010 -0800 |
|
14 @@ -16,4 +16,5 @@ |
|
15 org.chromium.debug.core;bundle-version="0.1.5", |
|
16 org.chromium.sdk;bundle-version="0.1.5" |
|
17 Bundle-ActivationPolicy: lazy |
|
18 -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 |
|
19 +Bundle-RequiredExecutionEnvironment: J2SE-1.5, |
|
20 + JavaSE-1.6 |
|
21 diff -r bb6160d0b6f2 org.chromium.sdk/META-INF/MANIFEST.MF |
|
22 --- a/org.chromium.sdk/META-INF/MANIFEST.MF Thu Jan 28 10:18:04 2010 -0800 |
|
23 +++ b/org.chromium.sdk/META-INF/MANIFEST.MF Thu Jan 28 11:23:45 2010 -0800 |
|
24 @@ -13,4 +13,5 @@ |
|
25 org.chromium.sdk.internal.tools.v8.processor;x-internal:=true, |
|
26 org.chromium.sdk.internal.tools.v8.request;x-internal:=true, |
|
27 org.chromium.sdk.internal.transport;x-internal:=true |
|
28 -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 |
|
29 +Bundle-RequiredExecutionEnvironment: J2SE-1.5, |
|
30 + JavaSE-1.6 |
|
31 diff -r bb6160d0b6f2 org.chromium.sdk/src/org/chromium/sdk/internal/BrowserImpl.java |
|
32 --- a/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserImpl.java Thu Jan 28 10:18:04 2010 -0800 |
|
33 +++ b/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserImpl.java Thu Jan 28 11:23:45 2010 -0800 |
|
34 @@ -17,6 +17,7 @@ |
|
35 |
|
36 import org.chromium.sdk.Browser; |
|
37 import org.chromium.sdk.BrowserTab; |
|
38 +import org.chromium.sdk.ChromiumIOException; |
|
39 import org.chromium.sdk.TabDebugEventListener; |
|
40 import org.chromium.sdk.UnsupportedVersionException; |
|
41 import org.chromium.sdk.Version; |
|
42 @@ -102,7 +103,7 @@ |
|
43 try { |
|
44 serverVersionString = devToolsHandler.version(OPERATION_TIMEOUT_MS); |
|
45 } catch (TimeoutException e) { |
|
46 - throw new IOException("Failed to get protocol version from remote", e); |
|
47 + throw new ChromiumIOException("Failed to get protocol version from remote", e); |
|
48 } |
|
49 if (serverVersionString == null) { |
|
50 throw new UnsupportedVersionException(BrowserImpl.PROTOCOL_VERSION, null); |
|
51 @@ -291,7 +292,7 @@ |
|
52 ticket = connectInternal(); |
|
53 } catch (UnsupportedVersionException e) { |
|
54 // This exception should have happened on tab fetcher creation. |
|
55 - throw new IOException("Unexpected version problem", e); |
|
56 + throw new ChromiumIOException("Unexpected version problem", e); |
|
57 } |
|
58 |
|
59 Session session = ticket.getSession(); |
|
60 diff -r bb6160d0b6f2 org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java |
|
61 --- a/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java Thu Jan 28 10:18:04 2010 -0800 |
|
62 +++ b/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java Thu Jan 28 11:23:45 2010 -0800 |
|
63 @@ -8,6 +8,7 @@ |
|
64 |
|
65 import org.chromium.sdk.Browser; |
|
66 import org.chromium.sdk.BrowserTab; |
|
67 +import org.chromium.sdk.ChromiumIOException; |
|
68 import org.chromium.sdk.DebugEventListener; |
|
69 import org.chromium.sdk.TabDebugEventListener; |
|
70 import org.chromium.sdk.internal.tools.ToolHandler; |
|
71 @@ -89,7 +90,7 @@ |
|
72 try { |
|
73 result = devToolSessionManager.attachToTab(); |
|
74 } catch (AttachmentFailureException e) { |
|
75 - throw new IOException(e); |
|
76 + throw new ChromiumIOException(e); |
|
77 } |
|
78 if (Result.OK != result) { |
|
79 throw new IOException("Failed to attach with result: " + result); |
|
80 diff -r bb6160d0b6f2 org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java |
|
81 --- a/org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java Thu Jan 28 10:18:04 2010 -0800 |
|
82 +++ b/org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java Thu Jan 28 11:23:45 2010 -0800 |
|
83 @@ -12,6 +12,7 @@ |
|
84 import java.util.logging.Level; |
|
85 import java.util.logging.Logger; |
|
86 |
|
87 +import org.chromium.sdk.ChromiumIOException; |
|
88 import org.chromium.sdk.DebugEventListener; |
|
89 import org.chromium.sdk.StandaloneVm; |
|
90 import org.chromium.sdk.UnsupportedVersionException; |
|
91 @@ -121,9 +122,9 @@ |
|
92 } catch (InterruptedException e) { |
|
93 throw new RuntimeException(e); |
|
94 } catch (ExecutionException e) { |
|
95 - throw new IOException("Failed to get version", e); |
|
96 + throw new ChromiumIOException("Failed to get version", e); |
|
97 } catch (TimeoutException e) { |
|
98 - throw new IOException("Timed out waiting for version", e); |
|
99 + throw new ChromiumIOException("Timed out waiting for version", e); |
|
100 } |
|
101 |
|
102 String versionString = remoteInfo.getProtocolVersion(); |
|
103 diff -r bb6160d0b6f2 org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java |
|
104 --- a/org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java Thu Jan 28 10:18:04 2010 -0800 |
|
105 +++ b/org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java Thu Jan 28 11:23:45 2010 -0800 |
|
106 @@ -10,8 +10,8 @@ |
|
107 import java.util.concurrent.ExecutionException; |
|
108 import java.util.concurrent.Future; |
|
109 import java.util.concurrent.FutureTask; |
|
110 -import java.util.concurrent.RunnableFuture; |
|
111 |
|
112 +import org.chromium.sdk.ChromiumIOException; |
|
113 import org.chromium.sdk.LineReader; |
|
114 import org.chromium.sdk.internal.transport.Message.MalformedMessageException; |
|
115 |
|
116 @@ -85,7 +85,7 @@ |
|
117 return runnableFuture; |
|
118 } |
|
119 |
|
120 - private final RunnableFuture<RemoteInfo> runnableFuture = |
|
121 + private final FutureTask<RemoteInfo> runnableFuture = |
|
122 new FutureTask<RemoteInfo>(new HandshakeTaks()); |
|
123 |
|
124 private LineReader input = null; |
|
125 @@ -100,7 +100,7 @@ |
|
126 } catch (InterruptedException e) { |
|
127 throw new RuntimeException(e); |
|
128 } catch (ExecutionException e) { |
|
129 - throw new IOException("Failed to perform handshake", e); |
|
130 + throw new ChromiumIOException("Failed to perform handshake", e); |
|
131 } |
|
132 |
|
133 } |
|
134 @@ -111,7 +111,7 @@ |
|
135 try { |
|
136 message = Message.fromBufferedReader(input); |
|
137 } catch (MalformedMessageException e) { |
|
138 - throw new IOException("Unrecognized handshake message from remote", e); |
|
139 + throw new ChromiumIOException("Unrecognized handshake message from remote", e); |
|
140 } |
|
141 if (message == null) { |
|
142 throw new IOException("End of stream"); |
|