Dart: Refactor Stubs

mojo/dart/packages/mojo_services/lib/icu_data/icu_data.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 icu_data_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;
 
@@ skipping 152 matching lines @@
 
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class IcuData {
   static const String serviceName = "icu_data::ICUData";
   dynamic map(String sha1hash,[Function responseFactory = null]);
 }
 
-
-class _IcuDataProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _IcuDataProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _IcuDataProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _IcuDataProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _IcuDataProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _IcuDataServiceDescription();
 
   String get serviceName => IcuData.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _icuDataMethodMapName:
         var r = IcuDataMapResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
         Completer c = completerMap[message.header.requestId];
@@ skipping 16 matching lines @@
     }
   }
 
   @override
   String toString() {
     var superString = super.toString();
     return "_IcuDataProxyControl($superString)";
   }
 }
 
-
-class IcuDataProxy extends bindings.Proxy
-                              implements IcuData {
+class IcuDataProxy
+    extends bindings.Proxy
+    implements IcuData {
   IcuDataProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _IcuDataProxyControl.fromEndpoint(endpoint));
 
   IcuDataProxy.fromHandle(core.MojoHandle handle)
       : super(new _IcuDataProxyControl.fromHandle(handle));
 
   IcuDataProxy.unbound()
       : super(new _IcuDataProxyControl.unbound());
 
@@ skipping 15 matching lines @@
     var params = new _IcuDataMapParams();
     params.sha1hash = sha1hash;
     return ctrl.sendMessageWithRequestId(
         params,
         _icuDataMethodMapName,
         -1,
         bindings.MessageHeader.kMessageExpectsResponse);
   }
 }
 
-
-class IcuDataStub extends bindings.Stub {
+class _IcuDataStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<IcuData> {
   IcuData _impl;
 
-  IcuDataStub.fromEndpoint(
+  _IcuDataStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [IcuData impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  IcuDataStub.fromHandle(
+  _IcuDataStubControl.fromHandle(
       core.MojoHandle handle, [IcuData impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  IcuDataStub.unbound([this._impl]) : super.unbound();
-
-  static IcuDataStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For IcuDataStub"));
-    return new IcuDataStub.fromEndpoint(endpoint);
-  }
+  _IcuDataStubControl.unbound([this._impl]) : super.unbound();
 
 
   IcuDataMapResponseParams _icuDataMapResponseParamsFactory(core.MojoSharedBuffer icuData) {
     var result = new IcuDataMapResponseParams();
     result.icuData = icuData;
     return result;
   }
 
   dynamic handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
@@ skipping 46 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "IcuDataStub($superString)";
+    return "_IcuDataStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _IcuDataServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class IcuDataStub
+    extends bindings.Stub<IcuData>
+    implements IcuData {
+  IcuDataStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [IcuData impl])
+      : super(new _IcuDataStubControl.fromEndpoint(endpoint, impl));
+
+  IcuDataStub.fromHandle(
+      core.MojoHandle handle, [IcuData impl])
+      : super(new _IcuDataStubControl.fromHandle(handle, impl));
+
+  IcuDataStub.unbound([IcuData impl])
+      : super(new _IcuDataStubControl.unbound(impl));
+
+  static IcuDataStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For IcuDataStub"));
+    return new IcuDataStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _IcuDataStubControl.serviceDescription;
+
+
+  dynamic map(String sha1hash,[Function responseFactory = null]) {
+    return impl.map(sha1hash,responseFactory);
+  }
+}
+