Fix quality flaw

Author: benzonico

java-squid/src/main/java/org/sonar/java/cfg/CFG.java

@@ -91,6 +91,17 @@ public class CFG {
   private Map<String, Block> labelsBreakTarget = Maps.newHashMap();
   private Map<String, Block> labelsContinueTarget = Maps.newHashMap();
 
+  private CFG(BlockTree tree, Symbol.MethodSymbol symbol) {
+    methodSymbol = symbol;
+    exitBlock = createBlock();
+    currentBlock = createBlock(exitBlock);
+    for (StatementTree statementTree : Lists.reverse(tree.body())) {
+      build(statementTree);
+    }
+    prune();
+    computePredecessors(blocks);
+  }
+
   public Symbol.MethodSymbol methodSymbol() {
     return methodSymbol;
   }
@@ -108,13 +119,13 @@ public List<Block> reversedBlocks() {
   }
 
   public static class Block {
-
     private int id;
     private final List<Tree> elements = new ArrayList<>();
     private final Set<Block> successors = new HashSet<>();
     private final Set<Block> predecessors = new HashSet<>();
     private Block trueBlock;
     private Block falseBlock;
+
     private Tree terminator;
 
     public Block(int id) {
@@ -184,7 +195,6 @@ public Tree terminator() {
     public boolean isInactive() {
       return terminator == null && elements.isEmpty();
     }
-
     private void prune(Block inactiveBlock) {
       if (inactiveBlock.equals(trueBlock)) {
         if (inactiveBlock.successors.size() != 1) {
@@ -202,17 +212,7 @@ private void prune(Block inactiveBlock) {
         successors.addAll(inactiveBlock.successors);
       }
     }
-  }
 
-  private CFG(BlockTree tree, Symbol.MethodSymbol symbol) {
-    methodSymbol = symbol;
-    exitBlock = createBlock();
-    currentBlock = createBlock(exitBlock);
-    for (StatementTree statementTree : Lists.reverse(tree.body())) {
-      build(statementTree);
-    }
-    prune();
-    computePredecessors(blocks);
   }
 
   private static void computePredecessors(List<Block> blocks) {

java-squid/src/main/java/org/sonar/java/collections/package-info.java

@@ -23,4 +23,4 @@
 @MethodsAreNonnullByDefault
 package org.sonar.java.collections;
 
-import org.sonar.plugins.java.api.tree.MethodsAreNonnullByDefault;
+import org.sonar.plugins.java.api.tree.MethodsAreNonnullByDefault;

java-squid/src/main/java/org/sonar/java/se/ExplodedGraphWalker.java

@@ -137,9 +137,7 @@ private void execute(MethodTree tree) {
       // LIFO:
       node = workList.removeFirst();
       programPosition = node.programPoint;
-      if (/* last */programPosition.block.successors().isEmpty()) {
-        // not guaranteed that last block will be reached, e.g. "label: goto label;"
-        // TODO(Godin): notify clients before continuing with another position
+      if (programPosition.block.successors().isEmpty()) {
         continue;
       }
       programState = node.programState;