| Index: mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceWithClient.java
|
| diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceWithClient.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceWithClient.java
|
| index c84b61a55f250acac6e61a5905f3eb406986d5cf..69fe6edcb3b5c217c1da54db65d2916e0b15dc2b 100644
|
| --- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceWithClient.java
|
| +++ b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceWithClient.java
|
| @@ -3,9 +3,6 @@
|
| // found in the LICENSE file.
|
|
|
| package org.chromium.mojo.bindings;
|
| -
|
| -import org.chromium.mojo.system.Core;
|
| -import org.chromium.mojo.system.MessagePipeHandle;
|
|
|
| /**
|
| * Base class for mojo generated interfaces that have a client.
|
| @@ -15,87 +12,8 @@
|
| public interface InterfaceWithClient<C extends Interface> extends Interface {
|
|
|
| /**
|
| - * Proxy class for interfaces with a client.
|
| - */
|
| - interface Proxy<C extends Interface> extends Interface.Proxy, InterfaceWithClient<C> {
|
| - }
|
| -
|
| - /**
|
| - * Base implementation of Proxy.
|
| - *
|
| - * @param <C> the type of the client interface.
|
| - */
|
| - abstract class AbstractProxy<C extends Interface> extends Interface.AbstractProxy
|
| - implements Proxy<C> {
|
| -
|
| - /**
|
| - * Constructor.
|
| - *
|
| - * @param core the Core implementation used to create pipes and access the async waiter.
|
| - * @param messageReceiver the message receiver to send message to.
|
| - */
|
| - public AbstractProxy(Core core, MessageReceiverWithResponder messageReceiver) {
|
| - super(core, messageReceiver);
|
| - }
|
| -
|
| - /**
|
| - * @see InterfaceWithClient#setClient(Interface)
|
| - */
|
| - @Override
|
| - public void setClient(C client) {
|
| - throw new UnsupportedOperationException(
|
| - "Setting the client on a proxy is not supported");
|
| - }
|
| - }
|
| -
|
| - /**
|
| - * Base manager implementation for interfaces that have a client.
|
| - *
|
| - * @param <I> the type of the interface the manager can handle.
|
| - * @param <P> the type of the proxy the manager can handle. To be noted, P always extends I.
|
| - * @param <C> the type of the client interface.
|
| - */
|
| - abstract class Manager<I extends InterfaceWithClient<C>, P extends Proxy<C>,
|
| - C extends Interface> extends Interface.Manager<I, P> {
|
| -
|
| - /**
|
| - * @see Interface.Manager#bind(Interface, MessagePipeHandle)
|
| - */
|
| - @Override
|
| - public final void bind(I impl, MessagePipeHandle handle) {
|
| - Router router = new RouterImpl(handle);
|
| - super.bind(handle.getCore(), impl, router);
|
| - @SuppressWarnings("unchecked")
|
| - C client = (C) getClientManager().attachProxy(handle.getCore(), router);
|
| - impl.setClient(client);
|
| - router.start();
|
| - }
|
| -
|
| - /**
|
| - * Returns a Proxy that will send messages to the given |handle|. This implies that the
|
| - * other end of the handle must be connected to an implementation of the interface. |client|
|
| - * is the implementation of the client interface.
|
| - */
|
| - public P attachProxy(MessagePipeHandle handle, C client) {
|
| - Router router = new RouterImpl(handle);
|
| - DelegatingConnectionErrorHandler handlers = new DelegatingConnectionErrorHandler();
|
| - handlers.addConnectionErrorHandler(client);
|
| - router.setErrorHandler(handlers);
|
| - getClientManager().bind(handle.getCore(), client, router);
|
| - P proxy = super.attachProxy(handle.getCore(), router);
|
| - handlers.addConnectionErrorHandler(proxy);
|
| - router.start();
|
| - return proxy;
|
| - }
|
| -
|
| - /**
|
| - * Returns a manager for the client inetrafce.
|
| - */
|
| - protected abstract Interface.Manager<C, ?> getClientManager();
|
| - }
|
| -
|
| - /**
|
| - * Set the client implementation for this interface.
|
| + * Set the client associated with this interface.
|
| */
|
| public void setClient(C client);
|
| +
|
| }
|
|
|