Projects >> xp >>b445ea9ea054e30e60135b14ce383237b9e27f85

Chunk
Conflicting content 
import com.enonic.xp.content.ContentId;
import com.enonic.xp.content.page.region.ImageComponent;
<<<<<<< HEAD
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.PortalResponseSerializer;
=======
import com.enonic.xp.portal.PortalContext;
import com.enonic.xp.portal.PortalResponse;
import com.enonic.xp.portal.RenderMode;
import com.enonic.xp.portal.impl.controller.PortalResponseSerializer;
import com.enonic.xp.portal.rendering.RenderResult;
>>>>>>> 3309351856fbf7e091e5c56ccaf684bbc662c205
import com.enonic.xp.portal.rendering.Renderer;
import com.enonic.xp.portal.url.ImageUrlParams;
import com.enonic.xp.portal.url.PortalUrlService;
Solution content 
import com.enonic.xp.content.ContentId;
import com.enonic.xp.content.page.region.ImageComponent;
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.PortalResponseSerializer;
import com.enonic.xp.portal.rendering.Renderer;
import com.enonic.xp.portal.url.ImageUrlParams;
import com.enonic.xp.portal.url.PortalUrlService;
File
ImageRenderer.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    {
        final ImageUrlParams params = new ImageUrlParams().portalRequest( portalRequest );
        params.id( id.toString() );
<<<<<<< HEAD
        params.scale( "width(500)" );
=======
        params.filter( "scalewidth(768)" );
>>>>>>> 3309351856fbf7e091e5c56ccaf684bbc662c205
        return this.urlService.imageUrl( params );
    }
Solution content 
    {
        final ImageUrlParams params = new ImageUrlParams().portalRequest( portalRequest );
        params.id( id.toString() );
        params.filter( "scalewidth(768)" );
        return this.urlService.imageUrl( params );
    }
File
ImageRenderer.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        //Process an html text containing a link to an unknown media
        final ProcessHtmlParams params = new ProcessHtmlParams().
<<<<<<< HEAD
            portalRequest( this.portalRequest ).
            value( "Content" );
=======
            context( this.context ).
            value( "Media" );
>>>>>>> 3309351856fbf7e091e5c56ccaf684bbc662c205

        //Checks that the error 500 page is returned
        final String processedHtml = this.service.processHtml( params );
Solution content 
        //Process an html text containing a link to an unknown media
        final ProcessHtmlParams params = new ProcessHtmlParams().
            portalRequest( this.portalRequest ).
            value( "Content" );

        //Checks that the error 500 page is returned
        final String processedHtml = this.service.processHtml( params );
File
PortalUrlServiceImpl_processHtmlTest.java
Developer's decision
Version 1
Kind of conflict
Other