knielsen 01/08/08 16:56:49 Modified: util/src/java/org/apache/commons/util BufferCache.java FileUtils.java GenerateUniqueId.java ObjectUtils.java SequencedHashtable.java StringUtils.java util/src/java/org/apache/commons/util/exception Nestable.java NestableDelegate.java NestableException.java NestableRuntimeException.java util/src/java/org/apache/commons/util/http BrowserDetector.java Log: Stripping trailing spaces Revision Changes Path 1.2 +5 -5 jakarta-commons-sandbox/util/src/java/org/apache/commons/util/BufferCache.java Index: BufferCache.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/util/src/java/org/apache/commons/util/BufferCache.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BufferCache.java 2001/08/07 23:23:40 1.1 +++ BufferCache.java 2001/08/08 23:56:48 1.2 @@ -25,13 +25,13 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Turbine" must not be used to endorse or promote products - * derived from this software without prior written permission. For + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache Turbine" must not be used to endorse or promote products + * derived from this software without prior written permission. For * written permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache", - * "Apache Turbine", nor may "Apache" appear in their name, without + * "Apache Turbine", nor may "Apache" appear in their name, without * prior written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED @@ -62,7 +62,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a> * @author <a href="mailto:[EMAIL PROTECTED]">Leonard Richardson</a> - * @version $Id: BufferCache.java,v 1.1 2001/08/07 23:23:40 dlr Exp $ + * @version $Id: BufferCache.java,v 1.2 2001/08/08 23:56:48 knielsen Exp $ */ public class BufferCache extends SequencedHashtable { 1.2 +5 -5 jakarta-commons-sandbox/util/src/java/org/apache/commons/util/FileUtils.java Index: FileUtils.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/util/src/java/org/apache/commons/util/FileUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FileUtils.java 2001/08/07 23:23:41 1.1 +++ FileUtils.java 2001/08/08 23:56:48 1.2 @@ -25,13 +25,13 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Turbine" must not be used to endorse or promote products - * derived from this software without prior written permission. For + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache Turbine" must not be used to endorse or promote products + * derived from this software without prior written permission. For * written permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache", - * "Apache Turbine", nor may "Apache" appear in their name, without + * "Apache Turbine", nor may "Apache" appear in their name, without * prior written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED @@ -58,7 +58,7 @@ * Common {@link java.io.File} manipulation routines. * * @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a> - * @version $Id: FileUtils.java,v 1.1 2001/08/07 23:23:41 dlr Exp $ + * @version $Id: FileUtils.java,v 1.2 2001/08/08 23:56:48 knielsen Exp $ */ public class FileUtils { 1.2 +5 -5 jakarta-commons-sandbox/util/src/java/org/apache/commons/util/GenerateUniqueId.java Index: GenerateUniqueId.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/util/src/java/org/apache/commons/util/GenerateUniqueId.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- GenerateUniqueId.java 2001/08/07 23:23:41 1.1 +++ GenerateUniqueId.java 2001/08/08 23:56:48 1.2 @@ -25,13 +25,13 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Turbine" must not be used to endorse or promote products - * derived from this software without prior written permission. For + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache Turbine" must not be used to endorse or promote products + * derived from this software without prior written permission. For * written permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache", - * "Apache Turbine", nor may "Apache" appear in their name, without + * "Apache Turbine", nor may "Apache" appear in their name, without * prior written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED @@ -68,7 +68,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a> * @author <a href="mailto:[EMAIL PROTECTED]">Neeme Praks</a> - * @version $Id: GenerateUniqueId.java,v 1.1 2001/08/07 23:23:41 dlr Exp $ + * @version $Id: GenerateUniqueId.java,v 1.2 2001/08/08 23:56:48 knielsen Exp $ */ public class GenerateUniqueId { 1.2 +12 -12 jakarta-commons-sandbox/util/src/java/org/apache/commons/util/ObjectUtils.java Index: ObjectUtils.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/util/src/java/org/apache/commons/util/ObjectUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ObjectUtils.java 2001/08/08 13:20:56 1.1 +++ ObjectUtils.java 2001/08/08 23:56:48 1.2 @@ -25,13 +25,13 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Turbine" must not be used to endorse or promote products - * derived from this software without prior written permission. For + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache Turbine" must not be used to endorse or promote products + * derived from this software without prior written permission. For * written permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache", - * "Apache Turbine", nor may "Apache" appear in their name, without + * "Apache Turbine", nor may "Apache" appear in their name, without * prior written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED @@ -66,7 +66,7 @@ * This is where common Object manipulation routines should go. * * @author <a href="mailto:[EMAIL PROTECTED]">Nissim Karpenstein</a> - * @version $Id: ObjectUtils.java,v 1.1 2001/08/08 13:20:56 jvanzyl Exp $ + * @version $Id: ObjectUtils.java,v 1.2 2001/08/08 23:56:48 knielsen Exp $ */ public class ObjectUtils { @@ -115,7 +115,7 @@ public static Object deserialize( byte[] objectData ) { Object object = null; - if (objectData != null) + if (objectData != null) { // These streams are closed in finally. ObjectInputStream in = null; @@ -123,7 +123,7 @@ new ByteArrayInputStream(objectData); BufferedInputStream bufin = new BufferedInputStream(bin); - try + try { in = new ObjectInputStream(bufin); @@ -134,14 +134,14 @@ catch (Exception e) { } - finally + finally { - try + try { if (in != null) in.close(); if (bufin != null) bufin.close(); if (bin != null) bin.close(); - } + } catch(IOException e) { } @@ -176,12 +176,12 @@ return o1.equals(o2); } } - + /** * Nice method for adding data to a Hashtable in such a way * as to not get NPE's. The point being that if the * value is null, Hashtable.put() will throw an exception. - * That blows in the case of this class cause you may want to + * That blows in the case of this class cause you may want to * essentially treat put("Not Null", null ) == put("Not Null", "") * We will still throw a NPE if the key is null cause that should * never happen. 1.2 +9 -9 jakarta-commons-sandbox/util/src/java/org/apache/commons/util/SequencedHashtable.java Index: SequencedHashtable.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/util/src/java/org/apache/commons/util/SequencedHashtable.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SequencedHashtable.java 2001/08/07 23:23:42 1.1 +++ SequencedHashtable.java 2001/08/08 23:56:48 1.2 @@ -25,13 +25,13 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Turbine" must not be used to endorse or promote products - * derived from this software without prior written permission. For + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache Turbine" must not be used to endorse or promote products + * derived from this software without prior written permission. For * written permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache", - * "Apache Turbine", nor may "Apache" appear in their name, without + * "Apache Turbine", nor may "Apache" appear in their name, without * prior written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED @@ -69,15 +69,15 @@ * <p> * Implementing the List interface is not possible due to a instance * method name clash between the Collection and the List interface: - * + * * <table> * <tr><td>Collections</td><td>boolean remove(Object o)</td></tr> * <tr><td>Lists</td><td>Object remove(Object o)</td></tr> * </table> - * - * So one cannot implement both interfaces at the same, which is unfortunate + * + * So one cannot implement both interfaces at the same, which is unfortunate * because the List interface would be very nice in conjuction with Velocity. - * + * * A slightly more complex implementation and interface could involve * the use of a list of <code>Map.Entry</code> objects. * @@ -186,7 +186,7 @@ /** * Returns the ordered sequence of keys. - * + * * This method is meant to be used for retrieval of Key / Value pairs * in e.g. Velocity: * <PRE> 1.2 +9 -9 jakarta-commons-sandbox/util/src/java/org/apache/commons/util/StringUtils.java Index: StringUtils.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/util/src/java/org/apache/commons/util/StringUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- StringUtils.java 2001/08/07 23:23:43 1.1 +++ StringUtils.java 2001/08/08 23:56:48 1.2 @@ -25,13 +25,13 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Turbine" must not be used to endorse or promote products - * derived from this software without prior written permission. For + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache Turbine" must not be used to endorse or promote products + * derived from this software without prior written permission. For * written permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache", - * "Apache Turbine", nor may "Apache" appear in their name, without + * "Apache Turbine", nor may "Apache" appear in their name, without * prior written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED @@ -66,7 +66,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a> * @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a> * @author <a href="mailto:[EMAIL PROTECTED]">Greg Coladonato</a> - * @version $Id: StringUtils.java,v 1.1 2001/08/07 23:23:43 dlr Exp $ + * @version $Id: StringUtils.java,v 1.2 2001/08/08 23:56:48 knielsen Exp $ */ public class StringUtils { @@ -93,7 +93,7 @@ { return (foo != null && foo.length() > 0); } - + /** * Determine whether a (trimmed) string is empty * @@ -127,7 +127,7 @@ } return trace; } - + /** * Returns the output of printStackTrace as a String. * @@ -143,7 +143,7 @@ } else { - return stackTrace(e); + return stackTrace(e); } } @@ -320,7 +320,7 @@ /** * Wraps a single line of text. Called by wrapText(). I can't - * think of any good reason for exposing this to the public, + * think of any good reason for exposing this to the public, * since wrapText should always be used AFAIK. * * @param line A line which is in need of word-wrapping. 1.2 +5 -5 jakarta-commons-sandbox/util/src/java/org/apache/commons/util/exception/Nestable.java Index: Nestable.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/util/src/java/org/apache/commons/util/exception/Nestable.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Nestable.java 2001/08/07 23:23:44 1.1 +++ Nestable.java 2001/08/08 23:56:48 1.2 @@ -25,13 +25,13 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Turbine" must not be used to endorse or promote products - * derived from this software without prior written permission. For + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache Turbine" must not be used to endorse or promote products + * derived from this software without prior written permission. For * written permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache", - * "Apache Turbine", nor may "Apache" appear in their name, without + * "Apache Turbine", nor may "Apache" appear in their name, without * prior written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED @@ -65,7 +65,7 @@ */ public interface Nestable { - /** + /** * Returns the reference to the exception or error that caused the * exception implementing the <code>Nestable</code> to be thrown. */ 1.2 +12 -12 jakarta-commons-sandbox/util/src/java/org/apache/commons/util/exception/NestableDelegate.java Index: NestableDelegate.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/util/src/java/org/apache/commons/util/exception/NestableDelegate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NestableDelegate.java 2001/08/07 23:23:45 1.1 +++ NestableDelegate.java 2001/08/08 23:56:48 1.2 @@ -25,13 +25,13 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Turbine" must not be used to endorse or promote products - * derived from this software without prior written permission. For + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache Turbine" must not be used to endorse or promote products + * derived from this software without prior written permission. For * written permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache", - * "Apache Turbine", nor may "Apache" appear in their name, without + * "Apache Turbine", nor may "Apache" appear in their name, without * prior written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED @@ -75,7 +75,7 @@ "The Nestable implementation passed to the NestableDelegate(Nestable) " + "constructor must extend java.lang.Throwable"; - /** + /** * Holds the reference to the exception or error that caused * this exception to be thrown. */ @@ -126,13 +126,13 @@ } msg.append(nestedMsg); } - + } return (msg.length() > 0 ? msg.toString() : null); } /** - * Prints the stack trace of this exception the the standar error + * Prints the stack trace of this exception the the standar error * stream. */ public void printStackTrace() @@ -142,13 +142,13 @@ printStackTrace(System.err); } } - + /** * Prints the stack trace of this exception to the specified print stream. * * @param out <code>PrintStream</code> to use for output. */ - public void printStackTrace(PrintStream out) + public void printStackTrace(PrintStream out) { synchronized (out) { @@ -189,8 +189,8 @@ if (nested instanceof Nestable) { ((Nestable) nested).printStackTrace(out, st.length - 2); - } - else + } + else { String[] nst = decompose(nested); for (int i = 0; i < nst.length - st.length + 2; i++) @@ -209,7 +209,7 @@ } /** - * Captures the stack trace associated with a <code>Throwable</code> + * Captures the stack trace associated with a <code>Throwable</code> * object, decomposing it into a list of stack frames. * * @param t The <code>Throwable</code>. 1.2 +27 -27 jakarta-commons-sandbox/util/src/java/org/apache/commons/util/exception/NestableException.java Index: NestableException.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/util/src/java/org/apache/commons/util/exception/NestableException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NestableException.java 2001/08/07 23:23:44 1.1 +++ NestableException.java 2001/08/08 23:56:48 1.2 @@ -25,13 +25,13 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Turbine" must not be used to endorse or promote products - * derived from this software without prior written permission. For + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache Turbine" must not be used to endorse or promote products + * derived from this software without prior written permission. For * written permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache", - * "Apache Turbine", nor may "Apache" appear in their name, without + * "Apache Turbine", nor may "Apache" appear in their name, without * prior written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED @@ -66,12 +66,12 @@ * The base class of all exceptions which can contain other exceptions. * * It is intended to ease the debugging by carrying on the information - * about the exception which was caught and provoked throwing the + * about the exception which was caught and provoked throwing the * current exception. Catching and rethrowing may occur multiple * times, and provided that all exceptions except the first one - * are descendands of <code>NestedException</code>, when the + * are descendands of <code>NestedException</code>, when the * exception is finally printed out using any of the <code> - * printStackTrace()</code> methods, the stacktrace will contain + * printStackTrace()</code> methods, the stacktrace will contain * the information about all exceptions thrown and caught on * the way. * <p> Running the following program @@ -86,7 +86,7 @@ * 8 e.printStackTrace(); * 9 } * 10 } - * 11 + * 11 * 12 public static void a() throws Exception { * 13 try { * 14 b(); @@ -94,7 +94,7 @@ * 16 throw new NestedException("foo", e); * 17 } * 18 } - * 19 + * 19 * 20 public static void b() throws Exception { * 21 try { * 22 c(); @@ -102,7 +102,7 @@ * 24 throw new NestedException("bar", e); * 25 } * 26 } - * 27 + * 27 * 28 public static void c() throws Exception { * 29 throw new Exception("baz"); * 30 } @@ -132,14 +132,14 @@ */ protected NestableDelegate delegate = new NestableDelegate(this); - /** + /** * Holds the reference to the exception or error that caused * this exception to be thrown. */ private Throwable nested = null; - + /** - * Constructs a new <code>NestableException</code> without specified + * Constructs a new <code>NestableException</code> without specified * detail message. */ public NestableException() @@ -148,7 +148,7 @@ } /** - * Constructs a new <code>NestableException</code> with specified + * Constructs a new <code>NestableException</code> with specified * detail message. * * @param msg The error message. @@ -157,12 +157,12 @@ { super(msg); } - + /** - * Constructs a new <code>NestableException</code> with specified + * Constructs a new <code>NestableException</code> with specified * nested <code>Throwable</code>. * - * @param nested The exception or error that caused this exception + * @param nested The exception or error that caused this exception * to be thrown. */ public NestableException(Throwable nested) @@ -170,13 +170,13 @@ super(); this.nested = nested; } - + /** - * Constructs a new <code>NestableException</code> with specified + * Constructs a new <code>NestableException</code> with specified * detail message and nested <code>Throwable</code>. * * @param msg The error message. - * @param nested The exception or error that caused this exception + * @param nested The exception or error that caused this exception * to be thrown. */ public NestableException(String msg, Throwable nested) @@ -184,7 +184,7 @@ super(msg); this.nested = nested; } - + /** * @see org.apache.commons.util.exception.Nestable#getNested() */ @@ -215,30 +215,30 @@ } msg.append(nestedMsg); } - + } return (msg.length() > 0 ? msg.toString() : null); } /** - * Prints the stack trace of this exception the the standar error + * Prints the stack trace of this exception the the standar error * stream. */ public void printStackTrace() { delegate.printStackTrace(); } - + /** * Prints the stack trace of this exception to the specified print stream. * * @param out <code>PrintStream</code> to use for output. */ - public void printStackTrace(PrintStream out) + public void printStackTrace(PrintStream out) { delegate.printStackTrace(out); } - + /** * @see org.apache.commons.util.exception.Nestable#printStackTrace(PrintWriter out) */ @@ -246,7 +246,7 @@ { delegate.printStackTrace(out); } - + /** * @see org.apache.commons.util.exception.Nestable#printStackTrace(PrintWriter out, int skip) */ 1.2 +21 -21 jakarta-commons-sandbox/util/src/java/org/apache/commons/util/exception/NestableRuntimeException.java Index: NestableRuntimeException.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/util/src/java/org/apache/commons/util/exception/NestableRuntimeException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NestableRuntimeException.java 2001/08/07 23:23:44 1.1 +++ NestableRuntimeException.java 2001/08/08 23:56:48 1.2 @@ -25,13 +25,13 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Turbine" must not be used to endorse or promote products - * derived from this software without prior written permission. For + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache Turbine" must not be used to endorse or promote products + * derived from this software without prior written permission. For * written permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache", - * "Apache Turbine", nor may "Apache" appear in their name, without + * "Apache Turbine", nor may "Apache" appear in their name, without * prior written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED @@ -79,14 +79,14 @@ */ protected NestableDelegate delegate = new NestableDelegate(this); - /** + /** * Holds the reference to the exception or error that caused * this exception to be thrown. */ private Throwable nested = null; - + /** - * Constructs a new <code>NestableRuntimeException</code> without specified + * Constructs a new <code>NestableRuntimeException</code> without specified * detail message. */ public NestableRuntimeException() @@ -95,7 +95,7 @@ } /** - * Constructs a new <code>NestableRuntimeException</code> with specified + * Constructs a new <code>NestableRuntimeException</code> with specified * detail message. * * @param msg The error message. @@ -104,12 +104,12 @@ { super(msg); } - + /** - * Constructs a new <code>NestableRuntimeException</code> with specified + * Constructs a new <code>NestableRuntimeException</code> with specified * nested <code>Throwable</code>. * - * @param nested The exception or error that caused this exception + * @param nested The exception or error that caused this exception * to be thrown. */ public NestableRuntimeException(Throwable nested) @@ -117,13 +117,13 @@ super(); this.nested = nested; } - + /** - * Constructs a new <code>NestableRuntimeException</code> with specified + * Constructs a new <code>NestableRuntimeException</code> with specified * detail message and nested <code>Throwable</code>. * * @param msg The error message. - * @param nested The exception or error that caused this exception + * @param nested The exception or error that caused this exception * to be thrown. */ public NestableRuntimeException(String msg, Throwable nested) @@ -131,7 +131,7 @@ super(msg); this.nested = nested; } - + /** * @see org.apache.commons.util.exception.Nestable#getNested() */ @@ -162,30 +162,30 @@ } msg.append(nestedMsg); } - + } return (msg.length() > 0 ? msg.toString() : null); } /** - * Prints the stack trace of this exception the the standar error + * Prints the stack trace of this exception the the standar error * stream. */ public void printStackTrace() { delegate.printStackTrace(); } - + /** * Prints the stack trace of this exception to the specified print stream. * * @param out <code>PrintStream</code> to use for output. */ - public void printStackTrace(PrintStream out) + public void printStackTrace(PrintStream out) { delegate.printStackTrace(out); } - + /** * @see org.apache.commons.util.exception.Nestable#printStackTrace(PrintWriter out) */ @@ -193,7 +193,7 @@ { delegate.printStackTrace(out); } - + /** * @see org.apache.commons.util.exception.Nestable#printStackTrace(PrintWriter out, int skip) */ 1.2 +5 -5 jakarta-commons-sandbox/util/src/java/org/apache/commons/util/http/BrowserDetector.java Index: BrowserDetector.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/util/src/java/org/apache/commons/util/http/BrowserDetector.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BrowserDetector.java 2001/08/07 23:23:46 1.1 +++ BrowserDetector.java 2001/08/08 23:56:48 1.2 @@ -25,13 +25,13 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Turbine" must not be used to endorse or promote products - * derived from this software without prior written permission. For + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache Turbine" must not be used to endorse or promote products + * derived from this software without prior written permission. For * written permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache", - * "Apache Turbine", nor may "Apache" appear in their name, without + * "Apache Turbine", nor may "Apache" appear in their name, without * prior written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED @@ -78,7 +78,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Leon Atkisnon</a> * @author <a href="mailto:[EMAIL PROTECTED]">Chris Mospaw</a> * @author <a href="mailto:[EMAIL PROTECTED]">Benjamin Elijah Griffin</a> - * @version $Id: BrowserDetector.java,v 1.1 2001/08/07 23:23:46 dlr Exp $ + * @version $Id: BrowserDetector.java,v 1.2 2001/08/08 23:56:48 knielsen Exp $ */ public class BrowserDetector {