Projects information

Chunk

Conflicting content
@Override public void move( final RealLocalizable localizable ) { <<<<<<< HEAD:imglib/src/main/java/mpicbg/imglib/position/transform/Floor.java for ( int d = 0; d < n; ++d ) { final double realPosition = position[ d ] + localizable.getDoublePosition( d ); final long floorPosition = floor( realPosition ); position[ d ] = realPosition; floor[ d ] = floorPosition - target.getLongPosition( d ); } target.move( floor ); } @Override public void move( final float[] distance ) ======= localizable.localize( position ); move( position ); } @Override public void move( final float[] pos ) >>>>>>> 2991943fc7b09ec44ef9c926b49b481731645055:imglib/src/main/java/mpicbg/imglib/location/transform/FloorRasterPositionable.java { for ( int d = 0; d < n; ++d ) {

Conflicting content

	@Override
	public void move( final RealLocalizable localizable )
	{
<<<<<<< HEAD:imglib/src/main/java/mpicbg/imglib/position/transform/Floor.java
		for ( int d = 0; d < n; ++d )
		{
			final double realPosition = position[ d ] + localizable.getDoublePosition( d );
			final long floorPosition = floor( realPosition );
			position[ d ] = realPosition;
			floor[ d ] = floorPosition - target.getLongPosition( d );
		}
		target.move( floor );
	}

	@Override
	public void move( final float[] distance )
=======
		localizable.localize( position );
		move( position );
	}

	@Override
	public void move( final float[] pos )
>>>>>>> 2991943fc7b09ec44ef9c926b49b481731645055:imglib/src/main/java/mpicbg/imglib/location/transform/FloorRasterPositionable.java
	{
		for ( int d = 0; d < n; ++d )
		{

Solution content
@Override public void move( final RealLocalizable localizable ) { for ( int d = 0; d < n; ++d ) { final double realPosition = position[ d ] + localizable.getDoublePosition( d ); final long floorPosition = floor( realPosition ); position[ d ] = realPosition; floor[ d ] = floorPosition - target.getLongPosition( d ); } target.move( floor ); } @Override public void move( final float[] distance ) { for ( int d = 0; d < n; ++d ) {

Solution content

	@Override
	public void move( final RealLocalizable localizable )
	{
		for ( int d = 0; d < n; ++d )
		{
			final double realPosition = position[ d ] + localizable.getDoublePosition( d );
			final long floorPosition = floor( realPosition );
			position[ d ] = realPosition;
			floor[ d ] = floorPosition - target.getLongPosition( d );
		}
		target.move( floor );
	}

	@Override
	public void move( final float[] distance )
	{
		for ( int d = 0; d < n; ++d )
		{

File
Floor.java

Developer's decision
Version 1

Kind of conflict
Annotation
For statement
Method invocation
Method signature

Chunk

Conflicting content
} @Override <<<<<<< HEAD:imglib/src/main/java/mpicbg/imglib/position/transform/Floor.java public void move( final double[] distance ) ======= public void move( final double[] pos ) >>>>>>> 2991943fc7b09ec44ef9c926b49b481731645055:imglib/src/main/java/mpicbg/imglib/location/transform/FloorRasterPositionable.java { for ( int d = 0; d < n; ++d ) {

Conflicting content

	}

	@Override
<<<<<<< HEAD:imglib/src/main/java/mpicbg/imglib/position/transform/Floor.java
	public void move( final double[] distance )
=======
	public void move( final double[] pos )
>>>>>>> 2991943fc7b09ec44ef9c926b49b481731645055:imglib/src/main/java/mpicbg/imglib/location/transform/FloorRasterPositionable.java
	{
		for ( int d = 0; d < n; ++d )
		{

Solution content
} @Override public void move( final double[] distance ) { for ( int d = 0; d < n; ++d ) {

File
Floor.java

Developer's decision
Version 1

Kind of conflict
Method signature

Chunk

Conflicting content
@Override public void move( final Localizable localizable ) { <<<<<<< HEAD:imglib/src/main/java/mpicbg/imglib/position/transform/Floor.java for ( int d = 0; d < n; ++d ) position[ d ] += localizable.getDoublePosition( d ); ======= localizable.localize( position ); >>>>>>> 2991943fc7b09ec44ef9c926b49b481731645055:imglib/src/main/java/mpicbg/imglib/location/transform/FloorRasterPositionable.java target.move( localizable ); }

Conflicting content

	@Override
	public void move( final Localizable localizable )
	{
<<<<<<< HEAD:imglib/src/main/java/mpicbg/imglib/position/transform/Floor.java
		for ( int d = 0; d < n; ++d )
			position[ d ] += localizable.getDoublePosition( d ); 
			
=======
		localizable.localize( position );
>>>>>>> 2991943fc7b09ec44ef9c926b49b481731645055:imglib/src/main/java/mpicbg/imglib/location/transform/FloorRasterPositionable.java
		target.move( localizable );
	}

Solution content
@Override public void move( final Localizable localizable ) { for ( int d = 0; d < n; ++d ) position[ d ] += localizable.getDoublePosition( d ); target.move( localizable ); }

File
Floor.java

Developer's decision
Version 1

Kind of conflict
For statement
Method invocation

Chunk

Conflicting content
} @Override <<<<<<< HEAD:imglib/src/main/java/mpicbg/imglib/position/transform/Floor.java public void move( final int[] distance ) { for ( int d = 0; d < n; ++d ) position[ d ] += distance[ d ]; target.move( distance ); } @Override public void move( final long[] distance ) { for ( int d = 0; d < n; ++d ) position[ d ] += distance[ d ]; target.move( distance ); ======= public void move( final int[] pos ) { for ( int d = 0; d < numDimensions; ++d ) this.position[ d ] = pos[ d ]; target.move( pos ); } @Override public void move( final long[] pos ) { for ( int d = 0; d < numDimensions; ++d ) this.position[ d ] = pos[ d ]; target.move( pos ); >>>>>>> 2991943fc7b09ec44ef9c926b49b481731645055:imglib/src/main/java/mpicbg/imglib/location/transform/FloorRasterPositionable.java } @Override

Conflicting content

	}

	@Override
<<<<<<< HEAD:imglib/src/main/java/mpicbg/imglib/position/transform/Floor.java
	public void move( final int[] distance )
	{
		for ( int d = 0; d < n; ++d )
			position[ d ] += distance[ d ]; 
			
		target.move( distance );
	}

	@Override
	public void move( final long[] distance )
	{
		for ( int d = 0; d < n; ++d )
			position[ d ] += distance[ d ];
		
		target.move( distance );
=======
	public void move( final int[] pos )
	{
		for ( int d = 0; d < numDimensions; ++d )
			this.position[ d ] = pos[ d ];
		target.move( pos );
	}

	@Override
	public void move( final long[] pos )
	{
		for ( int d = 0; d < numDimensions; ++d )
			this.position[ d ] = pos[ d ];
		target.move( pos );
>>>>>>> 2991943fc7b09ec44ef9c926b49b481731645055:imglib/src/main/java/mpicbg/imglib/location/transform/FloorRasterPositionable.java
	}
	
	@Override

Solution content
} @Override public void move( final int[] distance ) { for ( int d = 0; d < n; ++d ) position[ d ] += distance[ d ]; target.move( distance ); } @Override public void move( final long[] distance ) { for ( int d = 0; d < n; ++d ) position[ d ] += distance[ d ]; target.move( distance ); } @Override

Solution content

	}

	@Override
	public void move( final int[] distance )
	{
		for ( int d = 0; d < n; ++d )
			position[ d ] += distance[ d ]; 
			
		target.move( distance );
	}

	@Override
	public void move( final long[] distance )
	{
		for ( int d = 0; d < n; ++d )
			position[ d ] += distance[ d ];
		
		target.move( distance );
	}
	
	@Override

File
Floor.java

Developer's decision
Version 1

Kind of conflict
Annotation
For statement
Method declaration
Method invocation
Method signature

Projects >> imglib2 >>3905f29c9ffc0f5e1142d620ccff6e8934d054f0