[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers FileCopyPerformer.java,1.32,1.33

[Matthias K <mat...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23213/src/org/jcommander/ui/filepanel/performers

Modified Files:
	FileCopyPerformer.java 
Log Message:
- Added support for different Buttons in CustomConfirmDialogComposite: Yes/No and Ok/Cancel
- Text in CopyConfirmDialogComposite depends of whether one is moving or copying.

Index: FileCopyPerformer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileCopyPerformer.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** FileCopyPerformer.java	17 Apr 2006 14:53:59 -0000	1.32
--- FileCopyPerformer.java	17 Apr 2006 17:58:31 -0000	1.33
***************
*** 486,490 ****
  		}
  		
! 		confirmDialog.setDefaultButton(confirmDialogComposite.getYesButton());
  		confirmDialog.addShellListener(new ShellAdapter() {
  			public void shellClosed(ShellEvent e) {
--- 486,490 ----
  		}
  		
! 		confirmDialog.setDefaultButton(confirmDialogComposite.getOkButton());
  		confirmDialog.addShellListener(new ShellAdapter() {
  			public void shellClosed(ShellEvent e) {
***************
*** 493,497 ****
  		});
  		
! 		confirmDialogComposite.getYesButton().addSelectionListener(new SelectionAdapter() {
  			public void widgetSelected(SelectionEvent e) {
  				keepSelected = confirmDialogComposite.isKeptSelected();
--- 493,497 ----
  		});
  		
! 		confirmDialogComposite.getOkButton().addSelectionListener(new SelectionAdapter() {
  			public void widgetSelected(SelectionEvent e) {
  				keepSelected = confirmDialogComposite.isKeptSelected();
***************
*** 507,511 ****
  		confirmDialogComposite.selectDeleteCheckBox(deleteSourceFiles);
  		
! 		confirmDialogComposite.getNoButton().addSelectionListener(cancelButtonSelectionAdapter);
  		
  		Utils.accomodateComposite(confirmDialogComposite);
--- 507,511 ----
  		confirmDialogComposite.selectDeleteCheckBox(deleteSourceFiles);
  		
! 		confirmDialogComposite.getCancelButton().addSelectionListener(cancelButtonSelectionAdapter);
  		
  		Utils.accomodateComposite(confirmDialogComposite);
***************
*** 532,536 ****
  		}
  		
! 		confirmDialog.setText("Confirm Copy Operation");
  		WindowUtils.pack(confirmDialog);
  		WindowUtils.centerRelativeTo(confirmDialog, shell);
--- 532,539 ----
  		}
  		
! 		if (deleteSourceFiles) {
! 			confirmDialog.setText("Confirm Move Operation");
! 		} 
! 		else confirmDialog.setText("Confirm Copy Operation");
  		WindowUtils.pack(confirmDialog);
  		WindowUtils.centerRelativeTo(confirmDialog, shell);