From 9dd9d94006cec8f6f3b4b6e4d6d653f38d4b8e36 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@jetbrains.com>
Date: Thu, 13 Jan 2005 15:55:26 +0300
Subject: [PATCH] merged CVS and Subversion versions

---
 .../siyeh/ig/classmetrics/ClassInheritanceDepthInspection.java | 3 +--
 .../com/siyeh/ig/classmetrics/ClassNestingDepthInspection.java | 1 -
 .../src/com/siyeh/ig/classmetrics/FieldCountInspection.java    | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassInheritanceDepthInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassInheritanceDepthInspection.java
index 4160e43eb707..b4ffd9de5d3b 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassInheritanceDepthInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassInheritanceDepthInspection.java
@@ -76,8 +76,7 @@ public class ClassInheritanceDepthInspection
                 maxAncestorDepth = ancestorDepth;
             }
         }
-        final int depth = maxAncestorDepth + 1;
-        return depth;
+        return maxAncestorDepth + 1;
     }
 
 }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassNestingDepthInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassNestingDepthInspection.java
index 2f34d9d1d193..f557ae3dac13 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassNestingDepthInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassNestingDepthInspection.java
@@ -3,7 +3,6 @@ package com.siyeh.ig.classmetrics;
 import com.intellij.codeInspection.InspectionManager;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiIdentifier;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.GroupNames;
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/FieldCountInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/FieldCountInspection.java
index b919a6564ca1..15fb4176a823 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/FieldCountInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/FieldCountInspection.java
@@ -19,7 +19,7 @@ import java.text.NumberFormat;
 public class FieldCountInspection
         extends ClassMetricInspection {
     private static final int FIELD_COUNT_LIMIT = 10;
-    private boolean m_countConstantFields = true;
+    public boolean m_countConstantFields = false;
 
     public String getDisplayName() {
         return "Class with too many fields";