Menu
▾
▴
[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers FileCopyPerformer.java,1.35,1.36 FileDeletePerformer.java,1.18,1.19 UiCopyListener.java,1.11,1.12 MakeDirectoryPerformer.java,1.9,1.10
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1394/src/org/jcommander/ui/filepanel/performers Modified Files: FileCopyPerformer.java FileDeletePerformer.java UiCopyListener.java MakeDirectoryPerformer.java Log Message: further implementation of the move to JFace Dialogs: - deleting files is now a job, thus the DeleteProgressDialog is replaced by the standard job progress dialog - file questions (overwrite, read error, etc) use now JFace dialogs, too. - make directory dialog is now a JFace dialog. Index: UiCopyListener.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/UiCopyListener.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** UiCopyListener.java 25 Apr 2006 09:27:58 -0000 1.11 --- UiCopyListener.java 30 Apr 2006 13:10:55 -0000 1.12 *************** *** 6,9 **** --- 6,10 ---- import org.apache.commons.vfs.*; import org.apache.log4j.Logger; + import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.*; import org.jcommander.ui.filepanel.*; *************** *** 12,15 **** --- 13,17 ---- import org.jcommander.ui.logger.*; import org.jcommander.ui.utils.*; + import org.jcommander.vfsextensions.VfsManagerExtension; import org.jcommander.vfsextensions.listener.*; *************** *** 20,24 **** private final FileCopyPerformer performer; private final int UPDATE_INTERVAL; ! protected FileQuestionDialogController controller; protected boolean overwriteAll = false; --- 22,27 ---- private final FileCopyPerformer performer; private final int UPDATE_INTERVAL; ! //protected FileQuestionDialogController controller; ! protected int questionResult; protected boolean overwriteAll = false; *************** *** 64,92 **** EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! controller = new FileQuestionDialogController( ! EclipseBroker.getShell(), ! performer.mediator, ! "Overwrite question", ! "Target file \n" + target.getName() + " \nalready exists. \n\nOverwrite?" ! ); ! ! controller.openShell(); } }); ! Object userChoice = controller.waitForUserChoice(); ! if(userChoice == FileQuestionDialogController.CURRENT_CHOICE) { returnValue = true; } else ! if(userChoice == FileQuestionDialogController.SKIP_CURRENT_CHOICE) { returnValue = false; } else ! if(userChoice == FileQuestionDialogController.ALL_CHOICE) { overwriteAll = true; returnValue = overwriteAll; } else ! if(userChoice == FileQuestionDialogController.SKIP_ALL_CHOICE) { skipAll = true; --- 67,96 ---- EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! questionResult = MessageDialogAll.openQuestionAll(EclipseBroker.getShell(), "Overwrite?", "Target file \n" + VfsManagerExtension.getDisplayablePath(target) + " \nalready exists. \n\nOverwrite?"); ! // controller = new FileQuestionDialogController( ! // EclipseBroker.getShell(), ! // performer.mediator, ! // "Overwrite question", ! // "Target file \n" + target.getName() + " \nalready exists. \n\nOverwrite?" ! // ); ! // ! // controller.openShell(); } }); ! // Object questionResult = controller.waitForUserChoice(); ! if(questionResult == IDialogConstants.YES_ID) { returnValue = true; } else ! if(questionResult == IDialogConstants.NO_ID) { returnValue = false; } else ! if(questionResult == IDialogConstants.YES_TO_ALL_ID) { overwriteAll = true; returnValue = overwriteAll; } else ! if(questionResult == IDialogConstants.NO_TO_ALL_ID) { skipAll = true; *************** *** 254,278 **** EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! controller = new FileQuestionDialogController( ! EclipseBroker.getShell(), ! performer.mediator, ! "Permissions question", ! "Source file \n" + source.getName() + " \ncannot be read. \n\nRetry?", ! false ! ); ! ! controller.openShell(); } }); ! Object userChoice = controller.waitForUserChoice(); ! if(userChoice == FileQuestionDialogController.CURRENT_CHOICE) { return true; } else ! if(userChoice == FileQuestionDialogController.SKIP_CURRENT_CHOICE) { return false; } else ! if(userChoice == FileQuestionDialogController.SKIP_ALL_CHOICE) { skipAllRead = true; --- 258,283 ---- EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! questionResult = MessageDialogAll.openQuestionNoAll(EclipseBroker.getShell(), "Read Error", "Source file \n" + VfsManagerExtension.getDisplayablePath(source) + " \ncannot be read. \n\nRetry?"); ! // controller = new FileQuestionDialogController( ! // EclipseBroker.getShell(), ! // performer.mediator, ! // "Permissions question", ! // "Source file \n" + source.getName() + " \ncannot be read. \n\nRetry?", ! // false ! // ); ! // ! // controller.openShell(); } }); ! // Object questionResult = controller.waitForUserChoice(); ! if(questionResult == IDialogConstants.YES_ID) { return true; } else ! if(questionResult == IDialogConstants.NO_ID) { return false; } else ! if(questionResult == IDialogConstants.NO_TO_ALL_ID) { skipAllRead = true; *************** *** 290,314 **** EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! controller = new FileQuestionDialogController( ! EclipseBroker.getShell(), ! performer.mediator, ! "Permissions question", ! "Target file \n" + target.getName() + " \ncannot be written. \n\nRetry?", ! false ! ); ! ! controller.openShell(); } }); ! Object userChoice = controller.waitForUserChoice(); ! if(userChoice == FileQuestionDialogController.CURRENT_CHOICE) { return true; } else ! if(userChoice == FileQuestionDialogController.SKIP_CURRENT_CHOICE) { return false; } else ! if(userChoice == FileQuestionDialogController.SKIP_ALL_CHOICE) { skipAllWrite = true; --- 295,320 ---- EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! questionResult = MessageDialogAll.openQuestionNoAll(EclipseBroker.getShell(), "Write Error", "Target file \n" + VfsManagerExtension.getDisplayablePath(target) + " \ncannot be written. \n\nRetry?"); ! // controller = new FileQuestionDialogController( ! // EclipseBroker.getShell(), ! // performer.mediator, ! // "Write Error", ! // "Target file \n" + target.getName() + " \ncannot be written. \n\nRetry?", ! // false ! // ); ! // ! // controller.openShell(); } }); ! // Object questionResult = controller.waitForUserChoice(); ! if(questionResult == IDialogConstants.YES_ID) { return true; } else ! if(questionResult == IDialogConstants.NO_ID) { return false; } else ! if(questionResult == IDialogConstants.NO_TO_ALL_ID) { skipAllWrite = true; Index: FileCopyPerformer.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileCopyPerformer.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** FileCopyPerformer.java 26 Apr 2006 16:39:19 -0000 1.35 --- FileCopyPerformer.java 30 Apr 2006 13:10:55 -0000 1.36 *************** *** 161,165 **** }; ! job.setUser(true); job.setPriority(Job.LONG); job.addJobChangeListener(new JobChangeAdapter() { --- 161,165 ---- }; ! //job.setUser(true); //This makes the job opening in a dialog. job.setPriority(Job.LONG); job.addJobChangeListener(new JobChangeAdapter() { Index: MakeDirectoryPerformer.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/MakeDirectoryPerformer.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MakeDirectoryPerformer.java 20 Mar 2006 05:49:24 -0000 1.9 --- MakeDirectoryPerformer.java 30 Apr 2006 13:10:55 -0000 1.10 *************** *** 7,10 **** --- 7,11 ---- import org.apache.commons.vfs.*; + import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.*; import org.eclipse.swt.events.*; *************** *** 41,47 **** protected Object workerLock; ! protected Shell confirmDialog; ! protected MkDirConfirmDialogComposite confirmDialogComposite; public MakeDirectoryPerformer(TabMediator mediator) { --- 42,48 ---- protected Object workerLock; ! protected MakeDirectoryDialog inputDialog; ! //protected MkDirConfirmDialogComposite confirmDialogComposite; public MakeDirectoryPerformer(TabMediator mediator) { *************** *** 72,78 **** }); ! waitForUserChoice(); ! if(selectedOption == OK_OPTION) { // create the directory mkDir(); --- 73,79 ---- }); ! //waitForUserChoice(); ! if(inputDialog.getReturnCode() == IDialogConstants.OK_ID) { // create the directory mkDir(); *************** *** 88,100 **** }); */ - }else { - EclipseBroker.getDisplay().syncExec(new Runnable() { - public void run() { - if(!confirmDialog.isDisposed()) { - confirmDialog.setVisible(false); - } - } - }); } } --- 89,102 ---- }); */ } + // else { + // EclipseBroker.getDisplay().syncExec(new Runnable() { + // public void run() { + // if(!inputDialog.isDisposed()) { + // inputDialog.setVisible(false); + // } + // } + // }); + // } } *************** *** 110,117 **** EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! confirmDialog.setVisible(false); parentDir = sourcePanel.getFileControl().getModel().getCurrentParent(); ! newDirName = confirmDialogComposite.getDirectoryNameText().getText(); } }); --- 112,119 ---- EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! // inputDialog.setVisible(false); parentDir = sourcePanel.getFileControl().getModel().getCurrentParent(); ! newDirName = inputDialog.getName(); } }); *************** *** 159,203 **** Shell shell = EclipseBroker.getShell(); ! final SelectionAdapter cancelButtonSelectionAdapter = new SelectionAdapter() { ! public void widgetSelected(SelectionEvent e) { ! resumeOperationThread = true; ! selectedOption = CANCEL_OPTION; ! ! synchronized (workerLock) { ! workerLock.notifyAll(); ! } ! } ! }; ! ! confirmDialog = Utils.createOperationDialog(shell, mediator); ! confirmDialogComposite = new MkDirConfirmDialogComposite(confirmDialog, SWT.NONE); ! ! confirmDialog.setDefaultButton(confirmDialogComposite.getOkButton()); ! confirmDialog.addShellListener(new ShellAdapter() { ! public void shellClosed(ShellEvent e) { ! cancelButtonSelectionAdapter.widgetSelected(null); ! } ! }); ! ! confirmDialogComposite.getOkButton().addSelectionListener(new SelectionAdapter() { ! public void widgetSelected(SelectionEvent e) { ! resumeOperationThread = true; ! selectedOption = OK_OPTION; ! ! synchronized (workerLock) { ! workerLock.notifyAll(); ! } ! } ! }); ! ! confirmDialogComposite.getCancelButton().addSelectionListener(cancelButtonSelectionAdapter); ! Utils.accomodateComposite(confirmDialogComposite); ! ! confirmDialog.pack(); ! WindowUtils.centerRelativeTo(confirmDialog, shell); ! confirmDialog.setVisible(true); ! confirmDialog.setActive(); ! confirmDialogComposite.setFocus(); } } --- 161,208 ---- Shell shell = EclipseBroker.getShell(); ! inputDialog = new MakeDirectoryDialog(shell); ! inputDialog.open(); ! // final SelectionAdapter cancelButtonSelectionAdapter = new SelectionAdapter() { ! // public void widgetSelected(SelectionEvent e) { ! // resumeOperationThread = true; ! // selectedOption = CANCEL_OPTION; ! // ! // synchronized (workerLock) { ! // workerLock.notifyAll(); ! // } ! // } ! // }; ! // ! // inputDialog = Utils.createOperationDialog(shell, mediator); ! // confirmDialogComposite = new MkDirConfirmDialogComposite(inputDialog, SWT.NONE); ! // ! // inputDialog.setDefaultButton(confirmDialogComposite.getOkButton()); ! // inputDialog.addShellListener(new ShellAdapter() { ! // public void shellClosed(ShellEvent e) { ! // cancelButtonSelectionAdapter.widgetSelected(null); ! // } ! // }); ! // ! // confirmDialogComposite.getOkButton().addSelectionListener(new SelectionAdapter() { ! // public void widgetSelected(SelectionEvent e) { ! // resumeOperationThread = true; ! // selectedOption = OK_OPTION; ! // ! // synchronized (workerLock) { ! // workerLock.notifyAll(); ! // } ! // } ! // }); ! // ! // confirmDialogComposite.getCancelButton().addSelectionListener(cancelButtonSelectionAdapter); ! // ! // Utils.accomodateComposite(confirmDialogComposite); ! // ! // inputDialog.pack(); ! // WindowUtils.centerRelativeTo(inputDialog, shell); ! // inputDialog.setVisible(true); ! // inputDialog.setActive(); ! // confirmDialogComposite.setFocus(); } } Index: FileDeletePerformer.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileDeletePerformer.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** FileDeletePerformer.java 26 Apr 2006 16:39:19 -0000 1.18 --- FileDeletePerformer.java 30 Apr 2006 13:10:55 -0000 1.19 *************** *** 8,15 **** --- 8,24 ---- import org.apache.commons.vfs.*; import org.apache.commons.vfs.provider.local.LocalFile; + import org.eclipse.core.runtime.IProgressMonitor; + import org.eclipse.core.runtime.IStatus; + import org.eclipse.core.runtime.Status; + import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.*; import org.eclipse.swt.events.*; import org.eclipse.swt.widgets.*; + import org.eclipse.ui.PlatformUI; + import org.eclipse.ui.internal.Workbench; + import org.eclipse.ui.internal.progress.ProgressMonitorJobsDialog; + import org.eclipse.ui.internal.progress.ProgressView; + import org.eclipse.ui.progress.UIJob; import org.jcommander.ui.filepanel.*; import org.jcommander.ui.filepanel.controls.*; *************** *** 30,37 **** protected TabMediator mediator; protected Shell confirmDialog; ! protected Shell progressDialog; ! protected DeleteConfirmDialogComposite confirmDialogComposite; protected DeleteConfirmDialog dialog; ! protected DeleteProgressDialogComposite progressDialogComposite; // protected static final int NO_OPTION = 0; --- 39,46 ---- protected TabMediator mediator; protected Shell confirmDialog; ! protected DeleteProgressDialog progressDialog; ! //protected DeleteConfirmDialogComposite confirmDialogComposite; protected DeleteConfirmDialog dialog; ! //protected DeleteProgressDialogComposite progressDialogComposite; // protected static final int NO_OPTION = 0; *************** *** 73,82 **** */ public void run() { ! operationThread = new Thread(new Runnable() { ! public void run() { doDelete(); ! } ! }); ! operationThread.start(); } --- 82,91 ---- */ public void run() { ! // operationThread = new Thread(new Runnable() { ! // public void run() { doDelete(); ! // } ! // }); ! // operationThread.start(); } *************** *** 115,123 **** if(dialog.getReturnCode()==IDialogConstants.YES_ID) { // Display delete progress dialog ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! showProgressDialog(); ! } ! }); // do the deletion --- 124,132 ---- if(dialog.getReturnCode()==IDialogConstants.YES_ID) { // Display delete progress dialog ! // EclipseBroker.getDisplay().syncExec(new Runnable() { ! // public void run() { ! // showProgressDialog(); ! // } ! // }); // do the deletion *************** *** 126,130 **** EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! progressDialog.setVisible(false); } }); --- 135,139 ---- EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! //progressDialog.close(); } }); *************** *** 136,209 **** */ protected void performDeletion() { ! // get the inactive/target panel's current directory ! final FilePanel targetPanel = mediator.getFileTab().getInactiveFilePanel(); ! ! DeleteListener deleteListener = new DeleteListener() { ! public void updateStatus(final FileObject sourceFile, final FileObject targetFile, final long bytesProcessed) { ! ! long currentTime = System.currentTimeMillis(); ! ! FileControlModel model = sourcePanel.getFileControl().getModel(); ! if(model.containsMarking(sourceFile) != null) ! model.removeMarking(sourceFile); ! else ! model.removeHighlightedFile(); ! ! if(bytesProcessed == ProgressListener.OPERATION_START) { ! totalFiles ++; ! } ! if(currentTime - prevTime >= UPDATE_INTERVAL) { ! if(bytesProcessed == ProgressListener.OPERATION_START) { ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! progressDialogComposite.getCurrentFileLabel().setText(sourceFile.getName().getRootURI() + sourceFile.getName().getPath()); ! progressDialogComposite.getTotalProgressBar().setSelection(totalFiles); } ! }); } ! prevTime = currentTime; ! } ! } ! }; ! ! try { ! currentStats = VfsManagerExtension.computeStats(sourceFiles); ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! // init the composite with various statistics ! progressDialogComposite.getTotalProgressBar() ! .setMaximum(currentStats.getFileCount()); } ! }); ! ! totalFiles = 0; ! prevTime = 0; ! ! // do the deletion ! if(!VfsManagerExtension.delete(sourceFiles, deleteListener, moveToRecycle)) { ! MessageDisplayer.setStatusErrorMessage("Could not delete files!"); } ! ! } catch (final FileSystemException ex) { ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! MessageDisplayer.displayException(ex); ! } ! }); } ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! try{ ! sourcePanel.refresh(); ! targetPanel.refresh(); ! } catch(FileSystemException ex) { ! MessageDisplayer.displayException(ex); ! } ! } ! }); } --- 145,322 ---- */ protected void performDeletion() { ! class DeleteJob extends Job{ ! ! private IProgressMonitor jobMonitor; ! ! public DeleteJob() { ! super("Delete"); ! } ! ! protected IStatus run(IProgressMonitor monitor) { ! // final Job thisJob = this; ! // EclipseBroker.getDisplay().syncExec(new Runnable() { ! // public void run() { ! // Workbench.getInstance().getProgressService().showInDialog(EclipseBroker.getShell(), thisJob); ! // } ! // }); ! jobMonitor = monitor; ! // get the inactive/target panel's current directory ! final FilePanel targetPanel = mediator.getFileTab().getInactiveFilePanel(); ! DeleteListener deleteListener = new DeleteListener() { ! public void updateStatus(final FileObject sourceFile, final FileObject targetFile, final long bytesProcessed) { ! ! long currentTime = System.currentTimeMillis(); ! ! FileControlModel model = sourcePanel.getFileControl().getModel(); ! if(model.containsMarking(sourceFile) != null) ! model.removeMarking(sourceFile); ! else ! model.removeHighlightedFile(); ! ! if(bytesProcessed == ProgressListener.OPERATION_START) { ! totalFiles ++; ! } ! ! if(currentTime - prevTime >= UPDATE_INTERVAL) { ! if(bytesProcessed == ProgressListener.OPERATION_START) { ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! jobMonitor.subTask("Deleting "+VfsManagerExtension.getDisplayablePath(sourceFile)); ! jobMonitor.worked(1); ! // progressDialog.getCurrentFileLabel().setText("Deleting "+sourceFile.getName().getRootURI() + sourceFile.getName().getPath()); ! // progressDialog.getTotalProgressBar().setSelection(totalFiles); ! } ! }); } ! ! prevTime = currentTime; ! } } + }; + + try { + currentStats = VfsManagerExtension.computeStats(sourceFiles); + EclipseBroker.getDisplay().syncExec(new Runnable() { + public void run() { + // init the composite with various statistics + jobMonitor.beginTask("Deleting", currentStats.getFileCount()); + //progressDialog.getTotalProgressBar() + // .setMaximum(currentStats.getFileCount()); + } + }); ! totalFiles = 0; ! prevTime = 0; ! // do the deletion ! if(!VfsManagerExtension.delete(sourceFiles, deleteListener, moveToRecycle)) { ! MessageDisplayer.setStatusErrorMessage("Could not delete files!"); ! } ! ! } catch (final FileSystemException ex) { ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! MessageDisplayer.displayException(ex); ! } ! }); } ! ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! try{ ! sourcePanel.refresh(); ! targetPanel.refresh(); ! } catch(FileSystemException ex) { ! MessageDisplayer.displayException(ex); ! } ! } ! ! }); ! ! return Status.OK_STATUS; } ! ! } ! DeleteJob deleteJob = new DeleteJob(); ! deleteJob.setUser(true); //this makes the Job opening in a dialog. ! deleteJob.schedule(); ! ! //PlatformUI.getWorkbench().getProgressService(); ! //PlatformUI.getWorkbench().get ! ! // // get the inactive/target panel's current directory ! // final FilePanel targetPanel = mediator.getFileTab().getInactiveFilePanel(); ! // ! // DeleteListener deleteListener = new DeleteListener() { ! // public void updateStatus(final FileObject sourceFile, final FileObject targetFile, final long bytesProcessed) { ! // ! // long currentTime = System.currentTimeMillis(); ! // ! // FileControlModel model = sourcePanel.getFileControl().getModel(); ! // if(model.containsMarking(sourceFile) != null) ! // model.removeMarking(sourceFile); ! // else ! // model.removeHighlightedFile(); ! // ! // if(bytesProcessed == ProgressListener.OPERATION_START) { ! // totalFiles ++; ! // } ! // ! // if(currentTime - prevTime >= UPDATE_INTERVAL) { ! // if(bytesProcessed == ProgressListener.OPERATION_START) { ! // EclipseBroker.getDisplay().syncExec(new Runnable() { ! // public void run() { ! // progressDialog.getCurrentFileLabel().setText("Deleting "+sourceFile.getName().getRootURI() + sourceFile.getName().getPath()); ! // progressDialog.getTotalProgressBar().setSelection(totalFiles); ! // } ! // }); ! // } ! // ! // prevTime = currentTime; ! // } ! // } ! // }; ! // ! // try { ! // currentStats = VfsManagerExtension.computeStats(sourceFiles); ! // EclipseBroker.getDisplay().syncExec(new Runnable() { ! // public void run() { ! // // init the composite with various statistics ! // ! // progressDialog.getTotalProgressBar() ! // .setMaximum(currentStats.getFileCount()); ! // } ! // }); ! // ! // totalFiles = 0; ! // prevTime = 0; ! // ! // // do the deletion ! // if(!VfsManagerExtension.delete(sourceFiles, deleteListener, moveToRecycle)) { ! // MessageDisplayer.setStatusErrorMessage("Could not delete files!"); ! // } ! // ! // } catch (final FileSystemException ex) { ! // EclipseBroker.getDisplay().syncExec(new Runnable() { ! // public void run() { ! // MessageDisplayer.displayException(ex); ! // } ! // }); ! // } ! // ! // EclipseBroker.getDisplay().syncExec(new Runnable() { ! // public void run() { ! // try{ ! // sourcePanel.refresh(); ! // targetPanel.refresh(); ! // } catch(FileSystemException ex) { ! // MessageDisplayer.displayException(ex); ! // } ! // } ! // ! // }); } *************** *** 214,250 **** Shell shell = EclipseBroker.getShell(); ! progressDialog = Utils.createOperationDialog(shell, mediator); ! progressDialogComposite = new DeleteProgressDialogComposite(progressDialog, SWT.NONE); ! ! progressDialog.setDefaultButton(progressDialogComposite.getPauseButton()); ! progressDialogComposite.getAbortButton().addSelectionListener(new SelectionAdapter() { ! public void widgetSelected(SelectionEvent e) { ! /*resumeOperationThread = true; ! selectedOption = OK_OPTION; ! ! synchronized (workerLock) { ! workerLock.notifyAll(); ! }*/ ! } ! }); ! progressDialogComposite.getPauseButton().addSelectionListener(new SelectionAdapter() { ! public void widgetSelected(SelectionEvent e) { ! /*resumeOperationThread = true; ! selectedOption = CANCEL_OPTION; ! ! synchronized (workerLock) { ! workerLock.notifyAll(); ! }*/ ! } ! }); ! Utils.accomodateComposite(progressDialogComposite); ! progressDialog.pack(); ! WindowUtils.centerRelativeTo(progressDialog, shell); ! progressDialog.setVisible(true); ! progressDialog.setActive(); } --- 327,368 ---- Shell shell = EclipseBroker.getShell(); ! progressDialog = new DeleteProgressDialog(shell); ! progressDialog.setBlockOnOpen(false); ! progressDialog.create(); ! // progressDialog = Utils.createOperationDialog(shell, mediator); ! // progressDialogComposite = new DeleteProgressDialogComposite(progressDialog, SWT.NONE); ! // ! // progressDialog.setDefaultButton(progressDialogComposite.getPauseButton()); ! // ! // progressDialogComposite.getAbortButton().addSelectionListener(new SelectionAdapter() { ! // public void widgetSelected(SelectionEvent e) { ! // /*resumeOperationThread = true; ! // selectedOption = OK_OPTION; ! // ! // synchronized (workerLock) { ! // workerLock.notifyAll(); ! // }*/ ! // } ! // }); ! // progressDialogComposite.getPauseButton().addSelectionListener(new SelectionAdapter() { ! // public void widgetSelected(SelectionEvent e) { ! // /*resumeOperationThread = true; ! // selectedOption = CANCEL_OPTION; ! // ! // synchronized (workerLock) { ! // workerLock.notifyAll(); ! // }*/ ! // } ! // }); ! // Utils.accomodateComposite(progressDialogComposite); ! // progressDialog.pack(); ! // WindowUtils.centerRelativeTo(progressDialog, shell); ! // progressDialog.setVisible(true); ! // progressDialog.setActive(); ! progressDialog.open(); } |
