Version 1.5.0-dev.4.15

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
@@ skipping 36 matching lines @@
 
 /**
  * Main tab for Mobile launch configurations
  */
 public class MobileMainTab extends AbstractLaunchConfigurationTab {
 
   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";
 
   public static final String MOBILE_DOC_URL = "https://www.dartlang.org/tools/editor/mobile.html";
+  // PORT_FORWARD_DOC_URL should be #set-up-port-forwarding but is #connect-the-devices
+  // until dartbug.com/19457 is fixed.
+  public static final String PORT_FORWARD_DOC_URL = MOBILE_DOC_URL + "#connect-the-devices";
 
   private static final String INFO_TEXT = "Serve the application using 'pub serve'. "
       + "This requires setting up port forwarding.";
 
   // When these change, be sure to change the messaging in MobileUrlConnectionException
   private String[] servers = {"Embedded server", "Pub serve"};
 
   private LaunchTargetComposite launchTargetGroup;
 
   private AndroidDevice connectedDevice = null;
   private final AtomicBoolean monitorDeviceConnection = new AtomicBoolean(false);
   private Link infoLink;
   private Combo serversCombo;
   private Label infoLabel;
 
   @Override
-  public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-    startMonitorDeviceConnectionInBackground(launchTargetGroup.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();
@@ skipping 20 matching lines @@
       public void widgetSelected(SelectionEvent e) {
         handleComboChanged(serversCombo.getSelectionIndex() == 1);
       }
     });
     serversCombo.setItems(servers);
 
     infoLabel = new Label(group, SWT.WRAP);
     infoLabel.setText(INFO_TEXT);
     GridDataFactory.swtDefaults().grab(true, false).span(1, 2).applyTo(infoLabel);
 
-    infoLink = new Link(group, SWT.NONE);
+    infoLink = new Link(group, SWT.WRAP);
     infoLink.setText("Some configurations may require setting up port forwarding in order for the "
         + "mobile device to see the web server running on your development machine. See <a href=\""
-        + MOBILE_DOC_URL + "\"> port forwarding setup </a> for more information.");
+        + PORT_FORWARD_DOC_URL + "\"> port forwarding setup </a> for more information.");
     infoLink.addSelectionListener(new SelectionAdapter() {
       @Override
+      public void widgetDefaultSelected(SelectionEvent e) {
+        widgetSelected(e);
+      }
+
+      @Override
       public void widgetSelected(SelectionEvent e) {
-        ExternalBrowserUtil.openInExternalBrowser(MOBILE_DOC_URL);
+        ExternalBrowserUtil.openInExternalBrowser(e.text.trim());
       }
     });
-    GridDataFactory.swtDefaults().span(2, 1).grab(true, false).applyTo(infoLink);
+    GridDataFactory.swtDefaults().span(2, 1).grab(true, false).hint(415, SWT.DEFAULT).applyTo(
+        infoLink);
     new Label(group, SWT.NONE);
 
     setControl(composite);
   }
 
   @Override
   public void dispose() {
     Control control = getControl();
 
     if (control != null) {
@@ skipping 57 matching lines @@
       launchTargetGroup.setHtmlButtonSelection(false);
     }
 
     if (wrapper.getUsePubServe()) {
       serversCombo.select(1);
       handleComboChanged(true);
     } else {
       serversCombo.select(0);
       handleComboChanged(false);
     }
+
+    startMonitorDeviceConnectionInBackground(launchTargetGroup.getDisplay());
   }
 
   /**
    * 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());
@@ skipping 23 matching lines @@
     wrapper.setLaunchContentShell(true);
     wrapper.setUsePubServe(false);
   }
 
   protected void handleComboChanged(boolean usePubServe) {
     if (usePubServe) {
       infoLabel.setText(INFO_TEXT);
     } else {
       infoLabel.setText("");
     }
+    notifyPanelChanged();
   }
 
   private void notifyPanelChanged() {
     setDirty(true);
     updateLaunchConfigurationDialog();
   }
 
   private String performSdkCheck() {
     if (!DartSdkManager.getManager().hasSdk()) {
       return "Dart SDK is not installed ("
@@ skipping 56 matching lines @@
    * 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(AndroidDevice device) {
     connectedDevice = device;
     updateLaunchConfigurationDialog();
 
   }
 }