Skip to content

Commit

Permalink
feat: comment some data collectors
Browse files Browse the repository at this point in the history
  • Loading branch information
jpedroh committed Nov 26, 2024
1 parent 3ef944f commit ea520c5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/main/injectors/GenericMergeModule.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ class GenericMergeModule extends AbstractModule {
Multibinder<DataCollector> dataCollectorBinder = Multibinder.newSetBinder(binder(), DataCollector.class)

// Run the merge tools on the scenarios
dataCollectorBinder.addBinding().to(LastMergeMergeToolExecutorDataCollector.class)
dataCollectorBinder.addBinding().to(SporkMergeToolExecutorDataCollector.class)
// dataCollectorBinder.addBinding().to(LastMergeMergeToolExecutorDataCollector.class)
// dataCollectorBinder.addBinding().to(SporkMergeToolExecutorDataCollector.class)

// Normalize the files formatting by running Format on the resulting files.
dataCollectorBinder.addBinding().toInstance(new RunDataCollectorsInParallel(new ArrayList<DataCollector>([new FormatFileSyntacticNormalizationDataCollector("merge.java", "merge.format_normalized.java"),
Expand All @@ -45,7 +45,7 @@ class GenericMergeModule extends AbstractModule {
new SyntacticallyCompareScenarioFilesDataCollector("merge.spork.format_normalized.java", "merge.format_normalized.spork_normalized.java"),
new SyntacticallyCompareScenarioFilesDataCollector("merge.last_merge.format_normalized.java", "merge.format_normalized.java"),
// Run comparisons between conflicts themselves
new CompareScenarioMergeConflictsDataCollector("merge.last_merge.java", "merge.spork.java")])))
// new CompareScenarioMergeConflictsDataCollector("merge.last_merge.java", "merge.spork.java")])))

Multibinder<OutputProcessor> outputProcessorBinder = Multibinder.newSetBinder(binder(), OutputProcessor.class)
outputProcessorBinder.addBinding().to(EmptyOutputProcessor.class)
Expand Down

0 comments on commit ea520c5

Please sign in to comment.