Class AdditiveResourceMappingMerger

    • Constructor Detail

      • AdditiveResourceMappingMerger

        public AdditiveResourceMappingMerger()
    • Method Detail

      • mergeMapping

        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
        Description copied from class: EMFResourceMappingMerger
        Merges one mapping.
        Overrides:
        mergeMapping in class EMFResourceMappingMerger
        Parameters:
        mapping - The mapping to merge
        mergeContext - The merge context
        failingMappings - The set of failing mappings
        monitor - The progress monitor to use, 10 ticks will be consumed
        Throws:
        org.eclipse.core.runtime.CoreException
      • delegateMergeOfUnmergedResourcesAndMarkDiffsAsMerged

        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
        Description copied from class: EMFResourceMappingMerger
        Delegates the merge of so far non-merged resource additions and deletions and marks all other already merged resources as merged.
        Overrides:
        delegateMergeOfUnmergedResourcesAndMarkDiffsAsMerged in class EMFResourceMappingMerger
        Parameters:
        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.
        Throws:
        org.eclipse.core.runtime.CoreException