[Sandev-cvs] sand/apps/basics/build/generate/org/sandev/generator NodeClassGenerator.java, 1.24, 1.25

[Eric P. <th...@us...>]

Update of /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator
In directory vz-cvs-3.sog:/tmp/cvs-serv3948

Modified Files:
	NodeClassGenerator.java 
Log Message:
Gate the severity in the generated log method so we don't have to rely on
the logger having the appropriate setting.


Index: NodeClassGenerator.java
===================================================================
RCS file: /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator/NodeClassGenerator.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** NodeClassGenerator.java	31 Mar 2009 01:19:31 -0000	1.24
--- NodeClassGenerator.java	13 Aug 2011 19:24:58 -0000	1.25
***************
*** 333,336 ****
--- 333,338 ----
          out.println("     */");
          out.println("    public void log(int severity,String msg) {");
+         out.println("        if(severity<getLogLevel()) {");
+         out.println("            return; }");
          out.println("        if(logger==null) {  //external adaptor node, root node etc");
          out.println("            String nodeName=\"SAND unknown\";");
***************
*** 340,344 ****
          out.println("                nodeName=getClass().getName();");
          out.println("                nodeName=nodeName.substring(nodeName.lastIndexOf(\".\")+1); }");
!         out.println("            System.out.println(Logger.LOGLEVEL_STRINGS[severity] + ");
          out.println("                               \" [\" +nodeName + \"] \" + msg); }");
          out.println("        else try {");
--- 342,346 ----
          out.println("                nodeName=getClass().getName();");
          out.println("                nodeName=nodeName.substring(nodeName.lastIndexOf(\".\")+1); }");
!         out.println("            System.out.println(\"pln\" + Logger.LOGLEVEL_STRINGS[severity] + ");
          out.println("                               \" [\" +nodeName + \"] \" + msg); }");
          out.println("        else try {");