[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/sql SqlExecutor.java SqlAction.java ScriptReader.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/sql
In directory 
james.mmbase.org:/tmp/cvs-serv30736/cmsc/utilities/src/java/com/finalist/cmsc/sql

Modified Files:
        SqlExecutor.java SqlAction.java ScriptReader.java 
Log Message:
CMSC-907 Code Quality with PMD
Add final modifier to Util classes
Add final modifier to Logger instances
Change Boolean, Integer and Long instantiation to valueOf calls


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/sql
See also: http://www.mmbase.org/jira/browse/CMSC-907


Index: SqlExecutor.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/sql/SqlExecutor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- SqlExecutor.java    26 Nov 2007 11:43:44 -0000      1.6
+++ SqlExecutor.java    16 May 2008 11:46:36 -0000      1.7
@@ -22,7 +22,7 @@
 public class SqlExecutor {
 
    /** MMBase logging system */
-   private static Logger log = 
Logging.getLoggerInstance(SqlExecutor.class.getName());
+   private static final Logger log = 
Logging.getLoggerInstance(SqlExecutor.class.getName());
    private Connection connection;
 
 
@@ -120,7 +120,7 @@
             }
          }
          if (connection == null) {
-            throw new NullPointerException("connection not set. Write code to 
get it from MMBase datasource!");
+            throw new IllegalStateException("connection not set. Write code to 
get it from MMBase datasource!");
          }
       }
       return connection;


Index: SqlAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/sql/SqlAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SqlAction.java      26 Nov 2007 11:43:44 -0000      1.2
+++ SqlAction.java      16 May 2008 11:46:36 -0000      1.3
@@ -26,7 +26,7 @@
 
    public String getFieldname(String name) {
       if (mmb == null) {
-         throw new NullPointerException("MMBase system not found");
+         throw new IllegalStateException("MMBase system not found");
       }
       return (String) 
mmb.getStorageManagerFactory().getStorageIdentifier(name);
    }
@@ -34,7 +34,7 @@
 
    public String getTable(String name) {
       if (mmb == null) {
-         throw new NullPointerException("MMBase system not found");
+         throw new IllegalStateException("MMBase system not found");
       }
       return mmb.getBaseName() + "_" + name;
    }


Index: ScriptReader.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/sql/ScriptReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ScriptReader.java   26 Nov 2007 11:43:44 -0000      1.3
+++ ScriptReader.java   16 May 2008 11:46:36 -0000      1.4
@@ -39,7 +39,7 @@
    private String fileName;
 
    /** MMBase logging system */
-   private static Logger log = 
Logging.getLoggerInstance(ScriptReader.class.getName());
+   private static final Logger log = 
Logging.getLoggerInstance(ScriptReader.class.getName());
 
 
    /**
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs