From 16e0f0da326802971990c9ddc4341ce17cc9eea5 Mon Sep 17 00:00:00 2001 From: lcaouen Date: Tue, 22 Sep 2026 10:35:57 +0200 Subject: [PATCH 1/2] add generic fallback if the WidgetFontStyle name is unknown --- .../model/properties/FontWidgetProperty.java | 2 +- .../model/properties/WidgetFontStyle.java | 21 ++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/FontWidgetProperty.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/FontWidgetProperty.java index b69f81fe2c..3c88ad6c08 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/FontWidgetProperty.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/FontWidgetProperty.java @@ -99,7 +99,7 @@ public void readFromXML(final ModelReader model_reader, final Element property_x { // Current format: name = font_el.getAttribute(XMLTags.NAME); family = font_el.getAttribute(FAMILY); - style = WidgetFontStyle.valueOf(font_el.getAttribute(STYLE)); + style = WidgetFontStyle.safeValueOf(font_el.getAttribute(STYLE)); size = Double.parseDouble(font_el.getAttribute(SIZE)); } else diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/WidgetFontStyle.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/WidgetFontStyle.java index 71898e68ae..979d3c9676 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/WidgetFontStyle.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/WidgetFontStyle.java @@ -9,6 +9,9 @@ import org.csstudio.display.builder.model.Messages; +import java.util.logging.Level; +import java.util.logging.Logger; + /** Description of a font style * @author Kay Kasemir */ @@ -26,7 +29,7 @@ public enum WidgetFontStyle private final String name; - private WidgetFontStyle(final String name) + WidgetFontStyle(final String name) { this.name = name; } @@ -36,4 +39,20 @@ public String toString() { return name; } + + /** + * Returns the WidgetFontStyle corresponding to the given name. + * If the name does not match any enum constant, returns REGULAR. + * + * @param name The name of the font style + * @return The corresponding WidgetFontStyle, or REGULAR if not found + */ + public static WidgetFontStyle safeValueOf(String name) { + try { + return WidgetFontStyle.valueOf(name); + } catch (IllegalArgumentException e) { + Logger.getLogger(WidgetFontStyle.class.getName()).log(Level.WARNING, "Cannot find WidgetFontStyle", e); + return REGULAR; + } + } } From 82a13cccaca6d3cce6f4bb89baa0b9ad185a3a48 Mon Sep 17 00:00:00 2001 From: lcaouen Date: Tue, 22 Sep 2026 10:35:57 +0200 Subject: [PATCH 2/2] add generic fallback if the WidgetFontStyle name is unknown --- .../display/builder/model/properties/WidgetFontStyle.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/WidgetFontStyle.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/WidgetFontStyle.java index 979d3c9676..690365488a 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/WidgetFontStyle.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/WidgetFontStyle.java @@ -51,7 +51,7 @@ public static WidgetFontStyle safeValueOf(String name) { try { return WidgetFontStyle.valueOf(name); } catch (IllegalArgumentException e) { - Logger.getLogger(WidgetFontStyle.class.getName()).log(Level.WARNING, "Cannot find WidgetFontStyle", e); + Logger.getLogger(WidgetFontStyle.class.getName()).log(Level.WARNING, "Cannot find WidgetFontStyle : " + name, e); return REGULAR; } }