author | Eugene Ostroukhov <eugeneo@symbian.org> |
Mon, 15 Mar 2010 17:36:40 -0700 | |
changeset 267 | a0f8d02facf1 |
parent 115 | d367ed1b2991 |
permissions | -rw-r--r-- |
57
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
1 |
### Eclipse Workspace Patch 1.0 |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
2 |
#P org.chromium.sdk |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
3 |
Index: src/org/chromium/sdk/ChromiumIOException.java |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
4 |
=================================================================== |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
5 |
--- src/org/chromium/sdk/ChromiumIOException.java (revision 0) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
6 |
+++ src/org/chromium/sdk/ChromiumIOException.java (revision 0) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
7 |
@@ -0,0 +1,23 @@ |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
8 |
+package org.chromium.sdk; |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
9 |
+ |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
10 |
+import java.io.IOException; |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
11 |
+ |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
12 |
+public class ChromiumIOException extends IOException { |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
13 |
+ private static final long serialVersionUID = 3412049732071131594L; |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
14 |
+ private final Throwable cause; |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
15 |
+ |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
16 |
+ public ChromiumIOException(Throwable cause) { |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
17 |
+ super(); |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
18 |
+ this.cause = cause; |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
19 |
+ } |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
20 |
+ |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
21 |
+ public ChromiumIOException(String message, Throwable cause) { |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
22 |
+ super(message); |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
23 |
+ this.cause = cause; |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
24 |
+ } |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
25 |
+ |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
26 |
+ @Override |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
27 |
+ public Throwable getCause() { |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
28 |
+ return cause; |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
29 |
+ } |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
30 |
+} |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
31 |
Index: src/org/chromium/sdk/internal/BrowserImpl.java |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
32 |
=================================================================== |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
33 |
--- src/org/chromium/sdk/internal/BrowserImpl.java (revision 306) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
34 |
+++ src/org/chromium/sdk/internal/BrowserImpl.java (working copy) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
35 |
@@ -17,6 +17,7 @@ |
56
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
36 |
|
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
37 |
import org.chromium.sdk.Browser; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
38 |
import org.chromium.sdk.BrowserTab; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
39 |
+import org.chromium.sdk.ChromiumIOException; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
40 |
import org.chromium.sdk.TabDebugEventListener; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
41 |
import org.chromium.sdk.UnsupportedVersionException; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
42 |
import org.chromium.sdk.Version; |
57
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
43 |
@@ -102,7 +103,7 @@ |
56
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
44 |
try { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
45 |
serverVersionString = devToolsHandler.version(OPERATION_TIMEOUT_MS); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
46 |
} catch (TimeoutException e) { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
47 |
- throw new IOException("Failed to get protocol version from remote", e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
48 |
+ throw new ChromiumIOException("Failed to get protocol version from remote", e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
49 |
} |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
50 |
if (serverVersionString == null) { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
51 |
throw new UnsupportedVersionException(BrowserImpl.PROTOCOL_VERSION, null); |
57
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
52 |
@@ -291,7 +292,7 @@ |
56
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
53 |
ticket = connectInternal(); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
54 |
} catch (UnsupportedVersionException e) { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
55 |
// This exception should have happened on tab fetcher creation. |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
56 |
- throw new IOException("Unexpected version problem", e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
57 |
+ throw new ChromiumIOException("Unexpected version problem", e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
58 |
} |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
59 |
|
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
60 |
Session session = ticket.getSession(); |
57
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
61 |
Index: META-INF/MANIFEST.MF |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
62 |
=================================================================== |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
63 |
--- META-INF/MANIFEST.MF (revision 306) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
64 |
+++ META-INF/MANIFEST.MF (working copy) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
65 |
@@ -13,4 +13,5 @@ |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
66 |
org.chromium.sdk.internal.tools.v8.processor;x-internal:=true, |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
67 |
org.chromium.sdk.internal.tools.v8.request;x-internal:=true, |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
68 |
org.chromium.sdk.internal.transport;x-internal:=true |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
69 |
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6 |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
70 |
+Bundle-RequiredExecutionEnvironment: J2SE-1.5, |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
71 |
+ JavaSE-1.6 |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
72 |
Index: src/org/chromium/sdk/internal/BrowserTabImpl.java |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
73 |
=================================================================== |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
74 |
--- src/org/chromium/sdk/internal/BrowserTabImpl.java (revision 306) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
75 |
+++ src/org/chromium/sdk/internal/BrowserTabImpl.java (working copy) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
76 |
@@ -8,6 +8,7 @@ |
56
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
77 |
|
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
78 |
import org.chromium.sdk.Browser; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
79 |
import org.chromium.sdk.BrowserTab; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
80 |
+import org.chromium.sdk.ChromiumIOException; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
81 |
import org.chromium.sdk.DebugEventListener; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
82 |
import org.chromium.sdk.TabDebugEventListener; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
83 |
import org.chromium.sdk.internal.tools.ToolHandler; |
57
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
84 |
@@ -89,7 +90,7 @@ |
56
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
85 |
try { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
86 |
result = devToolSessionManager.attachToTab(); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
87 |
} catch (AttachmentFailureException e) { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
88 |
- throw new IOException(e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
89 |
+ throw new ChromiumIOException(e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
90 |
} |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
91 |
if (Result.OK != result) { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
92 |
throw new IOException("Failed to attach with result: " + result); |
57
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
93 |
Index: src/org/chromium/sdk/internal/StandaloneVmImpl.java |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
94 |
=================================================================== |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
95 |
--- src/org/chromium/sdk/internal/StandaloneVmImpl.java (revision 306) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
96 |
+++ src/org/chromium/sdk/internal/StandaloneVmImpl.java (working copy) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
97 |
@@ -12,6 +12,7 @@ |
56
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
98 |
import java.util.logging.Level; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
99 |
import java.util.logging.Logger; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
100 |
|
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
101 |
+import org.chromium.sdk.ChromiumIOException; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
102 |
import org.chromium.sdk.DebugEventListener; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
103 |
import org.chromium.sdk.StandaloneVm; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
104 |
import org.chromium.sdk.UnsupportedVersionException; |
57
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
105 |
@@ -121,9 +122,9 @@ |
56
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
106 |
} catch (InterruptedException e) { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
107 |
throw new RuntimeException(e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
108 |
} catch (ExecutionException e) { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
109 |
- throw new IOException("Failed to get version", e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
110 |
+ throw new ChromiumIOException("Failed to get version", e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
111 |
} catch (TimeoutException e) { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
112 |
- throw new IOException("Timed out waiting for version", e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
113 |
+ throw new ChromiumIOException("Timed out waiting for version", e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
114 |
} |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
115 |
|
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
116 |
String versionString = remoteInfo.getProtocolVersion(); |
57
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
117 |
Index: src/org/chromium/sdk/internal/transport/Handshaker.java |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
118 |
=================================================================== |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
119 |
--- src/org/chromium/sdk/internal/transport/Handshaker.java (revision 306) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
120 |
+++ src/org/chromium/sdk/internal/transport/Handshaker.java (working copy) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
121 |
@@ -10,8 +10,8 @@ |
56
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
122 |
import java.util.concurrent.ExecutionException; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
123 |
import java.util.concurrent.Future; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
124 |
import java.util.concurrent.FutureTask; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
125 |
-import java.util.concurrent.RunnableFuture; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
126 |
|
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
127 |
+import org.chromium.sdk.ChromiumIOException; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
128 |
import org.chromium.sdk.LineReader; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
129 |
import org.chromium.sdk.internal.transport.Message.MalformedMessageException; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
130 |
|
57
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
131 |
@@ -85,7 +85,7 @@ |
56
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
132 |
return runnableFuture; |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
133 |
} |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
134 |
|
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
135 |
- private final RunnableFuture<RemoteInfo> runnableFuture = |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
136 |
+ private final FutureTask<RemoteInfo> runnableFuture = |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
137 |
new FutureTask<RemoteInfo>(new HandshakeTaks()); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
138 |
|
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
139 |
private LineReader input = null; |
57
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
140 |
@@ -100,7 +100,7 @@ |
56
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
141 |
} catch (InterruptedException e) { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
142 |
throw new RuntimeException(e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
143 |
} catch (ExecutionException e) { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
144 |
- throw new IOException("Failed to perform handshake", e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
145 |
+ throw new ChromiumIOException("Failed to perform handshake", e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
146 |
} |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
147 |
|
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
148 |
} |
57
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
149 |
@@ -111,7 +111,7 @@ |
56
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
150 |
try { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
151 |
message = Message.fromBufferedReader(input); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
152 |
} catch (MalformedMessageException e) { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
153 |
- throw new IOException("Unrecognized handshake message from remote", e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
154 |
+ throw new ChromiumIOException("Unrecognized handshake message from remote", e); |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
155 |
} |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
156 |
if (message == null) { |
22f918ed49f7
Java5 is now supported
Eugene Ostroukhov <eostroukhov@gmail.com>
parents:
diff
changeset
|
157 |
throw new IOException("End of stream"); |
57
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
158 |
#P org.chromium.debug.core |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
159 |
Index: META-INF/MANIFEST.MF |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
160 |
=================================================================== |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
161 |
--- META-INF/MANIFEST.MF (revision 306) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
162 |
+++ META-INF/MANIFEST.MF (working copy) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
163 |
@@ -20,4 +20,5 @@ |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
164 |
org.chromium.debug.core.model, |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
165 |
org.chromium.debug.core.util |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
166 |
Eclipse-LazyStart: true |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
167 |
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6 |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
168 |
+Bundle-RequiredExecutionEnvironment: J2SE-1.5, |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
169 |
+ JavaSE-1.6 |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
170 |
#P org.chromium.debug.ui |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
171 |
Index: META-INF/MANIFEST.MF |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
172 |
=================================================================== |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
173 |
--- META-INF/MANIFEST.MF (revision 306) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
174 |
+++ META-INF/MANIFEST.MF (working copy) |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
175 |
@@ -16,4 +16,5 @@ |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
176 |
org.chromium.debug.core;bundle-version="0.1.5", |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
177 |
org.chromium.sdk;bundle-version="0.1.5" |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
178 |
Bundle-ActivationPolicy: lazy |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
179 |
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6 |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
180 |
+Bundle-RequiredExecutionEnvironment: J2SE-1.5, |
53a5a8929d21
Minor update to launch configuration
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
56
diff
changeset
|
181 |
+ JavaSE-1.6 |