Dart: Refactor Stubs

mojo/dart/packages/mojo_services/lib/mojo/geocoder.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 geocoder_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_services/mojo/location.mojom.dart' as location_mojom;
@@ skipping 1086 matching lines @@
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class Geocoder {
   static const String serviceName = null;
   dynamic addressToLocation(String address,Options options,[Function responseFactory = null]);
   dynamic locationToAddress(location_mojom.Location location,Options options,[Function responseFactory = null]);
 }
 
-
-class _GeocoderProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _GeocoderProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _GeocoderProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _GeocoderProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _GeocoderProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _GeocoderServiceDescription();
 
   String get serviceName => Geocoder.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _geocoderMethodAddressToLocationName:
         var r = GeocoderAddressToLocationResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
         Completer c = completerMap[message.header.requestId];
@@ skipping 36 matching lines @@
     }
   }
 
   @override
   String toString() {
     var superString = super.toString();
     return "_GeocoderProxyControl($superString)";
   }
 }
 
-
-class GeocoderProxy extends bindings.Proxy
-                              implements Geocoder {
+class GeocoderProxy
+    extends bindings.Proxy
+    implements Geocoder {
   GeocoderProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _GeocoderProxyControl.fromEndpoint(endpoint));
 
   GeocoderProxy.fromHandle(core.MojoHandle handle)
       : super(new _GeocoderProxyControl.fromHandle(handle));
 
   GeocoderProxy.unbound()
       : super(new _GeocoderProxyControl.unbound());
 
@@ skipping 26 matching lines @@
     params.location = location;
     params.options = options;
     return ctrl.sendMessageWithRequestId(
         params,
         _geocoderMethodLocationToAddressName,
         -1,
         bindings.MessageHeader.kMessageExpectsResponse);
   }
 }
 
-
-class GeocoderStub extends bindings.Stub {
+class _GeocoderStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<Geocoder> {
   Geocoder _impl;
 
-  GeocoderStub.fromEndpoint(
+  _GeocoderStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [Geocoder impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  GeocoderStub.fromHandle(
+  _GeocoderStubControl.fromHandle(
       core.MojoHandle handle, [Geocoder impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  GeocoderStub.unbound([this._impl]) : super.unbound();
-
-  static GeocoderStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For GeocoderStub"));
-    return new GeocoderStub.fromEndpoint(endpoint);
-  }
+  _GeocoderStubControl.unbound([this._impl]) : super.unbound();
 
 
   GeocoderAddressToLocationResponseParams _geocoderAddressToLocationResponseParamsFactory(String status, List<Result> results) {
     var result = new GeocoderAddressToLocationResponseParams();
     result.status = status;
     result.results = results;
     return result;
   }
   GeocoderLocationToAddressResponseParams _geocoderLocationToAddressResponseParamsFactory(String status, List<Result> results) {
     var result = new GeocoderLocationToAddressResponseParams();
@@ skipping 75 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "GeocoderStub($superString)";
+    return "_GeocoderStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _GeocoderServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class GeocoderStub
+    extends bindings.Stub<Geocoder>
+    implements Geocoder {
+  GeocoderStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [Geocoder impl])
+      : super(new _GeocoderStubControl.fromEndpoint(endpoint, impl));
+
+  GeocoderStub.fromHandle(
+      core.MojoHandle handle, [Geocoder impl])
+      : super(new _GeocoderStubControl.fromHandle(handle, impl));
+
+  GeocoderStub.unbound([Geocoder impl])
+      : super(new _GeocoderStubControl.unbound(impl));
+
+  static GeocoderStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For GeocoderStub"));
+    return new GeocoderStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _GeocoderStubControl.serviceDescription;
+
+
+  dynamic addressToLocation(String address,Options options,[Function responseFactory = null]) {
+    return impl.addressToLocation(address,options,responseFactory);
+  }
+  dynamic locationToAddress(location_mojom.Location location,Options options,[Function responseFactory = null]) {
+    return impl.locationToAddress(location,options,responseFactory);
+  }
+}
+