Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerImporter.java')
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerImporter.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerImporter.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerImporter.java
index a02bee12d5..99d3876094 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerImporter.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerImporter.java
@@ -153,8 +153,7 @@ public abstract class CDOServerImporter
*/
public static interface Handler2 extends Handler
{
- public void handleCommitInfo(long time, long previous, int branch, String user, String comment,
- int mergeSourceBranchID, long mergeSourceTime);
+ public void handleCommitInfo(long time, long previous, int branch, String user, String comment, int mergeSourceBranchID, long mergeSourceTime);
}
/**
@@ -303,8 +302,7 @@ public abstract class CDOServerImporter
handleCommitInfo(time, previous, branchID, user, comment, 0, CDOBranchPoint.UNSPECIFIED_DATE);
}
- public void handleCommitInfo(long time, long previous, int branchID, String user, String comment,
- int mergeSourceBranchID, long mergeSourceTime)
+ public void handleCommitInfo(long time, long previous, int branchID, String user, String comment, int mergeSourceBranchID, long mergeSourceTime)
{
CDOBranch branch = repository.getBranchManager().getBranch(branchID);
if (mergeSourceBranchID != 0 && accessor instanceof Raw2)

Back to the top