From 1edf2ee9b54898b2364a209194178a01faba18dd Mon Sep 17 00:00:00 2001 From: stoecker Date: Tue, 28 Jan 2025 14:55:24 +0000 Subject: [PATCH] fix PMD git-svn-id: https://josm.openstreetmap.de/svn/trunk@19300 0c6e7542-c601-0410-84e7-c038aed88b3b --- .../preferences/display/ColorPreference.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java index 9c1f2e3248d..f1096190e7e 100644 --- a/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java +++ b/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java @@ -110,17 +110,14 @@ private static class ColorEntry { * @return a description of the color */ public String getDisplay() { - switch (info.getCategory()) { - case NamedColorProperty.COLOR_CATEGORY_MAPPAINT: - if (info.getSource() != null) - return tr("Paint style {0}: {1}", tr(I18n.escape(info.getSource())), tr(info.getName())); - // fall through - default: - if (info.getSource() != null) - return tr(I18n.escape(info.getSource())) + " - " + tr(I18n.escape(info.getName())); - else - return tr(I18n.escape(info.getName())); + if (info.getSource() != null) { + if (info.getCategory() == NamedColorProperty.COLOR_CATEGORY_MAPPAINT) + return tr("Paint style {0}: {1}", tr(I18n.escape(info.getSource())), tr(info.getName())); + else + return tr(I18n.escape(info.getSource())) + " - " + tr(I18n.escape(info.getName())); } + else + return tr(I18n.escape(info.getName())); } /**