From 3860c54cc0246b06618d5b4400b3f1c0540f91ba Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Thu, 14 Aug 2014 15:27:53 -0500 Subject: [PATCH] Bug 437560 - Add new API to return contents of text field Change-Id: Ib14c69752e61ee7e03c37834f16923b5b41f16ef Signed-off-by: Greg Watson --- bundles/org.eclipse.remote.core/pom.xml | 2 +- bundles/org.eclipse.remote.jsch.core/pom.xml | 2 +- bundles/org.eclipse.remote.jsch.ui/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.remote.ui/pom.xml | 4 +-- .../ui/dialogs/RemoteResourceBrowser.java | 4 +-- .../widgets/RemoteResourceBrowserWidget.java | 25 +++++++++++++++++++ .../org.eclipse.remote-feature/feature.xml | 2 +- features/org.eclipse.remote-feature/pom.xml | 4 +-- releng/org.eclipse.remote.build/pom.xml | 4 +-- releng/org.eclipse.remote.repo/pom.xml | 4 +-- 11 files changed, 40 insertions(+), 15 deletions(-) diff --git a/bundles/org.eclipse.remote.core/pom.xml b/bundles/org.eclipse.remote.core/pom.xml index 79f026d6ec1..edf70cf3063 100644 --- a/bundles/org.eclipse.remote.core/pom.xml +++ b/bundles/org.eclipse.remote.core/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 1.0.1-SNAPSHOT + 1.1.0-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.jsch.core/pom.xml b/bundles/org.eclipse.remote.jsch.core/pom.xml index c9f21ad04c4..ef402885046 100644 --- a/bundles/org.eclipse.remote.jsch.core/pom.xml +++ b/bundles/org.eclipse.remote.jsch.core/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 1.0.1-SNAPSHOT + 1.1.0-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.jsch.ui/pom.xml b/bundles/org.eclipse.remote.jsch.ui/pom.xml index 4b863ada9b9..c6677296c88 100644 --- a/bundles/org.eclipse.remote.jsch.ui/pom.xml +++ b/bundles/org.eclipse.remote.jsch.ui/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 1.0.1-SNAPSHOT + 1.1.0-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF index 819c1f83ee5..5515186f105 100644 --- a/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.remote.ui;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.remote.internal.ui.RemoteUIPlugin Bundle-Vendor: %pluginProvider Require-Bundle: org.eclipse.ui, diff --git a/bundles/org.eclipse.remote.ui/pom.xml b/bundles/org.eclipse.remote.ui/pom.xml index 574fea94ea2..0634650efe9 100644 --- a/bundles/org.eclipse.remote.ui/pom.xml +++ b/bundles/org.eclipse.remote.ui/pom.xml @@ -6,11 +6,11 @@ org.eclipse.remote remote-parent - 1.0.1-SNAPSHOT + 1.1.0-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml org.eclipse.remote.ui - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT eclipse-plugin 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 e7fcfeeb7f2..53f7cd16f6f 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 @@ -219,8 +219,8 @@ public class RemoteResourceBrowser extends Dialog implements IRunnableContext { * @return selected resource or null if no resource is selected */ public IFileStore getResource() { - if (fResourceBrowserWidget != null && fResourceBrowserWidget.getResources().size() > 0) { - return fResourceBrowserWidget.getResources().get(0); + if (fResourceBrowserWidget != null) { + return fResourceBrowserWidget.getResource(); } return null; } 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 7ed2626699f..583bd4d5201 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 @@ -55,6 +55,8 @@ import org.eclipse.remote.internal.ui.messages.Messages; import org.eclipse.remote.ui.IRemoteUIConnectionManager; import org.eclipse.remote.ui.RemoteUIServices; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; @@ -166,6 +168,7 @@ public class RemoteResourceBrowserWidget extends Composite { */ public static final int SHOW_CONNECTIONS = 0x40; + @SuppressWarnings("unused") private static final int minimumWidth = 200; private static final int heightHint = 300; @@ -181,6 +184,7 @@ public class RemoteResourceBrowserWidget extends Composite { private boolean fShowHidden; private final List fResources = new ArrayList(); + private String fResource; private String fInitialPath; private IPath fRootPath; private IRemoteFileManager fFileMgr; @@ -249,6 +253,12 @@ public class RemoteResourceBrowserWidget extends Composite { setRoot(fRemotePathText.getText()); } }); + fRemotePathText.addModifyListener(new ModifyListener() { + @Override + public void modifyText(ModifyEvent e) { + fResource = fRemotePathText.getText().trim(); + } + }); GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false); // gd.minimumWidth = minimumWidth; fRemotePathText.setLayoutData(gd); @@ -584,6 +594,21 @@ public class RemoteResourceBrowserWidget extends Composite { return fConnection; } + /** + * Get a resource that corresponds to the text field + * + * @return resource corresponding to the text field + * @since 1.1 + */ + public IFileStore getResource() { + if (fResource != null) { + if (!fResource.equals("") && getConnection() != null) { //$NON-NLS-1$ + return getConnection().getFileManager().getResource(fResource); + } + } + return null; + } + /** * Get the resources that were selected. * diff --git a/features/org.eclipse.remote-feature/feature.xml b/features/org.eclipse.remote-feature/feature.xml index c2f6ae0c919..d3704c38407 100644 --- a/features/org.eclipse.remote-feature/feature.xml +++ b/features/org.eclipse.remote-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.remote-feature/pom.xml b/features/org.eclipse.remote-feature/pom.xml index f9e14d86343..0fcd7d6305b 100644 --- a/features/org.eclipse.remote-feature/pom.xml +++ b/features/org.eclipse.remote-feature/pom.xml @@ -6,11 +6,11 @@ org.eclipse.remote remote-parent - 1.0.1-SNAPSHOT + 1.1.0-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml org.eclipse.remote - 1.0.1-SNAPSHOT + 1.1.0-SNAPSHOT eclipse-feature diff --git a/releng/org.eclipse.remote.build/pom.xml b/releng/org.eclipse.remote.build/pom.xml index 9690f8c715c..7b8a85bae1f 100644 --- a/releng/org.eclipse.remote.build/pom.xml +++ b/releng/org.eclipse.remote.build/pom.xml @@ -10,12 +10,12 @@ org.eclipse.remote remote-parent - 1.0.1-SNAPSHOT + 1.1.0-SNAPSHOT pom Remote Parent - 1.0.1 + 1.1.0 luna 0.20.0 ${tycho-version} diff --git a/releng/org.eclipse.remote.repo/pom.xml b/releng/org.eclipse.remote.repo/pom.xml index 549480f3d8d..b844717ed2b 100644 --- a/releng/org.eclipse.remote.repo/pom.xml +++ b/releng/org.eclipse.remote.repo/pom.xml @@ -7,11 +7,11 @@ org.eclipse.remote remote-parent - 1.0.1-SNAPSHOT + 1.1.0-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml - 1.0.1-SNAPSHOT + 1.1.0-SNAPSHOT org.eclipse.remote.repo eclipse-repository