commit 8c3a16f3a034f78ec2d8e7189345a37b7b68015d
author Stephan Wahlbrink <sw@wahlbrink.eu> Tue Jun 22 14:48:28 2021 +0200
committer Stephan Wahlbrink <sw@wahlbrink.eu> Tue Jun 22 16:57:43 2021 +0200
tree 39a34e329d13a9281e8edf3cfd149a2ffb90fe8c
parent a96394eeec5631e8f643d882123d388e1e22dc7e

Bug 574391: Make extending TextViewerEditorColorUpdater.update simpler

Change-Id: I208306fc512b7d1d72d94a43c840d247ebd7884b

ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/TextViewerEditorColorUpdater.java

diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/TextViewerEditorColorUpdater.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/TextViewerEditorColorUpdater.java
index de5dcf8..30b2e3a 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/TextViewerEditorColorUpdater.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/TextViewerEditorColorUpdater.java
@@ -87,32 +87,37 @@
 	
 	
 	protected void updateColors() {
-		final StyledText styledText= this.viewer.getTextWidget();
-		if (UIAccess.isOkToUse(styledText)) {
-			{	// foreground color
-				final Color color= this.preferenceStore.getBoolean(
-						PREFERENCE_COLOR_FOREGROUND_SYSTEM_DEFAULT) ? null :
-								createColor(this.preferenceStore, PREFERENCE_COLOR_FOREGROUND);
-				styledText.setForeground(color);
-			}
-			{	// background color
-				final Color color= this.preferenceStore.getBoolean(
-						PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT) ? null :
-								createColor(this.preferenceStore, PREFERENCE_COLOR_BACKGROUND);
-				styledText.setBackground(color);
-			}
-			{	// selection foreground color
-				final Color color= this.preferenceStore.getBoolean(
-						PREFERENCE_COLOR_SELECTION_FOREGROUND_SYSTEM_DEFAULT) ? null :
-								createColor(this.preferenceStore, PREFERENCE_COLOR_SELECTION_FOREGROUND);
-				styledText.setSelectionForeground(color);
-			}
-			{	// selection background color
-				final Color color= this.preferenceStore.getBoolean(
-						PREFERENCE_COLOR_SELECTION_BACKGROUND_SYSTEM_DEFAULT) ? null :
-								createColor(this.preferenceStore, PREFERENCE_COLOR_SELECTION_BACKGROUND);
-				styledText.setSelectionBackground(color);
-			}
+		final var viewer= this.viewer;
+		final StyledText styledText= viewer.getTextWidget();
+		if (styledText != null && !styledText.isDisposed()) {
+			update(viewer, styledText);
+		}
+	}
+	
+	protected void update(final ISourceViewer viewer, final StyledText styledText) {
+		{	// foreground color
+			final Color color= this.preferenceStore.getBoolean(
+					PREFERENCE_COLOR_FOREGROUND_SYSTEM_DEFAULT) ? null :
+							createColor(this.preferenceStore, PREFERENCE_COLOR_FOREGROUND);
+			styledText.setForeground(color);
+		}
+		{	// background color
+			final Color color= this.preferenceStore.getBoolean(
+					PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT) ? null :
+							createColor(this.preferenceStore, PREFERENCE_COLOR_BACKGROUND);
+			styledText.setBackground(color);
+		}
+		{	// selection foreground color
+			final Color color= this.preferenceStore.getBoolean(
+					PREFERENCE_COLOR_SELECTION_FOREGROUND_SYSTEM_DEFAULT) ? null :
+							createColor(this.preferenceStore, PREFERENCE_COLOR_SELECTION_FOREGROUND);
+			styledText.setSelectionForeground(color);
+		}
+		{	// selection background color
+			final Color color= this.preferenceStore.getBoolean(
+					PREFERENCE_COLOR_SELECTION_BACKGROUND_SYSTEM_DEFAULT) ? null :
+							createColor(this.preferenceStore, PREFERENCE_COLOR_SELECTION_BACKGROUND);
+			styledText.setSelectionBackground(color);
 		}
 	}