Dart: Refactors Proxies

mojo/dart/packages/mojo/lib/mojo/application.mojom.dart

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 library application_mojom;
 import 'dart:async';
 import 'package:mojo/bindings.dart' as bindings;
 import 'package:mojo/core.dart' as core;
 import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
 import 'package:mojo/mojo/service_provider.mojom.dart' as service_provider_mojom;
@@ skipping 298 matching lines @@
 }
 
 abstract class Application {
   static const String serviceName = null;
   void initialize(Object shell, List<String> args, String url);
   void acceptConnection(String requestorUrl, Object services, Object exposedServices, String resolvedUrl);
   void requestQuit();
 }
 
 
-class _ApplicationProxyImpl extends bindings.Proxy {
-  _ApplicationProxyImpl.fromEndpoint(
+class _ApplicationProxyControl extends bindings.ProxyMessageHandler
+                                      implements bindings.ProxyControl {
+  _ApplicationProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
-  _ApplicationProxyImpl.fromHandle(core.MojoHandle handle) :
-      super.fromHandle(handle);
+  _ApplicationProxyControl.fromHandle(
+      core.MojoHandle handle) : super.fromHandle(handle);
 
-  _ApplicationProxyImpl.unbound() : super.unbound();
-
-  static _ApplicationProxyImpl newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For _ApplicationProxyImpl"));
-    return new _ApplicationProxyImpl.fromEndpoint(endpoint);
-  }
+  _ApplicationProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
-    new _ApplicationServiceDescription();
+      new _ApplicationServiceDescription();
 
+  String get serviceName => Application.serviceName;
+
+  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "_ApplicationProxyImpl($superString)";
+    return "_ApplicationProxyControl($superString)";
   }
 }
 
 
-class _ApplicationProxyCalls implements Application {
-  _ApplicationProxyImpl _proxyImpl;
+class ApplicationProxy extends bindings.Proxy
+                              implements Application {
+  ApplicationProxy.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint)
+      : super(new _ApplicationProxyControl.fromEndpoint(endpoint));
 
-  _ApplicationProxyCalls(this._proxyImpl);
-    void initialize(Object shell, List<String> args, String url) {
-      if (!_proxyImpl.isBound) {
-        _proxyImpl.proxyError("The Proxy is closed.");
-        return;
-      }
-      var params = new _ApplicationInitializeParams();
-      params.shell = shell;
-      params.args = args;
-      params.url = url;
-      _proxyImpl.sendMessage(params, _applicationMethodInitializeName);
-    }
-    void acceptConnection(String requestorUrl, Object services, Object exposedServices, String resolvedUrl) {
-      if (!_proxyImpl.isBound) {
-        _proxyImpl.proxyError("The Proxy is closed.");
-        return;
-      }
-      var params = new _ApplicationAcceptConnectionParams();
-      params.requestorUrl = requestorUrl;
-      params.services = services;
-      params.exposedServices = exposedServices;
-      params.resolvedUrl = resolvedUrl;
-      _proxyImpl.sendMessage(params, _applicationMethodAcceptConnectionName);
-    }
-    void requestQuit() {
-      if (!_proxyImpl.isBound) {
-        _proxyImpl.proxyError("The Proxy is closed.");
-        return;
-      }
-      var params = new _ApplicationRequestQuitParams();
-      _proxyImpl.sendMessage(params, _applicationMethodRequestQuitName);
-    }
-}
+  ApplicationProxy.fromHandle(core.MojoHandle handle)
+      : super(new _ApplicationProxyControl.fromHandle(handle));
 
+  ApplicationProxy.unbound()
+      : super(new _ApplicationProxyControl.unbound());
 
-class ApplicationProxy implements bindings.ProxyBase {
-  final bindings.Proxy impl;
-  Application ptr;
-
-  ApplicationProxy(_ApplicationProxyImpl proxyImpl) :
-      impl = proxyImpl,
-      ptr = new _ApplicationProxyCalls(proxyImpl);
-
-  ApplicationProxy.fromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) :
-      impl = new _ApplicationProxyImpl.fromEndpoint(endpoint) {
-    ptr = new _ApplicationProxyCalls(impl);
-  }
-
-  ApplicationProxy.fromHandle(core.MojoHandle handle) :
-      impl = new _ApplicationProxyImpl.fromHandle(handle) {
-    ptr = new _ApplicationProxyCalls(impl);
-  }
-
-  ApplicationProxy.unbound() :
-      impl = new _ApplicationProxyImpl.unbound() {
-    ptr = new _ApplicationProxyCalls(impl);
+  static ApplicationProxy newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For ApplicationProxy"));
+    return new ApplicationProxy.fromEndpoint(endpoint);
   }
 
   factory ApplicationProxy.connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     ApplicationProxy p = new ApplicationProxy.unbound();
     s.connectToService(url, p, serviceName);
     return p;
   }
 
-  static ApplicationProxy newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For ApplicationProxy"));
-    return new ApplicationProxy.fromEndpoint(endpoint);
+
+  void initialize(Object shell, List<String> args, String url) {
+    if (!ctrl.isBound) {
+      ctrl.proxyError("The Proxy is closed.");
+      return;
+    }
+    var params = new _ApplicationInitializeParams();
+    params.shell = shell;
+    params.args = args;
+    params.url = url;
+    ctrl.sendMessage(params,
+        _applicationMethodInitializeName);
   }
-
-  String get serviceName => Application.serviceName;
-
-  Future close({bool immediate: false}) => impl.close(immediate: immediate);
-
-  Future responseOrError(Future f) => impl.responseOrError(f);
-
-  Future get errorFuture => impl.errorFuture;
-
-  int get version => impl.version;
-
-  Future<int> queryVersion() => impl.queryVersion();
-
-  void requireVersion(int requiredVersion) {
-    impl.requireVersion(requiredVersion);
+  void acceptConnection(String requestorUrl, Object services, Object exposedServices, String resolvedUrl) {
+    if (!ctrl.isBound) {
+      ctrl.proxyError("The Proxy is closed.");
+      return;
+    }
+    var params = new _ApplicationAcceptConnectionParams();
+    params.requestorUrl = requestorUrl;
+    params.services = services;
+    params.exposedServices = exposedServices;
+    params.resolvedUrl = resolvedUrl;
+    ctrl.sendMessage(params,
+        _applicationMethodAcceptConnectionName);
   }
-
-  String toString() {
-    return "ApplicationProxy($impl)";
+  void requestQuit() {
+    if (!ctrl.isBound) {
+      ctrl.proxyError("The Proxy is closed.");
+      return;
+    }
+    var params = new _ApplicationRequestQuitParams();
+    ctrl.sendMessage(params,
+        _applicationMethodRequestQuitName);
   }
 }
 
 
 class ApplicationStub extends bindings.Stub {
   Application _impl;
 
   ApplicationStub.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [Application impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
@@ skipping 76 matching lines @@
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ApplicationServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }