Dart: Refactor Stubs

mojo/dart/packages/mojo_services/lib/mojo/service_registry.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 service_registry_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 109 matching lines @@
 
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class ServiceRegistry {
   static const String serviceName = "mojo::ServiceRegistry";
   void addServices(List<String> interfaceNames, Object serviceProvider);
 }
 
-
-class _ServiceRegistryProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _ServiceRegistryProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _ServiceRegistryProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _ServiceRegistryProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _ServiceRegistryProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _ServiceRegistryServiceDescription();
 
   String get serviceName => ServiceRegistry.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 "_ServiceRegistryProxyControl($superString)";
   }
 }
 
-
-class ServiceRegistryProxy extends bindings.Proxy
-                              implements ServiceRegistry {
+class ServiceRegistryProxy
+    extends bindings.Proxy
+    implements ServiceRegistry {
   ServiceRegistryProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _ServiceRegistryProxyControl.fromEndpoint(endpoint));
 
   ServiceRegistryProxy.fromHandle(core.MojoHandle handle)
       : super(new _ServiceRegistryProxyControl.fromHandle(handle));
 
   ServiceRegistryProxy.unbound()
       : super(new _ServiceRegistryProxyControl.unbound());
 
@@ skipping 17 matching lines @@
       return;
     }
     var params = new _ServiceRegistryAddServicesParams();
     params.interfaceNames = interfaceNames;
     params.serviceProvider = serviceProvider;
     ctrl.sendMessage(params,
         _serviceRegistryMethodAddServicesName);
   }
 }
 
-
-class ServiceRegistryStub extends bindings.Stub {
+class _ServiceRegistryStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<ServiceRegistry> {
   ServiceRegistry _impl;
 
-  ServiceRegistryStub.fromEndpoint(
+  _ServiceRegistryStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [ServiceRegistry impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  ServiceRegistryStub.fromHandle(
+  _ServiceRegistryStubControl.fromHandle(
       core.MojoHandle handle, [ServiceRegistry impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  ServiceRegistryStub.unbound([this._impl]) : super.unbound();
-
-  static ServiceRegistryStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For ServiceRegistryStub"));
-    return new ServiceRegistryStub.fromEndpoint(endpoint);
-  }
+  _ServiceRegistryStubControl.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 24 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "ServiceRegistryStub($superString)";
+    return "_ServiceRegistryStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ServiceRegistryServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class ServiceRegistryStub
+    extends bindings.Stub<ServiceRegistry>
+    implements ServiceRegistry {
+  ServiceRegistryStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [ServiceRegistry impl])
+      : super(new _ServiceRegistryStubControl.fromEndpoint(endpoint, impl));
+
+  ServiceRegistryStub.fromHandle(
+      core.MojoHandle handle, [ServiceRegistry impl])
+      : super(new _ServiceRegistryStubControl.fromHandle(handle, impl));
+
+  ServiceRegistryStub.unbound([ServiceRegistry impl])
+      : super(new _ServiceRegistryStubControl.unbound(impl));
+
+  static ServiceRegistryStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For ServiceRegistryStub"));
+    return new ServiceRegistryStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _ServiceRegistryStubControl.serviceDescription;
+
+
+  void addServices(List<String> interfaceNames, Object serviceProvider) {
+    return impl.addServices(interfaceNames, serviceProvider);
+  }
+}
+