1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
/*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.wizards;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.internal.resources.mapping.ResourceMapping;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.team.internal.ccvs.core.CVSMergeSubscriber;
import org.eclipse.team.internal.ccvs.core.CVSTag;
import org.eclipse.team.internal.ccvs.core.client.Command;
import org.eclipse.team.internal.ccvs.core.client.Update;
import org.eclipse.team.internal.ccvs.ui.*;
import org.eclipse.team.internal.ccvs.ui.actions.WorkspaceTraversalAction;
import org.eclipse.team.internal.ccvs.ui.operations.UpdateOperation;
import org.eclipse.team.internal.ccvs.ui.subscriber.MergeSynchronizeParticipant;
import org.eclipse.team.internal.ccvs.ui.tags.TagSource;
import org.eclipse.team.ui.TeamUI;
import org.eclipse.team.ui.synchronize.ISynchronizeParticipant;
import org.eclipse.ui.IWorkbenchPart;
public class MergeWizard extends Wizard {
MergeWizardPage page;
IResource[] resources;
private final IWorkbenchPart part;
private final ResourceMapping[] mappings;
public MergeWizard(IWorkbenchPart part, IResource[] resources, ResourceMapping[] mappings) {
this.part = part;
this.resources = resources;
this.mappings = mappings;
}
public void addPages() {
setNeedsProgressMonitor(true);
TagSource tagSource = TagSource.create(resources);
setWindowTitle(CVSUIMessages.MergeWizard_title); //$NON-NLS-1$
ImageDescriptor mergeImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_MERGE);
page = new MergeWizardPage("mergePage", CVSUIMessages.MergeWizard_0, mergeImage, CVSUIMessages.MergeWizard_1, tagSource); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
addPage(page);
}
/*
* @see IWizard#performFinish()
*/
public boolean performFinish() {
CVSTag startTag = page.getStartTag();
CVSTag endTag = page.getEndTag();
if (startTag == null || !page.isPreview()) {
// Perform the update (merge) in the background
UpdateOperation op = new UpdateOperation(getPart(), mappings, getLocalOptions(startTag, endTag), null);
try {
op.run();
} catch (InvocationTargetException e) {
CVSUIPlugin.openError(getShell(), null, null, e);
} catch (InterruptedException e) {
// Ignore
}
} else {
// First check if there is an existing matching participant, if so then re-use it
try {
resources = getAllResources(startTag, endTag);
} catch (InvocationTargetException e) {
// Log and continue with the original resources
CVSUIPlugin.log(IStatus.ERROR, "An error occurred while detemrining if extra resources should be included in the merge", e.getTargetException()); //$NON-NLS-1$
}
MergeSynchronizeParticipant participant = MergeSynchronizeParticipant.getMatchingParticipant(resources, startTag, endTag);
if(participant == null) {
CVSMergeSubscriber s = new CVSMergeSubscriber(resources, startTag, endTag);
participant = new MergeSynchronizeParticipant(s);
TeamUI.getSynchronizeManager().addSynchronizeParticipants(new ISynchronizeParticipant[] {participant});
}
participant.refresh(resources, null, null, null);
}
return true;
}
private IResource[] getAllResources(CVSTag startTag, CVSTag endTag) throws InvocationTargetException {
// Only do the extra work if the model is a logical model (i.e. not IResource)
if (!WorkspaceTraversalAction.isLogicalModel(mappings))
return resources;
CVSMergeSubscriber s = new CVSMergeSubscriber(WorkspaceTraversalAction.getProjects(resources), startTag, endTag);
IResource[] allResources = WorkspaceTraversalAction.getResourcesToCompare(mappings, s);
s.cancel();
return allResources;
}
private Command.LocalOption[] getLocalOptions(CVSTag startTag, CVSTag endTag) {
List options = new ArrayList();
if (startTag != null) {
options.add(Command.makeArgumentOption(Update.JOIN, startTag.getName()));
}
options.add(Command.makeArgumentOption(Update.JOIN, endTag.getName()));
return (Command.LocalOption[]) options.toArray(new Command.LocalOption[options.size()]);
}
private IWorkbenchPart getPart() {
return part;
}
}
|
