Dart: Refactor Stubs

mojo/dart/packages/mojo_services/lib/mojo/media/media_player.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 media_player_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/media/media_metadata.mojom.dart' as media_metadata_mojom;
@@ skipping 472 matching lines @@
 
 abstract class MediaPlayer {
   static const String serviceName = null;
   void play();
   void pause();
   void seek(int position);
   dynamic getStatus(int versionLastSeen,[Function responseFactory = null]);
   static const int kInitialStatus = 0;
 }
 
-
-class _MediaPlayerProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _MediaPlayerProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _MediaPlayerProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _MediaPlayerProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _MediaPlayerProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _MediaPlayerServiceDescription();
 
   String get serviceName => MediaPlayer.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _mediaPlayerMethodGetStatusName:
         var r = MediaPlayerGetStatusResponseParams.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 "_MediaPlayerProxyControl($superString)";
   }
 }
 
-
-class MediaPlayerProxy extends bindings.Proxy
-                              implements MediaPlayer {
+class MediaPlayerProxy
+    extends bindings.Proxy
+    implements MediaPlayer {
   MediaPlayerProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _MediaPlayerProxyControl.fromEndpoint(endpoint));
 
   MediaPlayerProxy.fromHandle(core.MojoHandle handle)
       : super(new _MediaPlayerProxyControl.fromHandle(handle));
 
   MediaPlayerProxy.unbound()
       : super(new _MediaPlayerProxyControl.unbound());
 
@@ skipping 43 matching lines @@
     var params = new _MediaPlayerGetStatusParams();
     params.versionLastSeen = versionLastSeen;
     return ctrl.sendMessageWithRequestId(
         params,
         _mediaPlayerMethodGetStatusName,
         -1,
         bindings.MessageHeader.kMessageExpectsResponse);
   }
 }
 
-
-class MediaPlayerStub extends bindings.Stub {
+class _MediaPlayerStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<MediaPlayer> {
   MediaPlayer _impl;
 
-  MediaPlayerStub.fromEndpoint(
+  _MediaPlayerStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [MediaPlayer impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  MediaPlayerStub.fromHandle(
+  _MediaPlayerStubControl.fromHandle(
       core.MojoHandle handle, [MediaPlayer impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  MediaPlayerStub.unbound([this._impl]) : super.unbound();
-
-  static MediaPlayerStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For MediaPlayerStub"));
-    return new MediaPlayerStub.fromEndpoint(endpoint);
-  }
+  _MediaPlayerStubControl.unbound([this._impl]) : super.unbound();
 
 
   MediaPlayerGetStatusResponseParams _mediaPlayerGetStatusResponseParamsFactory(int version, MediaPlayerStatus status) {
     var result = new MediaPlayerGetStatusResponseParams();
     result.version = version;
     result.status = status;
     return result;
   }
 
   dynamic handleMessage(bindings.ServiceMessage message) {
@@ skipping 58 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "MediaPlayerStub($superString)";
+    return "_MediaPlayerStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _MediaPlayerServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class MediaPlayerStub
+    extends bindings.Stub<MediaPlayer>
+    implements MediaPlayer {
+  MediaPlayerStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [MediaPlayer impl])
+      : super(new _MediaPlayerStubControl.fromEndpoint(endpoint, impl));
+
+  MediaPlayerStub.fromHandle(
+      core.MojoHandle handle, [MediaPlayer impl])
+      : super(new _MediaPlayerStubControl.fromHandle(handle, impl));
+
+  MediaPlayerStub.unbound([MediaPlayer impl])
+      : super(new _MediaPlayerStubControl.unbound(impl));
+
+  static MediaPlayerStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For MediaPlayerStub"));
+    return new MediaPlayerStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _MediaPlayerStubControl.serviceDescription;
+
+
+  void play() {
+    return impl.play();
+  }
+  void pause() {
+    return impl.pause();
+  }
+  void seek(int position) {
+    return impl.seek(position);
+  }
+  dynamic getStatus(int versionLastSeen,[Function responseFactory = null]) {
+    return impl.getStatus(versionLastSeen,responseFactory);
+  }
+}
+