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
|
/**
* Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) 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:
* Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.spi.cdo;
import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.cdo.CDOState;
import org.eclipse.emf.cdo.common.commit.CDOChangeSet;
import org.eclipse.emf.cdo.common.commit.CDOChangeSetData;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.revision.CDORevision;
import org.eclipse.emf.cdo.common.revision.CDORevisionKey;
import org.eclipse.emf.cdo.common.revision.CDORevisionProvider;
import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionDelta;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.transaction.CDOMerger;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
/**
* @author Eike Stepper
* @since 4.0
*/
public class CDOMergingConflictResolver extends AbstractChangeSetsConflictResolver
{
private CDOMerger merger;
public CDOMergingConflictResolver()
{
this(new DefaultCDOMerger.PerFeature.ManyValued());
}
public CDOMergingConflictResolver(CDOMerger merger)
{
this.merger = merger;
}
public CDOMerger getMerger()
{
return merger;
}
public void resolveConflicts(Set<CDOObject> conflicts)
{
CDOChangeSet target = getLocalChangeSet();
CDOChangeSet source = getRemoteChangeSet();
CDOChangeSetData result = merger.merge(target, source);
final InternalCDOTransaction transaction = (InternalCDOTransaction)getTransaction();
final InternalCDOSession session = transaction.getSession();
final InternalCDORevisionManager revisionManager = session.getRevisionManager();
final CDORevisionProvider ancestorProvider = new CDORevisionProvider()
{
public CDORevision getRevision(CDOID id)
{
CDORevision revision = getCleanRevision(transaction, id);
if (revision == null)
{
revision = revisionManager.getRevision(id, transaction, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true);
}
return revision;
}
private CDORevision getCleanRevision(InternalCDOTransaction transaction, CDOID id)
{
CDOObject object = transaction.getDirtyObjects().get(id);
if (object == null)
{
object = transaction.getDetachedObjects().get(id);
}
if (object != null)
{
InternalCDORevision revision = transaction.getCleanRevisions().get(object);
if (revision != null)
{
return revision;
}
}
return null;
}
};
final CDORevisionProvider targetProvider = new CDORevisionProvider()
{
public CDORevision getRevision(CDOID id)
{
CDOObject object = transaction.getObject(id, false);
if (object != null)
{
return object.cdoRevision();
}
return ancestorProvider.getRevision(id);
}
};
CDOChangeSetData applied = transaction.applyChangeSetData(result, ancestorProvider, targetProvider, transaction)
.getElement1();
ConcurrentMap<CDOID, CDORevisionDelta> revisionDeltas = transaction.getLastSavepoint().getRevisionDeltas();
for (CDORevisionKey key : applied.getChangedObjects())
{
CDOID id = key.getID();
InternalCDOObject object = (InternalCDOObject)transaction.getObject(id, false);
if (object != null)
{
object.cdoInternalSetState(CDOState.DIRTY);
InternalCDORevision revision = object.cdoRevision();
int version = revision.getVersion() + 1;
revision.setVersion(version);
InternalCDORevisionDelta revisionDelta = (InternalCDORevisionDelta)revisionDeltas.get(id);
if (revisionDelta != null)
{
revisionDelta.setVersion(version);
if (revisionDelta.getTarget() != null)
{
revisionDelta.setTarget(CDOBranchUtil.copyBranchVersion(revision));
}
}
}
}
}
}
|
