ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
GitOrigin-RevId: f9a633252daf311ecab19002c0f4757052eee9dc
This commit is contained in:
Anton Makeev
2019-05-16 14:00:10 +02:00
committed by intellij-monorepo-bot
parent c25785846b
commit 24a695344e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/jetbrains/java/decompiler/main/Fernflower.java
View File

@@ -32,7 +32,7 @@ public class Fernflower implements IDecompiledData {
String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL); String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL);
if (level != null) { if (level != null) {
try { try {
logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US))); logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.ENGLISH)));
} }
catch (IllegalArgumentException ignore) { } catch (IllegalArgumentException ignore) { }
} }

2
src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
View File

@@ -33,7 +33,7 @@ public class ConverterHelper implements IIdentifierRenamer {
!isValidIdentifier(elementType == Type.ELEMENT_METHOD, value) || !isValidIdentifier(elementType == Type.ELEMENT_METHOD, value) ||
KEYWORDS.contains(value) || KEYWORDS.contains(value) ||
elementType == Type.ELEMENT_CLASS && ( 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()); value.length() > 255 - ".class".length());
} }