Projects >> jbehave-web >>47b99d70616a13638b244c0d844ae62d08267b51

Chunk
Conflicting content 
    private final Embedder embedder;
    private final BatchFailures batchFailures;
    private final List> futures;
<<<<<<< HEAD
    private final WebQueueConfiguration configuration;
    private final Server server;

    public WebQueue(Embedder embedder, BatchFailures batchFailures, List> futures, WebQueueConfiguration configuration) {
        this.embedder = embedder;
        this.batchFailures = batchFailures;
        this.futures = futures;
        this.configuration = configuration;
        this.server = new Server(configuration.port());
=======
    private final File navigatorDir;
    
    private Server server;
    private String resultsPage;

    public WebQueue(Embedder embedder, BatchFailures batchFailures, List> futures, File navigatorDir) {
        this(embedder, batchFailures, futures, navigatorDir, "navigator.html");
    }

    public WebQueue(Embedder embedder, BatchFailures batchFailures, List> futures, File navigatorDir, String resultsPage) {
        this.embedder = embedder;
        this.batchFailures = batchFailures;
        this.futures = futures;
        this.navigatorDir = navigatorDir;
        this.resultsPage = resultsPage;
>>>>>>> 1c0361d4cadc9f5669f8b7fb4836b4ee2f0dee18
    }

    @SuppressWarnings("serial")
Solution content 
    private final Embedder embedder;
    private final BatchFailures batchFailures;
    private final List> futures;
    private final WebQueueConfiguration configuration;
    private Server server;

    public WebQueue(Embedder embedder, BatchFailures batchFailures, List> futures, WebQueueConfiguration configuration) {
        this.embedder = embedder;
        this.batchFailures = batchFailures;
        this.futures = futures;
        this.configuration = configuration;
    }
    
    @SuppressWarnings("serial")
File
WebQueue.java
Developer's decision
Combination
Kind of conflict
Attribute
Method declaration
Method invocation
Method signature
Chunk
Conflicting content 
        viewHandler.setWelcomeFiles(new String[] { configuration.welcomeFile() });

        try {
<<<<<<< HEAD
            StoryReporterBuilder builder = embedder.configuration().storyReporterBuilder();
            String viewDir = builder.outputDirectory().getPath() + "/" + builder.viewResources().getProperty("view");
            viewHandler.setResourceBase(configuration.navigatorDirectory().getCanonicalPath() + viewDir);
=======
            viewDir.setResourceBase(navigatorDir.getCanonicalPath());
>>>>>>> 1c0361d4cadc9f5669f8b7fb4836b4ee2f0dee18
            HandlerList handlers = new HandlerList();
            handlers.setHandlers(new Handler[] { context, viewHandler, new DefaultHandler() });
            server.setHandler(handlers);
Solution content 
        viewHandler.setWelcomeFiles(new String[] { configuration.welcomeFile() });

        try {
            StoryReporterBuilder builder = embedder.configuration().storyReporterBuilder();
            String viewDir = builder.outputDirectory().getPath() + "/" + builder.viewResources().getProperty("view");
            viewHandler.setResourceBase(configuration.navigatorDirectory().getCanonicalPath() + viewDir);
            HandlerList handlers = new HandlerList();
            handlers.setHandlers(new Handler[] { context, viewHandler, new DefaultHandler() });
            server.setHandler(handlers);
File
WebQueue.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable