Dart: Refactor Stubs

mojo/dart/packages/mojo_services/lib/mojo/files/files.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 files_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/files/directory.mojom.dart' as directory_mojom;
@@ skipping 171 matching lines @@
 
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class Files {
   static const String serviceName = "mojo::files::Files";
   dynamic openFileSystem(String fileSystem,Object directory,[Function responseFactory = null]);
 }
 
-
-class _FilesProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _FilesProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _FilesProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _FilesProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _FilesProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _FilesServiceDescription();
 
   String get serviceName => Files.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _filesMethodOpenFileSystemName:
         var r = FilesOpenFileSystemResponseParams.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 "_FilesProxyControl($superString)";
   }
 }
 
-
-class FilesProxy extends bindings.Proxy
-                              implements Files {
+class FilesProxy
+    extends bindings.Proxy
+    implements Files {
   FilesProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _FilesProxyControl.fromEndpoint(endpoint));
 
   FilesProxy.fromHandle(core.MojoHandle handle)
       : super(new _FilesProxyControl.fromHandle(handle));
 
   FilesProxy.unbound()
       : super(new _FilesProxyControl.unbound());
 
@@ skipping 16 matching lines @@
     params.fileSystem = fileSystem;
     params.directory = directory;
     return ctrl.sendMessageWithRequestId(
         params,
         _filesMethodOpenFileSystemName,
         -1,
         bindings.MessageHeader.kMessageExpectsResponse);
   }
 }
 
-
-class FilesStub extends bindings.Stub {
+class _FilesStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<Files> {
   Files _impl;
 
-  FilesStub.fromEndpoint(
+  _FilesStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [Files impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  FilesStub.fromHandle(
+  _FilesStubControl.fromHandle(
       core.MojoHandle handle, [Files impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  FilesStub.unbound([this._impl]) : super.unbound();
-
-  static FilesStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For FilesStub"));
-    return new FilesStub.fromEndpoint(endpoint);
-  }
+  _FilesStubControl.unbound([this._impl]) : super.unbound();
 
 
   FilesOpenFileSystemResponseParams _filesOpenFileSystemResponseParamsFactory(types_mojom.Error error) {
     var result = new FilesOpenFileSystemResponseParams();
     result.error = error;
     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 "FilesStub($superString)";
+    return "_FilesStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _FilesServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class FilesStub
+    extends bindings.Stub<Files>
+    implements Files {
+  FilesStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [Files impl])
+      : super(new _FilesStubControl.fromEndpoint(endpoint, impl));
+
+  FilesStub.fromHandle(
+      core.MojoHandle handle, [Files impl])
+      : super(new _FilesStubControl.fromHandle(handle, impl));
+
+  FilesStub.unbound([Files impl])
+      : super(new _FilesStubControl.unbound(impl));
+
+  static FilesStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For FilesStub"));
+    return new FilesStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _FilesStubControl.serviceDescription;
+
+
+  dynamic openFileSystem(String fileSystem,Object directory,[Function responseFactory = null]) {
+    return impl.openFileSystem(fileSystem,directory,responseFactory);
+  }
+}
+