Dart: Refactor Stubs

mojo/dart/packages/mojo_services/lib/mojo/http_server.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 http_server_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/http_connection.mojom.dart' as http_connection_mojom;
@@ skipping 94 matching lines @@
 
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class HttpServerDelegate {
   static const String serviceName = null;
   void onConnected(Object connection, Object delegate);
 }
 
-
-class _HttpServerDelegateProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _HttpServerDelegateProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _HttpServerDelegateProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _HttpServerDelegateProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _HttpServerDelegateProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _HttpServerDelegateServiceDescription();
 
   String get serviceName => HttpServerDelegate.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 "_HttpServerDelegateProxyControl($superString)";
   }
 }
 
-
-class HttpServerDelegateProxy extends bindings.Proxy
-                              implements HttpServerDelegate {
+class HttpServerDelegateProxy
+    extends bindings.Proxy
+    implements HttpServerDelegate {
   HttpServerDelegateProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _HttpServerDelegateProxyControl.fromEndpoint(endpoint));
 
   HttpServerDelegateProxy.fromHandle(core.MojoHandle handle)
       : super(new _HttpServerDelegateProxyControl.fromHandle(handle));
 
   HttpServerDelegateProxy.unbound()
       : super(new _HttpServerDelegateProxyControl.unbound());
 
@@ skipping 17 matching lines @@
       return;
     }
     var params = new _HttpServerDelegateOnConnectedParams();
     params.connection = connection;
     params.delegate = delegate;
     ctrl.sendMessage(params,
         _httpServerDelegateMethodOnConnectedName);
   }
 }
 
-
-class HttpServerDelegateStub extends bindings.Stub {
+class _HttpServerDelegateStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<HttpServerDelegate> {
   HttpServerDelegate _impl;
 
-  HttpServerDelegateStub.fromEndpoint(
+  _HttpServerDelegateStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [HttpServerDelegate impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  HttpServerDelegateStub.fromHandle(
+  _HttpServerDelegateStubControl.fromHandle(
       core.MojoHandle handle, [HttpServerDelegate impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  HttpServerDelegateStub.unbound([this._impl]) : super.unbound();
-
-  static HttpServerDelegateStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For HttpServerDelegateStub"));
-    return new HttpServerDelegateStub.fromEndpoint(endpoint);
-  }
+  _HttpServerDelegateStubControl.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 "HttpServerDelegateStub($superString)";
+    return "_HttpServerDelegateStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _HttpServerDelegateServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class HttpServerDelegateStub
+    extends bindings.Stub<HttpServerDelegate>
+    implements HttpServerDelegate {
+  HttpServerDelegateStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [HttpServerDelegate impl])
+      : super(new _HttpServerDelegateStubControl.fromEndpoint(endpoint, impl));
+
+  HttpServerDelegateStub.fromHandle(
+      core.MojoHandle handle, [HttpServerDelegate impl])
+      : super(new _HttpServerDelegateStubControl.fromHandle(handle, impl));
+
+  HttpServerDelegateStub.unbound([HttpServerDelegate impl])
+      : super(new _HttpServerDelegateStubControl.unbound(impl));
+
+  static HttpServerDelegateStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For HttpServerDelegateStub"));
+    return new HttpServerDelegateStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _HttpServerDelegateStubControl.serviceDescription;
+
+
+  void onConnected(Object connection, Object delegate) {
+    return impl.onConnected(connection, delegate);
+  }
+}
+