[jsword-svn] common/java/core/org/crosswire/common/util s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/common/java/core/org/crosswire/common/util
In directory www.crosswire.org:/tmp/cvs-serv5030/java/core/org/crosswire/common/util

Modified Files:
	StackTrace.java PatternFormatter.java 
Log Message:
Improved ranking, bible display and fixed a few bugs.

Index: StackTrace.java
===================================================================
RCS file: /cvs/jsword/common/java/core/org/crosswire/common/util/StackTrace.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StackTrace.java	19 Mar 2005 18:45:07 -0000	1.6
--- StackTrace.java	1 Apr 2005 17:09:33 -0000	1.7
***************
*** 159,162 ****
--- 159,166 ----
      }
  
+     public int getClassCount()
+     {
+         return classNames.length;
+     }
      /**
       * Get the Class that owns the function
***************
*** 186,190 ****
          public boolean hasMoreElements()
          {
!             return level < classNames.length;
          }
  
--- 190,202 ----
          public boolean hasMoreElements()
          {
!             return level < getClassCount();
!         }
! 
!         /**
!          * @return Returns the level.
!          */
!         public int getAndIncrementLevel()
!         {
!             return level++;
          }
  
***************
*** 192,196 ****
           * Are there more stack levels
           */
!          /* pkg protected */ int level;
      }
  
--- 204,208 ----
           * Are there more stack levels
           */
!          private int level;
      }
  
***************
*** 204,208 ****
              public Object nextElement()
              {
!                 return getClassName(level++);
              }
          };
--- 216,220 ----
              public Object nextElement()
              {
!                 return getClassName(getAndIncrementLevel());
              }
          };
***************
*** 218,222 ****
              public Object nextElement()
              {
!                 return getFunctionName(level++);
              }
          };
--- 230,234 ----
              public Object nextElement()
              {
!                 return getFunctionName(getAndIncrementLevel());
              }
          };
***************
*** 232,236 ****
              public Object nextElement()
              {
!                 return getFullFunctionName(level++);
              }
          };
--- 244,248 ----
              public Object nextElement()
              {
!                 return getFullFunctionName(getAndIncrementLevel());
              }
          };
***************
*** 240,244 ****
       * Array containing the class names
       */
!     /* pkg protected */ String[] classNames;
  
      /**
--- 252,256 ----
       * Array containing the class names
       */
!     private String[] classNames;
  
      /**

Index: PatternFormatter.java
===================================================================
RCS file: /cvs/jsword/common/java/core/org/crosswire/common/util/PatternFormatter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PatternFormatter.java	2 Oct 2004 23:50:53 -0000	1.3
--- PatternFormatter.java	1 Apr 2005 17:09:33 -0000	1.4
***************
*** 3,7 ****
  import java.io.PrintWriter;
  import java.io.StringWriter;
- import java.security.AccessController;
  import java.text.MessageFormat;
  import java.util.Date;
--- 3,6 ----
***************
*** 11,16 ****
  import java.util.logging.Logger;
  
- import sun.security.action.GetPropertyAction;
- 
  /**
   * Formats a log entry by pattern.
--- 10,13 ----
***************
*** 129,132 ****
      // Line separator string.  This is the value of the line.separator
      // property at the moment that the PatternFormatter was created.
!     private String lineSeparator = (String) AccessController.doPrivileged(new GetPropertyAction("line.separator")); //$NON-NLS-1$
  }
--- 126,129 ----
      // Line separator string.  This is the value of the line.separator
      // property at the moment that the PatternFormatter was created.
!     private String lineSeparator = System.getProperty("line.separator", "\r\n"); //$NON-NLS-1$ //$NON-NLS-2$
  }