Projects >> vrapper >>bb539d411e6bd521394b784889961f7b99a918fe

Chunk
Conflicting content 
    @Override
    public static final Motion MOVE_BIG_WORD_RIGHT_INSTANCE_BAIL_OFF = new MoveWordRightForUpdate( new MoveBigWORDRight(true) );
    
    
<<<<<<< HEAD
    //delegate motion
    private CountAwareMotion delegate;
    
    private MoveWordRightForUpdate(){}
    
    private MoveWordRightForUpdate(CountAwareMotion delegate) {
        this.delegate = delegate;
    }
    
    public int getCount() {
        return delegate.getCount();
    }

    public BorderPolicy borderPolicy() {
        return delegate.borderPolicy();
    }

    public boolean updateStickyColumn() {
        return delegate.updateStickyColumn();
    }

    public boolean isJump() {
        return delegate.isJump();
=======
    protected MoveWordRightForUpdate(boolean bailOff) {
    	super(bailOff);
>>>>>>> 6ed16623c9949095733844db36b10e6a25dec638
    }
Solution content 
    public static final Motion MOVE_BIG_WORD_RIGHT_INSTANCE_BAIL_OFF = new MoveWordRightForUpdate( new MoveBigWORDRight(true) );
    
    
    //delegate motion
    private CountAwareMotion delegate;
    
    private MoveWordRightForUpdate(){}
    
    private MoveWordRightForUpdate(CountAwareMotion delegate) {
        this.delegate = delegate;
    }
    
    public int getCount() {
        return delegate.getCount();
    }

    public BorderPolicy borderPolicy() {
        return delegate.borderPolicy();
    }

    public boolean updateStickyColumn() {
        return delegate.updateStickyColumn();
    }

    public boolean isJump() {
        return delegate.isJump();
    }

    @Override
File
MoveWordRightForUpdate.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method declaration
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
<<<<<<< HEAD
        int originalOffset = editorAdaptor.getPosition().getModelOffset();
        Position parentPosition = super.destination(editorAdaptor,count);
        
        //differ from the delegate in that we trim the last newline where appropriate
        int newOffset = offsetWithoutLastNewline(originalOffset, delegatePosition.getModelOffset(), editorAdaptor.getModelContent());
=======
        //differ from the parent in that we trim the last newline where appropriate
        int newOffset = MoveWordRightUtils.offsetWithoutLastNewline(originalOffset, parentPosition.getModelOffset(), editorAdaptor.getModelContent());
>>>>>>> 6ed16623c9949095733844db36b10e6a25dec638
        
        return editorAdaptor.getCursorService().newPositionForModelOffset(newOffset);
    }
Solution content 
        int originalOffset = editorAdaptor.getPosition().getModelOffset();
        Position delegatePosition = delegate.destination(editorAdaptor,count);
        
        //differ from the delegate in that we trim the last newline where appropriate
        int newOffset = offsetWithoutLastNewline(originalOffset, delegatePosition.getModelOffset(), editorAdaptor.getModelContent());
        
        return editorAdaptor.getCursorService().newPositionForModelOffset(newOffset);
    }
File
MoveWordRightForUpdate.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable