Merge to trunk cl - fixes/features for mobile support in the editor

dart/editor/tools/plugins/com.google.dart.tools.debug.ui/src/com/google/dart/tools/debug/ui/internal/mobile/MobileMainTab.java

 /*
  * Copyright (c) 2014, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
 package com.google.dart.tools.debug.ui.internal.mobile;
 
 import com.google.dart.tools.core.mobile.AndroidDebugBridge;
+import com.google.dart.tools.core.mobile.AndroidDevice;
 import com.google.dart.tools.core.model.DartSdkManager;
 import com.google.dart.tools.debug.core.DartLaunchConfigWrapper;
 import com.google.dart.tools.debug.ui.internal.DartDebugUIPlugin;
 import com.google.dart.tools.debug.ui.internal.util.LaunchTargetComposite;
 
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
@@ skipping 15 matching lines @@
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Main tab for Mobile launch configurations
  */
 public class MobileMainTab extends AbstractLaunchConfigurationTab {
 
   private static final String MOBILE_STATUS_PREFIX = "Mobile status: ";
   private static final String DEVICE_CONNECTED = "Connected";
+  private static final String DEVICE_NOT_AUTHORIZED = "Connected mobile is not authorized";
   private static final String DEVICE_NOT_FOUND = "No mobile found or USB development not enabled on mobile";
 
   private LaunchTargetComposite launchTargetGroup;
-  private Button dartBrowserButton;
   private Button installDartBrowserButton;
   private Label statusLabel;
 
-  private boolean deviceConnected = false;
+  private AndroidDevice connectedDevice = null;
   private final AtomicBoolean monitorDeviceConnection = new AtomicBoolean(false);
+  private Button usePubServeButton;
 
   @Override
   public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
     startMonitorDeviceConnectionInBackground(statusLabel.getDisplay());
     super.activated(workingCopy);
   }
 
   @Override
   public void createControl(Composite parent) {
     Composite composite = new Composite(parent, SWT.NONE);
     GridLayoutFactory.swtDefaults().spacing(1, 3).applyTo(composite);
 
     launchTargetGroup = new LaunchTargetComposite(composite, SWT.NONE);
     launchTargetGroup.addListener(SWT.Modify, new Listener() {
 
       @Override
       public void handleEvent(Event event) {
         notifyPanelChanged();
       }
     });
 
     // Browser selection group
     Group group = new Group(composite, SWT.NONE);
     group.setText("Browser settings");
     GridDataFactory.fillDefaults().grab(true, false).applyTo(group);
     GridLayoutFactory.swtDefaults().numColumns(3).applyTo(group);
     ((GridLayout) group.getLayout()).marginBottom = 4;
 
-    dartBrowserButton = new Button(group, SWT.CHECK);
-    dartBrowserButton.setText("Launch in a Dart Content Shell Browser");
-    dartBrowserButton.addSelectionListener(new SelectionAdapter() {
+    installDartBrowserButton = new Button(group, SWT.CHECK);
+    installDartBrowserButton.setText("Automatically install Dart Content Shell Browser on first launch");
+    GridDataFactory.swtDefaults().span(2, 1).grab(true, false).applyTo(installDartBrowserButton);
+
+    // pub serve setting
+    group = new Group(composite, SWT.NONE);
+    group.setText("Pub settings");
+    GridDataFactory.fillDefaults().grab(true, false).applyTo(group);
+    GridLayoutFactory.swtDefaults().numColumns(3).applyTo(group);
+    ((GridLayout) group.getLayout()).marginBottom = 5;
+    usePubServeButton = new Button(group, SWT.CHECK);
+    usePubServeButton.setText("Use pub to serve the application");
+    GridDataFactory.swtDefaults().span(3, 1).applyTo(usePubServeButton);
+    usePubServeButton.addSelectionListener(new SelectionAdapter() {
       @Override
       public void widgetSelected(SelectionEvent e) {
         notifyPanelChanged();
-        installDartBrowserButton.setEnabled(dartBrowserButton.getSelection());
-        installDartBrowserButton.setSelection(dartBrowserButton.getSelection());
       }
     });
-    GridDataFactory.swtDefaults().span(2, 1).grab(true, false).applyTo(dartBrowserButton);
-
-    installDartBrowserButton = new Button(group, SWT.CHECK);
-    installDartBrowserButton.setText("Automatically install Dart Content Shell Browser on first mobile launch");
-    GridDataFactory.swtDefaults().span(2, 1).grab(true, false).indent(20, 0).applyTo(
-        installDartBrowserButton);
+    Label label = new Label(group, SWT.NONE);
+    label.setText("(requires port forwarding setup using Chrome > Tools > Inspect Devices)");
+    GridDataFactory.swtDefaults().span(3, 1).indent(18, 0).applyTo(label);
 
     // Status and setup group
     group = new Group(composite, SWT.NONE);
     group.setText("Status and first time setup");
     GridDataFactory.fillDefaults().grab(true, false).applyTo(group);
     GridLayoutFactory.swtDefaults().numColumns(1).applyTo(group);
     ((GridLayout) group.getLayout()).marginBottom = 4;
 
     statusLabel = new Label(group, SWT.NONE);
     GridDataFactory.fillDefaults().grab(true, false).applyTo(statusLabel);
@@ skipping 17 matching lines @@
       setControl(null);
     }
 
   }
 
   @Override
   public String getErrorMessage() {
     if (performSdkCheck() != null) {
       return performSdkCheck();
     }
-    if (!deviceConnected) {
+    if (connectedDevice == null) {
       return DEVICE_NOT_FOUND;
     }
+    if (!connectedDevice.isAuthorized()) {
+      return DEVICE_NOT_AUTHORIZED;
+    }
     return launchTargetGroup.getErrorMessage();
   }
 
   /**
    * Answer the image to show in the configuration tab or <code>null</code> if none
    */
   @Override
   public Image getImage() {
     return DartDebugUIPlugin.getImage("android.png"); //$NON-NLS-1$
   }
@@ skipping 23 matching lines @@
     launchTargetGroup.setUrlTextValue(wrapper.getUrl());
 
     launchTargetGroup.setSourceDirectoryTextValue(wrapper.getSourceDirectoryName());
 
     if (wrapper.getShouldLaunchFile()) {
       launchTargetGroup.setHtmlButtonSelection(true);
     } else {
       launchTargetGroup.setHtmlButtonSelection(false);
     }
 
-    dartBrowserButton.setSelection(wrapper.getLaunchContentShell());
     installDartBrowserButton.setSelection(wrapper.getInstallContentShell());
+    usePubServeButton.setSelection(wrapper.getUsePubServe());
   }
 
   /**
    * Store the value specified in the UI into the launch configuration
    */
   @Override
   public void performApply(ILaunchConfigurationWorkingCopy config) {
 
     DartLaunchConfigWrapper wrapper = new DartLaunchConfigWrapper(config);
     wrapper.setShouldLaunchFile(launchTargetGroup.getHtmlButtonSelection());
 
     String fileUrl = launchTargetGroup.getHtmlFileName();
 
     if (fileUrl.indexOf('?') == -1) {
       wrapper.setApplicationName(fileUrl);
       wrapper.setUrlQueryParams("");
     } else {
       int index = fileUrl.indexOf('?');
 
       wrapper.setApplicationName(fileUrl.substring(0, index));
       wrapper.setUrlQueryParams(fileUrl.substring(index + 1));
     }
 
     wrapper.setUrl(launchTargetGroup.getUrlString());
     wrapper.setSourceDirectoryName(launchTargetGroup.getSourceDirectory());
-    wrapper.setLaunchContentShell(dartBrowserButton.getSelection());
     wrapper.setInstallContentShell(installDartBrowserButton.getSelection());
+    wrapper.setUsePubServe(usePubServeButton.getSelection());
   }
 
   @Override
   public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
     DartLaunchConfigWrapper wrapper = new DartLaunchConfigWrapper(configuration);
     wrapper.setShouldLaunchFile(true);
     wrapper.setApplicationName(""); //$NON-NLS-1$
     wrapper.setLaunchContentShell(true);
+    wrapper.setUsePubServe(false);
   }
 
   private void notifyPanelChanged() {
     setDirty(true);
     updateLaunchConfigurationDialog();
   }
 
   private String performSdkCheck() {
     if (!DartSdkManager.getManager().hasSdk()) {
       return "Dart SDK is not installed ("
           + DartSdkManager.getManager().getSdk().getDart2JsExecutable() + ")";
     } else {
       return null;
     }
   }
 
   /**
    * Start the background process that monitors device connection via ADB
    */
   private void startMonitorDeviceConnectionInBackground(final Display display) {
     if (!monitorDeviceConnection.get()) {
       monitorDeviceConnection.set(true);
       Thread thread = new Thread("Monitor mobile connection") {
         @Override
         public void run() {
 
           AndroidDebugBridge devBridge = AndroidDebugBridge.getAndroidDebugBridge();
-          boolean wasDeviceConnected = devBridge.getConnectedDevice() != null;
-          update(wasDeviceConnected);
+          AndroidDevice oldDevice = devBridge.getConnectedDevice();
+          update(oldDevice);
 
           while (monitorDeviceConnection.get()) {
-            final boolean isDeviceConnected = devBridge.getConnectedDevice() != null;
-            if (wasDeviceConnected != isDeviceConnected) {
-              wasDeviceConnected = isDeviceConnected;
-              update(isDeviceConnected);
+            AndroidDevice newDevice = devBridge.getConnectedDevice();
+            if (!AndroidDevice.isEqual(oldDevice, newDevice)) {
+              oldDevice = newDevice;
+              update(oldDevice);
             }
             try {
               Thread.sleep(1000);
             } catch (InterruptedException e) {
               //$FALL-THROUGH$
             }
           }
         }
 
-        private void update(final boolean isDeviceConnected) {
+        private void update(final AndroidDevice device) {
           display.asyncExec(new Runnable() {
             @Override
             public void run() {
-              updateMobileStatus(isDeviceConnected);
+              updateMobileStatus(device);
             }
           });
         }
       };
       thread.setDaemon(true);
       thread.start();
     }
   }
 
   /**
    * Stop the background process that monitors device connection via ADB
    */
   private void stopMonitorDeviceConnectionInBackground() {
     monitorDeviceConnection.set(false);
   }
 
   /**
    * Update the mobile status. Must be called on the UI thread.
    * 
    * @param isDeviceConnected {@code true} if a mobile device is currently connected
    */
-  private void updateMobileStatus(boolean isDeviceConnected) {
-    deviceConnected = isDeviceConnected;
+  private void updateMobileStatus(AndroidDevice device) {
+    connectedDevice = device;
     if (statusLabel != null && !statusLabel.isDisposed()) {
-      statusLabel.setText(MOBILE_STATUS_PREFIX
-          + (deviceConnected ? DEVICE_CONNECTED : DEVICE_NOT_FOUND));
+      String status;
+      if (device == null) {
+        status = DEVICE_NOT_FOUND;
+      } else if (!device.isAuthorized()) {
+        status = DEVICE_NOT_AUTHORIZED;
+      } else {
+        status = DEVICE_CONNECTED;
+      }
+      statusLabel.setText(MOBILE_STATUS_PREFIX + status);
       updateLaunchConfigurationDialog();
     }
   }
 }