Projects >> java-mateview >>0a00330b964ada64db3760b6d43bda85b84d8e78

Chunk
Conflicting content 
	public MateTextLocation getEnd();

	public void setEnd(MateTextLocation location);
<<<<<<< HEAD
	
=======

>>>>>>> fa8c1d7a79c5a8d211c35c47423337010addfa5e
	public int getLength();
	public boolean conatains(MateTextLocation location);
	public boolean overlaps(MateTextRange range);
Solution content 
	public MateTextLocation getEnd();

	public void setEnd(MateTextLocation location);
	
	public int getLength();
	public boolean conatains(MateTextLocation location);
	public boolean overlaps(MateTextRange range);
File
MateTextRange.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
	public int compareTo(MateTextLocation o) {
		return comperator.compare(this, o);
	}
<<<<<<< HEAD:src/com/redcareditor/mate/document/swt/SwtTextLocation.java
	
	private static int computeOffset(int line, int offset, StyledText text){
		line = line < 0 ? 0 : line;
		
		int result = text.getOffsetAtLine(line)+offset;
		
		result = result < 0 ? 0 : result;
		result = result > text.getCharCount() ? text.getCharCount() : result; 
		return result;
	}
	
	@Override
	public boolean equals(Object other) {
		if(other instanceof MateTextLocation){
			return compareTo((MateTextLocation) other) == 0;
		}
		return false;
=======

	private static int computeOffset(int line, int offset, StyledText text) {
		return text.getOffsetAtLine(line) + offset;
>>>>>>> fa8c1d7a79c5a8d211c35c47423337010addfa5e:src/com/redcareditor/mate/document/swt/SwtMateTextLocation.java
	}
}
Solution content 
	public int compareTo(MateTextLocation o) {
		return comperator.compare(this, o);
	}
	
	private static int computeOffset(int line, int offset, StyledText text){
		line = line < 0 ? 0 : line;
		
		int result = text.getOffsetAtLine(line)+offset;
		
		result = result < 0 ? 0 : result;
		result = result > text.getCharCount() ? text.getCharCount() : result; 
		return result;
	}
	
	@Override
	public boolean equals(Object other) {
		if(other instanceof MateTextLocation){
			return compareTo((MateTextLocation) other) == 0;
		}
		return false;
	}
}
File
SwtMateTextLocation.java
Developer's decision
Version 1
Kind of conflict
Annotation
If statement
Method declaration
Method invocation
Method signature
Return statement
Variable