cleanup: remove 'public' modifier from constructors in non-public classes (IDEA-195931)

public constructors in non-public classes may be confusing, and removing them makes code shorter.
master
nik 6 years ago
parent d42689b205
commit 21a80957bb
  1. 2
      src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
  2. 2
      src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
  3. 2
      src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
  4. 2
      src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
  5. 8
      src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
  6. 2
      test/org/jetbrains/java/decompiler/DecompilerTestFixture.java

@ -902,7 +902,7 @@ public class NestedClassProcessor {
public String fieldKey; public String fieldKey;
public VarVersionPair varPair; public VarVersionPair varPair;
public VarFieldPair(String field, VarVersionPair varPair) { VarFieldPair(String field, VarVersionPair varPair) {
this.fieldKey = field; this.fieldKey = field;
this.varPair = varPair; this.varPair = varPair;
} }

@ -553,7 +553,7 @@ public class FinallyProcessor {
// TODO: correct handling (merging) of multiple paths // TODO: correct handling (merging) of multiple paths
public List<int[]> lstStoreVars; public List<int[]> lstStoreVars;
public BlockStackEntry(BasicBlock blockCatch, BasicBlock blockSample, List<int[]> lstStoreVars) { BlockStackEntry(BasicBlock blockCatch, BasicBlock blockSample, List<int[]> lstStoreVars) {
this.blockCatch = blockCatch; this.blockCatch = blockCatch;
this.blockSample = blockSample; this.blockSample = blockSample;
this.lstStoreVars = new ArrayList<>(lstStoreVars); this.lstStoreVars = new ArrayList<>(lstStoreVars);

@ -678,7 +678,7 @@ public class IfHelper {
public final List<IfNode> succs = new ArrayList<>(); public final List<IfNode> succs = new ArrayList<>();
public final List<Integer> edgetypes = new ArrayList<>(); public final List<Integer> edgetypes = new ArrayList<>();
public IfNode(Statement value) { IfNode(Statement value) {
this.value = value; this.value = value;
} }

@ -20,7 +20,7 @@ public class IrreducibleCFGDeobfuscator {
public final Set<Node> preds = new HashSet<>(); public final Set<Node> preds = new HashSet<>();
public final Set<Node> succs = new HashSet<>(); public final Set<Node> succs = new HashSet<>();
public Node(Integer id) { Node(Integer id) {
this.id = id; this.id = id;
} }
} }

@ -64,7 +64,7 @@ public class FlattenStatementsHelper {
public int edgeIndex; public int edgeIndex;
public List<StatEdge> succEdges; public List<StatEdge> succEdges;
public StatementStackEntry(Statement statement, LinkedList<StackEntry> stackFinally, List<Exprent> tailExprents) { StatementStackEntry(Statement statement, LinkedList<StackEntry> stackFinally, List<Exprent> tailExprents) {
this.statement = statement; this.statement = statement;
this.stackFinally = stackFinally; this.stackFinally = stackFinally;
this.tailExprents = tailExprents; this.tailExprents = tailExprents;
@ -517,7 +517,7 @@ public class FlattenStatementsHelper {
public final DirectNode finallyShortRangeSource; public final DirectNode finallyShortRangeSource;
public final DirectNode finallyLongRangeSource; public final DirectNode finallyLongRangeSource;
public StackEntry(CatchAllStatement catchstatement, StackEntry(CatchAllStatement catchstatement,
boolean state, boolean state,
int edgetype, int edgetype,
Statement destination, Statement destination,
@ -539,7 +539,7 @@ public class FlattenStatementsHelper {
this.finallyLongRangeSource = finallyLongRangeSource; this.finallyLongRangeSource = finallyLongRangeSource;
} }
public StackEntry(CatchAllStatement catchstatement, boolean state) { StackEntry(CatchAllStatement catchstatement, boolean state) {
this(catchstatement, state, -1, null, null, null, null, null, false); this(catchstatement, state, -1, null, null, null, null, null, false);
} }
} }
@ -549,7 +549,7 @@ public class FlattenStatementsHelper {
public final Integer statid; public final Integer statid;
public final int edgetype; public final int edgetype;
public Edge(String sourceid, Integer statid, int edgetype) { Edge(String sourceid, Integer statid, int edgetype) {
this.sourceid = sourceid; this.sourceid = sourceid;
this.statid = statid; this.statid = statid;
this.edgetype = edgetype; this.edgetype = edgetype;

@ -118,7 +118,7 @@ public class DecompilerTestFixture {
private static class TestConsoleDecompiler extends ConsoleDecompiler { private static class TestConsoleDecompiler extends ConsoleDecompiler {
private final HashMap<String, ZipFile> zipFiles = new HashMap<>(); private final HashMap<String, ZipFile> zipFiles = new HashMap<>();
public TestConsoleDecompiler(File destination, Map<String, Object> options) { TestConsoleDecompiler(File destination, Map<String, Object> options) {
super(destination, options, new PrintStreamLogger(System.out)); super(destination, options, new PrintStreamLogger(System.out));
} }

Loading…
Cancel
Save