Dart: Refactor Stubs

mojo/dart/packages/mojo/lib/mojo/shell.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 shell_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/application_connector.mojom.dart' as application_connector_mojom;
@@ skipping 181 matching lines @@
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class Shell {
   static const String serviceName = null;
   void connectToApplication(String applicationUrl, Object services, Object exposedServices);
   void createApplicationConnector(Object applicationConnectorRequest);
 }
 
-
-class _ShellProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _ShellProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _ShellProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _ShellProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _ShellProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _ShellServiceDescription();
 
   String get serviceName => Shell.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 "_ShellProxyControl($superString)";
   }
 }
 
-
-class ShellProxy extends bindings.Proxy
-                              implements Shell {
+class ShellProxy
+    extends bindings.Proxy
+    implements Shell {
   ShellProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _ShellProxyControl.fromEndpoint(endpoint));
 
   ShellProxy.fromHandle(core.MojoHandle handle)
       : super(new _ShellProxyControl.fromHandle(handle));
 
   ShellProxy.unbound()
       : super(new _ShellProxyControl.unbound());
 
@@ skipping 28 matching lines @@
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _ShellCreateApplicationConnectorParams();
     params.applicationConnectorRequest = applicationConnectorRequest;
     ctrl.sendMessage(params,
         _shellMethodCreateApplicationConnectorName);
   }
 }
 
-
-class ShellStub extends bindings.Stub {
+class _ShellStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<Shell> {
   Shell _impl;
 
-  ShellStub.fromEndpoint(
+  _ShellStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [Shell impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  ShellStub.fromHandle(
+  _ShellStubControl.fromHandle(
       core.MojoHandle handle, [Shell impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  ShellStub.unbound([this._impl]) : super.unbound();
-
-  static ShellStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For ShellStub"));
-    return new ShellStub.fromEndpoint(endpoint);
-  }
+  _ShellStubControl.unbound([this._impl]) : super.unbound();
 
 
 
   dynamic handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
       return bindings.ControlMessageHandler.handleMessage(this,
                                                           0,
                                                           message);
     }
     if (_impl == null) {
@@ skipping 29 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "ShellStub($superString)";
+    return "_ShellStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ShellServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class ShellStub
+    extends bindings.Stub<Shell>
+    implements Shell {
+  ShellStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [Shell impl])
+      : super(new _ShellStubControl.fromEndpoint(endpoint, impl));
+
+  ShellStub.fromHandle(
+      core.MojoHandle handle, [Shell impl])
+      : super(new _ShellStubControl.fromHandle(handle, impl));
+
+  ShellStub.unbound([Shell impl])
+      : super(new _ShellStubControl.unbound(impl));
+
+  static ShellStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For ShellStub"));
+    return new ShellStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _ShellStubControl.serviceDescription;
+
+
+  void connectToApplication(String applicationUrl, Object services, Object exposedServices) {
+    return impl.connectToApplication(applicationUrl, services, exposedServices);
+  }
+  void createApplicationConnector(Object applicationConnectorRequest) {
+    return impl.createApplicationConnector(applicationConnectorRequest);
+  }
+}
+