Use DrawableTextUtilities for Label and TextFlow figures

This adds a new getTextUtilitie() method to the root figure, which
returns a DrawableTextUtilities, rather than a TextUtilities instance.

Author: ptziegler

org.eclipse.draw2d/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.draw2d;singleton:=true
-Bundle-Version: 3.20.200.qualifier
+Bundle-Version: 3.21.0.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.draw2d,

org.eclipse.draw2d/src/org/eclipse/draw2d/FigureUtilities.java

@@ -178,6 +178,16 @@ public static int getTextWidth(String s, Font f) {
 		return getTextDimension(s, f).x;
 	}
 
+	/**
+	 * @since 3.21
+	 */
+	public static TextUtilities getTextUtilities(IFigure figure) {
+		if (getRoot(figure) instanceof LightweightSystem.RootFigure rootFigure) {
+			return rootFigure.getTextUtilities();
+		}
+		return TextUtilities.INSTANCE;
+	}
+
 	/**
 	 * Returns a Color the same as the passed color in a lighter hue.
 	 *

org.eclipse.draw2d/src/org/eclipse/draw2d/Label.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -689,9 +689,8 @@ public void setTextPlacement(int where) {
 	 * @return a <code>TextUtilities</code> instance
 	 * @since 3.4
 	 */
-	@SuppressWarnings("static-method")
 	public TextUtilities getTextUtilities() {
-		return TextUtilities.INSTANCE;
+		return FigureUtilities.getTextUtilities(this);
 	}
 
 	/**

org.eclipse.draw2d/src/org/eclipse/draw2d/LightweightSystem.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2024 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -39,6 +39,7 @@
 import org.eclipse.swt.widgets.Listener;
 
 import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.internal.DrawableTextUtilities;
 
 /**
  * The LightweightSystem is the link between SWT and Draw2d. It is the component
@@ -55,6 +56,7 @@
  */
 public class LightweightSystem {
 
+	private DrawableTextUtilities textUtilities;
 	private Canvas canvas;
 	IFigure contents;
 	private IFigure root;
@@ -236,6 +238,8 @@ public void setControl(Canvas c) {
 		getEventDispatcher().setControl(c);
 		addListeners();
 
+		textUtilities = new DrawableTextUtilities(canvas);
+
 		// Size the root figure and contents to the current control's size
 		Rectangle r = new Rectangle(canvas.getClientArea());
 		r.setLocation(0, 0);
@@ -351,6 +355,13 @@ public boolean isMirrored() {
 		public boolean isShowing() {
 			return true;
 		}
+
+		/* package */ TextUtilities getTextUtilities() {
+			if (textUtilities == null) {
+				return TextUtilities.INSTANCE;
+			}
+			return textUtilities;
+		}
 	}
 
 	/**

org.eclipse.draw2d/src/org/eclipse/draw2d/text/TextFlow.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -19,6 +19,7 @@
 import org.eclipse.swt.graphics.TextLayout;
 
 import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.FigureUtilities;
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.TextUtilities;
 import org.eclipse.draw2d.geometry.Dimension;
@@ -733,9 +734,8 @@ protected FlowUtilities getFlowUtilities() {
 	 * @return a <code>TextUtilities</code> instance
 	 * @since 3.4
 	 */
-	@SuppressWarnings("static-method")
 	protected TextUtilities getTextUtilities() {
-		return TextUtilities.INSTANCE;
+		return FigureUtilities.getTextUtilities(this);
 	}
 
 }

org.eclipse.gef/src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java

@@ -81,10 +81,8 @@
 import org.eclipse.draw2d.LightweightSystem;
 import org.eclipse.draw2d.MarginBorder;
 import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.TextUtilities;
 import org.eclipse.draw2d.Triangle;
 import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.internal.DrawableTextUtilities;
 
 import org.eclipse.gef.GraphicalViewer;
 import org.eclipse.gef.dnd.TemplateTransfer;
@@ -1116,7 +1114,6 @@ protected void updateState() {
 	private class TitleLabel extends Label {
 		protected static final Border BORDER = new MarginBorder(4, 3, 4, 3);
 		protected static final Border TOOL_TIP_BORDER = new MarginBorder(0, 2, 0, 2);
-		private TextUtilities textUtilities;
 
 		public TitleLabel(boolean isHorizontal) {
 			super(GEFMessages.Palette_Label, InternalImages.get(InternalImages.IMG_PALETTE));
@@ -1128,14 +1125,6 @@ public TitleLabel(boolean isHorizontal) {
 			setForegroundColor(ColorConstants.listForeground);
 		}
 
-		@Override
-		public TextUtilities getTextUtilities() {
-			if (textUtilities == null) {
-				textUtilities = new DrawableTextUtilities(paletteContainer);
-			}
-			return textUtilities;
-		}
-
 		@Override
 		public IFigure getToolTip() {
 			if (isTextTruncated()) {