|
From: Matthias K <mat...@us...> - 2006-04-17 14:54:05
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10682/src/org/jcommander/ui/filepanel/performers Modified Files: FileCopyPerformer.java FileDeletePerformer.java Log Message: - made CopyConfirmDialogComposite subclass of CustomConfirmDialogComposite - a lot of refractorings to make variable names more selfexplaining - title text for DeleteConfirmDialog Index: FileCopyPerformer.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileCopyPerformer.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** FileCopyPerformer.java 28 Mar 2006 08:45:39 -0000 1.31 --- FileCopyPerformer.java 17 Apr 2006 14:53:59 -0000 1.32 *************** *** 486,490 **** } ! confirmDialog.setDefaultButton(confirmDialogComposite.getOkButton()); confirmDialog.addShellListener(new ShellAdapter() { public void shellClosed(ShellEvent e) { --- 486,490 ---- } ! confirmDialog.setDefaultButton(confirmDialogComposite.getYesButton()); confirmDialog.addShellListener(new ShellAdapter() { public void shellClosed(ShellEvent e) { *************** *** 493,497 **** }); ! confirmDialogComposite.getOkButton().addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { keepSelected = confirmDialogComposite.isKeptSelected(); --- 493,497 ---- }); ! confirmDialogComposite.getYesButton().addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { keepSelected = confirmDialogComposite.isKeptSelected(); *************** *** 507,511 **** confirmDialogComposite.selectDeleteCheckBox(deleteSourceFiles); ! confirmDialogComposite.getCancelButton().addSelectionListener(cancelButtonSelectionAdapter); Utils.accomodateComposite(confirmDialogComposite); --- 507,511 ---- confirmDialogComposite.selectDeleteCheckBox(deleteSourceFiles); ! confirmDialogComposite.getNoButton().addSelectionListener(cancelButtonSelectionAdapter); Utils.accomodateComposite(confirmDialogComposite); *************** *** 524,528 **** .getCurrentParent(); ! confirmDialogComposite.getCopyTarget().setText(targetDir.getName().getRootURI() + targetDir.getName().getPath()); if(predefinedSourceFiles != null) { --- 524,529 ---- .getCurrentParent(); ! //confirmDialogComposite.getCopyTarget().setText(targetDir.getName().getRootURI() + targetDir.getName().getPath()); ! confirmDialogComposite.setCopyTarget(targetDir.getName().getRootURI() + targetDir.getName().getPath()); if(predefinedSourceFiles != null) { Index: FileDeletePerformer.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileDeletePerformer.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** FileDeletePerformer.java 29 Dec 2005 15:07:39 -0000 1.16 --- FileDeletePerformer.java 17 Apr 2006 14:53:59 -0000 1.17 *************** *** 291,294 **** --- 291,295 ---- confirmDialog = Utils.createOperationDialog(shell, mediator); + confirmDialog.setText("Delete files"); confirmDialogComposite = new DeleteConfirmDialogComposite(confirmDialog, SWT.NONE); |