From 9c13ed2b01d999108076a28c3e031d1c436ffb82 Mon Sep 17 00:00:00 2001
From: Alena Laskavaia <elaskavaia.cdt@gmail.com>
Date: Mon, 8 Mar 2010 21:06:18 +0000
Subject: [PATCH] - changed enablement, severity and message for naming
 convention checker

---
 codan/org.eclipse.cdt.codan.checkers/plugin.xml        |  4 +++-
 .../checkers/NamingConventionFunctionChecker.java      | 10 ++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/codan/org.eclipse.cdt.codan.checkers/plugin.xml b/codan/org.eclipse.cdt.codan.checkers/plugin.xml
index dd237f3dfaa..82a9fceb713 100644
--- a/codan/org.eclipse.cdt.codan.checkers/plugin.xml
+++ b/codan/org.eclipse.cdt.codan.checkers/plugin.xml
@@ -69,8 +69,10 @@
             name="NamingConventionFunctionChecker">
       <problem
             category="org.eclipse.cdt.codan.core.categories.CodeStyle"
-            defaultSeverity="Warning"
+            defaultEnabled="false"
+            defaultSeverity="Info"
             id="org.eclipse.cdt.codan.examples.checkers.NamingConventionFunctionProblem"
+            messagePattern="Bad function name &quot;{0}&quot; (pattern /{1}/)"
             name="Name convention for function">
       </problem>
       </checker>
diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/examples/checkers/NamingConventionFunctionChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/examples/checkers/NamingConventionFunctionChecker.java
index 23c54fded2f..aa59036c65a 100644
--- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/examples/checkers/NamingConventionFunctionChecker.java
+++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/examples/checkers/NamingConventionFunctionChecker.java
@@ -27,6 +27,7 @@ import org.eclipse.core.runtime.CoreException;
  */
 public class NamingConventionFunctionChecker extends AbstractCIndexChecker
 		implements ICheckerWithParameters {
+	private static final String DEFAULT_PATTERN = "^[a-z]"; 	// name starts with english lowercase letter //$NON-NLS-1$
 	public static final String PARAM_KEY = "pattern"; //$NON-NLS-1$
 	private static final String ER_ID = "org.eclipse.cdt.codan.examples.checkers.NamingConventionFunctionProblem"; //$NON-NLS-1$
 
@@ -49,7 +50,7 @@ public class NamingConventionFunctionChecker extends AbstractCIndexChecker
 						if (!pattern.matcher(name).find()) {
 		
 							reportProblem(ER_ID, getFile(), 1, // TODO: line number 
-									"Bad function name: " + name);
+									name, parameter);
 						}
 						return false;
 					}
@@ -75,7 +76,7 @@ public class NamingConventionFunctionChecker extends AbstractCIndexChecker
 			}
 
 			public String getType() {
-				return "string";
+				return IProblemParameterInfo.TYPE_STRING;
 			}
 
 			public String getLabel() {
@@ -91,7 +92,8 @@ public class NamingConventionFunctionChecker extends AbstractCIndexChecker
 			}
 		};
 		problem.setParameterInfo(info);
-		problem.setParameter(PARAM_KEY, "^[a-z]"); // name starts with english
-													// lower case letter
+	
+		problem.setParameter(PARAM_KEY, DEFAULT_PATTERN); 
+									
 	}
 }