Dart: Refactor Stubs

mojo/dart/packages/mojo_services/lib/mojo/surfaces.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 surfaces_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/geometry.mojom.dart' as geometry_mojom;
@@ skipping 1243 matching lines @@
 
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class ResourceReturner {
   static const String serviceName = null;
   void returnResources(List<ReturnedResource> resources);
 }
 
-
-class _ResourceReturnerProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _ResourceReturnerProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _ResourceReturnerProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _ResourceReturnerProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _ResourceReturnerProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _ResourceReturnerServiceDescription();
 
   String get serviceName => ResourceReturner.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 "_ResourceReturnerProxyControl($superString)";
   }
 }
 
-
-class ResourceReturnerProxy extends bindings.Proxy
-                              implements ResourceReturner {
+class ResourceReturnerProxy
+    extends bindings.Proxy
+    implements ResourceReturner {
   ResourceReturnerProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _ResourceReturnerProxyControl.fromEndpoint(endpoint));
 
   ResourceReturnerProxy.fromHandle(core.MojoHandle handle)
       : super(new _ResourceReturnerProxyControl.fromHandle(handle));
 
   ResourceReturnerProxy.unbound()
       : super(new _ResourceReturnerProxyControl.unbound());
 
@@ skipping 16 matching lines @@
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _ResourceReturnerReturnResourcesParams();
     params.resources = resources;
     ctrl.sendMessage(params,
         _resourceReturnerMethodReturnResourcesName);
   }
 }
 
-
-class ResourceReturnerStub extends bindings.Stub {
+class _ResourceReturnerStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<ResourceReturner> {
   ResourceReturner _impl;
 
-  ResourceReturnerStub.fromEndpoint(
+  _ResourceReturnerStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [ResourceReturner impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  ResourceReturnerStub.fromHandle(
+  _ResourceReturnerStubControl.fromHandle(
       core.MojoHandle handle, [ResourceReturner impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  ResourceReturnerStub.unbound([this._impl]) : super.unbound();
-
-  static ResourceReturnerStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For ResourceReturnerStub"));
-    return new ResourceReturnerStub.fromEndpoint(endpoint);
-  }
+  _ResourceReturnerStubControl.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 "ResourceReturnerStub($superString)";
+    return "_ResourceReturnerStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ResourceReturnerServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class ResourceReturnerStub
+    extends bindings.Stub<ResourceReturner>
+    implements ResourceReturner {
+  ResourceReturnerStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [ResourceReturner impl])
+      : super(new _ResourceReturnerStubControl.fromEndpoint(endpoint, impl));
+
+  ResourceReturnerStub.fromHandle(
+      core.MojoHandle handle, [ResourceReturner impl])
+      : super(new _ResourceReturnerStubControl.fromHandle(handle, impl));
+
+  ResourceReturnerStub.unbound([ResourceReturner impl])
+      : super(new _ResourceReturnerStubControl.unbound(impl));
+
+  static ResourceReturnerStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For ResourceReturnerStub"));
+    return new ResourceReturnerStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _ResourceReturnerStubControl.serviceDescription;
+
+
+  void returnResources(List<ReturnedResource> resources) {
+    return impl.returnResources(resources);
+  }
+}
+
 const int _surfaceMethodGetIdNamespaceName = 0;
 const int _surfaceMethodSetResourceReturnerName = 1;
 const int _surfaceMethodCreateSurfaceName = 2;
 const int _surfaceMethodSubmitFrameName = 3;
 const int _surfaceMethodDestroySurfaceName = 4;
 
 class _SurfaceServiceDescription implements service_describer.ServiceDescription {
   dynamic getTopLevelInterface([Function responseFactory]) =>
       responseFactory(null);
 
   dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
       responseFactory(null);
 
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class Surface {
   static const String serviceName = "mojo::Surface";
   dynamic getIdNamespace([Function responseFactory = null]);
   void setResourceReturner(Object returner);
   void createSurface(int idLocal);
   dynamic submitFrame(int idLocal,Frame frame,[Function responseFactory = null]);
   void destroySurface(int idLocal);
 }
 
-
-class _SurfaceProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _SurfaceProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _SurfaceProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _SurfaceProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _SurfaceProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _SurfaceServiceDescription();
 
   String get serviceName => Surface.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _surfaceMethodGetIdNamespaceName:
         var r = SurfaceGetIdNamespaceResponseParams.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 "_SurfaceProxyControl($superString)";
   }
 }
 
-
-class SurfaceProxy extends bindings.Proxy
-                              implements Surface {
+class SurfaceProxy
+    extends bindings.Proxy
+    implements Surface {
   SurfaceProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _SurfaceProxyControl.fromEndpoint(endpoint));
 
   SurfaceProxy.fromHandle(core.MojoHandle handle)
       : super(new _SurfaceProxyControl.fromHandle(handle));
 
   SurfaceProxy.unbound()
       : super(new _SurfaceProxyControl.unbound());
 
@@ skipping 54 matching lines @@
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _SurfaceDestroySurfaceParams();
     params.idLocal = idLocal;
     ctrl.sendMessage(params,
         _surfaceMethodDestroySurfaceName);
   }
 }
 
-
-class SurfaceStub extends bindings.Stub {
+class _SurfaceStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<Surface> {
   Surface _impl;
 
-  SurfaceStub.fromEndpoint(
+  _SurfaceStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [Surface impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  SurfaceStub.fromHandle(
+  _SurfaceStubControl.fromHandle(
       core.MojoHandle handle, [Surface impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  SurfaceStub.unbound([this._impl]) : super.unbound();
-
-  static SurfaceStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For SurfaceStub"));
-    return new SurfaceStub.fromEndpoint(endpoint);
-  }
+  _SurfaceStubControl.unbound([this._impl]) : super.unbound();
 
 
   SurfaceGetIdNamespaceResponseParams _surfaceGetIdNamespaceResponseParamsFactory(int idNamespace) {
     var result = new SurfaceGetIdNamespaceResponseParams();
     result.idNamespace = idNamespace;
     return result;
   }
   SurfaceSubmitFrameResponseParams _surfaceSubmitFrameResponseParamsFactory() {
     var result = new SurfaceSubmitFrameResponseParams();
     return result;
@@ skipping 85 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "SurfaceStub($superString)";
+    return "_SurfaceStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _SurfaceServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class SurfaceStub
+    extends bindings.Stub<Surface>
+    implements Surface {
+  SurfaceStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [Surface impl])
+      : super(new _SurfaceStubControl.fromEndpoint(endpoint, impl));
+
+  SurfaceStub.fromHandle(
+      core.MojoHandle handle, [Surface impl])
+      : super(new _SurfaceStubControl.fromHandle(handle, impl));
+
+  SurfaceStub.unbound([Surface impl])
+      : super(new _SurfaceStubControl.unbound(impl));
+
+  static SurfaceStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For SurfaceStub"));
+    return new SurfaceStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _SurfaceStubControl.serviceDescription;
+
+
+  dynamic getIdNamespace([Function responseFactory = null]) {
+    return impl.getIdNamespace(responseFactory);
+  }
+  void setResourceReturner(Object returner) {
+    return impl.setResourceReturner(returner);
+  }
+  void createSurface(int idLocal) {
+    return impl.createSurface(idLocal);
+  }
+  dynamic submitFrame(int idLocal,Frame frame,[Function responseFactory = null]) {
+    return impl.submitFrame(idLocal,frame,responseFactory);
+  }
+  void destroySurface(int idLocal) {
+    return impl.destroySurface(idLocal);
+  }
+}
+