diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common')
3 files changed, 31 insertions, 23 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOCloningContext.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOCloningContext.java deleted file mode 100644 index 83a3a38262..0000000000 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOCloningContext.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.eclipse.emf.cdo.spi.common; - -import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; - -/** - * @author Eike Stepper - * @since 3.0 - */ -public interface CDOCloningContext -{ - public long getStartTime(); - - public long getEndTime(); - - public int getBranchID(); - - public void addPackageUnit(String id); - - public void addBranch(int id); - - public void addRevision(InternalCDORevision revision); -} diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOReplicationContext.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOReplicationContext.java new file mode 100644 index 0000000000..9a17e4d1fd --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOReplicationContext.java @@ -0,0 +1,25 @@ +/** + * 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.cdo.spi.common; + +import org.eclipse.emf.cdo.common.branch.CDOBranchHandler; +import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler; + +/** + * @author Eike Stepper + * @since 3.0 + */ +public interface CDOReplicationContext extends CDOBranchHandler, CDOCommitInfoHandler +{ + public int getLastReplicatedBranchID(); + + public long getLastReplicatedCommitTime(); +} diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java index 8dac62cdb0..4ab7ed46e1 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java @@ -10,6 +10,7 @@ */ package org.eclipse.emf.cdo.spi.common.branch; +import org.eclipse.emf.cdo.common.branch.CDOBranchHandler; import org.eclipse.emf.cdo.common.branch.CDOBranchManager; import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; @@ -39,12 +40,14 @@ public interface InternalCDOBranchManager extends CDOBranchManager, ILifecycle public InternalCDOBranch getBranch(int branchID); - public InternalCDOBranch getBranch(int id, String name, long baseTimeStamp, InternalCDOBranch base); + public InternalCDOBranch getBranch(int id, String name, InternalCDOBranch baseBranch, long baseTimeStamp); public InternalCDOBranch getBranch(String path); public InternalCDOBranch createBranch(String name, InternalCDOBranch baseBranch, long baseTimeStamp); + public InternalCDOBranch createBranch(int branchID, String name, InternalCDOBranch baseBranch, long baseTimeStamp); + public void handleBranchCreated(InternalCDOBranch branch); /** @@ -59,6 +62,8 @@ public interface InternalCDOBranchManager extends CDOBranchManager, ILifecycle public SubBranchInfo[] loadSubBranches(int branchID); + public int loadBranches(int startID, int endID, CDOBranchHandler branchHandler); + /** * @author Eike Stepper * @since 3.0 |