From 24a695344efc7a197848affde9a4dec17751f9b9 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Thu, 16 May 2019 14:00:10 +0200 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into amakeev/gradle GitOrigin-RevId: f9a633252daf311ecab19002c0f4757052eee9dc --- src/org/jetbrains/java/decompiler/main/Fernflower.java | 2 +- .../java/decompiler/modules/renamer/ConverterHelper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java index 37a7db1..692c1b6 100644 --- a/src/org/jetbrains/java/decompiler/main/Fernflower.java +++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java @@ -32,7 +32,7 @@ public class Fernflower implements IDecompiledData { String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL); if (level != null) { try { - logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US))); + logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.ENGLISH))); } catch (IllegalArgumentException ignore) { } } diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java index 93b3de7..4949a00 100644 --- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java +++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java @@ -33,7 +33,7 @@ public class ConverterHelper implements IIdentifierRenamer { !isValidIdentifier(elementType == Type.ELEMENT_METHOD, value) || KEYWORDS.contains(value) || elementType == Type.ELEMENT_CLASS && ( - RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.US)) || + RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.ENGLISH)) || value.length() > 255 - ".class".length()); }