*** empty log message ***

2 files changed, 17 insertions, 214 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
index 39b1bc2e3..793a30fc5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
@@ -102,7 +102,7 @@ public class SharingWizard extends Wizard implements IConfigurationWizard {
 				modulePage.setDescription(Policy.bind("SharingWizard.enterModuleNameDescription")); //$NON-NLS-1$
 				addPage(modulePage);
 				WorkspaceSynchronizeParticipant p = (WorkspaceSynchronizeParticipant)TeamUI.getSynchronizeManager().find(WorkspaceSynchronizeParticipant.ID)[0];
-				finishPage = new SharingWizardFinishPage("finishPage", Policy.bind("SharingWizard.readyToFinish"), p, sharingImage); //$NON-NLS-1$ //$NON-NLS-2$
+				finishPage = new SharingWizardFinishPage("finishPage", Policy.bind("SharingWizard.readyToFinish"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$
 				finishPage.setDescription(Policy.bind("SharingWizard.readyToFinishDescription")); //$NON-NLS-1$
 				addPage(finishPage);
 			}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java
index 247a49996..269f3ab74 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java
@@ -11,231 +11,34 @@
 package org.eclipse.team.internal.ccvs.ui.wizards;
 
 
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.compare.CompareConfiguration;
-import org.eclipse.compare.CompareEditorInput;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.*;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.team.core.TeamException;
-import org.eclipse.team.core.subscribers.SyncInfo;
-import org.eclipse.team.internal.ccvs.ui.subscriber.WorkspaceSynchronizeParticipant;
-import org.eclipse.team.internal.ui.widgets.*;
-import org.eclipse.team.ui.synchronize.*;
-import org.eclipse.ui.part.PageBook;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.team.internal.ccvs.ui.IHelpContextIds;
+import org.eclipse.team.internal.ccvs.ui.Policy;
+import org.eclipse.ui.help.WorkbenchHelp;
 
 public class SharingWizardFinishPage extends CVSWizardPage {
-	private WorkspaceSynchronizeParticipant participant;
-
-	private static class SyncInfoCompareEditorInput extends CompareEditorInput {
-		private TeamSubscriberParticipant participant2;
-
-		/**
-		 * @param configuration
-		 */
-		public SyncInfoCompareEditorInput(CompareConfiguration configuration, TeamSubscriberParticipant participant) {
-			super(configuration);
-			participant2 = participant;
-		}
-
-		public Viewer createDiffViewer(Composite parent) {
-			SyncInfoDiffTreeViewer v =  new SyncInfoDiffTreeViewer(parent, participant2, participant2.getInput().getFilteredSyncSet());
-			v.updateCompareEditorInput(this);
-			return v;
-		}
-
-		protected Object prepareInput(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-			return new SyncInfoDiffNode(participant2.getInput().getFilteredSyncSet(), ResourcesPlugin.getWorkspace().getRoot());
-		}
-	};
-	
-	public SharingWizardFinishPage(String pageName, String title, WorkspaceSynchronizeParticipant participant, ImageDescriptor titleImage) {
+	public SharingWizardFinishPage(String pageName, String title, ImageDescriptor titleImage) {
 		super(pageName, title, titleImage);
-		this.participant = participant;
 	}
 
 	/*
 	 * @see IDialogPage#createControl(Composite)
 	 */
 	public void createControl(Composite parent) {
-//		Composite composite = createComposite(parent, 1);
-//		// set F1 help
-//		WorkbenchHelp.setHelp(composite, IHelpContextIds.SHARING_FINISH_PAGE);
-//		Label label = new Label(composite, SWT.LEFT | SWT.WRAP);
-//		label.setText(Policy.bind("SharingWizardFinishPage.message")); //$NON-NLS-1$
-//		GridData data = new GridData();
-//		data.widthHint = 350;
-//		label.setLayoutData(data);
-//		setControl(composite);
-//        Dialog.applyDialogFont(parent);
-		
-		setControl(createFullCompareControl(parent));
-		
-		
-	}
-	
-	private static class NullPreviewer implements IChangePreviewViewer {
-		private Label fLabel;
-		public void createControl(Composite parent) {
-			fLabel= new Label(parent, SWT.CENTER | SWT.FLAT);
-			fLabel.setText("No preview available"); //$NON-NLS-1$
-		}
-		public void refresh() {
-		}
-		public Control getControl() {
-			return fLabel;
-		}
-		public void setInput(Object input) throws CoreException {
-		}
-	}
-	
-	public Composite createFullCompareControl(Composite parent) {
-		CompareEditorInput input = new SyncInfoCompareEditorInput(new CompareConfiguration(), participant);
-		try {
-			input.run(new NullProgressMonitor());
-		} catch (InterruptedException e) {
-		} catch (InvocationTargetException e) {
-		}
-		
-		Composite result= new Composite(parent, SWT.NONE);
-		GridLayout layout= new GridLayout();
-		layout.marginHeight= 0; layout.marginWidth= 0;
-		result.setLayout(layout);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.grabExcessHorizontalSpace = true;
-		data.grabExcessVerticalSpace = true;
-		result.setLayoutData(data);
-		
-		Control c = input.createContents(result);
-		c.setLayoutData(new GridData(GridData.FILL_BOTH));
-		return result;
-	}
-	
-	private PageBook fPreviewContainer;
-	private IChangePreviewViewer fNullPreviewer;
-	private IChangePreviewViewer fChangePreviewViewer;
-	private IChangePreviewViewer fCurrentPreviewViewer;
-	private Viewer fTreeViewer;
-	private SyncInfoDiffNode fCurrentSelection = null;
-	
-	public Composite createCoolControl(Composite parent) {
-		Composite result= new Composite(parent, SWT.NONE);
-		GridLayout layout= new GridLayout();
-		layout.marginHeight= 0; layout.marginWidth= 0;
-		result.setLayout(layout);
-		
-		SashForm sashForm= new SashForm(result, SWT.VERTICAL);
-		
-		ViewerPane pane= new ViewerPane(sashForm, SWT.BORDER | SWT.FLAT);
-		pane.setText("Synchronize Changes"); //$NON-NLS-1$
-		ToolBarManager tbm= pane.getToolBarManager();
-		//tbm.add(new NextChange());
-		//tbm.add(new PreviousChange());
-		//tbm.update(true);
-		
-		fTreeViewer= createTreeViewer(pane);
-		//fTreeViewer.setContentProvider(createTreeContentProvider());
-		//fTreeViewer.setLabelProvider(createTreeLabelProvider());
-		fTreeViewer.addSelectionChangedListener(createSelectionChangedListener());
-		//fTreeViewer.addCheckStateListener(createCheckStateListener());
-		pane.setContent(fTreeViewer.getControl());
-		//setTreeViewerInput();
-		
-		fPreviewContainer= new PageBook(sashForm, SWT.NONE);
-		fNullPreviewer= new NullPreviewer();
-		fNullPreviewer.createControl(fPreviewContainer);
-		fPreviewContainer.showPage(fNullPreviewer.getControl());
-		fCurrentPreviewViewer= fNullPreviewer;
-		
-		sashForm.setWeights(new int[]{33, 67});
-		GridData gd= new GridData(GridData.FILL_BOTH);
-		gd.widthHint= convertWidthInCharsToPixels(80);
-		sashForm.setLayoutData(gd);
-		Dialog.applyDialogFont(result);
-		
-		fChangePreviewViewer = new TextChangePreviewViewer();
-		fChangePreviewViewer.createControl(fPreviewContainer);
-		
-		return result;
-	}
-
-	/**
-	 * @param pane
-	 * @return
-	 */
-	private Viewer createTreeViewer(ViewerPane pane) {
-		Viewer viewer =  new SyncInfoDiffTreeViewer(pane, this.participant, participant.getInput().getFilteredSyncSet());
-		return viewer; 
-	}
-	
-	private ISelectionChangedListener createSelectionChangedListener() {
-		return new ISelectionChangedListener(){
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection sel= (IStructuredSelection) event.getSelection();
-				if (sel.size() == 1) {
-					SyncInfoDiffNode newSelection= (SyncInfoDiffNode)sel.getFirstElement();
-					if (newSelection != fCurrentSelection) {
-						fCurrentSelection= newSelection;
-						SyncInfo info = fCurrentSelection.getSyncInfo();						
-						if(info != null && info.getLocal().getType() == IResource.FILE) {
-							fetchContents(fCurrentSelection);
-							showPreview(fCurrentSelection);
-						} else {
-							showPreview(null);
-						}
-					}
-				} else {
-					showPreview(null);
-				}
-			}
-		};
-	}
-
-	private void fetchContents(final SyncInfoDiffNode node) {
-		try {
-			getContainer().run(true, true, new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						node.cacheContents(monitor);
-					} catch (TeamException e) {
-						throw new InvocationTargetException(e);
-					}
-				}
-			});
-		} catch (InvocationTargetException e) {
-			// TODO Auto-generated catch block
-		} catch (InterruptedException e) {
-			// TODO Auto-generated catch block
-		}
-	}
-	
-	private void showPreview(Object element) {
-		if (element == null) {
-			showNullPreviewer();
-		} else {
-			try {
-				fCurrentPreviewViewer = fChangePreviewViewer;
-				fCurrentPreviewViewer.setInput(element);
-			} catch (CoreException e) {
-				showNullPreviewer();
-			}
-			fPreviewContainer.showPage(fCurrentPreviewViewer.getControl());
-		}
-	}
-	
-	private void showNullPreviewer() {
-		fCurrentPreviewViewer= fNullPreviewer;
-		fPreviewContainer.showPage(fCurrentPreviewViewer.getControl());
+		Composite composite = createComposite(parent, 1);
+		// set F1 help
+		WorkbenchHelp.setHelp(composite, IHelpContextIds.SHARING_FINISH_PAGE);
+		Label label = new Label(composite, SWT.LEFT | SWT.WRAP);
+		label.setText(Policy.bind("SharingWizardFinishPage.message")); //$NON-NLS-1$
+		GridData data = new GridData();
+		data.widthHint = 350;
+		label.setLayoutData(data);
+		setControl(composite);
+        Dialog.applyDialogFont(parent);
 	}
 }