removed debug output

12 files changed, 36 insertions, 37 deletions

diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/DefaultContent.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/DefaultContent.java
index 379ceced4..280515b27 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/DefaultContent.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/DefaultContent.java
@@ -12,6 +12,8 @@ package org.eclipse.fx.ui.controls.styledtext;
 

 import java.util.Vector;

 

+import org.eclipse.fx.ui.controls.styledtext.internal.ContentView;

+

 class DefaultContent implements StyledTextContent {

 	static class Compatibility {

 		public static int pow2(int n) {

@@ -885,7 +887,7 @@ class DefaultContent implements StyledTextContent {
 		for (TextChangeListener l : this.textListeners) {

 			l.textChanged(textChanged);

 		}

-		System.err.println(getTextRange(0, getCharCount()));

+		if(ContentView.debugOut) System.err.println(getTextRange(0, getCharCount()));

 	}

 

 	/**

diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextArea.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextArea.java
index d787dbbb8..d6c6991a5 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextArea.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextArea.java
@@ -16,6 +16,7 @@ import java.lang.ref.WeakReference;
 import java.util.Collections;
 
 import org.eclipse.fx.ui.controls.styledtext.StyledTextContent.TextChangeListener;
+import org.eclipse.fx.ui.controls.styledtext.internal.ContentView;
 import org.eclipse.fx.ui.controls.styledtext.model.AnnotationPresenter;
 import org.eclipse.fx.ui.controls.styledtext.model.AnnotationProvider;
 import org.eclipse.fx.ui.controls.styledtext.skin.StyledTextSkin;
@@ -188,7 +189,7 @@ public class StyledTextArea extends Control {
 
 
 	void handleTextChanging(TextChangingEvent event) {
-		System.err.println("handleTextChanging");
+		if(ContentView.debugOut) System.err.println("handleTextChanging");
 		changingEvent = event;
 
 		this.renderer.textChanging(event);
@@ -217,7 +218,7 @@ public class StyledTextArea extends Control {
 	}
 
 	void handleTextChanged(TextChangedEvent xxx) {
-		System.err.println("handleTextChanged");
+		if(ContentView.debugOut) System.err.println("handleTextChanged");
 
 		if (changingEvent == null) {
 			// full text change
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/VerticalLineFlow.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/VerticalLineFlow.java
index 6dba57505..a8063a3f1 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/VerticalLineFlow.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/VerticalLineFlow.java
@@ -11,6 +11,8 @@ import java.util.function.Function;
 import java.util.function.Predicate;

 import java.util.function.Supplier;

 

+import org.eclipse.fx.ui.controls.styledtext.internal.ContentView;

+

 import javafx.beans.InvalidationListener;

 import javafx.beans.property.DoubleProperty;

 import javafx.beans.property.IntegerProperty;

@@ -138,7 +140,7 @@ public class VerticalLineFlow<M, N>  extends NodeCachePane {
 	protected void layoutChildren() {

 		this.activeNodes.entrySet().forEach(e -> {

 			if (!yOffsetData.containsKey(e.getKey())) {

-				System.err.println("NO DATA FOR " + e);

+				if(ContentView.debugOut) System.err.println("NO DATA FOR " + e);

 				return;

 			}

 			double x = 0;

diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/HoverSupport.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/HoverSupport.java
index 69bb1184b..55c7d224a 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/HoverSupport.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/HoverSupport.java
@@ -57,7 +57,6 @@ public class HoverSupport {
 	}

 

 	private void onMouseMoved(MouseEvent event) {

-		System.err.println("moved " + event.getTarget());

 		if( this.lastHover != null ) {

 			TextHoverEvent hoverEvent = createHoverEvent(event);

 			if( this.lastHover.getOffsetTokenStart() != hoverEvent.getOffsetTokenStart() ) {

@@ -77,7 +76,6 @@ public class HoverSupport {
 

 	protected static TextHoverEvent createHoverEvent(MouseEvent e) {

 

-		System.err.println("createHover for " + e.getTarget());

 

 		// TODO fix hover event

 //		if (e.getTarget() instanceof Annotation)

@@ -103,7 +101,6 @@ public class HoverSupport {
 

 	protected void handleHover(MouseEvent e) {

 		TextHoverEvent event = createHoverEvent(e);

-		System.err.println("hoverEvent " + event);

 		if( this.lastHover == null || this.lastHover.getOffsetTokenStart() != event.getOffsetTokenStart() ) {

 			Event.fireEvent(control, event);

 			if( event.getOffset() == -1 ) {

diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/StyledTextBehavior.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/StyledTextBehavior.java
index cee4c505d..ee97269bf 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/StyledTextBehavior.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/StyledTextBehavior.java
@@ -176,14 +176,12 @@ public class StyledTextBehavior {
 		}
 
 		public void selectWithCaretAtStart() {
-			System.err.println("selecting " + start + " l " + length);
 			moveCaretAbsolute(start);
 			getControl().setSelection(new TextSelection(start, length));
 		}
 
 
 		public void selectWithCaretAtEnd() {
-			System.err.println("selecting " + start + " l " + length);
 			moveCaretAbsolute(end);
 			getControl().setSelection(new TextSelection(start, length));
 		}
@@ -207,7 +205,6 @@ public class StyledTextBehavior {
 		int selOffset = getControl().getSelection().offset;
 		int selLength = getControl().getSelection().length;
 		boolean r =  selLength > 0 && isInRange(offset, selOffset, selLength);
-		System.err.println("isInSelection(" + offset + ")" + "[" + selOffset + ", " + (selOffset + selLength) + ") -> " + r);
 		return r;
 	}
 
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/ContentView.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/ContentView.java
index de0ede402..1c2e59345 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/ContentView.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/ContentView.java
@@ -44,7 +44,7 @@ import javafx.scene.layout.StackPane;
 

 public class ContentView  extends Pane {

 

-	private static boolean debugOut = Boolean.getBoolean("styledtext.debugout");

+	public static boolean debugOut = Boolean.getBoolean("styledtext.debugout");

 

 	private SetProperty<TextAnnotationPresenter> textAnnotationPresenter = new SimpleSetProperty<>(FXCollections.observableSet());

 	public SetProperty<TextAnnotationPresenter> textAnnotationPresenterProperty() {

@@ -379,7 +379,7 @@ public class ContentView  extends Pane {
 	private Range<Integer> getAffectedLines(TextSelection selection) {

 		int firstLine = getContent().getLineAtOffset(selection.offset);

 		int lastLine = getContent().getLineAtOffset(selection.offset + selection.length);

-		System.err.println("getAffectedLines " + selection + " -> " + firstLine + " - " + lastLine);

+		if(debugOut) System.err.println("getAffectedLines " + selection + " -> " + firstLine + " - " + lastLine);

 		if (lastLine == -1) {

 			lastLine = numberOfLines.get();

 		}

@@ -401,7 +401,7 @@ public class ContentView  extends Pane {
 			RangeSet<Integer> toUpdate = TreeRangeSet.create();

 			if (o != null) toUpdate.add(getAffectedLines(o));

 			if (n != null) toUpdate.add(getAffectedLines(n));

-			System.err.println("ContentView: onSelectionChange " + o + " -> " + n + " triggered " + toUpdate);

+			if(debugOut) System.err.println("ContentView: onSelectionChange " + o + " -> " + n + " triggered " + toUpdate);

 			updateNodesNow(toUpdate);

 		});

 	}

@@ -413,7 +413,7 @@ public class ContentView  extends Pane {
 			}

 			if (n != null) {

 				n.addTextChangeListener(this.textChangeListener);

-				System.err.println("init #ofLines with " + n.getLineCount());

+				if(debugOut) System.err.println("init #ofLines with " + n.getLineCount());

 				this.numberOfLines.set(n.getLineCount());

 			}

 		});

@@ -422,7 +422,7 @@ public class ContentView  extends Pane {
 			current.addTextChangeListener(this.textChangeListener);

 

 			// set inital values

-			System.err.println("init #ofLines with " + current.getLineCount());

+			if(debugOut) System.err.println("init #ofLines with " + current.getLineCount());

 			numberOfLines.set(current.getLineCount());

 

 		}

@@ -436,7 +436,7 @@ public class ContentView  extends Pane {
 

 		@Override

 		public void textSet(TextChangedEvent event) {

-			System.err.println("ContentView textSet");

+			if(debugOut) System.err.println("ContentView textSet");

 

 			// update number of lines

 			ContentView.this.numberOfLines.set(getContent().getLineCount());

@@ -467,16 +467,16 @@ public class ContentView  extends Pane {
 

 		@Override

 		public void textChanging(TextChangingEvent event) {

-			System.err.println("ContentView textChanging");

-			System.err.println(" current doc len = " + getContent().getLineCount());

-			System.err.println("Event: "+ event);

+			if(debugOut) System.err.println("ContentView textChanging");

+			if(debugOut) System.err.println(" current doc len = " + getContent().getLineCount());

+			if(debugOut) System.err.println("Event: "+ event);

 

 			final int changeBeginLine = getContent().getLineAtOffset(event.offset);

 

 			// determine first unchanged line

 			int firstUnchangedLine = computeFirstUnchangedLine(event);

 

-			System.err.println("FIRST UNCHANGEDLINE: " + firstUnchangedLine);

+			if(debugOut) System.err.println("FIRST UNCHANGEDLINE: " + firstUnchangedLine);

 

 			int deltaLines = event.newLineCount - event.replaceLineCount;

 

@@ -564,7 +564,7 @@ public class ContentView  extends Pane {
 

 		@Override

 		public void textChanged(TextChangedEvent event) {

-			System.err.println("ContentView textChanged");

+			if(debugOut) System.err.println("ContentView textChanged");

 

 

 			if (!toRelease.isEmpty()) {

@@ -662,8 +662,8 @@ public class ContentView  extends Pane {
 	}

 

 	private double computeLongestLine() {

-		System.err.println("compute longest line til " + getNumberOfLines());

-		System.err.println(" while content has " + content.get().getLineCount());

+		if(debugOut) System.err.println("compute longest line til " + getNumberOfLines());

+		if(debugOut) System.err.println(" while content has " + content.get().getLineCount());

 		Optional<Integer> longestLine = IntStream.range(0, getNumberOfLines()).mapToObj(index->lineHelper.getLengthCountTabsAsChars(index)).collect(Collectors.maxBy(Integer::compare));

 //		Optional<Integer> longestLine = model.stream().map(m->m.getLineLength() + countTabs(m.getText()) * 3).collect(Collectors.maxBy(Integer::compare));

 		longestLine = longestLine.map(s->s+2); // extra space

@@ -701,9 +701,9 @@ public class ContentView  extends Pane {
 

 

 	private void updateNodesNow(com.google.common.collect.RangeSet<Integer> rs) {

-		System.err.println("updateNodesNow nr of lines = " + getNumberOfLines());

+		if(debugOut) System.err.println("updateNodesNow nr of lines = " + getNumberOfLines());

 		RangeSet<Integer> subRangeSet = rs.subRangeSet(getVisibleLines()).subRangeSet(Range.closedOpen(0, getNumberOfLines()));

-		System.err.println("updateNodesNow: " + subRangeSet);

+		if(debugOut) System.err.println("updateNodesNow: " + subRangeSet);

 		subRangeSet.asRanges().forEach(r-> {

 			ContiguousSet.create(r, DiscreteDomain.integers()).forEach(index-> {

 				getLineLayer().updateNode(index);

diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineHelper.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineHelper.java
index 585b78d5e..d3985d100 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineHelper.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineHelper.java
@@ -100,9 +100,9 @@ public class LineHelper {
 		}

 

 		if (localSelection != null) {

-			System.err.println(index + " linerange - " + range);

-			System.err.println(index + " globalSelection - " + selection);

-			System.err.println(index + " localSelection - " + localSelection);

+			if(ContentView.debugOut) System.err.println(index + " linerange - " + range);

+			if(ContentView.debugOut) System.err.println(index + " globalSelection - " + selection);

+			if(ContentView.debugOut) System.err.println(index + " localSelection - " + localSelection);

 		}

 

 		return localSelection;

diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineNode.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineNode.java
index 9d4032051..2641e73f0 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineNode.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineNode.java
@@ -391,7 +391,7 @@ public class LineNode extends StackPane {
 

 			public void prepareNodes(Set<TextAnnotation> annotations) {

 				boolean same = current.equals(annotations);

-				System.err.println("annotation check: " + current +"\n"

+				if(ContentView.debugOut) System.err.println("annotation check: " + current +"\n"

 								+  "          versus: " + annotations + "\n"

 								+  "               -> " + same);

 

diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineRuler.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineRuler.java
index eaf9ae0c8..f6295f7a8 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineRuler.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/LineRuler.java
@@ -26,7 +26,7 @@ public class LineRuler extends VerticalLineFlow<Integer, Annotation>{
 	protected void layoutChildren() {

 		this.activeNodes.entrySet().forEach(e -> {

 			if (!yOffsetData.containsKey(e.getKey())) {

-				System.err.println("NO DATA FOR " + e);

+				if(ContentView.debugOut) System.err.println("NO DATA FOR " + e);

 				return;

 			}

 			double x = 0;

diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/Scroller.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/Scroller.java
index c6aae79ca..8314e23a5 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/Scroller.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/Scroller.java
@@ -134,7 +134,7 @@ public class Scroller {
 	}

 

 	public void scrollIntoView(int line) {

-		System.err.println("scrollIntoView " + line);

+		if(ContentView.debugOut) System.err.println("scrollIntoView " + line);

 

 		double lineOffset = line * this.lineHeight.get();

 

diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/skin/StyledTextSkin.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/skin/StyledTextSkin.java
index 3ef956899..91c8f4373 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/skin/StyledTextSkin.java
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/skin/StyledTextSkin.java
@@ -132,14 +132,14 @@ public class StyledTextSkin extends SkinBase<StyledTextArea> {
 
 		Map<AnnotationProvider, Subscription> subscriptions = new HashMap<>();
 		Consumer<RangeSet<Integer>> onAnnotationChange = r-> {
-			System.err.println("onAnnotationChange " + r);
+			if(ContentView.debugOut) System.err.println("onAnnotationChange " + r);
 			content.updateAnnotations(r);
 			sortedLineRulerFlows.forEach(f->f.update(r));
 		};
 
 		getSkinnable().getAnnotationProvider().addListener((SetChangeListener<? super AnnotationProvider>)(c) -> {
 			if (c.wasAdded()) {
-				System.err.println("register for2 " + c.getElementAdded());
+				if(ContentView.debugOut) System.err.println("register for2 " + c.getElementAdded());
 				Subscription s = c.getElementAdded().registerChangeListener(onAnnotationChange);
 				subscriptions.put(c.getElementAdded(), s);
 			}
@@ -149,7 +149,7 @@ public class StyledTextSkin extends SkinBase<StyledTextArea> {
 			}
 		});
 		for (AnnotationProvider p : getSkinnable().getAnnotationProvider()) {
-			System.err.println("register for " + p);
+			if(ContentView.debugOut) System.err.println("register for " + p);
 			if (!subscriptions.containsKey(p)) {
 				Subscription s = p.registerChangeListener(onAnnotationChange);
 				subscriptions.put(p, s);
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/styledtextarea.css b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/styledtextarea.css
index 65c987e6f..b202a26bc 100644
--- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/styledtextarea.css
+++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/styledtextarea.css
@@ -1,5 +1,5 @@
 .styled-text-area .source-segment {
-	-fx-font-family: Monospace;
+	-fx-font-family: Courier;
 	-fx-font-size: 12;
 	/* @SuppressWarning */
 	-styled-text-color: black;
@@ -17,12 +17,12 @@
 }
 
 .styled-text-area .plain-source-segment {
-	-fx-font-family: Monospace;
+	-fx-font-family: Courier;
 	-fx-font-size: 12;
 }
 
 .styled-text-area .line-ruler-text {
-	-fx-font-family: Monospace;
+	-fx-font-family: Courier;
 	-fx-font-size: 12;
 	-fx-fill: gray;
 }