public class AdditiveResourceMappingMerger extends EMFResourceMappingMerger implements IAdditiveResourceMappingMerger
EMFResourceMappingMerger.ResourceAdditionAndDeletionTracker
MERGER_REGISTRY
Constructor and Description |
---|
AdditiveResourceMappingMerger() |
Modifier and Type | Method and Description |
---|---|
protected void |
delegateMergeOfUnmergedResourcesAndMarkDiffsAsMerged(SynchronizationModel syncModel,
org.eclipse.team.core.mapping.IMergeContext mergeContext,
EMFResourceMappingMerger.ResourceAdditionAndDeletionTracker resourceTracker,
org.eclipse.core.runtime.SubMonitor subMonitor)
Delegates the merge of so far non-merged resource additions and deletions and marks all other already
merged resources as merged.
|
protected void |
mergeMapping(org.eclipse.core.resources.mapping.ResourceMapping mapping,
org.eclipse.team.core.mapping.IMergeContext mergeContext,
Set<org.eclipse.core.resources.mapping.ResourceMapping> failingMappings,
org.eclipse.core.runtime.IProgressMonitor monitor)
Merges one mapping.
|
collectConflictingResources, getMergeRule, markAsMerged, markResourcesAsMerged, merge, merge, removeNonExistingStorages, save, validateMerge
protected void mergeMapping(org.eclipse.core.resources.mapping.ResourceMapping mapping, org.eclipse.team.core.mapping.IMergeContext mergeContext, Set<org.eclipse.core.resources.mapping.ResourceMapping> failingMappings, org.eclipse.core.runtime.IProgressMonitor monitor) throws org.eclipse.core.runtime.CoreException
EMFResourceMappingMerger
mergeMapping
in class EMFResourceMappingMerger
mapping
- The mapping to mergemergeContext
- The merge contextfailingMappings
- The set of failing mappingsmonitor
- The progress monitor to use, 10 ticks will be consumedorg.eclipse.core.runtime.CoreException
protected void delegateMergeOfUnmergedResourcesAndMarkDiffsAsMerged(SynchronizationModel syncModel, org.eclipse.team.core.mapping.IMergeContext mergeContext, EMFResourceMappingMerger.ResourceAdditionAndDeletionTracker resourceTracker, org.eclipse.core.runtime.SubMonitor subMonitor) throws org.eclipse.core.runtime.CoreException
EMFResourceMappingMerger
delegateMergeOfUnmergedResourcesAndMarkDiffsAsMerged
in class EMFResourceMappingMerger
syncModel
- The synchronization model to obtain the storages.mergeContext
- The merge context.resourceTracker
- The tracker that tracked already merged file additions and deletions.subMonitor
- The progress monitor to use.org.eclipse.core.runtime.CoreException
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.