Fix after renaming NodeRunner to NodeMainExecutor.

android_gingerbread/src/org/ros/android/InitRunnable.java

@@ -16,26 +16,26 @@
 
 package org.ros.android;
 
-import org.ros.node.NodeRunner;
+import org.ros.node.NodeMainExecutor;
 
 /**
  * Initializes instances of classes derived from {@link RosActivity} with the
- * parent {@link RosActivity} and {@link NodeRunner}.
+ * parent {@link RosActivity} and {@link NodeMainExecutor}.
  * 
  * @author damonkohler@google.com (Damon Kohler)
  */
 class InitRunnable implements Runnable {
 
   private final RosActivity rosActivity;
-  private final NodeRunner nodeRunner;
+  private final NodeMainExecutor nodeMainExecutor;
 
-  public InitRunnable(RosActivity rosActivity, NodeRunner nodeRunner) {
+  public InitRunnable(RosActivity rosActivity, NodeMainExecutor nodeMainExecutor) {
     this.rosActivity = rosActivity;
-    this.nodeRunner = nodeRunner;
+    this.nodeMainExecutor = nodeMainExecutor;
   }
 
   @Override
   public void run() {
-    rosActivity.init(nodeRunner);
+    rosActivity.init(nodeMainExecutor);
   }
 }

android_gingerbread/src/org/ros/android/NodeRunnerListener.java

@@ -16,7 +16,7 @@
 
 package org.ros.android;
 
-import org.ros.node.NodeRunner;
+import org.ros.node.NodeMainExecutor;
 
 /**
  * @author damonkohler@google.com (Damon Kohler)
@@ -24,9 +24,9 @@ import org.ros.node.NodeRunner;
 public interface NodeRunnerListener {
 
   /**
-   * @param nodeRunner
-   *          the newly created {@link NodeRunner}
+   * @param nodeMainExecutor
+   *          the newly created {@link NodeMainExecutor}
    */
-  void onNewNodeRunner(NodeRunner nodeRunner);
+  void onNewNodeRunner(NodeMainExecutor nodeMainExecutor);
 
 }

android_gingerbread/src/org/ros/android/NodeRunnerService.java

@@ -31,11 +31,11 @@ import android.os.PowerManager.WakeLock;
 import android.util.Log;
 import org.ros.concurrent.ListenerCollection;
 import org.ros.concurrent.ListenerCollection.SignalRunnable;
-import org.ros.node.DefaultNodeRunner;
+import org.ros.node.DefaultNodeMainExecutor;
 import org.ros.node.NodeConfiguration;
 import org.ros.node.NodeListener;
 import org.ros.node.NodeMain;
-import org.ros.node.NodeRunner;
+import org.ros.node.NodeMainExecutor;
 
 import java.util.Collection;
 import java.util.concurrent.ExecutorService;
@@ -44,7 +44,7 @@ import java.util.concurrent.Executors;
 /**
  * @author damonkohler@google.com (Damon Kohler)
  */
-public class NodeRunnerService extends Service implements NodeRunner {
+public class NodeRunnerService extends Service implements NodeMainExecutor {
 
   private static final String TAG = "NodeRunnerService";
 
@@ -56,7 +56,7 @@ public class NodeRunnerService extends Service implements NodeRunner {
   static final String EXTRA_NOTIFICATION_TITLE = "org.ros.android.EXTRA_NOTIFICATION_TITLE";
   static final String EXTRA_NOTIFICATION_TICKER = "org.ros.android.EXTRA_NOTIFICATION_TICKER";
 
-  private final NodeRunner nodeRunner;
+  private final NodeMainExecutor nodeMainExecutor;
   private final IBinder binder;
   private final ListenerCollection<NodeRunnerServiceListener> listeners;
 
@@ -76,7 +76,7 @@ public class NodeRunnerService extends Service implements NodeRunner {
   public NodeRunnerService() {
     super();
     ExecutorService executorService = Executors.newCachedThreadPool();
-    nodeRunner = DefaultNodeRunner.newDefault(executorService);
+    nodeMainExecutor = DefaultNodeMainExecutor.newDefault(executorService);
     binder = new LocalBinder();
     listeners = new ListenerCollection<NodeRunnerServiceListener>(executorService);
   }
@@ -101,7 +101,7 @@ public class NodeRunnerService extends Service implements NodeRunner {
   @Override
   public void run(NodeMain nodeMain, NodeConfiguration nodeConfiguration,
       Collection<NodeListener> nodeListeneners) {
-    nodeRunner.run(nodeMain, nodeConfiguration, nodeListeneners);
+    nodeMainExecutor.run(nodeMain, nodeConfiguration, nodeListeneners);
   }
 
   @Override
@@ -111,21 +111,21 @@ public class NodeRunnerService extends Service implements NodeRunner {
 
   @Override
   public void execute(Runnable runnable) {
-    nodeRunner.execute(runnable);
+    nodeMainExecutor.execute(runnable);
   }
 
   @Override
   public void shutdownNodeMain(NodeMain nodeMain) {
-    nodeRunner.shutdownNodeMain(nodeMain);
+    nodeMainExecutor.shutdownNodeMain(nodeMain);
   }
 
   @Override
   public void shutdown() {
     signalOnShutdown();
     // NOTE(damonkohler): This may be called multiple times. Shutting down a
-    // NodeRunner multiple times is safe. It simply calls shutdown on all
+    // NodeMainExecutor multiple times is safe. It simply calls shutdown on all
     // NodeMains.
-    nodeRunner.shutdown();
+    nodeMainExecutor.shutdown();
     if (wakeLock.isHeld()) {
       wakeLock.release();
     }

android_gingerbread/src/org/ros/android/RosActivity.java

@@ -25,7 +25,7 @@ import android.content.ServiceConnection;
 import android.os.IBinder;
 import android.widget.Toast;
 import org.ros.node.NodeMain;
-import org.ros.node.NodeRunner;
+import org.ros.node.NodeMainExecutor;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -56,7 +56,7 @@ public abstract class RosActivity extends Activity {
       });
       // Run init() in a new thread as a convenience since it often requires
       // network access. Also, this allows us to keep a reference to the
-      // NodeRunner separate from this class.
+      // NodeMainExecutor separate from this class.
       nodeRunnerService.execute(new InitRunnable(RosActivity.this, nodeRunnerService));
     }
 
@@ -113,12 +113,12 @@ public abstract class RosActivity extends Activity {
    * This method is called in a background thread once this {@link Activity} has
    * been initialized with a master {@link URI} via the {@link MasterChooser}
    * and a {@link NodeRunnerService} has started. Your {@link NodeMain}s should
-   * be started here using the provided {@link NodeRunner}.
+   * be started here using the provided {@link NodeMainExecutor}.
    * 
-   * @param nodeRunner
-   *          the {@link NodeRunner} created for this {@link Activity}
+   * @param nodeMainExecutor
+   *          the {@link NodeMainExecutor} created for this {@link Activity}
    */
-  protected abstract void init(NodeRunner nodeRunner);
+  protected abstract void init(NodeMainExecutor nodeMainExecutor);
 
   @Override
   public void startActivityForResult(Intent intent, int requestCode) {

android_hokuyo/src/main/java/org/ros/android/hokuyo/scip20/Device.java

@@ -254,7 +254,7 @@ public class Device implements LaserScannerDevice {
 
   @Override
   public void startScanning(final LaserScanListener listener) {
-    // TODO(damonkohler): Use NodeRunner ExecutorService.
+    // TODO(damonkohler): Use NodeMainExecutor ExecutorService.
     new Thread() {
       @Override
       public void run() {

android_hokuyo/src/test/java/org/ros/android/hokuyo/LaserScanPublisherIntegrationTest.java

@@ -25,10 +25,10 @@ import org.junit.Test;
 import org.ros.RosCore;
 import org.ros.internal.node.DefaultNode;
 import org.ros.namespace.GraphName;
-import org.ros.node.DefaultNodeRunner;
+import org.ros.node.DefaultNodeMainExecutor;
 import org.ros.node.Node;
 import org.ros.node.NodeConfiguration;
-import org.ros.node.NodeRunner;
+import org.ros.node.NodeMainExecutor;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -38,7 +38,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class LaserScanPublisherIntegrationTest {
 
-  private NodeRunner nodeRunner;
+  private NodeMainExecutor nodeMainExecutor;
   private RosCore rosCore;
   private NodeConfiguration nodeConfiguration;
 
@@ -48,12 +48,12 @@ public class LaserScanPublisherIntegrationTest {
     rosCore.start();
     assertTrue(rosCore.awaitStart(1, TimeUnit.SECONDS));
     nodeConfiguration = NodeConfiguration.newPrivate(rosCore.getUri());
-    nodeRunner = DefaultNodeRunner.newDefault();
+    nodeMainExecutor = DefaultNodeMainExecutor.newDefault();
   }
 
   @After
   public void after() {
-    nodeRunner.shutdown();
+    nodeMainExecutor.shutdown();
     rosCore.shutdown();
   }
 
@@ -61,11 +61,11 @@ public class LaserScanPublisherIntegrationTest {
   public void testLaserScanPublisher() throws InterruptedException {
     FakeLaserDevice fakeLaserDevice = new FakeLaserDevice(3);
     LaserScanPublisher laserScanPublisher = new LaserScanPublisher(fakeLaserDevice);
-    nodeRunner.run(laserScanPublisher, nodeConfiguration.setNodeName("laser_node"));
+    nodeMainExecutor.run(laserScanPublisher, nodeConfiguration.setNodeName("laser_node"));
 
     final CountDownLatch laserScanReceived = new CountDownLatch(1);
     LaserScanSubscriber laserScanSubscriber = new LaserScanSubscriber(laserScanReceived);
-    nodeRunner.run(laserScanSubscriber, nodeConfiguration.setNodeName("subscriber_node"));
+    nodeMainExecutor.run(laserScanSubscriber, nodeConfiguration.setNodeName("subscriber_node"));
     // NOTE(damonkohler): This can take awhile when running from ant test.
     assertTrue(laserScanReceived.await(10, TimeUnit.SECONDS));
 

android_rosserial/src/org/ros/android/rosserial/MainActivity.java

@@ -27,7 +27,7 @@ import org.ros.android.acm_serial.PollingInputStream;
 import org.ros.android.acm_serial.StopBits;
 import org.ros.exception.RosRuntimeException;
 import org.ros.node.NodeConfiguration;
-import org.ros.node.NodeRunner;
+import org.ros.node.NodeMainExecutor;
 import org.ros.rosserial.RosSerial;
 import org.ros.time.NtpTimeProvider;
 
@@ -56,7 +56,7 @@ public class MainActivity extends AcmDeviceActivity {
   }
 
   @Override
-  protected void init(NodeRunner nodeRunner) {
+  protected void init(NodeMainExecutor nodeMainExecutor) {
     try {
       acmDeviceLatch.await();
     } catch (InterruptedException e) {
@@ -72,7 +72,7 @@ public class MainActivity extends AcmDeviceActivity {
         new NtpTimeProvider(InetAddressFactory.newFromHostString("ntp.ubuntu.com"));
     ntpTimeProvider.startPeriodicUpdates(1, TimeUnit.MINUTES);
     nodeConfiguration.setTimeProvider(ntpTimeProvider);
-    nodeRunner.run(
+    nodeMainExecutor.run(
         new RosSerial(new PollingInputStream(acmDevice.getInputStream(), Executors
             .newCachedThreadPool()), acmDevice.getOutputStream()), nodeConfiguration);
   }

android_tutorial_camera/src/org/ros/android/tutorial/camera/MainActivity.java

@@ -28,9 +28,9 @@ import org.ros.address.InetAddressFactory;
 import org.ros.android.MasterChooser;
 import org.ros.android.camera.R;
 import org.ros.android.views.RosCameraPreviewView;
-import org.ros.node.DefaultNodeRunner;
+import org.ros.node.DefaultNodeMainExecutor;
 import org.ros.node.NodeConfiguration;
-import org.ros.node.NodeRunner;
+import org.ros.node.NodeMainExecutor;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -41,14 +41,14 @@ import java.net.URISyntaxException;
  */
 public class MainActivity extends Activity {
 
-  private final NodeRunner nodeRunner;
+  private final NodeMainExecutor nodeMainExecutor;
 
   private int cameraId;
   private URI masterUri;
   private RosCameraPreviewView preview;
 
   public MainActivity() {
-    nodeRunner = DefaultNodeRunner.newDefault();
+    nodeMainExecutor = DefaultNodeMainExecutor.newDefault();
   }
 
   @Override
@@ -70,7 +70,7 @@ public class MainActivity extends Activity {
       NodeConfiguration nodeConfiguration =
           NodeConfiguration.newPublic(InetAddressFactory.newNonLoopback().getHostName());
       nodeConfiguration.setMasterUri(masterUri);
-      nodeRunner.run(preview, nodeConfiguration);
+      nodeMainExecutor.run(preview, nodeConfiguration);
     }
   }
 
@@ -100,7 +100,7 @@ public class MainActivity extends Activity {
   @Override
   protected void onPause() {
     super.onPause();
-    nodeRunner.shutdownNodeMain(preview);
+    nodeMainExecutor.shutdownNodeMain(preview);
   }
 
   @Override

android_tutorial_hokuyo/src/org/ros/android/tutorial/hokuyo/MainActivity.java

@@ -25,7 +25,7 @@ import org.ros.android.hokuyo.scip20.Device;
 import org.ros.exception.RosRuntimeException;
 import org.ros.namespace.GraphName;
 import org.ros.node.NodeConfiguration;
-import org.ros.node.NodeRunner;
+import org.ros.node.NodeMainExecutor;
 import org.ros.time.NtpTimeProvider;
 
 import java.util.concurrent.CountDownLatch;
@@ -38,7 +38,7 @@ public class MainActivity extends AcmDeviceActivity {
 
   private final CountDownLatch nodeRunnerServiceLatch;
 
-  private NodeRunner nodeRunner;
+  private NodeMainExecutor nodeMainExecutor;
 
   public MainActivity() {
     super("Hokuyo Node", "Hokuyo Node");
@@ -52,9 +52,9 @@ public class MainActivity extends AcmDeviceActivity {
   }
 
   @Override
-  protected void init(NodeRunner nodeRunner) {
+  protected void init(NodeMainExecutor nodeMainExecutor) {
     nodeRunnerServiceLatch.countDown();
-    this.nodeRunner = nodeRunner;
+    this.nodeMainExecutor = nodeMainExecutor;
   }
 
   private void startLaserScanPublisher(AcmDevice acmDevice) {
@@ -74,7 +74,7 @@ public class MainActivity extends AcmDeviceActivity {
     Device scipDevice =
         new Device(acmDevice.getInputStream(), acmDevice.getOutputStream(), ntpTimeProvider);
     LaserScanPublisher laserScanPublisher = new LaserScanPublisher(scipDevice);
-    nodeRunner.run(laserScanPublisher, nodeConfiguration);
+    nodeMainExecutor.run(laserScanPublisher, nodeConfiguration);
   }
 
   @Override

android_tutorial_image_transport/src/org/ros/android/tutorial/image_transport/MainActivity.java

@@ -23,7 +23,7 @@ import org.ros.android.RosActivity;
 import org.ros.android.views.RosImageView;
 import org.ros.message.sensor_msgs.CompressedImage;
 import org.ros.node.NodeConfiguration;
-import org.ros.node.NodeRunner;
+import org.ros.node.NodeMainExecutor;
 import org.ros.android.tutorial.image_transport.R;
 
 /**
@@ -50,8 +50,8 @@ public class MainActivity extends RosActivity {
   }
 
   @Override
-  protected void init(NodeRunner nodeRunner) {
+  protected void init(NodeMainExecutor nodeMainExecutor) {
     NodeConfiguration nodeConfiguration = NodeConfiguration.newPublic(InetAddressFactory.newNonLoopback().getHostAddress().toString(), getMasterUri());
-    nodeRunner.run(image, nodeConfiguration.setNodeName("android/video_view"));
+    nodeMainExecutor.run(image, nodeConfiguration.setNodeName("android/video_view"));
   }
 }

android_tutorial_pubsub/src/org/ros/android/tutorial/pubsub/MainActivity.java

@@ -21,9 +21,9 @@ import android.os.Bundle;
 import org.ros.RosCore;
 import org.ros.android.MessageCallable;
 import org.ros.android.views.RosTextView;
-import org.ros.node.DefaultNodeRunner;
+import org.ros.node.DefaultNodeMainExecutor;
 import org.ros.node.NodeConfiguration;
-import org.ros.node.NodeRunner;
+import org.ros.node.NodeMainExecutor;
 import org.ros.tutorials.pubsub.R;
 import org.ros.tutorials.pubsub.Talker;
 
@@ -32,14 +32,14 @@ import org.ros.tutorials.pubsub.Talker;
  */
 public class MainActivity extends Activity {
 
-  private final NodeRunner nodeRunner;
+  private final NodeMainExecutor nodeMainExecutor;
 
   private RosCore rosCore;
   private RosTextView<org.ros.message.std_msgs.String> rosTextView;
   private Talker talker;
 
   public MainActivity() {
-    nodeRunner = DefaultNodeRunner.newDefault();
+    nodeMainExecutor = DefaultNodeMainExecutor.newDefault();
   }
 
   @SuppressWarnings("unchecked")
@@ -70,8 +70,8 @@ public class MainActivity extends Activity {
       nodeConfiguration.setNodeName("pubsub_tutorial");
       nodeConfiguration.setMasterUri(rosCore.getUri());
       talker = new Talker();
-      nodeRunner.run(talker, nodeConfiguration);
-      nodeRunner.run(rosTextView, nodeConfiguration);
+      nodeMainExecutor.run(talker, nodeConfiguration);
+      nodeMainExecutor.run(rosTextView, nodeConfiguration);
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
@@ -80,7 +80,7 @@ public class MainActivity extends Activity {
   @Override
   protected void onPause() {
     super.onPause();
-    nodeRunner.shutdown();
+    nodeMainExecutor.shutdown();
     rosCore.shutdown();
   }
 }

android_tutorial_teleop/src/org/ros/android/tutorial/teleop/MainActivity.java

@@ -31,7 +31,7 @@ import org.ros.android.views.visualization.layer.PosePublisherLayer;
 import org.ros.android.views.visualization.layer.PoseSubscriberLayer;
 import org.ros.android.views.visualization.layer.RobotLayer;
 import org.ros.node.NodeConfiguration;
-import org.ros.node.NodeRunner;
+import org.ros.node.NodeMainExecutor;
 
 /**
  * An app that can be used to control a remote robot. This app also demonstrates
@@ -88,11 +88,11 @@ public class MainActivity extends RosActivity {
   }
 
   @Override
-  protected void init(NodeRunner nodeRunner) {
+  protected void init(NodeMainExecutor nodeMainExecutor) {
     NodeConfiguration nodeConfiguration =
         NodeConfiguration.newPublic(
             InetAddressFactory.newNonLoopback().getHostAddress().toString(), getMasterUri());
-    nodeRunner.run(virtualJoystickView, nodeConfiguration.setNodeName("virtual_joystick"));
-    nodeRunner.run(visualizationView, nodeConfiguration.setNodeName("android/map_view"));
+    nodeMainExecutor.run(virtualJoystickView, nodeConfiguration.setNodeName("virtual_joystick"));
+    nodeMainExecutor.run(visualizationView, nodeConfiguration.setNodeName("android/map_view"));
   }
 }