Fix an issue resolving paths when remote debugging.

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.internal.util.ResourceUtil;
 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.DebuggerViewManager;
 import com.google.dart.tools.ui.themes.Fonts;
 
-import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.ContainerSelectionDialog;
 import org.eclipse.ui.dialogs.ListDialog;
 
 import java.util.List;
 
 /**
  * A dialog to connect to remote debug instances.
  */
 public class RemoteConnectionDialog extends TitleAreaDialog {
 
   /**
@@ skipping 49 matching lines @@
       }
 
       return new DefaultChromiumTabChooser().chooseTab(tabs);
     }
   }
 
   public static class ConnectionJob extends Job {
     private IRemoteConnectionDelegate connectionDelegate;
     private String host;
     private int port;
-    private IFile file;
+    private IContainer container;
     private boolean usePubServe;
 
     public ConnectionJob(IRemoteConnectionDelegate connectionDelegate, String host, int port,
-        IFile file, boolean usePubServe) {
+        IContainer container, boolean usePubServe) {
       super("Connecting...");
 
       this.connectionDelegate = connectionDelegate;
       this.host = host;
       this.port = port;
-      this.file = file;
+      this.container = container;
       this.usePubServe = usePubServe;
     }
 
     @Override
     protected IStatus run(IProgressMonitor monitor) {
       try {
-        connectionDelegate.performRemoteConnection(host, port, file, monitor, usePubServe);
+        connectionDelegate.performRemoteConnection(host, port, container, monitor, usePubServe);
 
         // Show the debugger view.
         Display.getDefault().asyncExec(new Runnable() {
           @Override
           public void run() {
             DebuggerViewManager viewManager = DebuggerViewManager.getDefault();
 
             if (viewManager.hasDebuggerView()) {
               viewManager.openDebuggerView();
             }
@@ skipping 41 matching lines @@
 
     ConnectionType(String label, String message, String helpMessage, String hostDefault,
         String portDefault) {
       this.label = label;
       this.message = message;
       this.helpMessage = helpMessage;
       this.hostDefault = hostDefault;
       this.portDefault = portDefault;
     }
 
-    public void connection(String host, int port, IFile file, boolean usePubServe) {
+    public void connection(String host, int port, IContainer container, boolean usePubServe) {
       IRemoteConnectionDelegate connectionDelegate = null;
 
       switch (this) {
         case CHROME: {
           connectionDelegate = new DartiumLaunchConfigurationDelegate(new ChromeTabChooser());
           break;
         }
 
         case COMMAND_LINE: {
           connectionDelegate = new DartServerLaunchConfigurationDelegate();
           break;
         }
 
         default: {
           throw new IllegalArgumentException();
         }
       }
 
       if (connectionDelegate != null) {
-        Job job = new ConnectionJob(connectionDelegate, host, port, file, usePubServe);
+        Job job = new ConnectionJob(connectionDelegate, host, port, container, usePubServe);
         job.schedule();
       }
     }
   }
 
   static class TabLabelProvider extends LabelProvider {
 
     @Override
     public Image getImage(Object element) {
       return null;
@@ skipping 19 matching lines @@
 
     dialog.open();
   }
 
   private Combo exceptionsCombo;
 
   private Text hostText;
 
   private Text portText;
 
-  private Text fileText;
+  private Label resourcePathLabel;
 
   private Text instructionsLabel;
 
   private Button usePubServeButton;
 
   private Group pubGroup;
 
   /**
    * Create a new RemoteConnectionDialog with the given shell as its parent.
    * 
@@ skipping 23 matching lines @@
 
     return contents;
   }
 
   @Override
   protected void okPressed() {
     ConnectionType connection = getConnectionType();
 
     String host = hostText.getText().trim();
     String port = portText.getText().trim();
-    String filePath = fileText.getText().trim();
+    String resourcePath = resourcePathLabel.getText().trim();
     boolean usePubServe = usePubServeButton.getSelection();
 
     IDialogSettings settings = getDialogSettings();
 
     settings.put("selected", connection.ordinal());
     settings.put(connection.name() + ".host", host);
     settings.put(connection.name() + ".port", port);
-    settings.put(connection.name() + ".file", filePath);
+    settings.put(connection.name() + ".resource", resourcePath);
     settings.put(connection.name() + ".usePubServe", usePubServe);
 
     int connectionPort;
 
     try {
       connectionPort = Integer.parseInt(port);
     } catch (NumberFormatException nfe) {
       ErrorDialog.openError(getShell(), "Invalid Port", null, new Status(
           IStatus.ERROR,
           DartDebugUIPlugin.PLUGIN_ID,
           "\"" + port + "\" is an invalid port."));
       return;
     }
 
-    IFile file = ResourceUtil.getFile(filePath);
-    if (file == null) {
-      ErrorDialog.openError(getShell(), "Invalid Application File", null, new Status(
+    IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(resourcePath);
+
+    if (resource == null) {
+      ErrorDialog.openError(getShell(), "Invalid Source Project", null, new Status(
           IStatus.ERROR,
           DartDebugUIPlugin.PLUGIN_ID,
-          "\"" + filePath + "\" is an invalid resource path."));
+          "\"" + resourcePath + "\" is an invalid resource path."));
       return;
     }
 
-    connection.connection(host, connectionPort, file, usePubServe);
+    IContainer container = resource instanceof IContainer ? (IContainer) resource
+        : resource.getParent();
+    connection.connection(host, connectionPort, container, usePubServe);
 
     super.okPressed();
   }
 
   private void createDialogUI(Composite parent) {
     GridLayoutFactory.fillDefaults().numColumns(2).margins(12, 6).applyTo(parent);
 
     Label label = new Label(parent, SWT.NONE);
     label.setText("Connect to:");
 
     exceptionsCombo = new Combo(parent, SWT.DROP_DOWN | SWT.READ_ONLY);
     exceptionsCombo.setItems(getConnectionLabels());
     exceptionsCombo.addSelectionListener(new SelectionAdapter() {
       @Override
       public void widgetSelected(SelectionEvent e) {
         handleComboChanged();
       }
     });
 
     // spacer
     label = new Label(parent, SWT.NONE);
 
     Group group = new Group(parent, SWT.NONE);
     group.setText("Connection parameters");
     GridDataFactory.fillDefaults().grab(true, false).applyTo(group);
-    GridLayoutFactory.fillDefaults().numColumns(2).margins(12, 6).applyTo(group);
+    GridLayoutFactory.fillDefaults().numColumns(3).margins(12, 6).applyTo(group);
 
     label = new Label(group, SWT.NONE);
     label.setText("Host:");
 
     hostText = new Text(group, SWT.SINGLE | SWT.BORDER);
-    GridDataFactory.fillDefaults().grab(true, false).applyTo(hostText);
+    GridDataFactory.fillDefaults().grab(true, false).span(2, 1).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);
+    GridDataFactory.fillDefaults().grab(true, false).span(2, 1).applyTo(portText);
 
     label = new Label(group, SWT.NONE);
-    label.setText("File:");
+    label.setText("Project source:");

[devoncarew, 2014/11/25 18:27:35]

The user now needs to indicate where the source they're debugging lives.

 
-    fileText = new Text(group, SWT.SINGLE | SWT.BORDER);
-    GridDataFactory.fillDefaults().grab(true, false).applyTo(fileText);
+    resourcePathLabel = new Label(group, SWT.NONE);
+    GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.CENTER).applyTo(
+        resourcePathLabel);
+
+    Button projectBrowseButton = new Button(group, SWT.PUSH);
+    projectBrowseButton.setText("Select Folder...");
+    GridDataFactory.swtDefaults().applyTo(projectBrowseButton);
+    projectBrowseButton.addSelectionListener(new SelectionAdapter() {
+      @Override
+      public void widgetSelected(SelectionEvent e) {
+        handleSourceDirectoryBrowseButton();
+      }
+    });
 
     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);
 
@@ skipping 55 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")));
-    fileText.setText(notNull(settings.get(connection.name() + ".file")));
+    resourcePathLabel.setText(notNull(settings.get(connection.name() + ".resource")));
 
     pubGroup.setVisible(connection == ConnectionType.CHROME);
   }
 
+  private void handleSourceDirectoryBrowseButton() {
+    ContainerSelectionDialog dialog = new ContainerSelectionDialog(
+        getShell(),
+        null,
+        false,
+        "Select source location");
+
+    dialog.open();
+
+    Object[] results = dialog.getResult();
+
+    if ((results != null) && (results.length > 0)) {
+      String pathStr = ((IPath) results[0]).toString();
+      resourcePathLabel.setText(pathStr);
+    }
+  }
+
   private String notNull(String str) {
     return str == null ? "" : str;
   }
 
 }