| 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.media.MediaInfoService; ======= import com.enonic.xp.image.filter.ScaleMaxFilter; import com.enonic.xp.image.filter.ScaleSquareFilter; import com.enonic.xp.media.ImageOrientation; >>>>>>> 0a3e8a599a7cfe9ecb68d379c4030aeec1a926ef import com.enonic.xp.util.Exceptions; @Component |
| 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.media.ImageOrientation; import com.enonic.xp.util.Exceptions; @Component |
| File |
|---|
| ContentImageHelperImpl.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
{
if ( imageParams.isCropRequired() )
{
<<<<<<< HEAD
case SCALE_SQUARE_FILTER:
return new ScaleSquareFunction( size ).scale( image );
case SCALE_MAX_FILTER:
return new ScaleMaxFunction( size ).scale( image );
default:
throw new IllegalArgumentException( "Invalid image filter: " + imageFilter );
=======
return new ScaleSquareFilter( imageParams.getSize() ).filter( image );
}
else
{
return new ScaleMaxFilter( imageParams.getSize() ).filter( image );
>>>>>>> 0a3e8a599a7cfe9ecb68d379c4030aeec1a926ef
}
}
else |
| Solution content |
|---|
{
if ( imageParams.isCropRequired() )
{
return new ScaleSquareFunction( imageParams.getSize() ).scale( image );
}
else
{
return new ScaleMaxFunction( imageParams.getSize() ).scale( image );
}
}
else |
| File |
|---|
| ContentImageHelperImpl.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Case statement |
| Method invocation |
| Return statement |
| Throw statement |