From 6955697b4003d2664d4af31063169754dad2f9db Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Sat, 14 Jul 2012 20:10:45 +0200
Subject: [PATCH] IntIntMaplet: for consistency with TIntIntHashMap use 0
 instead of -1 value as 'empty' value

---
 .../dependencyView/IntIntPersistentMaplet.java      |  2 +-
 .../jetbrains/ether/dependencyView/Mappings.java    | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/IntIntPersistentMaplet.java b/jps/model/src/org/jetbrains/ether/dependencyView/IntIntPersistentMaplet.java
index c1b684503a20..6a814bfde0ca 100644
--- a/jps/model/src/org/jetbrains/ether/dependencyView/IntIntPersistentMaplet.java
+++ b/jps/model/src/org/jetbrains/ether/dependencyView/IntIntPersistentMaplet.java
@@ -86,7 +86,7 @@ public class IntIntPersistentMaplet extends IntIntMaplet {
   @Override
   public int get(final int key) {
     final Object obj = myCache.get(key);
-    return obj == NULL_OBJ? -1 : (Integer)obj;
+    return obj == NULL_OBJ? 0 : (Integer)obj;
   }
 
   @Override
diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
index 28d6f85f33ae..0538f15e2e12 100644
--- a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
+++ b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
@@ -557,7 +557,7 @@ public class Mappings {
 
       final int fileName = myClassToSourceFile.get(className);
 
-      if (fileName < 0) {
+      if (fileName <= 0) {
         debug("No source file detected for class ", className);
         debug("End of affectSubclasses");
         return;
@@ -1710,7 +1710,7 @@ public class Mappings {
 
         final int fileName = myClassToSourceFile.get(c.myName);
 
-        if (fileName != 0) {
+        if (fileName > 0) {
           myDelta.myChangedFiles.add(fileName);
         }
 
@@ -1769,7 +1769,7 @@ public class Mappings {
         public boolean execute(final int depClass) {
           final int depFile = myClassToSourceFile.get(depClass);
 
-          if (depFile != 0) {
+          if (depFile > 0) {
             final File theFile = new File(myContext.getValue(depFile));
 
             if (myAffectedFiles.contains(theFile) || myCompiledFiles.contains(theFile)) {
@@ -2159,11 +2159,10 @@ public class Mappings {
 
               final ClassRepr repr = getReprByName(rootClassName);
 
-              if (repr != null && fileName != 0) {
+              if (repr != null && fileName > 0) {
                 if (repr.addUsage(UsageRepr.createClassUsage(myContext, iname))) {
                   mySourceFileToClasses.put(fileName, repr);
                 }
-                ;
               }
             }
           }
@@ -2277,9 +2276,9 @@ public class Mappings {
     assert (myChangedClasses != null && myChangedFiles != null);
     myChangedClasses.add(it);
 
-    final Integer file = myClassToSourceFile.get(it);
+    final int file = myClassToSourceFile.get(it);
 
-    if (file != null) {
+    if (file > 0) {
       myChangedFiles.add(file);
     }
   }