mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 20:05:35 +02:00
Code Issues Wiki Activity

Revert "Bug 437560 - Add new API to return contents of text field"

Browse source 
This reverts commit 0a9379e119.
This commit is contained in:
Greg Watson 2014-08-14 13:45:30 -05:00
parent 37095ff1f1
commit b3f5531dbf
4 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.remote.ui;singleton:=true 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-Activator: org.eclipse.remote.internal.ui.RemoteUIPlugin
Bundle-Vendor: %pluginProvider Bundle-Vendor: %pluginProvider
Require-Bundle: org.eclipse.ui, Require-Bundle: org.eclipse.ui,

2
bundles/org.eclipse.remote.ui/pom.xml
View file

@ -11,6 +11,6 @@
</parent> </parent>
<artifactId>org.eclipse.remote.ui</artifactId> <artifactId>org.eclipse.remote.ui</artifactId>
<version>1.1.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
</project> </project>

4
bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
View file

@ -219,8 +219,8 @@ public class RemoteResourceBrowser extends Dialog implements IRunnableContext {
* @return selected resource or null if no resource is selected * @return selected resource or null if no resource is selected
*/ */
public IFileStore getResource() { public IFileStore getResource() {
if (fResourceBrowserWidget != null) { if (fResourceBrowserWidget != null && fResourceBrowserWidget.getResources().size() > 0) {
return fResourceBrowserWidget.getResource(); return fResourceBrowserWidget.getResources().get(0);
} }
return null; return null;
} }

25
bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteResourceBrowserWidget.java
View file

@ -55,8 +55,6 @@ import org.eclipse.remote.internal.ui.messages.Messages;
import org.eclipse.remote.ui.IRemoteUIConnectionManager; import org.eclipse.remote.ui.IRemoteUIConnectionManager;
import org.eclipse.remote.ui.RemoteUIServices; import org.eclipse.remote.ui.RemoteUIServices;
import org.eclipse.swt.SWT; 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.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridData;
@ -168,7 +166,6 @@ public class RemoteResourceBrowserWidget extends Composite {
*/ */
public static final int SHOW_CONNECTIONS = 0x40; public static final int SHOW_CONNECTIONS = 0x40;
@SuppressWarnings("unused")
private static final int minimumWidth = 200; private static final int minimumWidth = 200;
private static final int heightHint = 300; private static final int heightHint = 300;
@ -184,7 +181,6 @@ public class RemoteResourceBrowserWidget extends Composite {
private boolean fShowHidden; private boolean fShowHidden;
private final List<IFileStore> fResources = new ArrayList<IFileStore>(); private final List<IFileStore> fResources = new ArrayList<IFileStore>();
private String fResource;
private String fInitialPath; private String fInitialPath;
private IPath fRootPath; private IPath fRootPath;
private IRemoteFileManager fFileMgr; private IRemoteFileManager fFileMgr;
@ -253,12 +249,6 @@ public class RemoteResourceBrowserWidget extends Composite {
setRoot(fRemotePathText.getText()); 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); GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false);
// gd.minimumWidth = minimumWidth; // gd.minimumWidth = minimumWidth;
fRemotePathText.setLayoutData(gd); fRemotePathText.setLayoutData(gd);
@ -594,21 +584,6 @@ public class RemoteResourceBrowserWidget extends Composite {
return fConnection; 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. * Get the resources that were selected.
* *