diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java')
-rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java new file mode 100644 index 0000000000..7904374b29 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectMerger.java @@ -0,0 +1,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); + } +} |