Projects >> cismap-commons >>02b93e008de79d0ebf04a5da0abc3fdd4ce486fe

Chunk
Conflicting content 
import edu.umd.cs.piccolo.PNode;

import java.awt.Image;
<<<<<<< HEAD
=======
import java.awt.geom.Rectangle2D;
>>>>>>> 64b157eaa744c2ae478826009a7a0f7a6fd5ef6f

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
Solution content 
import java.awt.Image;
import edu.umd.cs.piccolo.PNode;
import java.awt.geom.Rectangle2D;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
File
HeadlessMapProvider.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import de.cismet.cismap.commons.gui.MappingComponent;
import de.cismet.cismap.commons.gui.layerwidget.ActiveLayerModel;
import de.cismet.cismap.commons.gui.piccolo.PFeature;
<<<<<<< HEAD
import de.cismet.cismap.commons.gui.printing.PrintingSettingsWidget;
=======
>>>>>>> 64b157eaa744c2ae478826009a7a0f7a6fd5ef6f
import de.cismet.cismap.commons.gui.printing.PrintingWidget;
import de.cismet.cismap.commons.interaction.CismapBroker;
import de.cismet.cismap.commons.raster.wms.AbstractWMS;
Solution content 
import de.cismet.cismap.commons.gui.MappingComponent;
import de.cismet.cismap.commons.gui.layerwidget.ActiveLayerModel;
import de.cismet.cismap.commons.gui.piccolo.PFeature;
import de.cismet.cismap.commons.gui.printing.PrintingSettingsWidget;
import de.cismet.cismap.commons.gui.printing.PrintingWidget;
import de.cismet.cismap.commons.interaction.CismapBroker;
import de.cismet.cismap.commons.raster.wms.AbstractWMS;
File
HeadlessMapProvider.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    private HeadlessMapProvider.DominatingDimension dominatingDimension = HeadlessMapProvider.DominatingDimension.SIZE;
    private HeadlessMapProvider.RoundingPrecision roundScaleTo = HeadlessMapProvider.RoundingPrecision.NO_ROUNDING;
    private boolean centerMapOnResize = false;
<<<<<<< HEAD
    private double printingResolution = 0;
    private double resolution = 72.0;
    private double featureResolutionFactor = PrintingSettingsWidget.FEATURE_RESOLUTION_FACTOR;
    
=======
    private double printingResolution = 72d / FEATURE_RESOLUTION_FACTOR;

>>>>>>> 64b157eaa744c2ae478826009a7a0f7a6fd5ef6f
    //~ Constructors -----------------------------------------------------------

    /**
Solution content 
    private HeadlessMapProvider.DominatingDimension dominatingDimension = HeadlessMapProvider.DominatingDimension.SIZE;
    private HeadlessMapProvider.RoundingPrecision roundScaleTo = HeadlessMapProvider.RoundingPrecision.NO_ROUNDING;
    private boolean centerMapOnResize = false;
    private double printingResolution = 0;
    private double resolution = 72.0;
    private double featureResolutionFactor = PrintingSettingsWidget.FEATURE_RESOLUTION_FACTOR;
    
    //~ Constructors -----------------------------------------------------------

    /**
File
HeadlessMapProvider.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
                homeBoundingBox = (XBoundingBox)homeMap.get(key);
                mappingModel.addHome(homeBoundingBox);
            }
<<<<<<< HEAD

            if (mappingModel.getInitialBoundingBox() == null) {
                LOG.error("Default home boundingBox not found");

=======

            if (mappingModel.getInitialBoundingBox() == null) {
                LOG.error("Default home boundingBox not found");

>>>>>>> 64b157eaa744c2ae478826009a7a0f7a6fd5ef6f
                if (homeBoundingBox != null) {
                    LOG.warn("Calculate home bounding box from " + homeBoundingBox);
                    try {
Solution content 
                homeBoundingBox = (XBoundingBox)homeMap.get(key);
                mappingModel.addHome(homeBoundingBox);
            }

            if (mappingModel.getInitialBoundingBox() == null) {
                LOG.error("Default home boundingBox not found");

                if (homeBoundingBox != null) {
                    LOG.warn("Calculate home bounding box from " + homeBoundingBox);
                    try {
File
HeadlessMapProvider.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
    /**
     * DOCUMENT ME!
     *
    /**
     * DOCUMENT ME!
     *
<<<<<<< HEAD
     * @return  the printingResolution
     */
    public double getPrintingResolution() {
        return printingResolution;
    }
     * @param  printingResolution  the printingResolution to set
     */
    public void setPrintingResolution(final double printingResolution) {
        this.printingResolution = printingResolution;
    }

    /**
     * DOCUMENT ME!
     *
     * @return  the featureResolutionFactor
     */
    public double getFeatureResolutionFactor() {
        return featureResolutionFactor;
    }

    /**
     * DOCUMENT ME!
     *
     * @param  featureResolutionFactor  the featureResolutionFactor to set
     */
    public void setFeatureResolutionFactor(final double featureResolutionFactor) {
        this.featureResolutionFactor = featureResolutionFactor;
    }    
    
    /**
     * DOCUMENT ME!
     *
=======
>>>>>>> 64b157eaa744c2ae478826009a7a0f7a6fd5ef6f
     * @return  DOCUMENT ME!
     */
    public MappingComponent getMappingComponent() {
Solution content 
    /**
     * DOCUMENT ME!
     *
     * @return  the printingResolution
     */
    public double getPrintingResolution() {
        return printingResolution;
    }

    /**
     * DOCUMENT ME!
     *
     * @param  printingResolution  the printingResolution to set
     */
    public void setPrintingResolution(final double printingResolution) {
        this.printingResolution = printingResolution;
    }

    /**
     * DOCUMENT ME!
     *
     * @return  the featureResolutionFactor
     */
    public double getFeatureResolutionFactor() {
        return featureResolutionFactor;
    }

    /**
     * DOCUMENT ME!
     *
     * @param  featureResolutionFactor  the featureResolutionFactor to set
     */
    public void setFeatureResolutionFactor(final double featureResolutionFactor) {
        this.featureResolutionFactor = featureResolutionFactor;
    }    
    
    /**
     * DOCUMENT ME!
     *
     * @return  DOCUMENT ME!
     */
    public MappingComponent getMappingComponent() {
File
HeadlessMapProvider.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
        }

        map.setSize(correctedWidthPixels, correctedHeightPixels);
<<<<<<< HEAD
        map.setNewViewBounds(null);
        map.gotoBoundingBox(correctedBoundingBox, true, true, 0, false);
        waitUntilGotoBoundingBoxIsComplete();
=======
        map.gotoBoundingBox(correctedBoundingBox, true, true, 0, false);
>>>>>>> 64b157eaa744c2ae478826009a7a0f7a6fd5ef6f
        // check the minimum map scale condition
        if ((minimumScaleDenominator > 0) && (map.getScaleDenominator() < minimumScaleDenominator)) {
            if (LOG.isDebugEnabled()) {
Solution content 
        }

        map.setSize(correctedWidthPixels, correctedHeightPixels);
        map.setNewViewBounds(null);
        map.gotoBoundingBox(correctedBoundingBox, true, true, 0, false);
        waitUntilGotoBoundingBoxIsComplete();
        // check the minimum map scale condition
        if ((minimumScaleDenominator > 0) && (map.getScaleDenominator() < minimumScaleDenominator)) {
            if (LOG.isDebugEnabled()) {
File
HeadlessMapProvider.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
                    bb.getY2(),
                    boundingBox.getSrs(),
                    boundingBox.isMetric());
<<<<<<< HEAD
            map.setNewViewBounds(null);
            map.gotoBoundingBox(correctedBoundingBox, true, true, 0, false);
            waitUntilGotoBoundingBoxIsComplete();
=======
            map.gotoBoundingBox(correctedBoundingBox, true, true, 0, false);
>>>>>>> 64b157eaa744c2ae478826009a7a0f7a6fd5ef6f
        }

        // check if we have to round up the scale to a certain precision
Solution content 
                    bb.getY2(),
                    boundingBox.getSrs(),
                    boundingBox.isMetric());
            map.setNewViewBounds(null);
            map.gotoBoundingBox(correctedBoundingBox, true, true, 0, false);
            waitUntilGotoBoundingBoxIsComplete();
        }

        // check if we have to round up the scale to a certain precision
File
HeadlessMapProvider.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
                    bb.getY2(),
                    boundingBox.getSrs(),
                    boundingBox.isMetric());
<<<<<<< HEAD
            map.setNewViewBounds(null);
            map.gotoBoundingBox(correctedBoundingBox, true, true, 0, false);
            waitUntilGotoBoundingBoxIsComplete();
=======
            map.gotoBoundingBox(correctedBoundingBox, true, true, 0, false);
>>>>>>> 64b157eaa744c2ae478826009a7a0f7a6fd5ef6f
        }

        imgScaleDenominator = map.getScaleDenominator();
Solution content 
            map.setNewViewBounds(null);
                    bb.getY2(),
                    boundingBox.getSrs(),
                    boundingBox.isMetric());
            map.gotoBoundingBox(correctedBoundingBox, true, true, 0, false);
            waitUntilGotoBoundingBoxIsComplete();
        }

        imgScaleDenominator = map.getScaleDenominator();
File
HeadlessMapProvider.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        @Override
        public synchronized void repaintStart(final RepaintEvent repaintEvent) {
            final RetrievalEvent e = repaintEvent.getRetrievalEvent();
<<<<<<< HEAD
            LOG.error("start");
=======
>>>>>>> 64b157eaa744c2ae478826009a7a0f7a6fd5ef6f
            if (LOG.isDebugEnabled()) {
                LOG.debug("retrievalStarted" + e.getRetrievalService()); // NOI18N
            }
Solution content 
        @Override
        public synchronized void repaintStart(final RepaintEvent repaintEvent) {
            final RetrievalEvent e = repaintEvent.getRetrievalEvent();
            LOG.error("start");
            if (LOG.isDebugEnabled()) {
                LOG.debug("retrievalStarted" + e.getRetrievalService()); // NOI18N
            }
File
HeadlessMapProvider.java
Developer's decision
Version 1
Kind of conflict
Method invocation