From b3f5531dbf41fae8c590ac16f52605f9f48cb0fd Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Thu, 14 Aug 2014 13:45:30 -0500 Subject: [PATCH] Revert "Bug 437560 - Add new API to return contents of text field" This reverts commit 0a9379e119fad649aba7a4db6946d9402afe8589. --- .../META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.remote.ui/pom.xml | 2 +- .../ui/dialogs/RemoteResourceBrowser.java | 4 +-- .../widgets/RemoteResourceBrowserWidget.java | 25 ------------------- 4 files changed, 4 insertions(+), 29 deletions(-) diff --git a/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF index 5515186f105..819c1f83ee5 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.1.0.qualifier +Bundle-Version: 1.0.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 7bad7adfeff..574fea94ea2 100644 --- a/bundles/org.eclipse.remote.ui/pom.xml +++ b/bundles/org.eclipse.remote.ui/pom.xml @@ -11,6 +11,6 @@ org.eclipse.remote.ui - 1.1.0-SNAPSHOT + 1.0.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 53f7cd16f6f..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 @@ -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) { - return fResourceBrowserWidget.getResource(); + if (fResourceBrowserWidget != null && fResourceBrowserWidget.getResources().size() > 0) { + return fResourceBrowserWidget.getResources().get(0); } 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 583bd4d5201..7ed2626699f 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,8 +55,6 @@ 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; @@ -168,7 +166,6 @@ 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; @@ -184,7 +181,6 @@ 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; @@ -253,12 +249,6 @@ 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); @@ -594,21 +584,6 @@ 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. *