[Fb-contrib-commit] SF.net SVN: fb-contrib: [441] trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ClassEnvy.java

[<dbr...@us...>]

Revision: 441
Author:   dbrosius
Date:     2006-04-11 17:56:54 -0700 (Tue, 11 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/fb-contrib/?rev=441&view=rev

Log Message:
-----------
simplify

Modified Paths:
--------------
    trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ClassEnvy.java
Modified: trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ClassEnvy.java
===================================================================
--- trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ClassEnvy.java	2006-04-11 14:34:15 UTC (rev 440)
+++ trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ClassEnvy.java	2006-04-12 00:56:54 UTC (rev 441)
@@ -235,27 +235,25 @@
 	 * @return true if the class is counted
 	 */
 	private boolean countClassAccess(final int classAtStackIndex) {
-		String calledClass = null;
+		String calledClass;
 		
 		try {
 			if (stack.getStackDepth() > classAtStackIndex) {
 				OpcodeStack.Item itm = stack.getStackItem(classAtStackIndex);
 				JavaClass cls = itm.getJavaClass();
-				if (cls != null)
+				if (cls != null) {
 					calledClass = cls.getClassName();
-				else 
-					return false;
-			} else
-				return false;
-		} catch (ClassNotFoundException cfne) {
+                    countClassAccess(calledClass);
+		            return true;
+                }
+            }
+        } catch (ClassNotFoundException cfne) {
 			bugReporter.reportMissingClass(cfne);
-			return false;
 		}
+
+        return false;
+    }
 	
-		countClassAccess(calledClass);
-		return true;
-	}
-	
 	/**
 	 * increment the count of class access of the specified class if it is in a similar
 	 * package to the caller, and is not general purpose


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.