internal void SetCurrentConflict( CurrentConflictContributorDeclarationRanges contributorRanges, DeclarationRange resultRange, bool hasUnsolvedConflicts) { mContributorsView.SetCurrentConflict(contributorRanges, hasUnsolvedConflicts); mResultView.SetCurrentConflict(resultRange, hasUnsolvedConflicts); }
void IDeclarationSynchronizer.GoToLine( ContributorDeclarationRanges contributorRanges, ResultDeclarationRange resultRange) { DeclarationRange resultDeclarationRange = (resultRange != null) ? resultRange.Range : null; mDeclarationSynchronizer.GoToLine(contributorRanges, resultDeclarationRange); Codice.Tree.Declaration currentDeclaration = (resultRange != null) ? resultRange.Declaration : contributorRanges.Declaration; mResultView.SetCurrentDeclaration(currentDeclaration); }