Projects >> gradle >>1936e3300aedcaaa8ab1d187e130e3e9bf0a431f

Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    private static class NestedToolingLogging extends NestedLogging {
        protected OutputEventRenderer createOutputEventRenderer() {
            OutputEventRenderer renderer = new OutputEventRenderer(Actions.doNothing());
            return renderer;
        }
    }
}
=======
    private static class ColoredLogging extends NestedLogging {
        final Console console;

        ColoredLogging(Console console) {
            this.console = console;
        }

        protected OutputEventRenderer createOutputEventRenderer() {
            OutputEventRenderer renderer = new OutputEventRenderer(new Action() {
                public void execute(OutputEventRenderer outputEventRenderer) {
                    outputEventRenderer.addConsole(console, true, true, new FallbackConsoleMetaData());
                }
            });
            return renderer;
        }
    }
}
>>>>>>> 062e28424f195da8e99eeee7586fac4b6e83eb8d
Solution content 
        }
    }

    private static class NestedToolingLogging extends NestedLogging {
        protected OutputEventRenderer createOutputEventRenderer() {
            OutputEventRenderer renderer = new OutputEventRenderer(Actions.doNothing());
            return renderer;
        }
    }

    private static class ColoredLogging extends NestedLogging {
        final Console console;

        ColoredLogging(Console console) {
            this.console = console;
        }

        protected OutputEventRenderer createOutputEventRenderer() {
            OutputEventRenderer renderer = new OutputEventRenderer(new Action() {
                public void execute(OutputEventRenderer outputEventRenderer) {
                    outputEventRenderer.addConsole(console, true, true, new FallbackConsoleMetaData());
                }
            });
            return renderer;
        }
    }
}
File
LoggingServiceRegistry.java
Developer's decision
Combination
Kind of conflict
Class declaration
Chunk
Conflicting content 
            loggingServices = this.loggingServices;
            executer = embeddedExecutor;
        } else {
<<<<<<< HEAD
            loggingServices = this.loggingServices.newToolingApiLogging();
=======
            if(operationParameters.isColorOutput() != null && operationParameters.isColorOutput() && operationParameters.getStandardOutput() != null) {
                PrintStream outStr = new PrintStream(operationParameters.getStandardOutput());
                DefaultColorMap colourMap = new DefaultColorMap();
                colourMap.setUseColor(true);
                Console console = new AnsiConsole(outStr, outStr, colourMap, true);
                loggingServices = this.loggingServices.newColoredLogging(console);
            } else {
                loggingServices = this.loggingServices.newLogging();
            }
>>>>>>> 062e28424f195da8e99eeee7586fac4b6e83eb8d
            loggingServices.get(OutputEventRenderer.class).configure(operationParameters.getBuildLogLevel());
            DaemonClientServices clientServices = new DaemonClientServices(loggingServices, params.daemonParams, operationParameters.getStandardInput(SafeStreams.emptyInput()));
            executer = clientServices.get(DaemonClient.class);
Solution content 
            loggingServices = this.loggingServices;
            executer = embeddedExecutor;
        } else {
            if(operationParameters.isColorOutput() != null && operationParameters.isColorOutput() && operationParameters.getStandardOutput() != null) {
                PrintStream outStr = new PrintStream(operationParameters.getStandardOutput());
                DefaultColorMap colourMap = new DefaultColorMap();
                colourMap.setUseColor(true);
                Console console = new AnsiConsole(outStr, outStr, colourMap, true);
                loggingServices = this.loggingServices.newColoredLogging(console);
            } else {
                loggingServices = this.loggingServices.newToolingApiLogging();
            }
            loggingServices.get(OutputEventRenderer.class).configure(operationParameters.getBuildLogLevel());
            DaemonClientServices clientServices = new DaemonClientServices(loggingServices, params.daemonParams, operationParameters.getStandardInput(SafeStreams.emptyInput()));
            executer = clientServices.get(DaemonClient.class);
File
ProviderConnection.java
Developer's decision
Combination
Kind of conflict
Attribute
If statement
Method invocation