Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java')
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
index 46e20ce37f..9a8deb9b86 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
@@ -226,8 +226,7 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
{
checkActive();
- Pair<Integer, Long> result = branchLoader.createBranch(branchID,
- new BranchInfo(name, baseBranch.getID(), baseTimeStamp));
+ Pair<Integer, Long> result = branchLoader.createBranch(branchID, new BranchInfo(name, baseBranch.getID(), baseTimeStamp));
int actualBranchID = result.getElement1();
long actualBaseTimeStamp = result.getElement2();
@@ -327,8 +326,7 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
* @author Eike Stepper
*/
@Deprecated
- private static final class BranchCreatedEvent extends BranchChangedEvent
- implements org.eclipse.emf.cdo.common.branch.CDOBranchCreatedEvent
+ private static final class BranchCreatedEvent extends BranchChangedEvent implements org.eclipse.emf.cdo.common.branch.CDOBranchCreatedEvent
{
private static final long serialVersionUID = 1L;

Back to the top