Projects >> xp >>8ac56ce4cc887dff3b49969dfe5761573dcd0cf2

Chunk
Conflicting content 
import com.enonic.xp.admin.impl.rest.resource.BaseImageHelperImpl;
import com.enonic.xp.image.ImageHelper;
<<<<<<< HEAD
import com.enonic.xp.image.filter.ScaleMaxFunction;
import com.enonic.xp.image.filter.ScaleSquareFunction;
=======
import com.enonic.xp.image.filter.ScaleMaxFilter;
import com.enonic.xp.image.filter.ScaleSquareFilter;
import com.enonic.xp.image.filter.ScaleWidthFilter;
>>>>>>> 3891254d81464f0c52b71127c53149167e2e6959
import com.enonic.xp.media.ImageOrientation;
import com.enonic.xp.util.Exceptions;
Solution content 
import com.enonic.xp.admin.impl.rest.resource.BaseImageHelperImpl;
import com.enonic.xp.image.ImageHelper;
import com.enonic.xp.image.filter.ScaleMaxFunction;
import com.enonic.xp.image.filter.ScaleSquareFunction;
import com.enonic.xp.image.filter.ScaleWidthFunction;
import com.enonic.xp.media.ImageOrientation;
import com.enonic.xp.util.Exceptions;
File
ContentImageHelperImpl.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
        }
        catch ( final Exception e )
        {
<<<<<<< HEAD
            throw new RuntimeException( "Invalid site.xml file", e );
=======
            throw new XmlException( e, "Could not load module descriptor [bundle:" + module.bundle.getSymbolicName() + ":" + url.getFile() +
                "]: " + e.getMessage() );
>>>>>>> 3891254d81464f0c52b71127c53149167e2e6959
        }
    }
Solution content 
        }
        catch ( final Exception e )
        {
            throw new XmlException( e, "Invalid site.xml file [bundle:" + module.bundle.getSymbolicName() + ":" + url.getFile() +
                "]: " + e.getMessage() );
        }
    }
File
ModuleBuilder.java
Developer's decision
Manual
Kind of conflict
Throw statement
Chunk
Conflicting content 
import com.enonic.xp.content.page.region.Component;
import com.enonic.xp.content.page.region.Descriptor;
import com.enonic.xp.content.page.region.DescriptorBasedComponent;
<<<<<<< HEAD
import com.enonic.xp.portal.PortalRequest;
=======
import com.enonic.xp.module.ModuleKey;
import com.enonic.xp.portal.PortalContext;
>>>>>>> 3891254d81464f0c52b71127c53149167e2e6959
import com.enonic.xp.portal.PortalResponse;
import com.enonic.xp.portal.RenderMode;
import com.enonic.xp.portal.impl.controller.ControllerScript;
Solution content 
import com.enonic.xp.content.page.region.Component;
import com.enonic.xp.content.page.region.Descriptor;
import com.enonic.xp.content.page.region.DescriptorBasedComponent;
import com.enonic.xp.module.ModuleKey;
import com.enonic.xp.portal.PortalRequest;
import com.enonic.xp.portal.PortalResponse;
import com.enonic.xp.portal.RenderMode;
import com.enonic.xp.portal.impl.controller.ControllerScript;
File
DescriptorBasedComponentRenderer.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
        {
        final ControllerScript controllerScript = this.controllerScriptFactory.fromDir( descriptor.getComponentPath() );

        // render
<<<<<<< HEAD
        final Component previousComponent = portalRequest.getComponent();
        try
            portalRequest.setComponent( component );
            controllerScript.execute( portalRequest, portalResponse );
=======
        final Component previousComponent = context.getComponent();
        final ModuleKey previousModule = context.getModule();
        try
        {
            context.setComponent( component );
            context.setModule( descriptor.getKey().getModuleKey() );

            controllerScript.execute( context );
            final PortalResponse response = context.getResponse();
>>>>>>> 3891254d81464f0c52b71127c53149167e2e6959

            final RenderMode renderMode = getRenderingMode( portalRequest );
            final String contentType = portalResponse.getContentType();
Solution content 
        final ControllerScript controllerScript = this.controllerScriptFactory.fromDir( descriptor.getComponentPath() );

        // render
        final Component previousComponent = portalRequest.getComponent();
        final ModuleKey previousModule = portalRequest.getModule();
        try
        {
            portalRequest.setComponent( component );
            portalRequest.setModule( descriptor.getKey().getModuleKey() );
            controllerScript.execute( portalRequest, portalResponse );

            final RenderMode renderMode = getRenderingMode( portalRequest );
            final String contentType = portalResponse.getContentType();
File
DescriptorBasedComponentRenderer.java
Developer's decision
Manual
Kind of conflict
Method invocation
Try statement
Variable
Chunk
Conflicting content 
        }
        finally
        {
<<<<<<< HEAD
            portalRequest.setComponent( previousComponent );
=======
            context.setComponent( previousComponent );
            context.setModule( previousModule );
>>>>>>> 3891254d81464f0c52b71127c53149167e2e6959
        }
    }
Solution content 
        }
        finally
        {
            portalRequest.setComponent( previousComponent );
            portalRequest.setModule( previousModule );
        }
    }
File
DescriptorBasedComponentRenderer.java
Developer's decision
Manual
Kind of conflict
Method invocation