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/dialogs/RemoteConnectionDialog.java

 /*
  * Copyright 2013 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.dialogs;
 
-import com.google.dart.tools.core.mobile.AndroidDebugBridge;
 import com.google.dart.tools.debug.core.configs.DartServerLaunchConfigurationDelegate;
 import com.google.dart.tools.debug.core.configs.DartiumLaunchConfigurationDelegate;
 import com.google.dart.tools.debug.core.util.IRemoteConnectionDelegate;
 import com.google.dart.tools.debug.core.webkit.ChromiumTabInfo;
 import com.google.dart.tools.debug.core.webkit.DefaultChromiumTabChooser;
 import com.google.dart.tools.debug.core.webkit.IChromiumTabChooser;
 import com.google.dart.tools.debug.ui.internal.DartDebugUIPlugin;
 import com.google.dart.tools.debug.ui.internal.view.DebuggerView;
 import com.google.dart.tools.ui.DartToolsPlugin;
 
@@ skipping 102 matching lines @@
 
       this.connectionDelegate = connectionDelegate;
       this.host = host;
       this.port = port;
       this.usePubServe = usePubServe;
     }
 
     @Override
     protected IStatus run(IProgressMonitor monitor) {
       try {
-        // TODO(keertip): add forwarding for chrome 
-        AndroidDebugBridge.getAndroidDebugBridge().setupPortForwarding(Integer.toString(port));
+
         connectionDelegate.performRemoteConnection(host, port, monitor, usePubServe);
 
         // Show the debugger view.
         Display.getDefault().asyncExec(new Runnable() {
           @Override
           public void run() {
             DartToolsPlugin.showView(DebuggerView.ID);
           }
         });
       } catch (CoreException ce) {
@@ skipping 102 matching lines @@
   private Combo exceptionsCombo;
 
   private Text hostText;
 
   private Text portText;
 
   private Text instructionsLabel;
 
   private Button usePubServeButton;
 
+  private Group pubGroup;
+
   /**
    * Create a new RemoteConnectionDialog with the given shell as its parent.
    * 
    * @param shell
    */
   public RemoteConnectionDialog(Shell shell) {
     super(shell);
   }
 
   @Override
@@ skipping 79 matching lines @@
     hostText = new Text(group, SWT.SINGLE | SWT.BORDER);
     GridDataFactory.fillDefaults().grab(true, false).applyTo(hostText);
 
     label = new Label(group, SWT.NONE);
     label.setText("Port:");
 
     portText = new Text(group, SWT.SINGLE | SWT.BORDER);
     GridDataFactory.fillDefaults().grab(true, false).applyTo(portText);
 
     label = new Label(parent, SWT.NONE);
-    // pub setttings
-    group = new Group(parent, SWT.NONE);
-    group.setText("Pub settings");
-    GridDataFactory.fillDefaults().grab(true, false).applyTo(group);
-    GridLayoutFactory.fillDefaults().margins(12, 6).applyTo(group);
-
-    usePubServeButton = new Button(group, SWT.CHECK);
-    usePubServeButton.setText("Using pub to serve the application");
-    usePubServeButton.setSelection(true);
-    GridDataFactory.fillDefaults().grab(true, false).applyTo(usePubServeButton);
-
-    // spacer
-    label = new Label(parent, SWT.NONE);
 
     instructionsLabel = new Text(parent, SWT.WRAP | SWT.READ_ONLY);
     instructionsLabel.setBackground(parent.getBackground());
     GridDataFactory.fillDefaults().grab(true, false).hint(100, -1).applyTo(instructionsLabel);
 
+    // spacer
+    label = new Label(parent, SWT.NONE);
+
+    label = new Label(parent, SWT.NONE);
+    label = new Label(parent, SWT.NONE);
+
+    pubGroup = new Group(parent, SWT.NONE);
+    pubGroup.setText("Pub settings");
+    GridDataFactory.fillDefaults().grab(true, false).applyTo(pubGroup);
+    GridLayoutFactory.fillDefaults().margins(12, 6).applyTo(pubGroup);
+
+    usePubServeButton = new Button(pubGroup, SWT.CHECK);
+    usePubServeButton.setText("Using pub to serve the application");
+    usePubServeButton.setSelection(true);
+    GridDataFactory.fillDefaults().grab(true, false).applyTo(usePubServeButton);
+
     try {
       exceptionsCombo.select(getDialogSettings().getInt("selected"));
     } catch (NumberFormatException nfe) {
       exceptionsCombo.select(0);
     }
 
     handleComboChanged();
   }
 
   private String[] getConnectionLabels() {
@@ skipping 29 matching lines @@
 
   private void handleComboChanged() {
     ConnectionType connection = getConnectionType();
 
     setMessage(connection.message);
     instructionsLabel.setText(connection.helpMessage);
 
     IDialogSettings settings = getDialogSettings();
     hostText.setText(notNull(settings.get(connection.name() + ".host")));
     portText.setText(notNull(settings.get(connection.name() + ".port")));
+
+    pubGroup.setVisible(connection == ConnectionType.CHROME);
   }
 
   private String notNull(String str) {
     return str == null ? "" : str;
   }
 
 }