Big merge from experimental to bleeding edge.

samples/dartcombat/player.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dartcombatlib;
 
 /** A local player (API known to the main isolate when creating players). */
 class Player {
 
   factory Player() => new PlayerImpl();
@@ skipping 57 matching lines @@
  * which contains the actual enemy state.
  */
 class EnemyImpl implements Enemy {
   SendPort portToEnemy;
 
   EnemyImpl(this.portToEnemy) {}
 
   Future<int> ready() {
     Completer<int> res = new Completer<int>();
     return portToEnemy.call({ "action" : MessageIds.ENEMY_IS_READY })
-      .transform((message) {
+      .then((message) {
          if (!message[0]) throw message[1];
          return 0;
        });
   }
 
   Future<int> shoot(int x, int y) {
     Completer<int> res = new Completer<int>();
     return portToEnemy.call({ "action" : MessageIds.SHOOT, "args" : [x, y] })
-      .transform((message) {
+      .then((message) {
          if (!message[0]) throw message[1];
          return message[1][0];
        });
   }
 }
 
 /** Collection of message IDs used to communicate with player isolates. */
 class MessageIds {
   /** message to set up a new player. */
   static const SETUP = 1;
 
   /** message to initialize the enemy of a player. */
   static const SET_ENEMY = 2;
 
   /** message indicating that the enemy is ready to play. */
   static const ENEMY_IS_READY = 3;
 
   /** message describing a shoot action. */
   static const SHOOT = 4;
 
   /** message to set up a test port, used to make tests non-flaky. */
   static const SET_PORT_FOR_TEST = 5;
 }