lang-impl, cleanup and generify

platform/lang-impl/src/com/intellij/cyclicDependencies/CyclicGraphUtil.java

@@ -9,6 +9,9 @@ import java.util.*;
  * Date: Feb 13, 2005
  */
 public class CyclicGraphUtil {
+  private CyclicGraphUtil() {
+  }
+
   public static <Node> Set<List<Node>> getNodeCycles(final Graph<Node> graph, final Node node){
     Set<List<Node>> result = new HashSet<List<Node>>();
 
@@ -55,8 +58,7 @@ public class CyclicGraphUtil {
 
     final HashSet<Node> retainNodes = new HashSet<Node>(inNodes);
     retainNodes.retainAll(outNodes);
-    for (Iterator<Node> iterator = retainNodes.iterator(); iterator.hasNext();) {
-      Node node1 = iterator.next();
+    for (Node node1 : retainNodes) {
       ArrayList<Node> oneNodeCycle = new ArrayList<Node>();
       oneNodeCycle.add(node1);
       oneNodeCycle.add(node);
@@ -66,14 +68,12 @@ public class CyclicGraphUtil {
     inNodes.removeAll(retainNodes);
     outNodes.removeAll(retainNodes);
 
-    final ShortestPathUtil algorithm = new ShortestPathUtil(graphWithoutNode);
+    final ShortestPathUtil<Node> algorithm = new ShortestPathUtil<Node>(graphWithoutNode);
 
-    for (Iterator<Node> iterator = outNodes.iterator(); iterator.hasNext();) {
-      Node fromNode = iterator.next();
-      for (Iterator<Node> iterator1 = inNodes.iterator(); iterator1.hasNext();) {
-        Node toNode = iterator1.next();
-        final List shortestPath = algorithm.getShortestPath( toNode, fromNode);
-        if (shortestPath != null){
+    for (Node fromNode : outNodes) {
+      for (Node toNode : inNodes) {
+        final List<Node> shortestPath = algorithm.getShortestPath(toNode, fromNode);
+        if (shortestPath != null) {
           ArrayList<Node> path = new ArrayList<Node>();
           path.addAll(shortestPath);
           path.add(node);

platform/lang-impl/testSrc/com/intellij/dependencies/SearchCyclesTest.java

@@ -132,10 +132,9 @@ public class SearchCyclesTest extends TestCase{
     checkResult(new String[][]{{"b","d","e","c","a"}, {"e","c","a"}}, nodeCycles);
   }
 
-  private void checkResult(String[][] expected, Set<List<String>> cycles){
+  private static void checkResult(String[][] expected, Set<List<String>> cycles){
     assertEquals(expected.length, cycles.size());
-    for (Iterator<List<String>> iterator = cycles.iterator(); iterator.hasNext();) {
-      List<String> strings = iterator.next();
+    for (List<String> strings : cycles) {
       assertTrue(findInMatrix(expected, strings.toArray(new String[strings.size()])) > -1);
     }
   }