mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00
Code Issues Wiki Activity

Bug 441597 - Add new folder name dialog

Browse source 
Change-Id: I0128deb7a3c6dffef846cd358b77676703532e34
Signed-off-by: Greg Watson <g.watson@computer.org>
This commit is contained in:
Greg Watson 2014-08-12 23:09:16 -04:00
parent f2be749153
commit 64c0a2dc84
3 changed files with 139 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/messages/Messages.java
View file

@ -96,6 +96,16 @@ public class Messages extends NLS {
public static String RemoteResourceBrowser_Show_hidden_files;
public static String RemoteResourceBrowser_UpOneLevel;
public static String RemoteResourceBrowserWidget_0;
public static String RemoteResourceBrowserWidget_1;
public static String RemoteResourceBrowserWidget_2;
public static String RemoteResourceBrowserWidget_3;
public static String RemoteResourceBrowserWidget_4;
public static String RemoteResourceBrowserWidget_New_Folder;
public static String RemoteResourceBrowserWidget_Unable_to_create_new_folder;

5
bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/messages/messages.properties
View file

@ -57,6 +57,11 @@ RemoteResourceBrowser_newConnection=New...
RemoteResourceBrowser_NewFolder=New folder
RemoteResourceBrowser_Show_hidden_files=Show hidden files
RemoteResourceBrowser_UpOneLevel=Up one level
RemoteResourceBrowserWidget_0=validate input
RemoteResourceBrowserWidget_1=Enter Folder Name
RemoteResourceBrowserWidget_2=Folder name:
RemoteResourceBrowserWidget_3=Folder already exists
RemoteResourceBrowserWidget_4=Please enter a folder name
RemoteResourceBrowserWidget_New_Folder=New Folder
RemoteResourceBrowserWidget_Unable_to_create_new_folder=Unable to create new folder
RemoteUIServices_Configuring_remote_services=Configuring remote services...

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

@ -19,10 +19,15 @@ import org.eclipse.core.filesystem.IFileStore;
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.ListenerList;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.IInputValidator;
import org.eclipse.jface.dialogs.InputDialog;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress;
@ -56,10 +61,12 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.ui.progress.UIJob;
/**
* Generic file/directory browser for remote resources.
@ -68,6 +75,72 @@ import org.eclipse.ui.model.WorkbenchLabelProvider;
*
*/
public class RemoteResourceBrowserWidget extends Composite {
/**
* Delayed input dialog uses {@link ValidateJob} to create an InputDialog that only validates it's text field after an
* appropriate timeout has occurred. This is to prevent excessive network traffic when checking the existence of a remote
* directory on a target system.
*
* Due to the timing of the validation, it is possible to close the dialog prior to the validation completing. However since the
* validation is only used to check for the existence of a remote file/directory, the worst that can happen is that the user
* will not be notified that the directory already exists.
*
*/
private class DelayedInputDialog extends InputDialog {
public DelayedInputDialog(Shell parentShell, String dialogTitle, String dialogMessage, String initialValue,
IInputValidator validator) {
super(parentShell, dialogTitle, dialogMessage, initialValue, validator);
}
@Override
protected void buttonPressed(int buttonId) {
/*
* Cancel the job as soon as the dialog is closed to avoid SWTException
*/
fValidateJob.cancel();
super.buttonPressed(buttonId);
}
protected void doValidate() {
super.validateInput();
}
@Override
protected void validateInput() {
fValidateJob.cancel();
if (!getText().getText().equals("")) { //$NON-NLS-1$
fValidateJob.schedule(VALIDATE_DELAY);
} else {
super.validateInput();
}
}
}
/**
* Validation job that will call the {@link DelayedInputDialog#doValidate()} method when run. The job should be scheduled with a
* delay to limit the frequency of validation.
*/
private class ValidateJob extends UIJob {
private DelayedInputDialog fDialog;
public ValidateJob() {
super(Messages.RemoteResourceBrowserWidget_0);
setSystem(true);
}
@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
fDialog.doValidate();
return Status.OK_STATUS;
}
public void setDialog(DelayedInputDialog dialog) {
fDialog = dialog;
}
}
private static final int VALIDATE_DELAY = 100;
private final ValidateJob fValidateJob = new ValidateJob();
/**
* Browse for files
*/
@ -409,7 +482,7 @@ public class RemoteResourceBrowserWidget extends Composite {
public void run(IProgressMonitor monitor) {
SubMonitor progress = SubMonitor.convert(monitor, 10);
String baseName = "newfolder"; //$NON-NLS-1$
IFileStore path = fConnection.getFileManager().getResource(parent);
final IFileStore path = fConnection.getFileManager().getResource(parent);
IFileStore child = path.getChild(baseName);
int count = 1;
try {
@ -417,13 +490,57 @@ public class RemoteResourceBrowserWidget extends Composite {
progress.setWorkRemaining(10);
child = path.getChild(baseName + " (" + count++ + ")"); //$NON-NLS-1$//$NON-NLS-2$
}
if (!progress.isCanceled()) {
child.mkdir(EFS.SHALLOW, progress.newChild(10));
name[0] = child.getName();
} catch (final CoreException e) {
Display.getDefault().syncExec(new Runnable() {
@Override
public void run() {
ErrorDialog.openError(getShell(), Messages.RemoteResourceBrowserWidget_New_Folder,
Messages.RemoteResourceBrowserWidget_Unable_to_create_new_folder, e.getStatus());
}
});
}
final IFileStore basePath = child;
final String[] userPath = new String[1];
Display.getDefault().syncExec(new Runnable() {
@Override
public void run() {
DelayedInputDialog dialog = new DelayedInputDialog(getShell(), Messages.RemoteResourceBrowserWidget_1,
Messages.RemoteResourceBrowserWidget_2, basePath.getName(), new IInputValidator() {
@Override
public String isValid(String newText) {
if (!newText.equals("")) { //$NON-NLS-1$
IFileStore newPath = path.getChild(newText);
if (newPath.fetchInfo().exists()) {
return Messages.RemoteResourceBrowserWidget_3;
}
} else {
return Messages.RemoteResourceBrowserWidget_4;
}
return null;
}
});
fValidateJob.setDialog(dialog);
if (dialog.open() == Dialog.OK) {
userPath[0] = dialog.getValue();
}
}
});
if (userPath[0] != null) {
try {
IFileStore newPath = path.getChild(userPath[0]);
if (!progress.isCanceled()) {
newPath.mkdir(EFS.SHALLOW, progress.newChild(10));
name[0] = newPath.getName();
}
} catch (final CoreException e) {
Display.getDefault().syncExec(new Runnable() {
@Override
public void run() {
ErrorDialog.openError(getShell(), Messages.RemoteResourceBrowserWidget_New_Folder,
Messages.RemoteResourceBrowserWidget_Unable_to_create_new_folder, e.getStatus());
}
});
}
} catch (CoreException e) {
ErrorDialog.openError(getShell(), Messages.RemoteResourceBrowserWidget_New_Folder,
Messages.RemoteResourceBrowserWidget_Unable_to_create_new_folder, e.getStatus());
}
}
};