Attachment 40729 Details for Bug 140802 – AnnotationPainter.java.diff

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] AnnotationPainter.java.diff

AnnotationPainter.java.diff (text/plain), 1.67 KB, created by Tom Hofmann

on 2006-05-09 10:41:10 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Hofmann

Created: 2006-05-09 10:41:10 EDT

Size: 1.67 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface.text
>Index: src/org/eclipse/jface/text/source/AnnotationPainter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java,v
>retrieving revision 1.75
>diff -u -r1.75 AnnotationPainter.java
>--- src/org/eclipse/jface/text/source/AnnotationPainter.java	28 Mar 2006 16:39:25 -0000	1.75
>+++ src/org/eclipse/jface/text/source/AnnotationPainter.java	9 May 2006 14:35:02 -0000
>@@ -1193,7 +1193,7 @@
> 			Annotation a= (Annotation)entry.getKey();
> 			Decoration pp = (Decoration)entry.getValue();
> 			// prune any annotation that is not drawable or does not need drawing
>-			if (!(a.isMarkedDeleted() || pp.fPainter == fgNullDrawer || pp.fPainter instanceof NullStrategy || skip(a) || !pp.fPosition.overlapsWith(vOffset, vLength))) {
>+			if (!(a.isMarkedDeleted() || pp.fPainter == fgNullDrawer || pp.fPainter instanceof NullStrategy || skip(a) || !overlapsWith(vOffset, vLength, pp.fPosition.getOffset(), pp.fPosition.getLength()))) {
> 				// ensure sized appropriately
> 				for (int i= toBeDrawn.size(); i <= pp.fLayer; i++)
> 					toBeDrawn.add(new LinkedList());
>@@ -1377,16 +1377,7 @@
> 	private boolean overlapsWith(int offset1, int length1, int offset2, int length2) {
> 		int end= offset2 + length2;
> 		int thisEnd= offset1 + length1;
>-
>-		if (length2 > 0) {
>-			if (length1 > 0)
>-				return offset1 < end && offset2 < thisEnd;
>-			return  offset2 <= offset1 && offset1 < end;
>-		}
>-
>-		if (length1 > 0)
>-			return offset1 <= offset2 && offset2 < thisEnd;
>-		return offset1 == offset2;
>+		return offset1 <= end && offset2 <= thisEnd;
> 	}
> 
> 	/*

Actions: View | Diff

Attachments on bug 140802: 40729