diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadMergeDataRequest.java')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadMergeDataRequest.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadMergeDataRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadMergeDataRequest.java index 65f3522923..f8eb63c115 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadMergeDataRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadMergeDataRequest.java @@ -47,9 +47,8 @@ public class LoadMergeDataRequest extends CDOClientRequestWithMonitoring<MergeDa private boolean auto; - public LoadMergeDataRequest(CDOClientProtocol protocol, CDORevisionAvailabilityInfo targetInfo, - CDORevisionAvailabilityInfo sourceInfo, CDORevisionAvailabilityInfo targetBaseInfo, - CDORevisionAvailabilityInfo sourceBaseInfo) + public LoadMergeDataRequest(CDOClientProtocol protocol, CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo, + CDORevisionAvailabilityInfo targetBaseInfo, CDORevisionAvailabilityInfo sourceBaseInfo) { super(protocol, CDOProtocolConstants.SIGNAL_LOAD_MERGE_DATA); this.targetInfo = targetInfo; @@ -86,8 +85,7 @@ public class LoadMergeDataRequest extends CDOClientRequestWithMonitoring<MergeDa } } - private void writeRevisionAvailabilityInfo(CDODataOutput out, CDORevisionAvailabilityInfo info, OMMonitor monitor) - throws IOException + private void writeRevisionAvailabilityInfo(CDODataOutput out, CDORevisionAvailabilityInfo info, OMMonitor monitor) throws IOException { CDOBranchPoint branchPoint = info.getBranchPoint(); if (branchPoint != CDOBranchUtil.AUTO_BRANCH_POINT) @@ -206,8 +204,7 @@ public class LoadMergeDataRequest extends CDOClientRequestWithMonitoring<MergeDa } } - private void readRevisionAvailabilityInfo(CDODataInput in, CDORevisionAvailabilityInfo info, Set<CDOID> result, - OMMonitor monitor) throws IOException + private void readRevisionAvailabilityInfo(CDODataInput in, CDORevisionAvailabilityInfo info, Set<CDOID> result, OMMonitor monitor) throws IOException { int size = in.readInt(); monitor.begin(size + 1); |