[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers FileCopyPerformer.java, 1.37, 1.38 UiCopyListener.java, 1.12, 1.13

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

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

Modified Files:
	FileCopyPerformer.java UiCopyListener.java 
Log Message:
-New CopyProgressDialog. Less important things moved to the details.
-A lot of renaming (lots of GridDatas and GridLayouts)

Index: UiCopyListener.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/UiCopyListener.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** UiCopyListener.java	30 Apr 2006 13:10:55 -0000	1.12
--- UiCopyListener.java	3 Jul 2006 22:10:10 -0000	1.13
***************
*** 47,52 ****
  		EclipseBroker.getDisplay().syncExec(new Runnable() {
  			public void run() {
! 				guiForceSkip = performer.getProgressDialogComposite().getOverwirteSkipRadio().getSelection();
! 				guiForceOverwrite = performer.getProgressDialogComposite().getOverwriteProceedRadio().getSelection();
  			}
  		});
--- 47,52 ----
  		EclipseBroker.getDisplay().syncExec(new Runnable() {
  			public void run() {
! 				guiForceSkip = performer.getProgressDialogComposite().isOverwriteSkip();
! 				guiForceOverwrite = performer.getProgressDialogComposite().isOverwriteProceed();
  			}
  		});
***************
*** 110,129 ****
  						if(source.getType() == FileType.FOLDER) {
  							// No exact computation possible in the current architecture
! 							progressComposite.getTotalDirsLabel().setText(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.getTotalFilesLabel().setText(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.getTotalSizeLabel().setText(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.getAvgSpeedLabel().setText(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.getPercentDoneLabel().setText(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.getRemainingTimeLabel().setText(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
  						} else {
  							// totalfiles --
! 							if(!progressComposite.getTotalFilesLabel().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)) {
! 								progressComposite.getTotalFilesLabel().setText(
! 									Integer.toString(Integer.parseInt(progressComposite.getTotalFilesLabel().getText()) - 1));
  							}
  							
  							// decrease total size
! 							if(!progressComposite.getTotalSizeLabel().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)) {
! 								progressComposite.getTotalSizeLabel().setText(
  									FormatUtils.getFullyFormattedSize(
  											UiCopyListener.this.performer.currentStats.getTotalSize() - source.getContent().getSize()));
--- 110,129 ----
  						if(source.getType() == FileType.FOLDER) {
  							// No exact computation possible in the current architecture
! 							progressComposite.setTotalDirs(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.setTotalFiles(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.setTotalSize(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.setAvgSpeed(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.setPercentDone(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
! 							progressComposite.setRemainingTime(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL);
  						} else {
  							// totalfiles --
! 							if(!progressComposite.getTotalFiles().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)) {
! 								progressComposite.setTotalFiles(
! 									Integer.toString(Integer.parseInt(progressComposite.getTotalFiles()) - 1));
  							}
  							
  							// decrease total size
! 							if(!progressComposite.getTotalSize().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)) {
! 								progressComposite.setTotalSize(
  									FormatUtils.getFullyFormattedSize(
  											UiCopyListener.this.performer.currentStats.getTotalSize() - source.getContent().getSize()));
***************
*** 195,212 ****
  					CopyProgressDialogComposite progressComposite = UiCopyListener.this.performer.progressDialogComposite;
  					
! 					if(!progressComposite.getPercentDoneLabel().getText().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)){
! 						progressComposite.getPercentDoneLabel()
! 										.setText(FormatUtils.getPercent(UiCopyListener.this.performer.totalCopiedSize, UiCopyListener.this.performer.currentStats.getTotalSize()));
  					}
  					
! 					progressComposite.getSizeDoneLabel()
! 									.setText(FormatUtils.getFullyFormattedSize(UiCopyListener.this.performer.totalCopiedSize));
  					
  					long elapsedTime = System.currentTimeMillis() - UiCopyListener.this.performer.operationStartTime;
  					
! 					progressComposite.getElapsedTimeLabel().setText(FormatUtils.formatTime(elapsedTime));
  					
! 					if(!progressComposite.getAvgSpeedLabel().getText().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)){
! 						progressComposite.getAvgSpeedLabel().setText(FormatUtils.formatTransferSpeed(UiCopyListener.this.performer.totalCopiedSize, elapsedTime));
  					}
  					
--- 195,210 ----
  					CopyProgressDialogComposite progressComposite = UiCopyListener.this.performer.progressDialogComposite;
  					
! 					if(!progressComposite.getPercentDone().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)){
! 						progressComposite.setPercentDone(FormatUtils.getPercent(UiCopyListener.this.performer.totalCopiedSize, UiCopyListener.this.performer.currentStats.getTotalSize()));
  					}
  					
! 					progressComposite.setSizeDone(FormatUtils.getFullyFormattedSize(UiCopyListener.this.performer.totalCopiedSize));
  					
  					long elapsedTime = System.currentTimeMillis() - UiCopyListener.this.performer.operationStartTime;
  					
! 					progressComposite.setElapsedTime(FormatUtils.formatTime(elapsedTime));
  					
! 					if(!progressComposite.getAvgSpeed().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)){
! 						progressComposite.setAvgSpeed(FormatUtils.formatTransferSpeed(UiCopyListener.this.performer.totalCopiedSize, elapsedTime));
  					}
  					
***************
*** 216,221 ****
  						UiCopyListener.this.performer.totalCopiedSize;
  						
! 						if(!progressComposite.getRemainingTimeLabel().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)){
! 							progressComposite.getRemainingTimeLabel().setText(FormatUtils.formatTime(remainingTime));
  						}
  					}
--- 214,219 ----
  						UiCopyListener.this.performer.totalCopiedSize;
  						
! 						if(!progressComposite.getRemainingTime().equals(CopyProgressDialogComposite.NOT_AVAILABLE_LABEL)){
! 							progressComposite.setRemainingTime(FormatUtils.formatTime(remainingTime));
  						}
  					}

Index: FileCopyPerformer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileCopyPerformer.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** FileCopyPerformer.java	17 May 2006 11:19:47 -0000	1.37
--- FileCopyPerformer.java	3 Jul 2006 22:10:10 -0000	1.38
***************
*** 169,173 ****
  				EclipseBroker.getDisplay().syncExec(new Runnable() {
  					public void run() {
! 						if(!progressDialogComposite.getKeepOpenCheckBox().getSelection()) {
  							progressDialog.setVisible(false);
  						}
--- 169,173 ----
  				EclipseBroker.getDisplay().syncExec(new Runnable() {
  					public void run() {
! 						if(!progressDialogComposite.isKeepOpen()) {
  							progressDialog.setVisible(false);
  						}
***************
*** 181,188 ****
  						progressDialogComposite.getTotalProgressBar()
  									.setSelection(progressDialogComposite.getTotalProgressBar().getMaximum());
! 						progressDialogComposite.getPercentDoneLabel().setText("100%");
  						
! 						progressDialogComposite.getPercentDoneLabel()
! 									.setBackground(progressDialogComposite.getDisplay().getSystemColor(SWT.COLOR_GREEN));
  						progressDialogComposite.getPauseButton().setEnabled(false);
  						progressDialogComposite.getAbortButton().setEnabled(false);
--- 181,187 ----
  						progressDialogComposite.getTotalProgressBar()
  									.setSelection(progressDialogComposite.getTotalProgressBar().getMaximum());
! 						progressDialogComposite.setPercentDone("100%");
  						
! 						progressDialogComposite.setPercentDoneColor(progressDialogComposite.getDisplay().getSystemColor(SWT.COLOR_GREEN));
  						progressDialogComposite.getPauseButton().setEnabled(false);
  						progressDialogComposite.getAbortButton().setEnabled(false);
***************
*** 307,316 ****
  					progressDialogComposite.getTotalProgressBar()
  								.setMaximum((int)currentStats.getTotalSize());
! 					progressDialogComposite.getTotalSizeLabel()
! 								.setText(FormatUtils.getFullyFormattedSize(currentStats.getTotalSize()));
! 					progressDialogComposite.getTotalDirsLabel()
! 								.setText(FormatUtils.getFormattedNumber(currentStats.getDirectoryCount()));
! 					progressDialogComposite.getTotalFilesLabel()
! 								.setText(FormatUtils.getFormattedNumber(currentStats.getFileCount()));
  				}
  			});
--- 306,312 ----
  					progressDialogComposite.getTotalProgressBar()
  								.setMaximum((int)currentStats.getTotalSize());
! 					progressDialogComposite.setTotalSize(FormatUtils.getFullyFormattedSize(currentStats.getTotalSize()));
! 					progressDialogComposite.setTotalDirs(FormatUtils.getFormattedNumber(currentStats.getDirectoryCount()));
! 					progressDialogComposite.setTotalFiles(FormatUtils.getFormattedNumber(currentStats.getFileCount()));
  				}
  			});