From 7995b0496a26eef36d7c00f75839452b1944b973 Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Thu, 4 Oct 2018 10:52:05 +0200
Subject: [PATCH] FontMetrics.getAverageCharWidth() ->
getAverageCharacterWidth()
* FontMetrics.getAverageCharWidth() has been deprecated
Issue-Ref: 3539
Issue-Url: https://af3-developer.fortiss.org/issues/3539
Signed-off-by: Simon Barner <barner@fortiss.org>
---
.../src/org/fortiss/tooling/kernel/ui/util/.ratings | 2 +-
.../org/fortiss/tooling/kernel/ui/util/WidgetsFactory.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings
index 2e07492f8..10264943c 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings
@@ -10,4 +10,4 @@ PropertiesConstantUtils.java 59b1a1e4d594bb98db3aa396f2ff6474ba405920 GREEN
SelectionUtils.java 3d20f87eaaee04173686ef62b09ca6971702cd00 GREEN
TutorialUIServiceUtils.java 093a8a3549c6952d44ea508e66691434b17a95b5 GREEN
UndoRedoImpl.java f218500875bda0ef52f4cc2ccdf452825e6751f7 GREEN
-WidgetsFactory.java ef048953bf7629341786e1b4ab451053f3a9aa94 GREEN
+WidgetsFactory.java 5be121cc81e93731f4d0ab11e7707417fa950c2c YELLOW
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/WidgetsFactory.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/WidgetsFactory.java
index ef048953b..5be121cc8 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/WidgetsFactory.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/WidgetsFactory.java
@@ -74,7 +74,9 @@ public class WidgetsFactory {
text.setText(initialText);
GC gc = new GC(text);
FontMetrics fm = gc.getFontMetrics();
- int width = charsNumber * fm.getAverageCharWidth();
+ // Cast double -> int is safe because FontMetrics.getAverageCharacterWidth() is implemented
+ // by calling "int FontMetrics.getAverageCharWidth()"
+ int width = charsNumber * (int)fm.getAverageCharacterWidth();
int height = fm.getHeight();
gc.dispose();
text.setLayoutData(new GridData(width, height));
--
GitLab