[jsword-svn] bibledesktop/java/main/org/crosswire/bibledesktop/passage s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage
In directory www.crosswire.org:/tmp/cvs-serv30623/java/main/org/crosswire/bibledesktop/passage

Modified Files:
	KeyTreeCellRenderer.java WholeBibleTreeNode.java 
	BookTreeNode.java BibleTreeNode.java 
Log Message:
Update pmd ruleset.xml, adding new rules, (re)testing all rules, and cleaning up trivial reports.

Index: WholeBibleTreeNode.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WholeBibleTreeNode.java	8 Sep 2004 19:57:58 -0000	1.4
--- WholeBibleTreeNode.java	19 Mar 2005 18:45:12 -0000	1.5
***************
*** 237,241 ****
--- 237,243 ----
      {
          if (!(node instanceof WholeBibleTreeNode))
+         {
              return -1;
+         }
  
          WholeBibleTreeNode vnode = (WholeBibleTreeNode) node;

Index: BookTreeNode.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/BookTreeNode.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BookTreeNode.java	28 Nov 2004 21:36:04 -0000	1.5
--- BookTreeNode.java	19 Mar 2005 18:45:12 -0000	1.6
***************
*** 93,97 ****
          try
          {
!             if (kids[i] != null) return kids[i];
  
              ChapterTreeNode node = new ChapterTreeNode(this, book, i + 1);
--- 93,100 ----
          try
          {
!             if (kids[i] != null)
!             {
!                 return kids[i];
!             }
  
              ChapterTreeNode node = new ChapterTreeNode(this, book, i + 1);
***************
*** 124,128 ****
--- 127,133 ----
      {
          if (!(node instanceof ChapterTreeNode))
+         {
              return -1;
+         }
  
          ChapterTreeNode chap = (ChapterTreeNode) node;

Index: KeyTreeCellRenderer.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/KeyTreeCellRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** KeyTreeCellRenderer.java	24 Jan 2005 23:25:18 -0000	1.4
--- KeyTreeCellRenderer.java	19 Mar 2005 18:45:12 -0000	1.5
***************
*** 60,64 ****
       * The log stream
       */
!     private static Logger log = Logger.getLogger(KeyTreeCellRenderer.class);
  
      /**
--- 60,64 ----
       * The log stream
       */
!     private static final Logger log = Logger.getLogger(KeyTreeCellRenderer.class);
  
      /**

Index: BibleTreeNode.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/BibleTreeNode.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BibleTreeNode.java	28 Nov 2004 21:36:04 -0000	1.5
--- BibleTreeNode.java	19 Mar 2005 18:45:12 -0000	1.6
***************
*** 88,92 ****
          try
          {
!             if (kids[i] != null) return kids[i];
  
              BookTreeNode node = new BookTreeNode(this, i + 1);
--- 88,95 ----
          try
          {
!             if (kids[i] != null)
!             {
!                 return kids[i];
!             }
  
              BookTreeNode node = new BookTreeNode(this, i + 1);
***************
*** 128,132 ****
--- 131,137 ----
      {
          if (!(node instanceof BookTreeNode))
+         {
              return -1;
+         }
  
          BookTreeNode book = (BookTreeNode) node;
***************
*** 163,167 ****
      public String toString()
      {
!         if (ref == null) return Msg.WHOLE_BIBLE.toString();
  
          return Msg.PART_BIBLE.toString(ref.getOverview());
--- 168,175 ----
      public String toString()
      {
!         if (ref == null)
!         {
!             return Msg.WHOLE_BIBLE.toString();
!         }
  
          return Msg.PART_BIBLE.toString(ref.getOverview());