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
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
|
package org.eclipse.team.internal.ccvs.ui.sync;
/*
* (c) Copyright IBM Corp. 2000, 2002.
* All Rights Reserved.
*/
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.sync.IRemoteResource;
import org.eclipse.team.core.sync.IRemoteSyncElement;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.core.CVSTag;
import org.eclipse.team.internal.ccvs.core.ICVSFile;
import org.eclipse.team.internal.ccvs.core.ICVSFolder;
import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile;
import org.eclipse.team.internal.ccvs.core.ILogEntry;
import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
import org.eclipse.team.internal.ccvs.ui.HistoryView;
import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
import org.eclipse.team.internal.ccvs.ui.OverlayIcon;
import org.eclipse.team.internal.ccvs.ui.OverlayIconCache;
import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.internal.ccvs.ui.merge.OverrideUpdateMergeAction;
import org.eclipse.team.internal.ccvs.ui.merge.UpdateMergeAction;
import org.eclipse.team.internal.ccvs.ui.merge.UpdateWithForcedJoinAction;
import org.eclipse.team.ui.sync.CatchupReleaseViewer;
import org.eclipse.team.ui.sync.ITeamNode;
import org.eclipse.team.ui.sync.MergeResource;
import org.eclipse.team.ui.sync.SyncView;
import org.eclipse.team.ui.sync.TeamFile;
public class CVSCatchupReleaseViewer extends CatchupReleaseViewer {
// Actions
private UpdateSyncAction updateAction;
private ForceUpdateSyncAction forceUpdateAction;
private CommitSyncAction commitAction;
private ForceCommitSyncAction forceCommitAction;
private UpdateMergeAction updateMergeAction;
private UpdateWithForcedJoinAction updateWithJoinAction;
private IgnoreAction ignoreAction;
private HistoryAction showInHistory;
private OverrideUpdateMergeAction forceUpdateMergeAction;
private static class DiffOverlayIcon extends OverlayIcon {
private static final int HEIGHT = 16;
private static final int WIDTH = 22;
public DiffOverlayIcon(Image baseImage, ImageDescriptor overlay) {
super(baseImage, new ImageDescriptor[] { overlay }, new Point(WIDTH, HEIGHT));
}
protected void drawOverlays(ImageDescriptor[] overlays) {
ImageDescriptor overlay = overlays[0];
ImageData overlayData = overlay.getImageData();
drawImage(overlayData, WIDTH - overlayData.width, (HEIGHT - overlayData.height) / 2);
}
}
private static class HistoryAction extends Action implements ISelectionChangedListener {
IStructuredSelection selection;
public HistoryAction(String label) {
super(label);
}
public void run() {
if (selection.isEmpty()) {
return;
}
HistoryView view = HistoryView.openInActivePerspective();
if (view == null) {
return;
}
ITeamNode node = (ITeamNode)selection.getFirstElement();
IRemoteSyncElement remoteSyncElement = ((TeamFile)node).getMergeResource().getSyncElement();
ICVSRemoteFile remoteFile = (ICVSRemoteFile)remoteSyncElement.getRemote();
IResource local = remoteSyncElement.getLocal();
ICVSRemoteFile baseFile = (ICVSRemoteFile)remoteSyncElement.getBase();
// can only show history if remote exists or local has a base.
String currentRevision = null;
try {
currentRevision = baseFile!=null ? baseFile.getRevision(): null;
} catch(TeamException e) {
CVSUIPlugin.log(e.getStatus());
}
if(remoteFile!=null) {
view.showHistory(remoteFile, currentRevision);
} else if(baseFile!=null) {
view.showHistory(baseFile, currentRevision);
}
}
public void selectionChanged(SelectionChangedEvent event) {
ISelection selection = event.getSelection();
if (!(selection instanceof IStructuredSelection)) {
setEnabled(false);
return;
}
IStructuredSelection ss = (IStructuredSelection)selection;
if (ss.size() != 1) {
setEnabled(false);
return;
}
ITeamNode first = (ITeamNode)ss.getFirstElement();
if (first instanceof TeamFile) {
// can only show history on elements that have a remote file
this.selection = ss;
IRemoteSyncElement remoteSyncElement = ((TeamFile)first).getMergeResource().getSyncElement();
if(remoteSyncElement.getRemote() != null || remoteSyncElement.getBase() != null) {
setEnabled(true);
} else {
setEnabled(false);
}
} else {
this.selection = null;
setEnabled(false);
}
}
}
public CVSCatchupReleaseViewer(Composite parent, CVSSyncCompareInput model) {
super(parent, model);
initializeActions(model);
initializeLabelProvider();
}
private void initializeLabelProvider() {
final ImageDescriptor conflictDescriptor = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_MERGEABLE_CONFLICT);
final ImageDescriptor questionableDescriptor = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_QUESTIONABLE);
final LabelProvider oldProvider = (LabelProvider)getLabelProvider();
setLabelProvider(new LabelProvider() {
private OverlayIconCache iconCache = new OverlayIconCache();
public void dispose() {
iconCache.disposeAll();
oldProvider.dispose();
}
public Image getImage(Object element) {
Image image = oldProvider.getImage(element);
if (element instanceof ITeamNode) {
ITeamNode node = (ITeamNode)element;
int kind = node.getKind();
if ((kind & IRemoteSyncElement.AUTOMERGE_CONFLICT) != 0) {
return iconCache.getImageFor(new DiffOverlayIcon(image, conflictDescriptor));
}
if (kind == (IRemoteSyncElement.OUTGOING | IRemoteSyncElement.ADDITION)) {
IResource resource = node.getResource();
if (resource.getType() == IResource.FILE) {
try {
ICVSFile cvsFile = CVSWorkspaceRoot.getCVSFileFor((IFile) resource);
if (cvsFile.getSyncInfo() == null) {
return iconCache.getImageFor(new DiffOverlayIcon(image, questionableDescriptor));
}
} catch (TeamException e) {
ErrorDialog.openError(getControl().getShell(), null, null, e.getStatus());
// Fall through and return the default image
}
}
}
}
return image;
}
public String getText(Object element) {
if (element instanceof ITeamNode) {
ITeamNode node = (ITeamNode)element;
IResource resource = node.getResource();
if (resource.exists()) {
try {
if (resource.getType() == IResource.FILE) {
ICVSFile cvsFile = CVSWorkspaceRoot.getCVSFileFor((IFile)resource);
ResourceSyncInfo info = cvsFile.getSyncInfo();
KSubstOption option = info != null && info.getKeywordMode() != null ?
info.getKeywordMode() :
KSubstOption.fromFile((IFile)resource);
return Policy.bind("CVSCatchupReleaseViewer.fileDecoration", oldProvider.getText(element), option.getShortDisplayText()); //$NON-NLS-1$
} else if (resource instanceof IContainer) {
ICVSFolder cvsFolder = CVSWorkspaceRoot.getCVSFolderFor((IContainer)resource);
FolderSyncInfo info = cvsFolder.getFolderSyncInfo();
if (info != null) {
CVSTag tag = info.getTag();
if (tag != null) {
return Policy.bind("CVSCatchupReleaseViewer.folderDecoration", oldProvider.getText(element), tag.getName()); //$NON-NLS-1$
}
}
}
} catch (CVSException e) {
ErrorDialog.openError(getControl().getShell(), null, null, e.getStatus());
}
}
}
return oldProvider.getText(element);
}
});
}
protected void fillContextMenu(IMenuManager manager) {
super.fillContextMenu(manager);
if (showInHistory != null) {
manager.add(showInHistory);
}
manager.add(new Separator());
switch (getSyncMode()) {
case SyncView.SYNC_INCOMING:
updateAction.update(SyncView.SYNC_INCOMING);
manager.add(updateAction);
forceUpdateAction.update(SyncView.SYNC_INCOMING);
manager.add(forceUpdateAction);
break;
case SyncView.SYNC_OUTGOING:
commitAction.update(SyncView.SYNC_OUTGOING);
manager.add(commitAction);
forceCommitAction.update(SyncView.SYNC_OUTGOING);
manager.add(forceCommitAction);
ignoreAction.update();
manager.add(ignoreAction);
break;
case SyncView.SYNC_BOTH:
commitAction.update(SyncView.SYNC_BOTH);
manager.add(commitAction);
updateAction.update(SyncView.SYNC_BOTH);
manager.add(updateAction);
manager.add(new Separator());
forceCommitAction.update(SyncView.SYNC_BOTH);
manager.add(forceCommitAction);
forceUpdateAction.update(SyncView.SYNC_BOTH);
manager.add(forceUpdateAction);
break;
case SyncView.SYNC_MERGE:
updateMergeAction.update(SyncView.SYNC_INCOMING);
forceUpdateMergeAction.update(SyncView.SYNC_INCOMING);
updateWithJoinAction.update(SyncView.SYNC_INCOMING);
manager.add(updateMergeAction);
manager.add(forceUpdateMergeAction);
manager.add(updateWithJoinAction);
break;
}
}
/**
* Creates the actions for this viewer.
*/
private void initializeActions(final CVSSyncCompareInput diffModel) {
Shell shell = getControl().getShell();
commitAction = new CommitSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.commit"), shell); //$NON-NLS-1$
forceCommitAction = new ForceCommitSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.forceCommit"), shell); //$NON-NLS-1$
updateAction = new UpdateSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.update"), shell); //$NON-NLS-1$
forceUpdateAction = new ForceUpdateSyncAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.forceUpdate"), shell); //$NON-NLS-1$
updateMergeAction = new UpdateMergeAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.update"), shell); //$NON-NLS-1$
ignoreAction = new IgnoreAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.ignore"), shell); //$NON-NLS-1$
updateWithJoinAction = new UpdateWithForcedJoinAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.mergeUpdate"), shell); //$NON-NLS-1$
forceUpdateMergeAction = new OverrideUpdateMergeAction(diffModel, this, Policy.bind("CVSCatchupReleaseViewer.forceUpdate"), shell); //$NON-NLS-1$
// Show in history view
showInHistory = new HistoryAction(Policy.bind("CVSCatchupReleaseViewer.showInHistory")); //$NON-NLS-1$
addSelectionChangedListener(showInHistory);
}
/**
* Provide CVS-specific labels for the editors.
*/
protected void updateLabels(MergeResource resource) {
CompareConfiguration config = getCompareConfiguration();
String name = resource.getName();
config.setLeftLabel(Policy.bind("CVSCatchupReleaseViewer.workspaceFile", name)); //$NON-NLS-1$
IRemoteSyncElement syncTree = resource.getSyncElement();
IRemoteResource remote = syncTree.getRemote();
if (remote != null) {
try {
ICVSRemoteFile remoteFile = (ICVSRemoteFile)remote;
String revision = remoteFile.getRevision();
// XXX Should have real progress
ILogEntry logEntry = remoteFile.getLogEntry(new NullProgressMonitor());
String author = logEntry.getAuthor();
config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.repositoryFileRevision", new Object[] {name, revision, author})); //$NON-NLS-1$
} catch (TeamException e) {
ErrorDialog.openError(getControl().getShell(), null, null, e.getStatus());
config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.repositoryFile", name)); //$NON-NLS-1$
}
} else {
config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.noRepositoryFile")); //$NON-NLS-1$
}
IRemoteResource base = syncTree.getBase();
if (base != null) {
try {
String revision = ((ICVSRemoteFile)base).getRevision();
config.setAncestorLabel(Policy.bind("CVSCatchupReleaseViewer.commonFileRevision", new Object[] {name, revision} )); //$NON-NLS-1$
} catch (TeamException e) {
ErrorDialog.openError(getControl().getShell(), null, null, e.getStatus());
config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.commonFile", name)); //$NON-NLS-1$
}
} else {
config.setAncestorLabel(Policy.bind("CVSCatchupReleaseViewer.noCommonFile")); //$NON-NLS-1$
}
}
}
|
