Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(728)

Unified Diff: mojo/bindings/java/src/org/chromium/mojo/bindings/Connector.java

Issue 371603003: Adding a router class to handle messages that expect responses. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix findbugs issue Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/bindings/java/src/org/chromium/mojo/bindings/Connector.java
diff --git a/mojo/bindings/java/src/org/chromium/mojo/bindings/Connector.java b/mojo/bindings/java/src/org/chromium/mojo/bindings/Connector.java
index f978ba49b0b3a4f504ec1c34309d93dd9dda753f..17cc7ed9fe27e3d3d540a5edc792246a60f076ce 100644
--- a/mojo/bindings/java/src/org/chromium/mojo/bindings/Connector.java
+++ b/mojo/bindings/java/src/org/chromium/mojo/bindings/Connector.java
@@ -21,13 +21,6 @@ import org.chromium.mojo.system.MojoResult;
public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle> {
/**
- * An {@link ErrorHandler} is notified of error happening while using the message pipe.
- */
- interface ErrorHandler {
- public void onError(MojoException e);
- }
-
- /**
* The callback that is notified when the state of the owned handle changes.
*/
private final AsyncWaiterCallback mAsyncWaiterCallback = new AsyncWaiterCallback();
@@ -55,14 +48,14 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
/**
* The error handler to notify of errors.
*/
- private ErrorHandler mErrorHandler;
+ private ConnectionErrorHandler mErrorHandler;
/**
* Create a new connector over a |messagePipeHandle|. The created connector will use the default
* {@link AsyncWaiter} from the {@link Core} implementation of |messagePipeHandle|.
*/
public Connector(MessagePipeHandle messagePipeHandle) {
- this(messagePipeHandle, getDefaultAsyncWaiterForMessagePipe(messagePipeHandle));
+ this(messagePipeHandle, BindingsHelper.getDefaultAsyncWaiterForHandle(messagePipeHandle));
}
/**
@@ -83,9 +76,10 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
}
/**
- * Set the {@link ErrorHandler} that will be notified of errors on the owned message pipe.
+ * Set the {@link ConnectionErrorHandler} that will be notified of errors on the owned message
+ * pipe.
*/
- public void setErrorHandler(ErrorHandler errorHandler) {
+ public void setErrorHandler(ConnectionErrorHandler errorHandler) {
mErrorHandler = errorHandler;
}
@@ -98,13 +92,13 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
}
/**
- * @see MessageReceiver#accept(Message)
+ * @see MessageReceiver#accept(MessageWithHeader)
*/
@Override
- public boolean accept(Message message) {
+ public boolean accept(MessageWithHeader message) {
try {
- mMessagePipeHandle.writeMessage(message.buffer, message.handles,
- MessagePipeHandle.WriteFlags.NONE);
+ mMessagePipeHandle.writeMessage(message.getMessage().buffer,
+ message.getMessage().handles, MessagePipeHandle.WriteFlags.NONE);
return true;
} catch (MojoException e) {
onError(e);
@@ -133,15 +127,6 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
mMessagePipeHandle.close();
}
- private static AsyncWaiter getDefaultAsyncWaiterForMessagePipe(
- MessagePipeHandle messagePipeHandle) {
- if (messagePipeHandle.getCore() != null) {
- return messagePipeHandle.getCore().getDefaultAsyncWaiter();
- } else {
- return null;
- }
- }
-
private class AsyncWaiterCallback implements AsyncWaiter.Callback {
/**
@@ -178,7 +163,7 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
mCancellable = null;
close();
if (mErrorHandler != null) {
- mErrorHandler.onError(exception);
+ mErrorHandler.onConnectionError(exception);
}
}
@@ -202,7 +187,7 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
int result;
do {
try {
- result = Message.readAndDispatchMessage(mMessagePipeHandle,
+ result = MessageWithHeader.readAndDispatchMessage(mMessagePipeHandle,
mIncomingMessageReceiver);
} catch (MojoException e) {
onError(e);
@@ -222,5 +207,4 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
mCancellable = null;
}
}
-
}

Powered by Google App Engine
This is Rietveld 408576698