Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 77496 invoked from network); 30 Mar 2006 21:35:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 Mar 2006 21:35:29 -0000 Received: (qmail 93943 invoked by uid 500); 30 Mar 2006 21:35:23 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 93608 invoked by uid 500); 30 Mar 2006 21:35:20 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 93065 invoked by uid 99); 30 Mar 2006 21:35:17 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Mar 2006 13:35:17 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 30 Mar 2006 13:35:03 -0800 Received: (qmail 76705 invoked by uid 65534); 30 Mar 2006 21:34:42 -0000 Message-ID: <20060330213442.76704.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r390246 [3/15] - in /incubator/harmony/enhanced/classlib/trunk: archive/modules/security/src/main/java/java/security/ modules/archive/src/main/java/java/util/jar/ modules/archive/src/test/java/tests/api/java/util/zip/ modules/beans/src/main... Date: Thu, 30 Mar 2006 21:34:28 -0000 To: harmony-commits@incubator.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/NamingException.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/NamingException.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/NamingException.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/NamingException.java Thu Mar 30 13:34:23 2006 @@ -11,369 +11,369 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ - - -package javax.naming; - -import java.io.PrintStream; -import java.io.PrintWriter; - -/** - * A NamingException is the basic exception thrown by the naming - * classes. There are numerous subclasses of it which are used to further - * describe the type of error encountered. - *

- * A NamingException can hold information relating to an error - * encountered when trying to resolve a Name. It holds the two - * parts of the original name, firstly the part of the name which was - * successfully resolved, secondly the part of the name which could not be - * resolved.

- *

- * For example:
- * ------------
- * The resolved name could be something like http://www.apache.org where jndi has - * successfully resolved the DNS name. - * The part of the name which could not be resolved could be something like - * java/classes.index.html where jndi could not resolve the file name.

- *

- * It can also refer to the object that is associated with the resolved name.

- *

- * Additionaly it can refer to another exception, which may be the root cause - * of this exception.

- *

- * Multithreaded access to a NamingException instance is only - * safe when client code locks the object first.

- * - */ -public class NamingException extends Exception { - - /* - * This constant is used during deserialization to check the J2SE version - * which created the serialized object. - */ - private static final long serialVersionUID = -1299181962103167177L; - - /* - * ------------------------------------------------------------------- - * Instance variables - * ------------------------------------------------------------------- - */ - - /** - * The resolved name. This may be null. - */ - protected Name resolvedName = null; - - /** - * The remaining name. This may be null. - */ - protected Name remainingName = null; - - /** - * The resolved object. This may be null. - */ - protected Object resolvedObj = null; - - /** - * The exception that caused this NamingException to be raised. This may be null. - */ - protected Throwable rootException = null; - - /* - * ------------------------------------------------------------------- - * Constructors - * ------------------------------------------------------------------- - */ - - /** - * Constructs a NamingException instance - * with all data initialized to null. - */ - public NamingException() { - super(); - } - - /** - * Constructs a NamingException instance - * with the specified message. All other fields are initialized to null. - * - * @param s The detail message for the exception. It may be null. - */ - public NamingException(String s) { - super(s); - } - - /* - * ------------------------------------------------------------------- - * Methods - * ------------------------------------------------------------------- - */ - - /** - * Returns the message passed in as a param to the constructor. - * This may be null. - * - * @return the message passed in as a param to the constructor. - */ - public String getExplanation() { - return super.getMessage(); - } - - /** - * Appends the supplied string to the Name held as the - * remaining name. The string may be null. - * - * @param s the string to append to the remaining Name. - * @throws IllegalArgumentException if appending the supplied - * String s causes the name to become invalid. - */ - public void appendRemainingComponent(String s) { - if (null != s) { - try { - if (null == remainingName) { - remainingName = new CompositeName(""); //$NON-NLS-1$ - } - remainingName = remainingName.add(s); - } catch (InvalidNameException e) { - throw new IllegalArgumentException("Found invalid name, reason: " + e); //$NON-NLS-1$ - } - } - } - - /** - * Returns the remaining name. This may be null. - * - * @return the remaining name. This may be null. - */ - public Name getRemainingName() { - return remainingName; - } - - /** - * Returns the resolved name. This may be null. - * - * @return the resolved name. This may be null. - */ - public Name getResolvedName() { - return resolvedName; - } - - /** - * Returns the resolved object. This may be null. - * - * @return the resolved object. This may be null. - */ - public Object getResolvedObj() { - return resolvedObj; - } - - /** - * Sets the resolved name to the specified name. This may be null. - * The resolved name details must not change even if the original - * Name itself changes. - * - * @param name the resolved name to set. - */ - public void setResolvedName(Name name) { - resolvedName = null == name ? null : (Name) name.clone(); - } - - /** - * Sets the remaining name to the specified n. This may be null. - * The remaining name details must not change even if the original - * Name itself changes. - * - * @param name the remaining name to set. - */ - public void setRemainingName(Name name) { - remainingName = null == name ? null : (Name) name.clone(); - } - - /** - * Sets the resolved object to the specified o. This may be null. - * - * @param o the resolved object to set. - */ - public void setResolvedObj(Object o) { - resolvedObj = o; - } - - /** - * Appends the elements of the supplied Name n to the - * Name held as the remaining name. The Name n - * may be null or may be empty. - * - * @param n the name to append to the remaining name. - * @throws IllegalArgumentException if appending the supplied - * Name n causes the name to become invalid. - */ - public void appendRemainingName(Name n) { - if (null != n) { - try { - if (null == remainingName) { - remainingName = new CompositeName(""); //$NON-NLS-1$ - } - remainingName = remainingName.addAll(n); - } catch (InvalidNameException e) { - throw new IllegalArgumentException("Found invalid name, reason: " + e); //$NON-NLS-1$ - } - } - } - - /** - * Returns the exception which caused this NamingException - * which may be null. - * - * @return the exception which caused this NamingException - * which may be null. - */ - public Throwable getRootCause() { - return rootException; - } - - /** - * Sets the exception that caused this NamingException. - * It may be null. - * Ignore the supplied parameter if it is actually this exception. - * - * @param t the exception that caused this NamingException. - */ - public void setRootCause(Throwable t) { - if (t != this) { - rootException = t; - } - } - - /** - * Returns the same details as the toString() method except - * that, if the flag is set to true, then details of the - * resolved object are also appended to the string. - * The actual format can be decided by the implementor. - * - * @param flag Indicates if the resolved object need to be returned. - * - * @return the string represenatation of this NamingException. - */ - public String toString(boolean flag) { - return toStringImpl(flag); - } - - /* - * ------------------------------------------------------------------- - * Methods override parent class Exception - * ------------------------------------------------------------------- - */ - - /** - * If there is a root exception associated with this - * NamingException then first print the class name and message - * of this NamingException, followed by the text - * ". The stack trace of the root exception is: ", followed by the stack - * trace of the exception which caused this exception. - *

- * If there is no root exception associated with this - * NamingException then print the stack trace of this - * NamingException.

- *

- * The output from this goes to System.err.

- */ - public void printStackTrace() { - if (null != rootException) { - System.err.print(super.toString()); - System.err.print(". The stack trace of the root exception is: "); //$NON-NLS-1$ - rootException.printStackTrace(); - } else { - super.printStackTrace(); - } - } - - /** - * Performs the same as printStackTrace() except the output - * goes to the specified PrintStream p. - * - * @param p the PrintStream to which the stack trace is - * printed. - */ - public void printStackTrace(PrintStream p) { - if (null != rootException) { - p.print(super.toString()); - p.print(". The stack trace of the root exception is: "); //$NON-NLS-1$ - rootException.printStackTrace(p); - } else { - super.printStackTrace(p); - } - } - - /** - * Performs the same as printStackTrace() except the output - * goes to the specified PrintWriter p. - * - * @param p the PrintWrite to which the stack trace is - * printed. - */ - public void printStackTrace(PrintWriter p) { - if (null != rootException) { - p.print(super.toString()); - p.print(". The stack trace of the root exception is: "); //$NON-NLS-1$ - rootException.printStackTrace(p); - } else { - super.printStackTrace(p); - } - } - - /* - * (non-Javadoc) - * @see java.lang.Throwable#getCause() - */ - public Throwable getCause() { - return super.getCause(); - } - - /* - * (non-Javadoc) - * @see java.lang.Throwable#initCause(Throwable) - */ - public Throwable initCause(Throwable cause) { - return super.initCause(cause); - } - - /* - * ------------------------------------------------------------------- - * Methods override parent class Object - * ------------------------------------------------------------------- - */ - - /** - * Returns the string represenatation of this NamingException. - * The string contains the string representation of this exception together - * with details of the exception which caused this and any remaining - * portion of the Name. - *

- * The actual format can be decided by the implementor.

- * - * @return the string - */ - public String toString() { - return this.toStringImpl(false); - } - - private String toStringImpl(boolean flag) { - StringBuffer sb = new StringBuffer(); - sb.append(super.toString()); - if (null != rootException) { - sb.append(" [Root exception is ").append(rootException.toString()).append( //$NON-NLS-1$ - "]"); //$NON-NLS-1$ - } - if (null != remainingName) { - sb.append("; Remaining name: '").append(remainingName.toString()).append("'"); //$NON-NLS-1$//$NON-NLS-2$ - } - if (flag && null != resolvedObj) { - sb.append("; Resolved object: '").append(resolvedObj.toString()).append("'"); //$NON-NLS-1$ //$NON-NLS-2$ - } - return sb.toString(); - } - -} - - + */ + + +package javax.naming; + +import java.io.PrintStream; +import java.io.PrintWriter; + +/** + * A NamingException is the basic exception thrown by the naming + * classes. There are numerous subclasses of it which are used to further + * describe the type of error encountered. + *

+ * A NamingException can hold information relating to an error + * encountered when trying to resolve a Name. It holds the two + * parts of the original name, firstly the part of the name which was + * successfully resolved, secondly the part of the name which could not be + * resolved.

+ *

+ * For example:
+ * ------------
+ * The resolved name could be something like http://www.apache.org where jndi has + * successfully resolved the DNS name. + * The part of the name which could not be resolved could be something like + * java/classes.index.html where jndi could not resolve the file name.

+ *

+ * It can also refer to the object that is associated with the resolved name.

+ *

+ * Additionaly it can refer to another exception, which may be the root cause + * of this exception.

+ *

+ * Multithreaded access to a NamingException instance is only + * safe when client code locks the object first.

+ * + */ +public class NamingException extends Exception { + + /* + * This constant is used during deserialization to check the J2SE version + * which created the serialized object. + */ + private static final long serialVersionUID = -1299181962103167177L; + + /* + * ------------------------------------------------------------------- + * Instance variables + * ------------------------------------------------------------------- + */ + + /** + * The resolved name. This may be null. + */ + protected Name resolvedName = null; + + /** + * The remaining name. This may be null. + */ + protected Name remainingName = null; + + /** + * The resolved object. This may be null. + */ + protected Object resolvedObj = null; + + /** + * The exception that caused this NamingException to be raised. This may be null. + */ + protected Throwable rootException = null; + + /* + * ------------------------------------------------------------------- + * Constructors + * ------------------------------------------------------------------- + */ + + /** + * Constructs a NamingException instance + * with all data initialized to null. + */ + public NamingException() { + super(); + } + + /** + * Constructs a NamingException instance + * with the specified message. All other fields are initialized to null. + * + * @param s The detail message for the exception. It may be null. + */ + public NamingException(String s) { + super(s); + } + + /* + * ------------------------------------------------------------------- + * Methods + * ------------------------------------------------------------------- + */ + + /** + * Returns the message passed in as a param to the constructor. + * This may be null. + * + * @return the message passed in as a param to the constructor. + */ + public String getExplanation() { + return super.getMessage(); + } + + /** + * Appends the supplied string to the Name held as the + * remaining name. The string may be null. + * + * @param s the string to append to the remaining Name. + * @throws IllegalArgumentException if appending the supplied + * String s causes the name to become invalid. + */ + public void appendRemainingComponent(String s) { + if (null != s) { + try { + if (null == remainingName) { + remainingName = new CompositeName(""); //$NON-NLS-1$ + } + remainingName = remainingName.add(s); + } catch (InvalidNameException e) { + throw new IllegalArgumentException("Found invalid name, reason: " + e); //$NON-NLS-1$ + } + } + } + + /** + * Returns the remaining name. This may be null. + * + * @return the remaining name. This may be null. + */ + public Name getRemainingName() { + return remainingName; + } + + /** + * Returns the resolved name. This may be null. + * + * @return the resolved name. This may be null. + */ + public Name getResolvedName() { + return resolvedName; + } + + /** + * Returns the resolved object. This may be null. + * + * @return the resolved object. This may be null. + */ + public Object getResolvedObj() { + return resolvedObj; + } + + /** + * Sets the resolved name to the specified name. This may be null. + * The resolved name details must not change even if the original + * Name itself changes. + * + * @param name the resolved name to set. + */ + public void setResolvedName(Name name) { + resolvedName = null == name ? null : (Name) name.clone(); + } + + /** + * Sets the remaining name to the specified n. This may be null. + * The remaining name details must not change even if the original + * Name itself changes. + * + * @param name the remaining name to set. + */ + public void setRemainingName(Name name) { + remainingName = null == name ? null : (Name) name.clone(); + } + + /** + * Sets the resolved object to the specified o. This may be null. + * + * @param o the resolved object to set. + */ + public void setResolvedObj(Object o) { + resolvedObj = o; + } + + /** + * Appends the elements of the supplied Name n to the + * Name held as the remaining name. The Name n + * may be null or may be empty. + * + * @param n the name to append to the remaining name. + * @throws IllegalArgumentException if appending the supplied + * Name n causes the name to become invalid. + */ + public void appendRemainingName(Name n) { + if (null != n) { + try { + if (null == remainingName) { + remainingName = new CompositeName(""); //$NON-NLS-1$ + } + remainingName = remainingName.addAll(n); + } catch (InvalidNameException e) { + throw new IllegalArgumentException("Found invalid name, reason: " + e); //$NON-NLS-1$ + } + } + } + + /** + * Returns the exception which caused this NamingException + * which may be null. + * + * @return the exception which caused this NamingException + * which may be null. + */ + public Throwable getRootCause() { + return rootException; + } + + /** + * Sets the exception that caused this NamingException. + * It may be null. + * Ignore the supplied parameter if it is actually this exception. + * + * @param t the exception that caused this NamingException. + */ + public void setRootCause(Throwable t) { + if (t != this) { + rootException = t; + } + } + + /** + * Returns the same details as the toString() method except + * that, if the flag is set to true, then details of the + * resolved object are also appended to the string. + * The actual format can be decided by the implementor. + * + * @param flag Indicates if the resolved object need to be returned. + * + * @return the string representation of this NamingException. + */ + public String toString(boolean flag) { + return toStringImpl(flag); + } + + /* + * ------------------------------------------------------------------- + * Methods override parent class Exception + * ------------------------------------------------------------------- + */ + + /** + * If there is a root exception associated with this + * NamingException then first print the class name and message + * of this NamingException, followed by the text + * ". The stack trace of the root exception is: ", followed by the stack + * trace of the exception which caused this exception. + *

+ * If there is no root exception associated with this + * NamingException then print the stack trace of this + * NamingException.

+ *

+ * The output from this goes to System.err.

+ */ + public void printStackTrace() { + if (null != rootException) { + System.err.print(super.toString()); + System.err.print(". The stack trace of the root exception is: "); //$NON-NLS-1$ + rootException.printStackTrace(); + } else { + super.printStackTrace(); + } + } + + /** + * Performs the same as printStackTrace() except the output + * goes to the specified PrintStream p. + * + * @param p the PrintStream to which the stack trace is + * printed. + */ + public void printStackTrace(PrintStream p) { + if (null != rootException) { + p.print(super.toString()); + p.print(". The stack trace of the root exception is: "); //$NON-NLS-1$ + rootException.printStackTrace(p); + } else { + super.printStackTrace(p); + } + } + + /** + * Performs the same as printStackTrace() except the output + * goes to the specified PrintWriter p. + * + * @param p the PrintWrite to which the stack trace is + * printed. + */ + public void printStackTrace(PrintWriter p) { + if (null != rootException) { + p.print(super.toString()); + p.print(". The stack trace of the root exception is: "); //$NON-NLS-1$ + rootException.printStackTrace(p); + } else { + super.printStackTrace(p); + } + } + + /* + * (non-Javadoc) + * @see java.lang.Throwable#getCause() + */ + public Throwable getCause() { + return super.getCause(); + } + + /* + * (non-Javadoc) + * @see java.lang.Throwable#initCause(Throwable) + */ + public Throwable initCause(Throwable cause) { + return super.initCause(cause); + } + + /* + * ------------------------------------------------------------------- + * Methods override parent class Object + * ------------------------------------------------------------------- + */ + + /** + * Returns the string representation of this NamingException. + * The string contains the string representation of this exception together + * with details of the exception which caused this and any remaining + * portion of the Name. + *

+ * The actual format can be decided by the implementor.

+ * + * @return the string + */ + public String toString() { + return this.toStringImpl(false); + } + + private String toStringImpl(boolean flag) { + StringBuffer sb = new StringBuffer(); + sb.append(super.toString()); + if (null != rootException) { + sb.append(" [Root exception is ").append(rootException.toString()).append( //$NON-NLS-1$ + "]"); //$NON-NLS-1$ + } + if (null != remainingName) { + sb.append("; Remaining name: '").append(remainingName.toString()).append("'"); //$NON-NLS-1$//$NON-NLS-2$ + } + if (flag && null != resolvedObj) { + sb.append("; Resolved object: '").append(resolvedObj.toString()).append("'"); //$NON-NLS-1$ //$NON-NLS-2$ + } + return sb.toString(); + } + +} + + Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/InvalidAttributeValueException.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/InvalidAttributeValueException.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/InvalidAttributeValueException.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/directory/InvalidAttributeValueException.java Thu Mar 30 13:34:23 2006 @@ -11,69 +11,69 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ - - package javax.naming.directory; - -import javax.naming.NamingException; - -/** - * Thrown when the value part of an attribute is invalid. - *

- * Directory service providers may restrict the characteristics of the attribute - * value. If an attempt is made to set the attribute with an invalid attribute - * value the provider will throw an InvalidAttributeValueException.

- *

- * Examples include attempting to set a value on an attribute that doesn't take - * a value, attempting to set multiple values on an attribute that only takes a - * single value, attempting to clear a value on an attribute that must have a - * value, and so on.

- *

- * The serialization and synchonization specification for NamingException - * applies equally to this class.

- * - * @see NamingException - * - */ -public class InvalidAttributeValueException extends NamingException { - - /* - * ------------------------------------------------------------------- - * Constants - * ------------------------------------------------------------------- - */ - - /* Serialization information - start. */ - private static final long serialVersionUID = 0x7903d78afec63b03L; - /* Serialization information - end. */ - - /* - * ------------------------------------------------------------------- - * Constructors - * ------------------------------------------------------------------- - */ - - /** - * Default constructor. - *

- * All fields are initialized to null.

- */ - public InvalidAttributeValueException() { - super(); - } - - /** - * Constructs an InvalidAttributeValueException instance - * using the supplied text of the message. - *

- * All fields are initialized to null.

- * - * @param s message about the problem - */ - public InvalidAttributeValueException(String s) { - super(s); - } - -} - - + */ + + package javax.naming.directory; + +import javax.naming.NamingException; + +/** + * Thrown when the value part of an attribute is invalid. + *

+ * Directory service providers may restrict the characteristics of the attribute + * value. If an attempt is made to set the attribute with an invalid attribute + * value the provider will throw an InvalidAttributeValueException.

+ *

+ * Examples include attempting to set a value on an attribute that doesn't take + * a value, attempting to set multiple values on an attribute that only takes a + * single value, attempting to clear a value on an attribute that must have a + * value, and so on.

+ *

+ * The serialization and synchronization specification for NamingException + * applies equally to this class.

+ * + * @see NamingException + * + */ +public class InvalidAttributeValueException extends NamingException { + + /* + * ------------------------------------------------------------------- + * Constants + * ------------------------------------------------------------------- + */ + + /* Serialization information - start. */ + private static final long serialVersionUID = 0x7903d78afec63b03L; + /* Serialization information - end. */ + + /* + * ------------------------------------------------------------------- + * Constructors + * ------------------------------------------------------------------- + */ + + /** + * Default constructor. + *

+ * All fields are initialized to null.

+ */ + public InvalidAttributeValueException() { + super(); + } + + /** + * Constructs an InvalidAttributeValueException instance + * using the supplied text of the message. + *

+ * All fields are initialized to null.

+ * + * @param s message about the problem + */ + public InvalidAttributeValueException(String s) { + super(s); + } + +} + + Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/NamingEvent.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/NamingEvent.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/NamingEvent.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/event/NamingEvent.java Thu Mar 30 13:34:23 2006 @@ -11,272 +11,272 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ - - -package javax.naming.event; - -import java.util.EventObject; -import javax.naming.Binding; - -/** - * An event from a directory or naming service, for passing to a listener. - *

- * The source of the event is always the EventContext that the - * listener registered with. Names in the NamingEvent object - * are all relative to this context.

- *

- * Note the discussion about threads and synchronization in the description for - * this package.

- * - * - */ -public class NamingEvent extends EventObject { - - /* - * ----------------------------------------- - * Constants - * ----------------------------------------- - */ - - /** - * A NamingEvent type constant, indicating that an object was - * added. - */ - public static final int OBJECT_ADDED = 0; - - /** - * A NamingEvent type constant, indicating that an object was - * changed. - */ - public static final int OBJECT_CHANGED = 3; - - /** - * A NamingEvent type constant, indicating that an object was - * removed. - */ - public static final int OBJECT_REMOVED = 1; - - /** - * A NamingEvent type constant, indicating that an object was - * renamed. - */ - public static final int OBJECT_RENAMED = 2; - - /* - * This constant is used during deserialization to check the J2SE version which - * created the serialized object. - */ - private static final long serialVersionUID = 0x9d18b00289d22f45L; //J2SE 1.4.2 - - /* - * ------------------------------------------------------------------- - * Instance variables - * ------------------------------------------------------------------- - */ - - /** - * Some information about the event, whose format is specified by the - * service provider. - * - * @serial - */ - protected Object changeInfo; - - /** - * The binding after the event. - * - * @serial - */ - protected Binding newBinding; - - /** - * The binding before the event. - * - * @serial - */ - protected Binding oldBinding; - - /** - * The type of this event. Its value is one of the constant event types - * above. - * - * @serial - */ - protected int type; - - // the context that generated this event - private transient EventContext eventContext; - - /* - * ----------------------------------------- - * Constructors - * ----------------------------------------- - */ - - /** - * - * Constructs an NamingEvent with all parameters. - * - * @param eventContext the context that generated this event. It is the - * originator of this event and cannot be null. - * @param type the constant value that specifies the type of event - * @param newBinding binding after the event. newBinding might - * be null depending on the value of the type - * paramater as follows: - *
    - *
  • - * OBJECT_ADDED - newBinding cannot be null - *
  • - *
  • - * OBJECT_CHANGED - newBinding cannot be null - *
  • - *
  • - * OBJECT_REMOVED - newBinding can be null - *
  • - *
  • - * OBJECT_RENAMED - newBinding can be null - *
  • - *
- * The names are relative to the eventContext - * @param oldBinding the binding before the event. oldBinding might - * be null depending on the value of the type - * paramater as follows: - *
    - *
  • - * OBJECT_ADDED - oldBinding - * can be null - *
  • - *
  • - * OBJECT_CHANGED - oldBinding - * cannot be null - *
  • - *
  • - * OBJECT_REMOVED - oldBinding - * cannot be null - *
  • - *
  • - * OBJECT_RENAMED - oldBinding - * can be null - *
  • - *
- * The names are relative to the eventContext - * @param changeInfo contain some information about the event and maybe - * null, the format of which is specified by the - * service provider. - */ - public NamingEvent( - EventContext eventContext, - int type, - Binding newBinding, - Binding oldBinding, - Object changeInfo) { - super(eventContext); - - this.type = type; - this.changeInfo = changeInfo; - this.newBinding = newBinding; - this.oldBinding = oldBinding; - this.eventContext = eventContext; - - } - - /* - * ----------------------------------------- - * Methods - * ----------------------------------------- - */ - - /** - * Calls a method to notify the listener of this event. - *

- * For OBJECT_ADDED, OBJECT_REMOVED or - * OBJECT_RENAMED type events this method calls the - * corresponding method in the NamespaceChangedListener - * interface. For OBJECT_CHANGED type events this method calls - * objectChanged() in the ObjectChangeListener - * interface.

- * - * @param naminglistener the listener of this event - */ - public void dispatch(NamingListener naminglistener) { - switch (type) { - case OBJECT_ADDED : - ((NamespaceChangeListener) naminglistener).objectAdded(this); - break; - case OBJECT_REMOVED : - ((NamespaceChangeListener) naminglistener).objectRemoved(this); - break; - case OBJECT_RENAMED : - ((NamespaceChangeListener) naminglistener).objectRenamed(this); - break; - case OBJECT_CHANGED : - ((ObjectChangeListener) naminglistener).objectChanged(this); - break; - } - } - - /** - * Gets the change information. - * - * @return the change information object provided by the - * service provider, which may be null. - */ - public Object getChangeInfo() { - return changeInfo; - } - - /** - * Gets the EventContext that generated this event. - * - * @return the EventContext that generated this event. - */ - public EventContext getEventContext() { - return eventContext; - } - - /** - * Gets the binding after this event. - *

- * If it exists and is inside the scope that was specified when the listener - * was registered using EventContext.addNamimgListener. - * Returns null otherwise. Therefore for an OBJECT_RENAMED - * event, the return value will be non-null if the new name places the - * binding within the scope for the listener.

- * - * @return the binding after this event - */ - public Binding getNewBinding() { - return newBinding; - } - - /** - * Gets the binding before this event. - *

- * If it existed and was inside the scope that was specified when the - * listener was registered using EventContext.addNamimgListener. - * Returns null otherwise. Therefore for an OBJECT_RENAMED - * event, the return value will be non-null if the old name placed the - * binding within the scope for the listener.

- * - * @return the binding before this event - */ - public Binding getOldBinding() { - return oldBinding; - } - - /** - * Gets the type of the event. - *

- * The return value is constrained to a choice from: - * OBJECT_ADDED, OBJECT_REMOVED, - * OBJECT_RENAMED, OBJECT_CHANGED.

- * - * @return the type of the event - */ - public int getType() { - return type; - } -} - - + */ + + +package javax.naming.event; + +import java.util.EventObject; +import javax.naming.Binding; + +/** + * An event from a directory or naming service, for passing to a listener. + *

+ * The source of the event is always the EventContext that the + * listener registered with. Names in the NamingEvent object + * are all relative to this context.

+ *

+ * Note the discussion about threads and synchronization in the description for + * this package.

+ * + * + */ +public class NamingEvent extends EventObject { + + /* + * ----------------------------------------- + * Constants + * ----------------------------------------- + */ + + /** + * A NamingEvent type constant, indicating that an object was + * added. + */ + public static final int OBJECT_ADDED = 0; + + /** + * A NamingEvent type constant, indicating that an object was + * changed. + */ + public static final int OBJECT_CHANGED = 3; + + /** + * A NamingEvent type constant, indicating that an object was + * removed. + */ + public static final int OBJECT_REMOVED = 1; + + /** + * A NamingEvent type constant, indicating that an object was + * renamed. + */ + public static final int OBJECT_RENAMED = 2; + + /* + * This constant is used during deserialization to check the J2SE version which + * created the serialized object. + */ + private static final long serialVersionUID = 0x9d18b00289d22f45L; //J2SE 1.4.2 + + /* + * ------------------------------------------------------------------- + * Instance variables + * ------------------------------------------------------------------- + */ + + /** + * Some information about the event, whose format is specified by the + * service provider. + * + * @serial + */ + protected Object changeInfo; + + /** + * The binding after the event. + * + * @serial + */ + protected Binding newBinding; + + /** + * The binding before the event. + * + * @serial + */ + protected Binding oldBinding; + + /** + * The type of this event. Its value is one of the constant event types + * above. + * + * @serial + */ + protected int type; + + // the context that generated this event + private transient EventContext eventContext; + + /* + * ----------------------------------------- + * Constructors + * ----------------------------------------- + */ + + /** + * + * Constructs an NamingEvent with all parameters. + * + * @param eventContext the context that generated this event. It is the + * originator of this event and cannot be null. + * @param type the constant value that specifies the type of event + * @param newBinding binding after the event. newBinding might + * be null depending on the value of the type + * parameter as follows: + *
    + *
  • + * OBJECT_ADDED - newBinding cannot be null + *
  • + *
  • + * OBJECT_CHANGED - newBinding cannot be null + *
  • + *
  • + * OBJECT_REMOVED - newBinding can be null + *
  • + *
  • + * OBJECT_RENAMED - newBinding can be null + *
  • + *
+ * The names are relative to the eventContext + * @param oldBinding the binding before the event. oldBinding might + * be null depending on the value of the type + * parameter as follows: + *
    + *
  • + * OBJECT_ADDED - oldBinding + * can be null + *
  • + *
  • + * OBJECT_CHANGED - oldBinding + * cannot be null + *
  • + *
  • + * OBJECT_REMOVED - oldBinding + * cannot be null + *
  • + *
  • + * OBJECT_RENAMED - oldBinding + * can be null + *
  • + *
+ * The names are relative to the eventContext + * @param changeInfo contain some information about the event and maybe + * null, the format of which is specified by the + * service provider. + */ + public NamingEvent( + EventContext eventContext, + int type, + Binding newBinding, + Binding oldBinding, + Object changeInfo) { + super(eventContext); + + this.type = type; + this.changeInfo = changeInfo; + this.newBinding = newBinding; + this.oldBinding = oldBinding; + this.eventContext = eventContext; + + } + + /* + * ----------------------------------------- + * Methods + * ----------------------------------------- + */ + + /** + * Calls a method to notify the listener of this event. + *

+ * For OBJECT_ADDED, OBJECT_REMOVED or + * OBJECT_RENAMED type events this method calls the + * corresponding method in the NamespaceChangedListener + * interface. For OBJECT_CHANGED type events this method calls + * objectChanged() in the ObjectChangeListener + * interface.

+ * + * @param naminglistener the listener of this event + */ + public void dispatch(NamingListener naminglistener) { + switch (type) { + case OBJECT_ADDED : + ((NamespaceChangeListener) naminglistener).objectAdded(this); + break; + case OBJECT_REMOVED : + ((NamespaceChangeListener) naminglistener).objectRemoved(this); + break; + case OBJECT_RENAMED : + ((NamespaceChangeListener) naminglistener).objectRenamed(this); + break; + case OBJECT_CHANGED : + ((ObjectChangeListener) naminglistener).objectChanged(this); + break; + } + } + + /** + * Gets the change information. + * + * @return the change information object provided by the + * service provider, which may be null. + */ + public Object getChangeInfo() { + return changeInfo; + } + + /** + * Gets the EventContext that generated this event. + * + * @return the EventContext that generated this event. + */ + public EventContext getEventContext() { + return eventContext; + } + + /** + * Gets the binding after this event. + *

+ * If it exists and is inside the scope that was specified when the listener + * was registered using EventContext.addNamimgListener. + * Returns null otherwise. Therefore for an OBJECT_RENAMED + * event, the return value will be non-null if the new name places the + * binding within the scope for the listener.

+ * + * @return the binding after this event + */ + public Binding getNewBinding() { + return newBinding; + } + + /** + * Gets the binding before this event. + *

+ * If it existed and was inside the scope that was specified when the + * listener was registered using EventContext.addNamimgListener. + * Returns null otherwise. Therefore for an OBJECT_RENAMED + * event, the return value will be non-null if the old name placed the + * binding within the scope for the listener.

+ * + * @return the binding before this event + */ + public Binding getOldBinding() { + return oldBinding; + } + + /** + * Gets the type of the event. + *

+ * The return value is constrained to a choice from: + * OBJECT_ADDED, OBJECT_REMOVED, + * OBJECT_RENAMED, OBJECT_CHANGED.

+ * + * @return the type of the event + */ + public int getType() { + return type; + } +} + + Modified: incubator/harmony/enhanced/classlib/trunk/modules/kernel/src/main/java/java/lang/Thread.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/kernel/src/main/java/java/lang/Thread.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/kernel/src/main/java/java/lang/Thread.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/kernel/src/main/java/java/lang/Thread.java Thu Mar 30 13:34:23 2006 @@ -645,7 +645,7 @@ * This is a no-op if the receiver is suspended. If the receiver * isAlive() however, suspended it until * resume() is sent to it. Suspend requests are not queued, - * which means that N requests are equivalenet to just one - only one resume + * which means that N requests are equivalent to just one - only one resume * request is needed in this case. * * @exception SecurityException Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java Thu Mar 30 13:34:23 2006 @@ -985,7 +985,7 @@ * directory already exists, answer false. If the directories were created * successfully, answer true. * - * @return true if the neccessary directories were created, + * @return true if the necessary directories were created, * false otherwise. * */ Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java Thu Mar 30 13:34:23 2006 @@ -1399,7 +1399,7 @@ /** * Read a new array from the receiver. It is assumed the array has not been - * read yet (not a cyclic rfeference). Return the array read. + * read yet (not a cyclic reference). Return the array read. * * @param unshared * read the object unshared @@ -1488,7 +1488,7 @@ /** * Reads a new class from the receiver. It is assumed the class has not been - * read yet (not a cyclic rfeference). Return the class read. + * read yet (not a cyclic reference). Return the class read. * * @param unshared * read the object unshared @@ -1515,7 +1515,7 @@ /** * Reads a new class descriptor from the receiver. It is assumed the class - * descriptor has not been read yet (not a cyclic rfeference). Return the + * descriptor has not been read yet (not a cyclic reference). Return the * class descriptor read. * * @param unshared @@ -1570,7 +1570,7 @@ /** * Reads a new proxy class descriptor from the receiver. It is assumed the - * proxy class descriptor has not been read yet (not a cyclic rfeference). + * proxy class descriptor has not been read yet (not a cyclic reference). * Return the proxy class descriptor read. * * @return The Class read from the stream. Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedReader.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedReader.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedReader.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedReader.java Thu Mar 30 13:34:23 2006 @@ -223,7 +223,7 @@ } /* - * Did the read fully suceed in the previous copy or is the + * Did the read fully succeed in the previous copy or is the * buffer empty? */ if (copyLength == count || in == -1) Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/Reader.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/Reader.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/Reader.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/Reader.java Thu Mar 30 13:34:23 2006 @@ -25,7 +25,7 @@ */ public abstract class Reader { /** - * The object used to syncronize access to the reader. + * The object used to synchronize access to the reader. */ protected Object lock; Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/Writer.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/Writer.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/Writer.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/Writer.java Thu Mar 30 13:34:23 2006 @@ -24,7 +24,7 @@ * @see Reader */ public abstract class Writer { - /** The object used to syncronize access to the writer. */ + /** The object used to synchronize access to the writer. */ protected Object lock; /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/CharSequence.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/CharSequence.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/CharSequence.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/CharSequence.java Thu Mar 30 13:34:23 2006 @@ -17,7 +17,7 @@ /** - * The CharSequence interface represets an ordered set of characters and the + * The CharSequence interface represents an ordered set of characters and the * functions to probe them. */ public interface CharSequence { Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Integer.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Integer.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Integer.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Integer.java Thu Mar 30 13:34:23 2006 @@ -226,7 +226,7 @@ /** * Answers an Integer representing the integer value of the property named * by the argument. If the property could not be found, or its value could - * not be parsed as an integer, answer an Integer reperesenting the second + * not be parsed as an integer, answer an Integer representing the second * argument. * * @param string Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Readable.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Readable.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Readable.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Readable.java Thu Mar 30 13:34:23 2006 @@ -21,7 +21,7 @@ /** * Readable marks that the implementing class provides character sequence. * Readable gives a reference to character sequence from within itself to caller - * through a CharBuffer paramter of the read + * through a CharBuffer parameter of the read * method. */ public interface Readable { Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/UnknownHostException.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/UnknownHostException.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/UnknownHostException.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/UnknownHostException.java Thu Mar 30 13:34:23 2006 @@ -19,7 +19,7 @@ import java.io.IOException; /** - * This UnknownHostException is thrown when an IP address resolution is attemped + * This UnknownHostException is thrown when an IP address resolution is attempted * and no host or resolver may be found. */ public class UnknownHostException extends IOException { Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Random.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Random.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Random.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Random.java Thu Mar 30 13:34:23 2006 @@ -51,7 +51,7 @@ double nextNextGaussian = 0; /** - * Construct a random generator with the curent time of day in milliseconds + * Construct a random generator with the current time of day in milliseconds * as the initial state. * * @see #setSeed Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Stack.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Stack.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Stack.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Stack.java Thu Mar 30 13:34:23 2006 @@ -94,9 +94,9 @@ } /** - * Returns the index of the first occurence of the object. + * Returns the index of the first occurrence of the object. * - * @return the index of the first occurence of the object + * @return the index of the first occurrence of the object * @param o * the object to be searched */ Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileTest.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileTest.java Thu Mar 30 13:34:23 2006 @@ -839,7 +839,7 @@ .equals(base + "temp.tst")); // Finding a non-existent directory for tests 3 and 4 - // This is necessay because getCanonicalPath is case sensitive and + // This is necessary because getCanonicalPath is case sensitive and // could // cause a failure in the test if the directory exists but with // different Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java Thu Mar 30 13:34:23 2006 @@ -125,7 +125,7 @@ return; } fail( - "Failed to throw exception attemting connect on already connected stream"); + "Failed to throw exception attempting connect on already connected stream"); } Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/PushbackInputStreamTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/PushbackInputStreamTest.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/PushbackInputStreamTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/PushbackInputStreamTest.java Thu Mar 30 13:34:23 2006 @@ -71,7 +71,7 @@ assertTrue("Available returned incorrect number of bytes", pis .available() == fileString.getBytes().length); } catch (IOException e) { - fail("Exception during avaialable test: " + e.toString()); + fail("Exception during available test: " + e.toString()); } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java Thu Mar 30 13:34:23 2006 @@ -177,7 +177,7 @@ fail("Exception during getParameterTypes test:" + e.toString()); } - assertTrue("Incorrect paramter returned", types.length == 0); + assertTrue("Incorrect parameter returned", types.length == 0); Class[] parms = null; try { @@ -190,7 +190,7 @@ fail("Exception during getParameterTypes test:" + e.toString()); } - assertTrue("Incorrect paramter returned", types[0].equals(parms[0])); + assertTrue("Incorrect parameter returned", types[0].equals(parms[0])); } /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLTest.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLTest.java Thu Mar 30 13:34:23 2006 @@ -165,7 +165,7 @@ assertTrue("u3b returns a wrong file", u3b.getFile().equals("")); assertTrue("u3b returns a wrong anchor", u3b.getRef() == null); - // test for non-port ":" and wierd characters occurences + // test for non-port ":" and wierd characters occurrences u4 = new URL( "http://www.yahoo5.com/di!@$%^&*()_+r1/di:::r2/test.cgi?point1.html#anchor1"); assertTrue("u4 returns a wrong protocol", u4.getProtocol().equals( Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ArraysTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ArraysTest.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ArraysTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ArraysTest.java Thu Mar 30 13:34:23 2006 @@ -103,10 +103,10 @@ for (byte counter = 0; counter < arraySize; counter++) assertTrue("Binary search on byte[] answered incorrect position", Arrays.binarySearch(byteArray, counter) == counter); - assertTrue("Binary search suceeded for value not present in array 1", + assertTrue("Binary search succeeded for value not present in array 1", Arrays.binarySearch(intArray, (byte) -1) == -1); assertTrue( - "Binary search suceeded for value not present in array 2", + "Binary search succeeded for value not present in array 2", Arrays.binarySearch(intArray, (byte) arraySize) == -(arraySize + 1)); for (byte counter = 0; counter < arraySize; counter++) byteArray[counter] -= 50; @@ -125,10 +125,10 @@ assertTrue( "Binary search on char[] answered incorrect position", Arrays.binarySearch(charArray, (char) (counter + 1)) == counter); - assertTrue("Binary search suceeded for value not present in array 1", + assertTrue("Binary search succeeded for value not present in array 1", Arrays.binarySearch(charArray, '\u0000') == -1); assertTrue( - "Binary search suceeded for value not present in array 2", + "Binary search succeeded for value not present in array 2", Arrays.binarySearch(charArray, (char) (arraySize + 1)) == -(arraySize + 1)); } @@ -141,10 +141,10 @@ assertTrue( "Binary search on double[] answered incorrect position", Arrays.binarySearch(doubleArray, (double) counter) == (double) counter); - assertTrue("Binary search suceeded for value not present in array 1", + assertTrue("Binary search succeeded for value not present in array 1", Arrays.binarySearch(doubleArray, (double) -1) == -1); assertTrue( - "Binary search suceeded for value not present in array 2", + "Binary search succeeded for value not present in array 2", Arrays.binarySearch(doubleArray, (double) arraySize) == -(arraySize + 1)); for (int counter = 0; counter < arraySize; counter++) doubleArray[counter] -= (double) 50; @@ -175,10 +175,10 @@ assertTrue( "Binary search on float[] answered incorrect position", Arrays.binarySearch(floatArray, (float) counter) == (float) counter); - assertTrue("Binary search suceeded for value not present in array 1", + assertTrue("Binary search succeeded for value not present in array 1", Arrays.binarySearch(floatArray, (float) -1) == -1); assertTrue( - "Binary search suceeded for value not present in array 2", + "Binary search succeeded for value not present in array 2", Arrays.binarySearch(floatArray, (float) arraySize) == -(arraySize + 1)); for (int counter = 0; counter < arraySize; counter++) floatArray[counter] -= (float) 50; @@ -207,9 +207,9 @@ for (int counter = 0; counter < arraySize; counter++) assertTrue("Binary search on int[] answered incorrect position", Arrays.binarySearch(intArray, counter) == counter); - assertTrue("Binary search suceeded for value not present in array 1", + assertTrue("Binary search succeeded for value not present in array 1", Arrays.binarySearch(intArray, -1) == -1); - assertTrue("Binary search suceeded for value not present in array 2", + assertTrue("Binary search succeeded for value not present in array 2", Arrays.binarySearch(intArray, arraySize) == -(arraySize + 1)); for (int counter = 0; counter < arraySize; counter++) intArray[counter] -= 50; @@ -227,10 +227,10 @@ for (long counter = 0; counter < arraySize; counter++) assertTrue("Binary search on long[] answered incorrect position", Arrays.binarySearch(longArray, counter) == counter); - assertTrue("Binary search suceeded for value not present in array 1", + assertTrue("Binary search succeeded for value not present in array 1", Arrays.binarySearch(longArray, (long) -1) == -1); assertTrue( - "Binary search suceeded for value not present in array 2", + "Binary search succeeded for value not present in array 2", Arrays.binarySearch(longArray, (long) arraySize) == -(arraySize + 1)); for (long counter = 0; counter < arraySize; counter++) longArray[(int) counter] -= (long) 50; @@ -251,10 +251,10 @@ assertTrue( "Binary search on Object[] answered incorrect position", Arrays.binarySearch(objectArray, objArray[counter]) == counter); - assertTrue("Binary search suceeded for value not present in array 1", + assertTrue("Binary search succeeded for value not present in array 1", Arrays.binarySearch(objectArray, new Integer(-1)) == -1); assertTrue( - "Binary search suceeded for value not present in array 2", + "Binary search succeeded for value not present in array 2", Arrays.binarySearch(objectArray, new Integer(arraySize)) == -(arraySize + 1)); } @@ -269,10 +269,10 @@ for (int counter = 0; counter < arraySize; counter++) objectArray[counter] = objArray[arraySize - counter - 1]; assertTrue( - "Binary search suceeded for value not present in array 1", + "Binary search succeeded for value not present in array 1", Arrays.binarySearch(objectArray, new Integer(-1), comp) == -(arraySize + 1)); assertTrue( - "Binary search suceeded for value not present in array 2", + "Binary search succeeded for value not present in array 2", Arrays.binarySearch(objectArray, new Integer(arraySize), comp) == -1); for (int counter = 0; counter < arraySize; counter++) assertTrue( @@ -289,10 +289,10 @@ for (short counter = 0; counter < arraySize; counter++) assertTrue("Binary search on short[] answered incorrect position", Arrays.binarySearch(shortArray, counter) == counter); - assertTrue("Binary search suceeded for value not present in array 1", + assertTrue("Binary search succeeded for value not present in array 1", Arrays.binarySearch(intArray, (short) -1) == -1); assertTrue( - "Binary search suceeded for value not present in array 2", + "Binary search succeeded for value not present in array 2", Arrays.binarySearch(intArray, (short) arraySize) == -(arraySize + 1)); for (short counter = 0; counter < arraySize; counter++) shortArray[counter] -= 50; Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/FileChannel.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/FileChannel.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/FileChannel.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/FileChannel.java Thu Mar 30 13:34:23 2006 @@ -443,7 +443,7 @@ * no bytes beyond the given size then the file contents are unmodified. *

*

- * If the file position is curently greater than the given size, then it is + * If the file position is currently greater than the given size, then it is * set to be the given size. *

* Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java Thu Mar 30 13:34:23 2006 @@ -80,7 +80,7 @@ /** * Start an IO operation that is potentially blocking. *

- * Once the operation is completed the applicaion should invoke a + * Once the operation is completed the application should invoke a * corresponding end(boolean). */ protected final void begin() { Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java Thu Mar 30 13:34:23 2006 @@ -653,7 +653,7 @@ } /** - * Encodes a string and outputs to a byte buffer that is to be retured. + * Encodes a string and outputs to a byte buffer that is to be returned. *

* The default action in case of encoding errors is * CodingErrorAction.REPLACE. @@ -669,7 +669,7 @@ /** * Decodes the content of the give byte buffer and outputs to a character - * buffer that is to be retured. + * buffer that is to be returned. *

* The default action in case of decoding errors is * CodingErrorAction.REPLACE. Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/CharsetDecoder.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/CharsetDecoder.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/CharsetDecoder.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/CharsetDecoder.java Thu Mar 30 13:34:23 2006 @@ -75,7 +75,7 @@ * decoding process for all charsets. Decoder for specific charset should extend * this class and need only implement * {@link #decodeLoop(ByteBuffer, CharBuffer) decodeLoop} method for basic - * decoding loop. If a subclass mantains internl state, it should override the + * decoding loop. If a subclass maintains internal state, it should override the * {@link #implFlush(CharBuffer) implFlush} method and * {@link #implReset() implReset} method in addition. *

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/CharsetEncoder.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/CharsetEncoder.java?rev=390246&r1=390245&r2=390246&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/CharsetEncoder.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/CharsetEncoder.java Thu Mar 30 13:34:23 2006 @@ -74,7 +74,7 @@ * encoding process for all charsets. encoder for specific charset should extend * this class and need only implement * {@link #encodeLoop(CharBuffer, ByteBuffer) encodeLoop} method for basic - * encoding loop. If a subclass mantains internl state, it should override the + * encoding loop. If a subclass maintains internal state, it should override the * {@link #implFlush(ByteBuffer) implFlush} method and * {@link #implReset() implReset} method in addition. *

@@ -845,7 +845,7 @@ } /** - * Reset this encoder. This method will reset internla status, and then call + * Reset this encoder. This method will reset internal status, and then call * implReset() to reset any status related to specific * charset. *