Bug 298936: Regression onI20141027-2000I20141027-0800I20141026-2100

ScrollAnnotatedJavaEditorTest#testScrollJavaEditorLineWise1() perf test

consolidated 5 switches into VerticalRuler.IS_MAC_BUG_298936

5 files changed, 6 insertions, 41 deletions

diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java
index 06d813bd849..027b46205af 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java
@@ -41,8 +41,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 
-import org.eclipse.jface.util.Util;
-
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
@@ -131,13 +129,6 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 		}
 	}
 
-	/**
-	 * <code>true</code> if we're on a Mac, where "new GC(canvas)" is expensive.
-	 * @see <a href="https://bugs.eclipse.org/298936">bug 298936</a>
-	 * @since 3.6
-	 */
-	private static final boolean IS_MAC= Util.isMac();
-
 	/** This column's parent ruler */
 	private CompositeRuler fParentRuler;
 	/** The cached text viewer */
@@ -816,7 +807,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 	 */
 	public void redraw() {
 		if (fCanvas != null && !fCanvas.isDisposed()) {
-			if (IS_MAC) {
+			if (VerticalRuler.IS_MAC_BUG_298936) {
 				fCanvas.redraw();
 				fCanvas.update();
 			} else {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java
index d2be64cc5fd..7669b1cfe3d 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java
@@ -34,7 +34,6 @@ import org.eclipse.core.runtime.Assert;
 
 import org.eclipse.jface.internal.text.revisions.RevisionPainter;
 import org.eclipse.jface.internal.text.source.DiffPainter;
-import org.eclipse.jface.util.Util;
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import org.eclipse.jface.text.BadLocationException;
@@ -117,13 +116,6 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 	}
 
 	/**
-	 * <code>true</code> if we're on a Mac, where "new GC(canvas)" is expensive.
-	 * @see <a href="https://bugs.eclipse.org/298936">bug 298936</a>
-	 * @since 3.6
-	 */
-	private static final boolean IS_MAC= Util.isMac();
-
-	/**
 	 * The view(port) listener.
 	 */
 	private final InternalListener fInternalListener= new InternalListener();
@@ -341,7 +333,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 	public void redraw() {
 
 		if (fCachedTextViewer != null && fCanvas != null && !fCanvas.isDisposed()) {
-			if (IS_MAC) {
+			if (VerticalRuler.IS_MAC_BUG_298936) {
 				fCanvas.redraw();
 				fCanvas.update();
 			} else {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java
index 8e185662c40..cbcd61663c2 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java
@@ -36,8 +36,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.TypedListener;
 
-import org.eclipse.jface.util.Util;
-
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
@@ -365,13 +363,6 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 		}
 	}
 
-	/**
-	 * <code>true</code> if we're on a Mac, where "new GC(canvas)" is expensive.
-	 * @see <a href="https://bugs.eclipse.org/298936">bug 298936</a>
-	 * @since 3.6
-	 */
-	private static final boolean IS_MAC= Util.isMac();
-
 	/** This column's parent ruler */
 	private CompositeRuler fParentRuler;
 	/** Cached text viewer */
@@ -851,7 +842,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 		}
 
 		if (fCachedTextViewer != null && fCanvas != null && !fCanvas.isDisposed()) {
-			if (IS_MAC) {
+			if (VerticalRuler.IS_MAC_BUG_298936) {
 				fCanvas.redraw();
 				fCanvas.update();
 			} else {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java
index 9b85bdcb5a4..bfaeb3dbe26 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java
@@ -41,8 +41,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.ScrollBar;
 
-import org.eclipse.jface.util.Util;
-
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
@@ -376,13 +374,6 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 	private static final boolean DEBUG_COMPUTE_Y= false;
 	private static final boolean DEBUG_TO_DOCUMENT_LINE_NUMBER= false;
 	
-	/**
-	 * <code>true</code> if we're on a Mac, where "new GC(canvas)" is expensive.
-	 * @see <a href="https://bugs.eclipse.org/298936">bug 298936</a>
-	 * @since 3.6
-	 */
-	private static final boolean IS_MAC= Util.isMac();
-
 	private static final int INSET= 2;
 	private static final int ANNOTATION_HEIGHT= 4;
 	private static boolean ANNOTATION_HEIGHT_SCALABLE= true;
@@ -896,7 +887,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 			return;
 
 		if (fCanvas != null && !fCanvas.isDisposed()) {
-			if (IS_MAC) {
+			if (VerticalRuler.IS_MAC_BUG_298936) {
 				fCanvas.redraw();
 				fCanvas.update();
 			} else {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java
index 127b5f7ca9f..4efa04e9dab 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java
@@ -92,7 +92,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens
 	 * @see <a href="https://bugs.eclipse.org/298936">bug 298936</a>
 	 * @since 3.6
 	 */
-	private static final boolean IS_MAC= Util.isMac();
+	static final boolean IS_MAC_BUG_298936= Util.isMac();
 
 	/** The vertical ruler's text viewer */
 	private ITextViewer fTextViewer;
@@ -472,7 +472,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens
 	 */
 	private void redraw() {
 		if (fCanvas != null && !fCanvas.isDisposed()) {
-			if (IS_MAC) {
+			if (IS_MAC_BUG_298936) {
 				fCanvas.redraw();
 				fCanvas.update();
 			} else {