From 89e9a42b63aa2f329d94c1d8907d0ef42e9a2831 Mon Sep 17 00:00:00 2001 From: Aleksey Rostovskiy Date: Mon, 27 May 2019 14:04:25 +0300 Subject: [PATCH] get rid of intellij.build.toolbox.litegen parameter and use BuildOptions.TOOLBOX_LITE_GEN_STEP to skip it instead GitOrigin-RevId: 9aac8ee4ed1ebf2a29de18a238825fafb1ab88f9 --- .../jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java | 2 +- .../java/decompiler/main/ClassReference14Processor.java | 2 +- src/org/jetbrains/java/decompiler/main/Fernflower.java | 2 +- .../java/decompiler/main/decompiler/ConsoleDecompiler.java | 2 +- .../java/decompiler/main/rels/NestedClassProcessor.java | 2 +- .../decompiler/modules/decompiler/StackVarsProcessor.java | 2 +- .../decompiler/modules/decompiler/sforms/DirectGraph.java | 2 +- .../java/decompiler/modules/decompiler/stats/Statement.java | 4 ++-- .../decompiler/modules/decompiler/vars/VarVersionsGraph.java | 2 +- .../java/decompiler/modules/renamer/ConverterHelper.java | 2 +- .../java/decompiler/struct/gen/generics/GenericMain.java | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java index 3c6b14d..08223cf 100644 --- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java +++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java @@ -745,7 +745,7 @@ public class ControlFlowGraph implements CodeConstants { return res; } - private static void addToReversePostOrderListIterative(BasicBlock root, List lst) { + private static void addToReversePostOrderListIterative(BasicBlock root, List lst) { LinkedList stackNode = new LinkedList<>(); LinkedList stackIndex = new LinkedList<>(); diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java index a6369f5..41b5a9a 100644 --- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java +++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java @@ -74,7 +74,7 @@ public class ClassReference14Processor { } } - private static void processClassRec(ClassNode node, Map mapClassMeths, Set setFound) { + private static void processClassRec(ClassNode node, Map mapClassMeths, Set setFound) { ClassWrapper wrapper = node.getWrapper(); // search code 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/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java index 684249e..120470d 100644 --- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java +++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java @@ -83,7 +83,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver { } @SuppressWarnings("UseOfSystemOutOrSystemErr") - private static void addPath(List list, String path) { + private static void addPath(List list, String path) { File file = new File(path); if (file.exists()) { list.add(file); diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java index 1b91f44..da17532 100644 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java @@ -798,7 +798,7 @@ public class NestedClassProcessor { return null; } - private static Statement getDefStatement(Statement stat, VarType classType, Set setStats) { + private static Statement getDefStatement(Statement stat, VarType classType, Set setStats) { List lst = new ArrayList<>(); Statement retStat = null; diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java index c235387..1232e64 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java @@ -525,7 +525,7 @@ public class StackVarsProcessor { return new Object[]{null, changed, false}; } - private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List res) { + private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List res) { VarVersionsGraph ssuversions = ssa.getSsuversions(); VarVersionNode varnode = ssuversions.nodes.getWithKey(var); diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java index 6f33885..aa2fae8 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java @@ -39,7 +39,7 @@ public class DirectGraph { } } - private static void addToReversePostOrderListIterative(DirectNode root, List lst) { + private static void addToReversePostOrderListIterative(DirectNode root, List lst) { LinkedList stackNode = new LinkedList<>(); LinkedList stackIndex = new LinkedList<>(); diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java index e57e9ef..b5e8213 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java @@ -546,7 +546,7 @@ public class Statement implements IMatchable { // private methods // ***************************************************************************** - private static void addToReversePostOrderListIterative(Statement root, List lst) { + private static void addToReversePostOrderListIterative(Statement root, List lst) { LinkedList stackNode = new LinkedList<>(); LinkedList stackIndex = new LinkedList<>(); @@ -589,7 +589,7 @@ public class Statement implements IMatchable { } - private static void addToPostReversePostOrderList(Statement stat, List lst, HashSet setVisited) { + private static void addToPostReversePostOrderList(Statement stat, List lst, HashSet setVisited) { if (setVisited.contains(stat)) { // because of not considered exception edges, s. isExitComponent. Should be rewritten, if possible. return; diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java index e295915..58eda68 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java @@ -99,7 +99,7 @@ public class VarVersionsGraph { return lst; } - private static void addToReversePostOrderListIterative(VarVersionNode root, List lst, Set setVisited) { + private static void addToReversePostOrderListIterative(VarVersionNode root, List lst, Set setVisited) { Map> mapNodeSuccs = new HashMap<>(); LinkedList stackNode = new LinkedList<>(); LinkedList stackIndex = new LinkedList<>(); 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()); } diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java index 45ca557..3e4e1f1 100644 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java @@ -95,7 +95,7 @@ public class GenericMain { } } - private static String parseFormalParameters(String signature, List parameters, List> bounds) { + private static String parseFormalParameters(String signature, List parameters, List> bounds) { if (signature.charAt(0) != '<') { return signature; }