Dart: Refactors Proxies

examples/dart/netcat/lib/main.dart

 #!mojo mojo:dart_content_handler
 // 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.
 
 import 'dart:async';
 import 'dart:core';
 import 'dart:typed_data';
 
 import 'package:mojo/application.dart';
@@ skipping 47 matching lines @@
       : _readBuffer = new ByteData(16 * 1024),
         _writeBuffer = new ByteData(16 * 1024);
 
   Future connect(NetAddress remote_address) async {
     try {
       var networkService = new NetworkServiceProxy.unbound();
       _application.connectToService('mojo:network_service', networkService);
 
       NetAddress local_address = makeIPv4NetAddress([0, 0, 0, 0], 0);
       var boundSocket = new TcpBoundSocketProxy.unbound();
-      await networkService.ptr.createTcpBoundSocket(local_address, boundSocket);
+      await networkService.createTcpBoundSocket(local_address, boundSocket);
       await networkService.close();
 
       var sendDataPipe = new MojoDataPipe();
       _socketSender = sendDataPipe.producer;
       var receiveDataPipe = new MojoDataPipe();
       _socketReceiver = receiveDataPipe.consumer;
       _socket = new TcpConnectedSocketProxy.unbound();
-      await boundSocket.ptr.connect(remote_address, sendDataPipe.consumer,
+      await boundSocket.connect(remote_address, sendDataPipe.consumer,
           receiveDataPipe.producer, _socket);
       await boundSocket.close();
 
       // Set up reading from the terminal.
       _startReadingFromTerminal();
 
       // Set up reading from the socket.
       _socketReceiverEventSubscription =
           new MojoEventSubscription(_socketReceiver.handle);
       _socketReceiverEventSubscription.subscribe(_onSocketReceiverEvent);
     } catch (e) {
       _shutDown();
     }
   }
 
   void _startReadingFromTerminal() {
     // TODO(vtl): Do we have to do something on error?
-    _terminal.ptr
+    _terminal
         .read(_writeBuffer.lengthInBytes, 0, files.Whence.fromCurrent)
         .then(_onReadFromTerminal)
         .catchError((e) {
       _shutDown();
     });
   }
 
   void _onReadFromTerminal(files.FileReadResponseParams p) {
     if (p.error != files.Error.ok) {
       // TODO(vtl): Do terminal errors.
@@ skipping 17 matching lines @@
 
     _startReadingFromTerminal();
   }
 
   void _onSocketReceiverEvent(int mojoSignals) {
     var shouldShutDown = false;
     if (MojoHandleSignals.isReadable(mojoSignals)) {
       var numBytesRead = _socketReceiver.read(_readBuffer);
       if (_socketReceiver.status == MojoResult.kOk) {
         assert(numBytesRead > 0);
-        _terminal.ptr
+        _terminal
             .write(_readBuffer.buffer.asUint8List(0, numBytesRead), 0,
                 files.Whence.fromCurrent)
             .catchError((e) {
           _shutDown();
         });
         _socketReceiverEventSubscription.enableReadEvents();
       } else {
         shouldShutDown = true;
       }
     } else if (MojoHandleSignals.isPeerClosed(mojoSignals)) {
@@ skipping 38 matching lines @@
   }
 
   @override
   void connectToTerminal(files.FileProxy terminal) {
     var url = Uri.parse(_resolvedUrl);
     NetAddress remote_address;
     try {
       remote_address = _getNetAddressFromUrl(url);
     } catch (e) {
       fputs(
-          terminal.ptr,
+          terminal,
           'HALP: Add a query: ?host=<host>&port=<port>\n'
               '(<host> must be "localhost" or n1.n2.n3.n4)\n\n'
               'Got query parameters:\n' +
               url.queryParameters.toString());
       ignoreFuture(terminal.close());
       return;
     }
 
     // TODO(vtl): Currently, we only do IPv4, so this should work.
     fputs(
-        terminal.ptr,
+        terminal,
         'Connecting to: ' +
             remote_address.ipv4.addr.join('.') +
             ':' +
             remote_address.ipv4.port.toString() +
             '...');
 
     var connector = new Connector(_application, terminal);
     // TODO(vtl): Do we have to do something on error?
     connector.connect(remote_address).catchError((e) {});
   }
@@ skipping 19 matching lines @@
   }
 }
 
 main(List args, Object handleToken) {
   MojoHandle appHandle = new MojoHandle(handleToken);
   new NetcatApplication.fromHandle(appHandle)
     ..onError = ((Object e) {
       MojoHandle.reportLeakedHandles();
     });
 }