From b7718d07a0d3c309bfc98ea6818ee3a21a415ec0 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@intellij.com>
Date: Mon, 31 Aug 2009 19:56:30 +0400
Subject: [PATCH] diGraph moved to java-impl

---
 .../com/intellij/internal/diGraph/Edge.java   |  0
 .../com/intellij/internal/diGraph/Node.java   |  0
 .../diGraph/analyzer/GlobalAnalyzer.java      |  1 -
 .../internal/diGraph/analyzer/Mark.java       |  2 --
 .../internal/diGraph/analyzer/MarkedEdge.java |  0
 .../internal/diGraph/analyzer/MarkedNode.java |  0
 .../diGraph/analyzer/OneEndFunctor.java       |  0
 .../diGraph/analyzer/TwoEndsFunctor.java      |  0
 .../internal/diGraph/impl/EdgeImpl.java       |  0
 .../internal/diGraph/impl/NodeImpl.java       | 31 +++++++++----------
 10 files changed, 14 insertions(+), 20 deletions(-)
 rename {source => java/java-impl/src}/com/intellij/internal/diGraph/Edge.java (100%)
 rename {source => java/java-impl/src}/com/intellij/internal/diGraph/Node.java (100%)
 rename {source => java/java-impl/src}/com/intellij/internal/diGraph/analyzer/GlobalAnalyzer.java (99%)
 rename {source => java/java-impl/src}/com/intellij/internal/diGraph/analyzer/Mark.java (84%)
 rename {source => java/java-impl/src}/com/intellij/internal/diGraph/analyzer/MarkedEdge.java (100%)
 rename {source => java/java-impl/src}/com/intellij/internal/diGraph/analyzer/MarkedNode.java (100%)
 rename {source => java/java-impl/src}/com/intellij/internal/diGraph/analyzer/OneEndFunctor.java (100%)
 rename {source => java/java-impl/src}/com/intellij/internal/diGraph/analyzer/TwoEndsFunctor.java (100%)
 rename {source => java/java-impl/src}/com/intellij/internal/diGraph/impl/EdgeImpl.java (100%)
 rename {source => java/java-impl/src}/com/intellij/internal/diGraph/impl/NodeImpl.java (59%)

diff --git a/source/com/intellij/internal/diGraph/Edge.java b/java/java-impl/src/com/intellij/internal/diGraph/Edge.java
similarity index 100%
rename from source/com/intellij/internal/diGraph/Edge.java
rename to java/java-impl/src/com/intellij/internal/diGraph/Edge.java
diff --git a/source/com/intellij/internal/diGraph/Node.java b/java/java-impl/src/com/intellij/internal/diGraph/Node.java
similarity index 100%
rename from source/com/intellij/internal/diGraph/Node.java
rename to java/java-impl/src/com/intellij/internal/diGraph/Node.java
diff --git a/source/com/intellij/internal/diGraph/analyzer/GlobalAnalyzer.java b/java/java-impl/src/com/intellij/internal/diGraph/analyzer/GlobalAnalyzer.java
similarity index 99%
rename from source/com/intellij/internal/diGraph/analyzer/GlobalAnalyzer.java
rename to java/java-impl/src/com/intellij/internal/diGraph/analyzer/GlobalAnalyzer.java
index 96db79ee123e..b0e97ebb3051 100644
--- a/source/com/intellij/internal/diGraph/analyzer/GlobalAnalyzer.java
+++ b/java/java-impl/src/com/intellij/internal/diGraph/analyzer/GlobalAnalyzer.java
@@ -13,7 +13,6 @@ import java.util.LinkedList;
  * To change this template use Options | File Templates.
  */
 public class GlobalAnalyzer {
-
   private static boolean stepOneEnd(MarkedNode currNode, LinkedList worklist, OneEndFunctor functor) {
     boolean result = false;
 
diff --git a/source/com/intellij/internal/diGraph/analyzer/Mark.java b/java/java-impl/src/com/intellij/internal/diGraph/analyzer/Mark.java
similarity index 84%
rename from source/com/intellij/internal/diGraph/analyzer/Mark.java
rename to java/java-impl/src/com/intellij/internal/diGraph/analyzer/Mark.java
index 52dc262840eb..7a2b2beda191 100644
--- a/source/com/intellij/internal/diGraph/analyzer/Mark.java
+++ b/java/java-impl/src/com/intellij/internal/diGraph/analyzer/Mark.java
@@ -1,7 +1,5 @@
 package com.intellij.internal.diGraph.analyzer;
 
-import com.intellij.internal.typeDeducer.Type;
-
 /**
  * Created by IntelliJ IDEA.
  * User: db
diff --git a/source/com/intellij/internal/diGraph/analyzer/MarkedEdge.java b/java/java-impl/src/com/intellij/internal/diGraph/analyzer/MarkedEdge.java
similarity index 100%
rename from source/com/intellij/internal/diGraph/analyzer/MarkedEdge.java
rename to java/java-impl/src/com/intellij/internal/diGraph/analyzer/MarkedEdge.java
diff --git a/source/com/intellij/internal/diGraph/analyzer/MarkedNode.java b/java/java-impl/src/com/intellij/internal/diGraph/analyzer/MarkedNode.java
similarity index 100%
rename from source/com/intellij/internal/diGraph/analyzer/MarkedNode.java
rename to java/java-impl/src/com/intellij/internal/diGraph/analyzer/MarkedNode.java
diff --git a/source/com/intellij/internal/diGraph/analyzer/OneEndFunctor.java b/java/java-impl/src/com/intellij/internal/diGraph/analyzer/OneEndFunctor.java
similarity index 100%
rename from source/com/intellij/internal/diGraph/analyzer/OneEndFunctor.java
rename to java/java-impl/src/com/intellij/internal/diGraph/analyzer/OneEndFunctor.java
diff --git a/source/com/intellij/internal/diGraph/analyzer/TwoEndsFunctor.java b/java/java-impl/src/com/intellij/internal/diGraph/analyzer/TwoEndsFunctor.java
similarity index 100%
rename from source/com/intellij/internal/diGraph/analyzer/TwoEndsFunctor.java
rename to java/java-impl/src/com/intellij/internal/diGraph/analyzer/TwoEndsFunctor.java
diff --git a/source/com/intellij/internal/diGraph/impl/EdgeImpl.java b/java/java-impl/src/com/intellij/internal/diGraph/impl/EdgeImpl.java
similarity index 100%
rename from source/com/intellij/internal/diGraph/impl/EdgeImpl.java
rename to java/java-impl/src/com/intellij/internal/diGraph/impl/EdgeImpl.java
diff --git a/source/com/intellij/internal/diGraph/impl/NodeImpl.java b/java/java-impl/src/com/intellij/internal/diGraph/impl/NodeImpl.java
similarity index 59%
rename from source/com/intellij/internal/diGraph/impl/NodeImpl.java
rename to java/java-impl/src/com/intellij/internal/diGraph/impl/NodeImpl.java
index f9b3f6fa2ec2..d3223adc686e 100644
--- a/source/com/intellij/internal/diGraph/impl/NodeImpl.java
+++ b/java/java-impl/src/com/intellij/internal/diGraph/impl/NodeImpl.java
@@ -1,13 +1,10 @@
 package com.intellij.internal.diGraph.impl;
 
-import com.intellij.internal.diGraph.Node;
-import com.intellij.internal.diGraph.Edge;
-import com.intellij.internal.diGraph.analyzer.MarkedNode;
 import com.intellij.internal.diGraph.analyzer.Mark;
+import com.intellij.internal.diGraph.analyzer.MarkedNode;
 
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.HashSet;
 
 /**
  * Created by IntelliJ IDEA.
@@ -17,17 +14,17 @@ import java.util.HashSet;
  * To change this template use Options | File Templates.
  */
 public class NodeImpl implements MarkedNode {
-  LinkedList myIn;
-  LinkedList myOut;
+  LinkedList<EdgeImpl> myIn;
+  LinkedList<EdgeImpl> myOut;
 
   public NodeImpl() {
-    myIn = new LinkedList();
-    myOut = new LinkedList();
+    myIn = new LinkedList<EdgeImpl>();
+    myOut = new LinkedList<EdgeImpl>();
   }
 
   public NodeImpl(EdgeImpl[] in, EdgeImpl[] out) {
-    myIn = new LinkedList();
-    myOut = new LinkedList();
+    myIn = new LinkedList<EdgeImpl>();
+    myOut = new LinkedList<EdgeImpl>();
 
     for (int i = 0; i < (in == null ? 0 : in.length); i++) {
       myIn.add(in[i]);
@@ -40,19 +37,19 @@ public class NodeImpl implements MarkedNode {
     }
   }
 
-  public NodeImpl(LinkedList in, LinkedList out) {
-    myIn = in == null ? new LinkedList() : in;
-    myOut = out == null ? new LinkedList() : out;
+  public NodeImpl(LinkedList<EdgeImpl> in, LinkedList<EdgeImpl> out) {
+    myIn = in == null ? new LinkedList<EdgeImpl>() : in;
+    myOut = out == null ? new LinkedList<EdgeImpl>() : out;
 
-    for (Iterator i = myIn.iterator(); i.hasNext();) ((EdgeImpl) i.next()).myEnd = this;
-    for (Iterator i = myOut.iterator(); i.hasNext();) ((EdgeImpl) i.next()).myBeg = this;
+    for (EdgeImpl aMyIn : myIn) aMyIn.myEnd = this;
+    for (EdgeImpl aMyOut : myOut) aMyOut.myBeg = this;
   }
 
-  public Iterator inIterator() {
+  public Iterator<EdgeImpl> inIterator() {
     return myIn.iterator();
   }
 
-  public Iterator outIterator() {
+  public Iterator<EdgeImpl> outIterator() {
     return myOut.iterator();
   }