Projects >> mapfish-print >>fcf90a5c2acf3a676b40d48928c33028f6ddf4b2

Chunk
Conflicting content 
import net.sf.jasperreports.engine.JasperCompileManager;
import net.sf.jasperreports.engine.data.JRMapCollectionDataSource;
import org.mapfish.print.attribute.TableListAttribute.TableListAttributeValue;
<<<<<<< HEAD
import org.mapfish.print.output.Values;
import org.mapfish.print.processor.AbstractProcessor;
import org.mapfish.print.wrapper.json.PJsonArray;
=======
import org.mapfish.print.config.Configuration;
import org.mapfish.print.config.HasConfiguration;
import org.mapfish.print.config.WorkingDirectories;
import org.mapfish.print.output.Values;
import org.mapfish.print.processor.AbstractProcessor;
import org.mapfish.print.wrapper.json.PJsonArray;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
>>>>>>> dcdca5241efc473b05577acab878c8a10d5b986f

import java.awt.Color;
import java.io.File;
Solution content 
import net.sf.jasperreports.engine.JasperCompileManager;
import net.sf.jasperreports.engine.data.JRMapCollectionDataSource;

import org.mapfish.print.attribute.TableListAttribute.TableListAttributeValue;
import org.mapfish.print.config.Configuration;
import org.mapfish.print.config.HasConfiguration;
import org.mapfish.print.config.WorkingDirectories;
import org.mapfish.print.output.Values;
import org.mapfish.print.processor.AbstractProcessor;
import org.mapfish.print.wrapper.json.PJsonArray;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

import java.awt.Color;
import java.io.File;
File
TableListProcessor.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
    private Map dynamicReport = null;
<<<<<<< HEAD
=======
    @Autowired
    private WorkingDirectories workingDirectories;

    private File dynamicReportDirectory;
    
    private Configuration configuration;
    
>>>>>>> dcdca5241efc473b05577acab878c8a10d5b986f
    /**
     * Constructor.
     */
Solution content 
    @Autowired
    private WorkingDirectories workingDirectories;


    private Map dynamicReport = null;

    private File dynamicReportDirectory;
    
    private Configuration configuration;

    /**
     * Constructor.
     */
File
TableListProcessor.java
Developer's decision
Combination
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
    @Override
        this.dynamicReport = dynamicReport;
    }

<<<<<<< HEAD
    @Override
    protected final void extraValidation(final List validationErrors) {
        // no validation needed
=======
    public final void setDynamicReportDirectory(final String dynamicReportDirectory) {
        this.dynamicReportDirectory = new File(this.configuration.getDirectory(), dynamicReportDirectory);
    }
    
    public final void setConfiguration(final Configuration configuration) {
        this.configuration = configuration;
>>>>>>> dcdca5241efc473b05577acab878c8a10d5b986f
    }

    /**
Solution content 
        this.dynamicReport = dynamicReport;
    }

    @Override
    protected final void extraValidation(final List validationErrors) {
        // no validation needed
    }

    public final void setDynamicReportDirectory(final String dynamicReportDirectory) {
        this.dynamicReportDirectory = new File(this.configuration.getDirectory(), dynamicReportDirectory);
    }
    
    @Override
    public final void setConfiguration(final Configuration configuration) {
        this.configuration = configuration;
    }

    /**
File
TableListProcessor.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Attribute
Comment
Method declaration
Method signature