[Fb-contrib-commit] SF.net SVN: fb-contrib:[1478] trunk/fb-contrib

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

Revision: 1478
          http://fb-contrib.svn.sourceforge.net/fb-contrib/?rev=1478&view=rev
Author:   dbrosius
Date:     2010-01-12 06:07:30 +0000 (Tue, 12 Jan 2010)

Log Message:
-----------
soften the language of wrong null guard to suspicious null guard

Modified Paths:
--------------
    trunk/fb-contrib/etc/findbugs.xml
    trunk/fb-contrib/etc/messages.xml
    trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SuspiciousNullGuard.java

Modified: trunk/fb-contrib/etc/findbugs.xml
===================================================================
--- trunk/fb-contrib/etc/findbugs.xml	2010-01-12 06:00:17 UTC (rev 1477)
+++ trunk/fb-contrib/etc/findbugs.xml	2010-01-12 06:07:30 UTC (rev 1478)
@@ -314,7 +314,7 @@
 		speed="fast" reports="NFF_NON_FUNCTIONAL_FIELD" />
 
 	<Detector class="com.mebigfatguy.fbcontrib.detect.SuspiciousNullGuard"
-		speed="fast" reports="SNG_WRONG_NULL_FIELD_GUARD,SNG_WRONG_NULL_LOCAL_GUARD" />
+		speed="fast" reports="SNG_SUSPICIOUS_NULL_FIELD_GUARD,SNG_SUSPICIOUS_NULL_LOCAL_GUARD" />
 
     	<Detector class="com.mebigfatguy.fbcontrib.detect.MoreDumbMethods"
 		speed="fast"
@@ -570,9 +570,9 @@
 		category="CORRECTNESS" experimental="true" />
 	<BugPattern abbrev="NFF" type="NFF_NON_FUNCTIONAL_FIELD"
 		category="CORRECTNESS" experimental="true" />
-	<BugPattern abbrev="SNG" type="SNG_WRONG_NULL_FIELD_GUARD"
+	<BugPattern abbrev="SNG" type="SNG_SUSPICIOUS_NULL_FIELD_GUARD"
 		category="CORRECTNESS" experimental="true" />
-	<BugPattern abbrev="SNG" type="SNG_WRONG_NULL_LOCAL_GUARD"
+	<BugPattern abbrev="SNG" type="SNG_SUSPICIOUS_NULL_LOCAL_GUARD"
 		category="CORRECTNESS" experimental="true" />
 	<BugPattern abbrev="MDM" type="MDM_RUNTIME_EXIT_OR_HALT"
 		category="CORRECTNESS" experimental="true" />

Modified: trunk/fb-contrib/etc/messages.xml
===================================================================
--- trunk/fb-contrib/etc/messages.xml	2010-01-12 06:00:17 UTC (rev 1477)
+++ trunk/fb-contrib/etc/messages.xml	2010-01-12 06:07:30 UTC (rev 1478)
@@ -2822,7 +2822,7 @@
 		</Details>
 	</BugPattern>
     
-    	<BugPattern type="SNG_WRONG_NULL_FIELD_GUARD">
+    	<BugPattern type="SNG_SUSPICIOUS_NULL_FIELD_GUARD">
     		<ShortDescription>method tests a field for null as guard for code that doesn't use it</ShortDescription>
     		<LongDescription>method {1} tests a field for null as guard for code that doesn't use it</LongDescription>
     		<Details>
@@ -2835,7 +2835,7 @@
     		</Details>
     	</BugPattern>
     	
-    	<BugPattern type="SNG_WRONG_NULL_LOCAL_GUARD">
+    	<BugPattern type="SNG_SUSPICIOUS_NULL_LOCAL_GUARD">
     		<ShortDescription>method tests a local variable for null as guard for code that doesn't use it</ShortDescription>
     		<LongDescription>method {1} tests a local variable for null as guard for code that doesn't use it</LongDescription>
     		<Details>
@@ -3087,6 +3087,6 @@
 	<BugCode abbrev="NSE">Non Symmetric Equals</BugCode>
     	<BugCode abbrev="CVAA">Contravariant Array Assignment</BugCode>
     	<BugCode abbrev="NFF">Non Functional Field</BugCode>
-    	<BugCode abbrev="SNG">Wrong Null Guard</BugCode>
+    	<BugCode abbrev="SNG">SUSPICIOUS Null Guard</BugCode>
     	<BugCode abbrev="MDM">More Dumb Methods</BugCode>
 </MessageCollection>

Modified: trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SuspiciousNullGuard.java
===================================================================
--- trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SuspiciousNullGuard.java	2010-01-12 06:00:17 UTC (rev 1477)
+++ trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SuspiciousNullGuard.java	2010-01-12 06:07:30 UTC (rev 1478)
@@ -102,7 +102,7 @@
 			NullGuard guard = nullGuards.remove(pc);
 			if ((guard != null) && guard.sawSignatureOfGuard()) {
 				boolean localBug = guard.getRegister() >= 0;
-				bugReporter.reportBug(new BugInstance(this, localBug ? "SNG_WRONG_NULL_LOCAL_GUARD" : "SNG_WRONG_NULL_FIELD_GUARD", localBug ? NORMAL_PRIORITY : LOW_PRIORITY)
+				bugReporter.reportBug(new BugInstance(this, localBug ? "SNG_SUSPICIOUS_NULL_LOCAL_GUARD" : "SNG_SUSPICIOUS_NULL_FIELD_GUARD", localBug ? NORMAL_PRIORITY : LOW_PRIORITY)
 						                    .addClass(this)
 						                    .addMethod(this)
 						                    .addSourceLine(this, guard.getLocation()));


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