Example #1
0
        internal MergePanel(
            ICurrentConflictUpdater currentConflictUpdater,
            IConflictResolver conflictResolver,
            IHeaderPrinter headerPrinter,
            IIconPrinter iconPrinter,
            IExplanationUpdater explanationUpdater,
            IManualEditionSaver manualEditionSaver,
            SemanticMergeSource.FileTrees fileTrees,
            SemanticToolInfo toolInfo,
            IDifferencesExecutor diffExecutor,
            ISyntaxLanguageListener syntaxLanguageListener,
            IFileNavigator fileNavigator)
        {
            mFileTrees = fileTrees;
            mToolInfo  = toolInfo;

            mContributorsView = new ContributorsView(
                currentConflictUpdater,
                conflictResolver,
                this,
                headerPrinter,
                explanationUpdater,
                this,
                this,
                toolInfo,
                diffExecutor,
                fileNavigator);

            mResultView = new ResultView(
                currentConflictUpdater,
                conflictResolver,
                this,
                headerPrinter,
                iconPrinter,
                explanationUpdater,
                this,
                this,
                manualEditionSaver,
                toolInfo,
                diffExecutor,
                syntaxLanguageListener,
                fileNavigator);
        }
Example #2
0
 internal void SetFileTrees(SemanticMergeSource.FileTrees fileTrees)
 {
     mFileTrees = fileTrees;
 }