Dart: Refactor Stubs

mojo/dart/packages/mojo_services/lib/mojo/device_info.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 device_info_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 230 matching lines @@
 
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class DeviceInfo {
   static const String serviceName = "mojo::DeviceInfo";
   dynamic getDeviceType([Function responseFactory = null]);
 }
 
-
-class _DeviceInfoProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _DeviceInfoProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _DeviceInfoProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _DeviceInfoProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _DeviceInfoProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _DeviceInfoServiceDescription();
 
   String get serviceName => DeviceInfo.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _deviceInfoMethodGetDeviceTypeName:
         var r = DeviceInfoGetDeviceTypeResponseParams.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 "_DeviceInfoProxyControl($superString)";
   }
 }
 
-
-class DeviceInfoProxy extends bindings.Proxy
-                              implements DeviceInfo {
+class DeviceInfoProxy
+    extends bindings.Proxy
+    implements DeviceInfo {
   DeviceInfoProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _DeviceInfoProxyControl.fromEndpoint(endpoint));
 
   DeviceInfoProxy.fromHandle(core.MojoHandle handle)
       : super(new _DeviceInfoProxyControl.fromHandle(handle));
 
   DeviceInfoProxy.unbound()
       : super(new _DeviceInfoProxyControl.unbound());
 
@@ skipping 14 matching lines @@
   dynamic getDeviceType([Function responseFactory = null]) {
     var params = new _DeviceInfoGetDeviceTypeParams();
     return ctrl.sendMessageWithRequestId(
         params,
         _deviceInfoMethodGetDeviceTypeName,
         -1,
         bindings.MessageHeader.kMessageExpectsResponse);
   }
 }
 
-
-class DeviceInfoStub extends bindings.Stub {
+class _DeviceInfoStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<DeviceInfo> {
   DeviceInfo _impl;
 
-  DeviceInfoStub.fromEndpoint(
+  _DeviceInfoStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [DeviceInfo impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  DeviceInfoStub.fromHandle(
+  _DeviceInfoStubControl.fromHandle(
       core.MojoHandle handle, [DeviceInfo impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  DeviceInfoStub.unbound([this._impl]) : super.unbound();
-
-  static DeviceInfoStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For DeviceInfoStub"));
-    return new DeviceInfoStub.fromEndpoint(endpoint);
-  }
+  _DeviceInfoStubControl.unbound([this._impl]) : super.unbound();
 
 
   DeviceInfoGetDeviceTypeResponseParams _deviceInfoGetDeviceTypeResponseParamsFactory(DeviceInfoDeviceType deviceType) {
     var result = new DeviceInfoGetDeviceTypeResponseParams();
     result.deviceType = deviceType;
     return result;
   }
 
   dynamic handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
@@ skipping 44 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "DeviceInfoStub($superString)";
+    return "_DeviceInfoStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _DeviceInfoServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class DeviceInfoStub
+    extends bindings.Stub<DeviceInfo>
+    implements DeviceInfo {
+  DeviceInfoStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [DeviceInfo impl])
+      : super(new _DeviceInfoStubControl.fromEndpoint(endpoint, impl));
+
+  DeviceInfoStub.fromHandle(
+      core.MojoHandle handle, [DeviceInfo impl])
+      : super(new _DeviceInfoStubControl.fromHandle(handle, impl));
+
+  DeviceInfoStub.unbound([DeviceInfo impl])
+      : super(new _DeviceInfoStubControl.unbound(impl));
+
+  static DeviceInfoStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For DeviceInfoStub"));
+    return new DeviceInfoStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _DeviceInfoStubControl.serviceDescription;
+
+
+  dynamic getDeviceType([Function responseFactory = null]) {
+    return impl.getDeviceType(responseFactory);
+  }
+}
+