From 8149858afce239c26db1d78758fdbfee128c66fe Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Fri, 20 Jun 2014 15:53:34 -0400 Subject: [PATCH] Bug 437842 - Fix setInitialPath() so it works. Change-Id: Ic8599552b1c1b9b99743bd73429b60a1d73dc29f Signed-off-by: Greg Watson --- .../eclipse/remote/ui/dialogs/RemoteResourceBrowser.java | 6 +++--- .../remote/ui/widgets/RemoteResourceBrowserWidget.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java index 118632e87f8..e7fcfeeb7f2 100644 --- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java +++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java @@ -116,12 +116,12 @@ public class RemoteResourceBrowser extends Dialog implements IRunnableContext { } else { setTitle(fDialogTitle); } - if (fConnection != null) { - fResourceBrowserWidget.setConnection(fConnection); - } if (fInitialPath != null) { fResourceBrowserWidget.setInitialPath(fInitialPath); } + if (fConnection != null) { + fResourceBrowserWidget.setConnection(fConnection); + } updateDialog(); return contents; } diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteResourceBrowserWidget.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteResourceBrowserWidget.java index 76ced9fce6f..c75498445f4 100644 --- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteResourceBrowserWidget.java +++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteResourceBrowserWidget.java @@ -517,6 +517,8 @@ public class RemoteResourceBrowserWidget extends Composite { * text field, and in a future version should expand the browser to this * location if it exists. * + * NOTE: This must be called *before* {@link #setConnection(IRemoteConnection)} to have any effect. + * * @param path */ public void setInitialPath(String path) {