Merge remote-tracking branch 'origin/master' into amakeev/gradle

GitOrigin-RevId: f9a633252daf311ecab19002c0f4757052eee9dc
6 years ago · 24a695344e
parent c25785846b
commit 24a695344e
2 changed files with 2 additions and 2 deletions
--- 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) { }
    }
--- 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());
  }