blob: 049b544f6f36be324d870d8521916805b370bbb5 (
plain) (
blame)
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
|
/*
* Created on Jun 18, 2003
*
* To change the template for this generated file go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
package org.eclipse.team.internal.ccvs.core.subscribers;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.subscribers.SyncInfo;
import org.eclipse.team.core.subscribers.TeamSubscriber;
import org.eclipse.team.core.sync.IRemoteResource;
/**
* @author JLemieux
*
* To change the template for this generated type comment go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
public class CVSMergeSyncInfo extends CVSSyncInfo {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.core.CVSSyncInfo#handleDeletionConflicts(int)
*/
protected int handleDeletionConflicts(int kind) {
// (see bug 40053).
if(kind == (SyncInfo.CONFLICTING | SyncInfo.DELETION | SyncInfo.PSEUDO_CONFLICT)) {
return SyncInfo.IN_SYNC;
}
return kind;
}
protected int calculateKind(IProgressMonitor progress) throws TeamException {
// Report merged resources as in-sync
if (((CVSMergeSubscriber)getSubscriber()).isMerged(getLocal())) {
return IN_SYNC;
}
int kind = super.calculateKind(progress);
// Report outgoing resources as in-sync
if((kind & DIRECTION_MASK) == OUTGOING) {
return IN_SYNC;
}
return kind;
}
public CVSMergeSyncInfo(IResource local, IRemoteResource base, IRemoteResource remote, TeamSubscriber subscriber, IProgressMonitor monitor) throws TeamException {
super(local, base, remote, subscriber, monitor);
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.core.CVSSyncInfo#makeOutgoing(org.eclipse.core.runtime.IProgressMonitor)
*/
public void makeOutgoing(IProgressMonitor monitor) throws TeamException {
// Make the resource outgoing by marking it as merged with the subscriber
CVSMergeSubscriber subscriber = (CVSMergeSubscriber)getSubscriber();
subscriber.merged(new IResource[] {getLocal() });
}
}
|
