[MMBASE CVS] contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders RichTextBuilder.java InlineRel.java

[Nico Klasens]

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

Modified Files:
        RichTextBuilder.java InlineRel.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/richtext/src/java/com/finalist/cmsc/richtext/builders
See also: http://www.mmbase.org/jira/browse/CMSC-907


Index: RichTextBuilder.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- RichTextBuilder.java        10 May 2008 16:31:23 -0000      1.13
+++ RichTextBuilder.java        16 May 2008 11:46:33 -0000      1.14
@@ -5,7 +5,6 @@
 import java.util.*;
 
 import org.apache.commons.lang.StringUtils;
-
 import org.mmbase.applications.wordfilter.WordHtmlCleaner;
 import org.mmbase.bridge.Field;
 import org.mmbase.bridge.NodeManager;
@@ -18,9 +17,7 @@
 import org.mmbase.storage.search.implementation.NodeSearchQuery;
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
+import org.w3c.dom.*;
 
 import com.finalist.cmsc.richtext.RichText;
 
@@ -32,7 +29,7 @@
 public class RichTextBuilder extends MMObjectBuilder {
 
    /** MMbase logging system */
-   private static Logger log = 
Logging.getLoggerInstance(RichTextBuilder.class.getName());
+   private static final Logger log = 
Logging.getLoggerInstance(RichTextBuilder.class.getName());
 
    /** list of html text fields to clean */
    protected List<String> htmlFields = new ArrayList<String>();
@@ -98,7 +95,7 @@
       if (inlinerelBuilder == null) {
          inlinerelBuilder = mmb.getMMObject(RichText.INLINEREL_NM);
          if (inlinerelBuilder == null) {
-            throw new RuntimeException("Builder '" + RichText.INLINEREL_NM + 
"' does not exist.");
+            throw new IllegalStateException("Builder '" + 
RichText.INLINEREL_NM + "' does not exist.");
          }
          inlinerelNumber = 
mmb.getRelDef().getNumberByName(RichText.INLINEREL_NM);
       }
@@ -106,7 +103,7 @@
       if (imagerelBuilder == null) {
          imagerelBuilder = mmb.getMMObject(RichText.IMAGEINLINEREL_NM);
          if (imagerelBuilder == null) {
-            throw new RuntimeException("Builder '" + 
RichText.IMAGEINLINEREL_NM + "' does not exist.");
+            throw new IllegalStateException("Builder '" + 
RichText.IMAGEINLINEREL_NM + "' does not exist.");
          }
          imagerelNumber = 
mmb.getRelDef().getNumberByName(RichText.IMAGEINLINEREL_NM);
       }


Index: InlineRel.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/InlineRel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- InlineRel.java      26 Nov 2007 11:43:45 -0000      1.3
+++ InlineRel.java      16 May 2008 11:46:33 -0000      1.4
@@ -16,7 +16,7 @@
 import org.mmbase.util.logging.*;
 
 public class InlineRel extends InsRel {
-   static Logger log = Logging.getLoggerInstance(InlineRel.class.getName());
+   static final Logger log = 
Logging.getLoggerInstance(InlineRel.class.getName());
    MMBase mmbaseroot = null;
 
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs