From 84ea54eb1e2c68091080951a3024cca98f70aca2 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 29 Aug 2014 14:31:45 +0400 Subject: java-decompiler: post-import cleanup (code style issues) --- .../java/decompiler/code/cfg/ControlFlowGraph.java | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/org/jetbrains/java/decompiler/code/cfg') diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java index 6b0624f..1e395ed 100644 --- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java +++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java @@ -94,11 +94,11 @@ public class ControlFlowGraph implements CodeConstants { List suc = block.getSuccs(); for (int j = 0; j < suc.size(); j++) { - buf.append(">>>>>>>>(regular) Block " + ((BasicBlock)suc.get(j)).id + new_line_separator); + buf.append(">>>>>>>>(regular) Block " + suc.get(j).id + new_line_separator); } suc = block.getSuccExceptions(); for (int j = 0; j < suc.size(); j++) { - BasicBlock handler = (BasicBlock)suc.get(j); + BasicBlock handler = suc.get(j); ExceptionRangeCFG range = getExceptionRange(handler, block); if (range == null) { @@ -134,19 +134,19 @@ public class ControlFlowGraph implements CodeConstants { public void removeBlock(BasicBlock block) { while (block.getSuccs().size() > 0) { - block.removeSuccessor((BasicBlock)block.getSuccs().get(0)); + block.removeSuccessor(block.getSuccs().get(0)); } while (block.getSuccExceptions().size() > 0) { - block.removeSuccessorException((BasicBlock)block.getSuccExceptions().get(0)); + block.removeSuccessorException(block.getSuccExceptions().get(0)); } while (block.getPreds().size() > 0) { - ((BasicBlock)block.getPreds().get(0)).removeSuccessor(block); + block.getPreds().get(0).removeSuccessor(block); } while (block.getPredExceptions().size() > 0) { - ((BasicBlock)block.getPredExceptions().get(0)).removeSuccessorException(block); + block.getPredExceptions().get(0).removeSuccessorException(block); } last.removePredecessor(block); @@ -154,7 +154,7 @@ public class ControlFlowGraph implements CodeConstants { blocks.removeWithKey(block.id); for (int i = exceptions.size() - 1; i >= 0; i--) { - ExceptionRangeCFG range = (ExceptionRangeCFG)exceptions.get(i); + ExceptionRangeCFG range = exceptions.get(i); if (range.getHandler() == block) { exceptions.remove(i); } @@ -394,7 +394,7 @@ public class ControlFlowGraph implements CodeConstants { ExceptionRangeCFG range = new ExceptionRangeCFG(protectedRange, handle, handler.exceptionClass == null ? null - : Arrays.asList(new String[]{handler.exceptionClass})); + : Arrays.asList(handler.exceptionClass)); mapRanges.put(key, range); exceptions.add(range); @@ -495,11 +495,11 @@ public class ControlFlowGraph implements CodeConstants { // find the first intersection for (int i = 0; i < lstJsr.size(); i++) { - Object[] arr = (Object[])lstJsr.get(i); + Object[] arr = lstJsr.get(i); HashSet set = (HashSet)arr[1]; for (int j = i + 1; j < lstJsr.size(); j++) { - Object[] arr1 = (Object[])lstJsr.get(j); + Object[] arr1 = lstJsr.get(j); HashSet set1 = (HashSet)arr1[1]; if (!set.contains(arr1[0]) && !set1.contains(arr[0])) { // rang 0 doesn't contain entry 1 and vice versa @@ -613,11 +613,11 @@ public class ControlFlowGraph implements CodeConstants { for (int i = lst.size() - 1; i >= 0; i--) { - BasicBlock child = (BasicBlock)lst.get(i); + BasicBlock child = lst.get(i); Integer childid = child.id; if (mapNewNodes.containsKey(childid)) { - node.replaceSuccessor(child, (BasicBlock)mapNewNodes.get(childid)); + node.replaceSuccessor(child, mapNewNodes.get(childid)); } else if (common_blocks.contains(child)) { @@ -632,11 +632,11 @@ public class ControlFlowGraph implements CodeConstants { } else { for (int k = 0; k < child.getSuccs().size(); k++) { - copy.addSuccessor((BasicBlock)child.getSuccs().get(k)); + copy.addSuccessor(child.getSuccs().get(k)); } } for (int k = 0; k < child.getSuccExceptions().size(); k++) { - copy.addSuccessorException((BasicBlock)child.getSuccExceptions().get(k)); + copy.addSuccessorException(child.getSuccExceptions().get(k)); } lstNodes.add(copy); @@ -666,7 +666,7 @@ public class ControlFlowGraph implements CodeConstants { for (int i = exceptions.size() - 1; i >= 0; i--) { - ExceptionRangeCFG range = (ExceptionRangeCFG)exceptions.get(i); + ExceptionRangeCFG range = exceptions.get(i); List lstRange = range.getProtectedRange(); HashSet setBoth = new HashSet(common_blocks); @@ -678,7 +678,7 @@ public class ControlFlowGraph implements CodeConstants { if (setBoth.size() == lstRange.size()) { lstNewRange = new ArrayList(); ExceptionRangeCFG newRange = new ExceptionRangeCFG(lstNewRange, - (BasicBlock)mapNewNodes.get(range.getHandler().id), range.getExceptionTypes()); + mapNewNodes.get(range.getHandler().id), range.getExceptionTypes()); exceptions.add(newRange); } else { @@ -729,14 +729,14 @@ public class ControlFlowGraph implements CodeConstants { block.mark = 1; for (int i = 0; i < block.getSuccs().size(); i++) { - BasicBlock suc = (BasicBlock)block.getSuccs().get(i); + BasicBlock suc = block.getSuccs().get(i); if (suc.mark != 1) { removeJsrInstructions(pool, suc, data.copy()); } } for (int i = 0; i < block.getSuccExceptions().size(); i++) { - BasicBlock suc = (BasicBlock)block.getSuccExceptions().get(i); + BasicBlock suc = block.getSuccExceptions().get(i); if (suc.mark != 1) { DataPoint point = new DataPoint(); -- cgit v1.2.3