From c8fc668301bb306f43848732b3c703244b23b901 Mon Sep 17 00:00:00 2001 From: Viliam Repan Date: Thu, 18 Apr 2024 09:05:07 +0200 Subject: [PATCH] improved localization default for enum --- .../java/com/evolveum/midpoint/studio/util/MidPointUtils.java | 2 +- .../com/evolveum/midpoint/studio/util/StudioLocalization.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/util/MidPointUtils.java b/studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/util/MidPointUtils.java index dedb593b..b7ca4f00 100644 --- a/studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/util/MidPointUtils.java +++ b/studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/util/MidPointUtils.java @@ -112,7 +112,7 @@ public class MidPointUtils { public static final Pattern UUID_PATTERN = Pattern.compile("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"); - public static final Comparator OBJECT_TYPES_COMPARATOR = (o1, o2) -> String.CASE_INSENSITIVE_ORDER.compare(o1.getTypeQName().getLocalPart(), o2.getTypeQName().getLocalPart()); + public static final Comparator OBJECT_TYPES_COMPARATOR = Comparator.comparing(o -> o.name()); public static final Comparator OBJECT_TYPE_COMPARATOR = (o1, o2) -> String.CASE_INSENSITIVE_ORDER.compare(getOrigFromPolyString(o1.getName()), getOrigFromPolyString(o2.getName())); diff --git a/studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/util/StudioLocalization.java b/studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/util/StudioLocalization.java index 559d355f..fc1936fc 100644 --- a/studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/util/StudioLocalization.java +++ b/studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/util/StudioLocalization.java @@ -68,7 +68,7 @@ public String translateEnum(Enum e, String nullKey) { } String key = MidPointUtils.createKeyForEnum(e); - return translate(key); + return translate(key, key); } public String translate(String key) {