blob: 7904374b29b706e2b3c736eb9375234c9640515b (
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
|
/***************************************************************************
* Copyright (c) 2004 - 2008 Eike Stepper, Germany.
* 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:
* Simon McDuff - initial API and implementation
* Eike Stepper - maintenance
**************************************************************************/
package org.eclipse.emf.internal.cdo;
import org.eclipse.emf.cdo.CDOState;
import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
import org.eclipse.emf.cdo.internal.protocol.revision.delta.CDORevisionMerger;
import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta;
/**
* @author Simon McDuff
*/
public class CDOObjectMerger extends CDORevisionMerger
{
public CDOObjectMerger()
{
}
public void merge(InternalCDOObject object, CDORevisionDelta delta)
{
CDORevisionImpl revision = new CDORevisionImpl((CDORevisionImpl)object.cdoRevision());
revision.increaseVersion();
object.cdoInternalSetRevision(revision);
object.cdoInternalSetState(CDOState.DIRTY);
merge(revision, delta);
}
}
|
