You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2008/01/28 23:29:15 UTC
svn commit: r616090 - in
/harmony/enhanced/classlib/trunk/modules/luni/src/main/java: java/io/
java/lang/ java/net/ java/util/
org/apache/harmony/luni/internal/net/www/protocol/file/
org/apache/harmony/luni/internal/net/www/protocol/http/ org/apache/ha...
Author: tellison
Date: Mon Jan 28 14:29:07 2008
New Revision: 616090
URL: http://svn.apache.org/viewvc?rev=616090&view=rev
Log:
Fixing comments / whitespace, including a number of warnings and errors
reported when running JavaDoc tool.
Modified:
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayWriter.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataInputStream.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintStream.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintWriter.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackInputStream.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AbstractMethodError.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Appendable.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArithmeticException.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArrayStoreException.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AssertionError.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Boolean.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Byte.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/NumberFormatException.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/OutOfMemoryError.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Override.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Process.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/StringBuffer.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/StringBuilder.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/Authenticator.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocketImpl.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Scanner.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Stack.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayWriter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayWriter.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayWriter.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayWriter.java Mon Jan 28 14:29:07 2008
@@ -238,10 +238,10 @@
* CharArrayWriter.append(<code>c</code>) works the same way as
* CharArrayWriter.write(<code>c</code>).
*
- * @override Writer.append
* @param c
* The character appended to the CharArrayWriter.
* @return The CharArrayWriter.
+ * @see Writer#append(char)
*/
@Override
public CharArrayWriter append(char c) {
@@ -256,10 +256,10 @@
* <code>csq</code> is null, then then "null" will be substituted for
* <code>csq</code>.
*
- * @override Writer.append
* @param csq
* The CharSequence appended to the CharArrayWriter.
* @return The CharArrayWriter
+ * @see Writer#append(CharSequence)
*/
@Override
public CharArrayWriter append(CharSequence csq) {
@@ -280,7 +280,6 @@
* If <code>csq</code> is null, then "null" will be substituted for
* <code>csq</code>.
*
- * @override Writer.append
* @param csq
* The CharSequence appended to the CharArrayWriter.
* @param start
@@ -293,6 +292,7 @@
* @throws IndexOutOfBoundsException
* If start is less than end, end is greater than the length of
* the CharSequence, or start or end is negative.
+ * @see Writer#append(CharSequence, int, int)
*/
@Override
public CharArrayWriter append(CharSequence csq, int start, int end) {
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataInputStream.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataInputStream.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataInputStream.java Mon Jan 28 14:29:07 2008
@@ -214,7 +214,7 @@
* the byte array into which the data is read
* @param offset
* the offset the operation start at
- * @param count
+ * @param length
* the maximum number of bytes to read
*
* @throws IOException
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintStream.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintStream.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintStream.java Mon Jan 28 14:29:07 2008
@@ -184,7 +184,7 @@
* All writes to the target can now take place through this PrintStream. Its
* encoding character set is the default charset in the VM.
*
- * @param file
+ * @param fileName
* the file to provide convenience methods on.
* @throws FileNotFoundException
* if the file does not exist or cannot be opened to write. Or
@@ -203,7 +203,7 @@
* All writes to the target can now take place through this PrintStream. Its
* encoding character set name is <code>csn</code>.
*
- * @param file
+ * @param fileName
* the file to provide convenience methods on.
* @param csn
* the character set name
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintWriter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintWriter.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintWriter.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintWriter.java Mon Jan 28 14:29:07 2008
@@ -341,7 +341,7 @@
* The arguments list. If there are more arguments than those
* specified by the format string, then the additional arguments
* are ignored.
- * @return
+ * @return the PrintWriter.
* @throws IllegalFormatException
* If the format string is illegal or incompatible with the
* arguments or the arguments are less than those required by
@@ -681,10 +681,10 @@
* PrintWriter.append(<code>c</code>) works the same way as
* PrintWriter.write(<code>c</code>).
*
- * @override Writer.append
* @param c
* The character appended to the PrintWriter.
* @return The PrintWriter.
+ * @see Writer#append(char)
*/
@Override
public PrintWriter append(char c) {
@@ -698,10 +698,10 @@
* PrintWriter.write(<code>csq</code>.toString()). If <code>csq</code>
* is null, then "null" will be substituted for <code>csq</code>
*
- * @override Writer.append
* @param csq
* The CharSequence appended to the PrintWriter.
* @return The PrintWriter
+ * @see Writer#append(CharSequence)
*/
@Override
public PrintWriter append(CharSequence csq) {
@@ -722,7 +722,6 @@
* <code>csq</code> is null, then "null" will be substituted for
* <code>csq</code>.
*
- * @override Writer.append
* @param csq
* The CharSequence appended to the PrintWriter.
* @param start
@@ -735,6 +734,7 @@
* @throws IndexOutOfBoundsException
* If start is less than end, end is greater than the length of
* the CharSequence, or start or end is negative.
+ * @see Writer#append(CharSequence, int, int)
*/
@Override
public PrintWriter append(CharSequence csq, int start, int end) {
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackInputStream.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackInputStream.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackInputStream.java Mon Jan 28 14:29:07 2008
@@ -315,7 +315,7 @@
* @param readlimit
* the maximum number of bytes that are able to be read before
* the mark becomes invalid
- * @override the method mark in FilterInputStream
+ * @see FilterInputStream#mark(int)
*/
@Override
public void mark(int readlimit) {
@@ -326,9 +326,9 @@
* Reset current position to the mark made previously int the stream, but
* the reset method will throw IOException and do nothing else if called.
*
- * @override the method reset in FilterInputStream
* @throws IOException
* If the method is called
+ * @see FilterInputStream#reset()
*/
@Override
public void reset() throws IOException {
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AbstractMethodError.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AbstractMethodError.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AbstractMethodError.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AbstractMethodError.java Mon Jan 28 14:29:07 2008
@@ -17,12 +17,11 @@
package java.lang;
-
/**
- * This error is thrown when the VM notices that a an attempt is being made to
+ * This error is thrown when the VM notices that an attempt is being made to
* invoke an abstract method.
- * <p>
- * Note that this can only occur when inconsistant class files are being loaded,
+ * </p>
+ * Note that this can only occur when inconsistent class files are being loaded,
* since invoking an abstract method is a compile time error.
*/
public class AbstractMethodError extends IncompatibleClassChangeError {
@@ -30,20 +29,20 @@
private static final long serialVersionUID = -1654391082989018462L;
/**
- * Constructs a new instance of this class with its walkback filled in.
- */
- public AbstractMethodError() {
- super();
- }
+ * Constructs a new instance of this class with its walkback filled in.
+ */
+ public AbstractMethodError() {
+ super();
+ }
- /**
- * Constructs a new instance of this class with its walkback and message
- * filled in.
- *
- * @param detailMessage
- * String The detail message for the exception.
- */
- public AbstractMethodError(String detailMessage) {
- super(detailMessage);
- }
+ /**
+ * Constructs a new instance of this class with its walkback and message
+ * filled in.
+ *
+ * @param detailMessage
+ * String The detail message for the exception.
+ */
+ public AbstractMethodError(String detailMessage) {
+ super(detailMessage);
+ }
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java Mon Jan 28 14:29:07 2008
@@ -23,11 +23,9 @@
import org.apache.harmony.luni.util.Msg;
/**
- * <p>
* A modifiable {@link CharSequence sequence of characters} for use in creating
* and modifying Strings. This class is intended as a base class for
* {@link java.lang.StringBuffer} and {@link java.lang.StringBuilder}.
- * </p>
*
* @see java.lang.StringBuffer
* @see java.lang.StringBuilder
@@ -200,12 +198,10 @@
}
/**
- * <p>
* Retrieves the character at the <code>index</code>.
- * </p>
*
- * @param The
- * index of character in this object to retrieve.
+ * @param index
+ * The index of character in this object to retrieve.
* @return The char value.
* @throws IndexOutOfBoundsException
* if <code>index</code> is negative or greater than or equal
@@ -268,7 +264,6 @@
}
/**
- * <p>
* Ensures that this object has a minimum capacity available before
* requiring the internal buffer to be enlarged. The general policy of this
* method is that if the <code>minimumCapacity</code> is larger than the
@@ -276,9 +271,8 @@
* largest value of either the <code>minimumCapacity</code> or the current
* capacity multiplied by two plus two. Although this is the general policy,
* there is no guarantee that the capacity will change.
- * </p>
*
- * @param minimumCapacity
+ * @param min
* The new minimum capacity to set.
*/
public void ensureCapacity(int min) {
@@ -288,10 +282,8 @@
}
/**
- * <p>
* Copies the requested sequence of characters to be copied to the
* <code>char[]</code> passed.
- * </p>
*
* @param start
* The inclusive start index of the characters to copy from this
@@ -386,9 +378,7 @@
}
/**
- * <p>
* The current length of this object.
- * </p>
*
* @return the number of characters in this StringBuffer
*/
@@ -483,9 +473,7 @@
}
/**
- * <p>
* Sets the character at the <code>index</code> in this object.
- * </p>
*
* @param index
* the zero-based index of the character to replace.
@@ -507,11 +495,9 @@
}
/**
- * <p>
* Sets the current length to a new value. If the new length is larger than
* the current length, then the new characters at the end of this object
* will contain the <code>char</code> value of <code>\u0000</code>.
- * </p>
*
* @param length
* the new length of this StringBuffer
@@ -543,10 +529,8 @@
}
/**
- * <p>
* Returns the String value of the subsequence of this object from the
* <code>start</code> index to the current end.
- * </p>
*
* @param start
* The inclusive start index to begin the subsequence.
@@ -568,10 +552,8 @@
}
/**
- * <p>
* Returns the String value of the subsequence of this object from the
* <code>start</code> index to the <code>start</code> index.
- * </p>
*
* @param start
* The inclusive start index to begin the subsequence.
@@ -595,9 +577,7 @@
}
/**
- * <p>
* Returns the current String representation of this object.
- * </p>
*
* @return a String containing the characters in this StringBuilder.
*/
@@ -615,10 +595,8 @@
}
/**
- * <p>
* Returns a <code>CharSequence</code> of the subsequence of this object
* from the <code>start</code> index to the <code>start</code> index.
- * </p>
*
* @param start
* The inclusive start index to begin the subsequence.
@@ -640,7 +618,6 @@
* character. The search for the character starts at the beginning and moves
* towards the end.
*
- *
* @param string
* the string to find
* @return the index in this StringBuffer of the specified character, -1 if
@@ -782,10 +759,8 @@
}
/**
- * <p>
* Trims off any extra capacity beyond the current length. Note, this method
* is NOT guaranteed to change the capacity of this object.
- * </p>
*
* @since 1.5
*/
@@ -799,9 +774,7 @@
}
/**
- * <p>
* Retrieves the Unicode code point value at the <code>index</code>.
- * </p>
*
* @param index
* The index to the <code>char</code> code unit within this
@@ -822,10 +795,8 @@
}
/**
- * <p>
* Retrieves the Unicode code point value that precedes the
* <code>index</code>.
- * </p>
*
* @param index
* The index to the <code>char</code> code unit within this
@@ -846,10 +817,8 @@
}
/**
- * <p>
* Calculates the number of Unicode code points between
* <code>beginIndex</code> and <code>endIndex</code>.
- * </p>
*
* @param beginIndex
* The inclusive beginning index of the subsequence.
@@ -871,10 +840,8 @@
}
/**
- * <p>
* Returns the index within this object that is offset from
* <code>index</code> by <code>codePointOffset</code> code points.
- * </p>
*
* @param index
* The index within this object to calculate the offset from.
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Appendable.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Appendable.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Appendable.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Appendable.java Mon Jan 28 14:29:07 2008
@@ -22,66 +22,80 @@
* Appendable is an object used to append character or character sequence. Any
* class implements this interface can receive data formatted by
* <code>Formatter</code>. The appended character or character sequence
- * should be valid accroding to the rules described
+ * should be valid according to the rules described
* <code>Unicode Character Representation</code>.
* <p>
- * Appendable itself does not gurantee thread safety. This responsibility is up
- * to the implementing class.</p>
+ * Appendable itself does not guarantee thread safety. This responsibility is up
+ * to the implementing class.
+ * </p>
* <p>
* The implementing class can choose different exception handling mechanism. It
* can choose to throw exceptions other than IOException but which must be
* compatible with IOException, or does not throw any exceptions at all and use
- * error code instead. All in all, the implementing class does not gurantee to
- * propagate the exception declared by this interface.</p>
- *
+ * error code instead. All in all, the implementing class does not guarantee to
+ * propagate the exception declared by this interface.
+ * </p>
*/
public interface Appendable {
-
+
/**
* Append the given character.
*
- * @param c the character to append
+ * @param c
+ * the character to append
* @return this <code>Appendable</code>
- * @throws IOException if some I/O operation fails
+ * @throws IOException
+ * if some I/O operation fails
*/
Appendable append(char c) throws IOException;
/**
* Append the given <code>CharSequence</code>.
* <p>
- * The behaviour of this method depends on the implementation class of
- * <code>Appendable</code>.</p>
+ * The behaviour of this method depends on the implementation class of
+ * <code>Appendable</code>.
+ * </p>
* <p>
- * If the give <code>CharSequence</code> is null, the sequence is treated as
- * String "null".</p>
+ * If the give <code>CharSequence</code> is null, the sequence is treated
+ * as String "null".
+ * </p>
*
- * @param csq the <code>CharSequence</code> to be append
+ * @param csq
+ * the <code>CharSequence</code> to be append
* @return this <code>Appendable</code>
- * @throws IOException if some I/O operation fails
+ * @throws IOException
+ * if some I/O operation fails
*/
Appendable append(CharSequence csq) throws IOException;
/**
* Append part of the given <code>CharSequence</code>.
- * <p>
- * If the given <code>CharSequence</code> is not null, this method behaves
- * same as the following statement:</p>
- * <pre> out.append(csq.subSequence(start, end)) </pre>
- * <p>
- * If the give <code>CharSequence</code> is null, the sequence is treated as
- * String "null".</p>
*
- * @param csq the <code>CharSequence</code> to be append
- * @param start the index to spicify the start position of
- * <code>CharSequence</code> to be append, must be non-negative,
- * and not larger than the end
- * @param end the index to speicify the end position of
- * <code>CharSequence</code> to be append, must be non-negative,
- * and not larger than the size of csq
+ * If the given <code>CharSequence</code> is not null, this method behaves
+ * same as the following statement:
+ *
+ * <pre>
+ * out.append(csq.subSequence(start, end))
+ * </pre>
+ *
+ * If the give <code>CharSequence</code> is null, the sequence is treated
+ * as String "null".
+ *
+ * @param csq
+ * the <code>CharSequence</code> to be append
+ * @param start
+ * the index to specify the start position of
+ * <code>CharSequence</code> to be append, must be
+ * non-negative, and not larger than the <code>end</code>
+ * @param end
+ * the index to specify the end position of
+ * <code>CharSequence</code> to be append, must be
+ * non-negative, and not larger than the size of <code>csq</code>
* @return this <code>Appendable</code>
- * @throws IOException if some I/O operation fails
+ * @throws IOException
+ * if some I/O operation fails
* @throws IndexOutOfBoundsException
- * if the start or end is illegal
+ * if the start or end is illegal
*/
Appendable append(CharSequence csq, int start, int end) throws IOException;
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArithmeticException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArithmeticException.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArithmeticException.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArithmeticException.java Mon Jan 28 14:29:07 2008
@@ -17,7 +17,6 @@
package java.lang;
-
/**
* This runtime exception is thrown when the an invalid arithmetic operation is
* attempted.
@@ -27,20 +26,20 @@
private static final long serialVersionUID = 2256477558314496007L;
/**
- * Constructs a new instance of this class with its walkback filled in.
- */
- public ArithmeticException() {
- super();
- }
+ * Constructs a new instance of this class with its walkback filled in.
+ */
+ public ArithmeticException() {
+ super();
+ }
- /**
- * Constructs a new instance of this class with its walkback and message
- * filled in.
- *
- * @param detailMessage
- * String The detail message for the exception.
- */
- public ArithmeticException(String detailMessage) {
- super(detailMessage);
- }
+ /**
+ * Constructs a new instance of this class with its walkback and message
+ * filled in.
+ *
+ * @param detailMessage
+ * String The detail message for the exception.
+ */
+ public ArithmeticException(String detailMessage) {
+ super(detailMessage);
+ }
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArrayStoreException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArrayStoreException.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArrayStoreException.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArrayStoreException.java Mon Jan 28 14:29:07 2008
@@ -17,7 +17,6 @@
package java.lang;
-
/**
* This runtime exception is thrown when a program attempts to store into an
* array an element of a a type which the array can not hold..
@@ -27,20 +26,20 @@
private static final long serialVersionUID = -4522193890499838241L;
/**
- * Constructs a new instance of this class with its walkback filled in.
- */
- public ArrayStoreException() {
- super();
- }
+ * Constructs a new instance of this class with its walkback filled in.
+ */
+ public ArrayStoreException() {
+ super();
+ }
- /**
- * Constructs a new instance of this class with its walkback and message
- * filled in.
- *
- * @param detailMessage
- * String The detail message for the exception.
- */
- public ArrayStoreException(String detailMessage) {
- super(detailMessage);
- }
+ /**
+ * Constructs a new instance of this class with its walkback and message
+ * filled in.
+ *
+ * @param detailMessage
+ * String The detail message for the exception.
+ */
+ public ArrayStoreException(String detailMessage) {
+ super(detailMessage);
+ }
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AssertionError.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AssertionError.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AssertionError.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/AssertionError.java Mon Jan 28 14:29:07 2008
@@ -18,9 +18,7 @@
package java.lang;
/**
- * <p>
* Indicates that an assertion has failed.
- * </p>
*
* @since 1.4
*/
@@ -29,24 +27,21 @@
private static final long serialVersionUID = -5013299493970297370L;
/**
- * <p>
* Constructs an instance without a message.
- * </p>
*/
public AssertionError() {
super();
}
/**
- * <p>
* Constructs an instance with a message that is the
* {@link String#valueOf(Object)} of the object passed. If the object passed
- * is an instanceof {@link Throwable}, then it also becomes the cause of
+ * is an instance of {@link Throwable}, then it also becomes the cause of
* this error.
- * </p>
*
- * @param detailMessage The value to be converted into the message and
- * optionally the cause.
+ * @param detailMessage
+ * The value to be converted into the message and optionally the
+ * cause.
*/
public AssertionError(Object detailMessage) {
super(String.valueOf(detailMessage),
@@ -55,72 +50,66 @@
}
/**
- * <p>
* Constructs an instance with a message that is the
* {@link String#valueOf(boolean)} of the boolean passed.
- * </p>
*
- * @param detailMessage The value to be converted into the message.
+ * @param detailMessage
+ * The value to be converted into the message.
*/
public AssertionError(boolean detailMessage) {
this(String.valueOf(detailMessage));
}
/**
- * <p>
* Constructs an instance with a message that is the
* {@link String#valueOf(char)} of the char passed.
- * </p>
*
- * @param detailMessage The value to be converted into the message.
+ * @param detailMessage
+ * The value to be converted into the message.
*/
public AssertionError(char detailMessage) {
this(String.valueOf(detailMessage));
}
/**
- * <p>
* Constructs an instance with a message that is the
* {@link String#valueOf(int)} of the int passed.
- * </p>
*
- * @param detailMessage The value to be converted into the message.
+ * @param detailMessage
+ * The value to be converted into the message.
*/
public AssertionError(int detailMessage) {
this(Integer.toString(detailMessage));
}
/**
- * <p>
* Constructs an instance with a message that is the
* {@link String#valueOf(long)} of the long passed.
- * </p>
*
- * @param detailMessage The value to be converted into the message.
+ * @param detailMessage
+ * The value to be converted into the message.
*/
public AssertionError(long detailMessage) {
this(Long.toString(detailMessage));
}
/**
- * <p>
* Constructs an instance with a message that is the
* {@link String#valueOf(float)} of the float passed.
- * </p>
*
- * @param detailMessage The value to be converted into the message.
+ * @param detailMessage
+ * The value to be converted into the message.
*/
public AssertionError(float detailMessage) {
this(Float.toString(detailMessage));
}
/**
- * <p>
* Constructs an instance with a message that is the
* {@link String#valueOf(double)} of the double passed.
- * </p>
*
- * @param detailMessage The value to be converted into the message.
+ * @param detailMessage
+ * The value to be converted into the message.
*/
public AssertionError(double detailMessage) {
this(Double.toString(detailMessage));
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Boolean.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Boolean.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Boolean.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Boolean.java Mon Jan 28 14:29:07 2008
@@ -20,9 +20,7 @@
import java.io.Serializable;
/**
- * <p>
* Boolean is the wrapper for the primitive type <code>boolean</code>.
- * </p>
*
* @since 1.0
*/
@@ -36,7 +34,7 @@
private final boolean value;
/**
- * The java.lang.Class that represents this class.
+ * The {@link java.lang.Class} that represents this class.
*/
@SuppressWarnings("unchecked")
public static final Class<Boolean> TYPE = (Class<Boolean>) new boolean[0]
@@ -95,6 +93,7 @@
* In this case, the argument must also be a Boolean, and the receiver and
* argument must represent the same boolean value (i.e. both true or both
* false).
+ * </p>
*
* @param o
* the object to compare with this object
@@ -110,18 +109,16 @@
}
/**
- * <p>
* Compares this <code>Boolean</code> to another <code>Boolean</code>.
* If this instance has the same value as the instance passed, then
* <code>0</code> is returned. If this instance is <code>true</code> and
* the instance passed is <code>false</code>, then a positive value is
* returned. If this instance is <code>false</code> and the instance
* passed is <code>true</code>, then a negative value is returned.
- * </p>
*
* @param that
* The instance to compare to.
- * @throws java.lang.NullPointerException
+ * @throws NullPointerException
* if <code>that</code> is <code>null</code>.
* @since 1.5
* @see java.lang.Comparable
@@ -144,7 +141,6 @@
* answer the same value for this method.
*
* @return the receiver's hash
- *
* @see #equals
*/
@Override
@@ -179,11 +175,9 @@
}
/**
- * <p>
* Parses the string as a <code>boolean</code>. If the string is not
* <code>null</code> and is equal to <code>"true"</code>, regardless
* case, then <code>true</code> is returned, otherwise <code>false</code>.
- * </p>
*
* @param s
* The string to parse.
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Byte.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Byte.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Byte.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Byte.java Mon Jan 28 14:29:07 2008
@@ -18,320 +18,315 @@
package java.lang;
/**
- * <p>Byte is the wrapper for the primitive type <code>byte</code>.</p>
+ * Byte is the wrapper for the primitive type <code>byte</code>.
+ *
* @since 1.1
*/
-public final class Byte extends Number implements Comparable<Byte> {
- private static final long serialVersionUID = -7183698231559129828L;
+public final class Byte extends Number implements Comparable<Byte> {
- /**
- * The value which the receiver represents.
- */
- private final byte value;
+ private static final long serialVersionUID = -7183698231559129828L;
- /**
- * <p>
+ /**
+ * The value which the receiver represents.
+ */
+ private final byte value;
+
+ /**
* Constant for the maximum <code>byte</code> value, 2<sup>7</sup>-1.
- * </p>
*/
public static final byte MAX_VALUE = (byte) 0x7F;
/**
- * <p>
* Constant for the minimum <code>byte</code> value, -2<sup>7</sup>.
- * </p>
*/
public static final byte MIN_VALUE = (byte) 0x80;
-
+
/**
- * <p>
* Constant for the number of bits to represent a <code>byte</code> in
* two's compliment form.
- * </p>
*
* @since 1.5
*/
public static final int SIZE = 8;
- /**
- * The java.lang.Class that represents this class.
- */
+ /**
+ * The java.lang.Class that represents this class.
+ */
@SuppressWarnings("unchecked")
public static final Class<Byte> TYPE = (Class<Byte>) new byte[0].getClass()
.getComponentType();
- // Note: This can't be set to "byte.class", since *that* is
- // defined to be "java.lang.Byte.TYPE";
-
+ // Note: This can't be set to "byte.class", since *that* is
+ // defined to be "java.lang.Byte.TYPE";
+
/**
- * <p>
* A cache of instances used by {@link #valueOf(byte)} and auto-boxing.
- * </p>
*/
private static final Byte[] CACHE = new Byte[256];
- /**
- * Constructs a new instance of the receiver which represents the byte
- * valued argument.
- *
- * @param value
- * the byte to store in the new instance.
- */
- public Byte(byte value) {
- this.value = value;
- }
-
- /**
- * Constructs a new instance of this class given a string.
- *
- * @param string
- * a string representation of a single byte quantity.
- * @throws NumberFormatException
- * if the argument could not be parsed as a byte quantity.
- */
- public Byte(String string) throws NumberFormatException {
- this(parseByte(string));
- }
-
- /**
- * Answers the byte value which the receiver represents
- *
- * @return byte the value of the receiver.
- */
- @Override
+ /**
+ * Constructs a new instance of the receiver which represents the byte
+ * valued argument.
+ *
+ * @param value
+ * the byte to store in the new instance.
+ */
+ public Byte(byte value) {
+ this.value = value;
+ }
+
+ /**
+ * Constructs a new instance of this class given a string.
+ *
+ * @param string
+ * a string representation of a single byte quantity.
+ * @throws NumberFormatException
+ * if the argument could not be parsed as a byte quantity.
+ */
+ public Byte(String string) throws NumberFormatException {
+ this(parseByte(string));
+ }
+
+ /**
+ * Answers the byte value which the receiver represents
+ *
+ * @return byte the value of the receiver.
+ */
+ @Override
public byte byteValue() {
- return value;
- }
+ return value;
+ }
- /**
- * <p>
+ /**
* Compares this <code>Byte</code> to the <code>Byte</code> passed. If
* this instance's value is equal to the value of the instance passed, then
* 0 is returned. If this instance's value is less than the value of the
* instance passed, then a negative value is returned. If this instance's
* value is greater than the value of the instance passed, then a positive
* value is returned.
- * </p>
*
- * @param object The instance to compare to.
- * @throws NullPointerException if <code>object</code> is
- * <code>null</code>.
+ * @param object
+ * The instance to compare to.
+ * @throws NullPointerException
+ * if <code>object</code> is <code>null</code>.
* @since 1.2
*/
public int compareTo(Byte object) {
return value > object.value ? 1 : (value < object.value ? -1 : 0);
}
- /**
- * Parses the string argument as if it was a byte value and returns the
- * result. It is an error if the received string does not contain a
- * representation of a single byte quantity. The string may be a hexadecimal
- * ("0x..."), octal ("0..."), or decimal ("...") representation of a byte.
- *
- * @param string
- * a string representation of a single byte quantity.
- * @return Byte the value represented by the argument
- * @throws NumberFormatException
- * if the argument could not be parsed as a byte quantity.
- */
- public static Byte decode(String string) throws NumberFormatException {
- int intValue = Integer.decode(string).intValue();
- byte result = (byte) intValue;
- if (result == intValue) {
+ /**
+ * Parses the string argument as if it was a byte value and returns the
+ * result. It is an error if the received string does not contain a
+ * representation of a single byte quantity. The string may be a hexadecimal
+ * ("0x..."), octal ("0..."), or decimal ("...") representation of a byte.
+ *
+ * @param string
+ * a string representation of a single byte quantity.
+ * @return Byte the value represented by the argument
+ * @throws NumberFormatException
+ * if the argument could not be parsed as a byte quantity.
+ */
+ public static Byte decode(String string) throws NumberFormatException {
+ int intValue = Integer.decode(string).intValue();
+ byte result = (byte) intValue;
+ if (result == intValue) {
return valueOf(result);
}
- throw new NumberFormatException();
- }
+ throw new NumberFormatException();
+ }
- /**
- * Answers the double value which the receiver represents
- *
- * @return double the value of the receiver.
- */
- @Override
+ /**
+ * Answers the double value which the receiver represents
+ *
+ * @return double the value of the receiver.
+ */
+ @Override
public double doubleValue() {
- return value;
- }
+ return value;
+ }
- /**
- * Compares the argument to the receiver, and answers true if they represent
- * the <em>same</em> object using a class specific comparison.
- * <p>
- * In this case, the argument must also be a Byte, and the receiver and
- * argument must represent the same byte value.
- *
- * @param object
- * the object to compare with this object
- * @return <code>true</code> if the object is the same as this object
- * <code>false</code> if it is different from this object
- * @see #hashCode
- */
- @Override
+ /**
+ * Compares the argument to the receiver, and answers true if they represent
+ * the <em>same</em> object using a class specific comparison.
+ * <p>
+ * In this case, the argument must also be a Byte, and the receiver and
+ * argument must represent the same byte value.
+ * </p>
+ *
+ * @param object
+ * the object to compare with this object
+ * @return <code>true</code> if the object is the same as this object
+ * <code>false</code> if it is different from this object
+ * @see #hashCode
+ */
+ @Override
public boolean equals(Object object) {
- return (object == this) || (object instanceof Byte)
- && (value == ((Byte) object).value);
- }
-
- /**
- * Answers the float value which the receiver represents
- *
- * @return float the value of the receiver.
- */
- @Override
+ return (object == this) || (object instanceof Byte)
+ && (value == ((Byte) object).value);
+ }
+
+ /**
+ * Answers the float value which the receiver represents
+ *
+ * @return float the value of the receiver.
+ */
+ @Override
public float floatValue() {
- return value;
- }
+ return value;
+ }
- /**
- * Answers an integer hash code for the receiver. Any two objects which
- * answer <code>true</code> when passed to <code>equals</code> must
- * answer the same value for this method.
- *
- * @return the receiver's hash
- *
- * @see #equals
- */
- @Override
+ /**
+ * Answers an integer hash code for the receiver. Any two objects which
+ * answer <code>true</code> when passed to <code>equals</code> must
+ * answer the same value for this method.
+ *
+ * @return the receiver's hash
+ * @see #equals
+ */
+ @Override
public int hashCode() {
- return value;
- }
+ return value;
+ }
- /**
- * Answers the int value which the receiver represents
- *
- * @return int the value of the receiver.
- */
- @Override
+ /**
+ * Answers the int value which the receiver represents
+ *
+ * @return int the value of the receiver.
+ */
+ @Override
public int intValue() {
- return value;
- }
+ return value;
+ }
- /**
- * Answers the long value which the receiver represents
- *
- * @return long the value of the receiver.
- */
- @Override
+ /**
+ * Answers the long value which the receiver represents
+ *
+ * @return long the value of the receiver.
+ */
+ @Override
public long longValue() {
- return value;
- }
+ return value;
+ }
- /**
- * Parses the string argument as if it was a byte value and returns the
- * result. Throws NumberFormatException if the string does not represent a
- * single byte quantity.
- *
- * @param string
- * a string representation of a single byte quantity.
- * @return byte the value represented by the argument
- * @throws NumberFormatException
- * if the argument could not be parsed as a byte quantity.
- */
- public static byte parseByte(String string) throws NumberFormatException {
- int intValue = Integer.parseInt(string);
- byte result = (byte) intValue;
- if (result == intValue) {
+ /**
+ * Parses the string argument as if it was a byte value and returns the
+ * result. Throws NumberFormatException if the string does not represent a
+ * single byte quantity.
+ *
+ * @param string
+ * a string representation of a single byte quantity.
+ * @return byte the value represented by the argument
+ * @throws NumberFormatException
+ * if the argument could not be parsed as a byte quantity.
+ */
+ public static byte parseByte(String string) throws NumberFormatException {
+ int intValue = Integer.parseInt(string);
+ byte result = (byte) intValue;
+ if (result == intValue) {
return result;
}
- throw new NumberFormatException();
- }
+ throw new NumberFormatException();
+ }
- /**
- * Parses the string argument as if it was a byte value and returns the
- * result. Throws NumberFormatException if the string does not represent a
- * single byte quantity. The second argument specifies the radix to use when
- * parsing the value.
- *
- * @param string
- * a string representation of a single byte quantity.
- * @param radix
- * the radix to use when parsing.
- * @return byte the value represented by the argument
- * @throws NumberFormatException
- * if the argument could not be parsed as a byte quantity.
- */
- public static byte parseByte(String string, int radix)
- throws NumberFormatException {
- int intValue = Integer.parseInt(string, radix);
- byte result = (byte) intValue;
- if (result == intValue) {
+ /**
+ * Parses the string argument as if it was a byte value and returns the
+ * result. Throws NumberFormatException if the string does not represent a
+ * single byte quantity. The second argument specifies the radix to use when
+ * parsing the value.
+ *
+ * @param string
+ * a string representation of a single byte quantity.
+ * @param radix
+ * the radix to use when parsing.
+ * @return byte the value represented by the argument
+ * @throws NumberFormatException
+ * if the argument could not be parsed as a byte quantity.
+ */
+ public static byte parseByte(String string, int radix)
+ throws NumberFormatException {
+ int intValue = Integer.parseInt(string, radix);
+ byte result = (byte) intValue;
+ if (result == intValue) {
return result;
}
- throw new NumberFormatException();
- }
+ throw new NumberFormatException();
+ }
- /**
- * Answers the short value which the receiver represents
- *
- * @return short the value of the receiver.
- */
- @Override
+ /**
+ * Answers the short value which the receiver represents
+ *
+ * @return short the value of the receiver.
+ */
+ @Override
public short shortValue() {
- return value;
- }
+ return value;
+ }
- /**
- * Answers a string containing a concise, human-readable description of the
- * receiver.
- *
- * @return a printable representation for the receiver.
- */
- @Override
+ /**
+ * Answers a string containing a concise, human-readable description of the
+ * receiver.
+ *
+ * @return a printable representation for the receiver.
+ */
+ @Override
public String toString() {
- return Integer.toString(value);
- }
+ return Integer.toString(value);
+ }
+
+ /**
+ * Answers a string containing a concise, human-readable description of the
+ * argument.
+ *
+ * @param value
+ * byte the byte to convert.
+ * @return String a printable representation for the byte.
+ */
+ public static String toString(byte value) {
+ return Integer.toString(value);
+ }
- /**
- * Answers a string containing a concise, human-readable description of the
- * argument.
- *
- * @param value
- * byte the byte to convert.
- * @return String a printable representation for the byte.
- */
- public static String toString(byte value) {
- return Integer.toString(value);
- }
-
- /**
- * Parses the string argument as if it was a byte value and returns a Byte
- * representing the result. Throws NumberFormatException if the string
- * cannot be parsed as a byte quantity.
- *
- * @param string
- * a string representation of a single byte quantity.
- * @return Byte the value represented by the argument
- * @throws NumberFormatException
- * if the argument could not be parsed as a byte quantity.
- */
- public static Byte valueOf(String string) throws NumberFormatException {
- return valueOf(parseByte(string));
- }
-
- /**
- * Parses the string argument as if it was a byte value and returns a Byte
- * representing the result. Throws NumberFormatException if the string
- * cannot be parsed as a byte quantity. The second argument specifies the
- * radix to use when parsing the value.
- *
- * @param string
- * a string representation of a single byte quantity.
- * @param radix
- * the radix to use when parsing.
- * @return Byte the value represented by the argument
- * @throws NumberFormatException
- * if the argument could not be parsed as a byte quantity.
- */
- public static Byte valueOf(String string, int radix)
- throws NumberFormatException {
- return valueOf(parseByte(string, radix));
- }
-
- /**
- * <p>Returns a <code>Byte</code> instance for the <code>byte</code> value passed.
- * This method is preferred over the constructor, as this method may maintain a cache
- * of instances.</p>
- * @param b The byte value.
+ /**
+ * Parses the string argument as if it was a byte value and returns a Byte
+ * representing the result. Throws NumberFormatException if the string
+ * cannot be parsed as a byte quantity.
+ *
+ * @param string
+ * a string representation of a single byte quantity.
+ * @return Byte the value represented by the argument
+ * @throws NumberFormatException
+ * if the argument could not be parsed as a byte quantity.
+ */
+ public static Byte valueOf(String string) throws NumberFormatException {
+ return valueOf(parseByte(string));
+ }
+
+ /**
+ * Parses the string argument as if it was a byte value and returns a Byte
+ * representing the result. Throws NumberFormatException if the string
+ * cannot be parsed as a byte quantity. The second argument specifies the
+ * radix to use when parsing the value.
+ *
+ * @param string
+ * a string representation of a single byte quantity.
+ * @param radix
+ * the radix to use when parsing.
+ * @return Byte the value represented by the argument
+ * @throws NumberFormatException
+ * if the argument could not be parsed as a byte quantity.
+ */
+ public static Byte valueOf(String string, int radix)
+ throws NumberFormatException {
+ return valueOf(parseByte(string, radix));
+ }
+
+ /**
+ * Returns a <code>Byte</code> instance for the <code>byte</code> value
+ * passed. This method is preferred over the constructor, as this method may
+ * maintain a cache of instances.
+ *
+ * @param b
+ * The byte value.
* @return A <code>Byte</code> instance.
* @since 1.5
*/
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/NumberFormatException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/NumberFormatException.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/NumberFormatException.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/NumberFormatException.java Mon Jan 28 14:29:07 2008
@@ -17,30 +17,29 @@
package java.lang;
-
/**
* This runtime exception is thrown when a "string to number" conversion routine
* is passed an invalid value.
*/
-public class NumberFormatException extends java.lang.IllegalArgumentException {
+public class NumberFormatException extends IllegalArgumentException {
private static final long serialVersionUID = -2848938806368998894L;
/**
- * Constructs a new instance of this class with its walkback filled in.
- */
- public NumberFormatException() {
- super();
- }
+ * Constructs a new instance of this class with its walkback filled in.
+ */
+ public NumberFormatException() {
+ super();
+ }
- /**
- * Constructs a new instance of this class with its walkback and message
- * filled in.
- *
- * @param detailMessage
- * String The detail message for the exception.
- */
- public NumberFormatException(String detailMessage) {
- super(detailMessage);
- }
+ /**
+ * Constructs a new instance of this class with its walkback and message
+ * filled in.
+ *
+ * @param detailMessage
+ * String The detail message for the exception.
+ */
+ public NumberFormatException(String detailMessage) {
+ super(detailMessage);
+ }
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/OutOfMemoryError.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/OutOfMemoryError.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/OutOfMemoryError.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/OutOfMemoryError.java Mon Jan 28 14:29:07 2008
@@ -24,7 +24,7 @@
* virtual machine which can not be satisfied using the available platform
* resources.
*/
-public class OutOfMemoryError extends java.lang.VirtualMachineError {
+public class OutOfMemoryError extends VirtualMachineError {
private static final long serialVersionUID = 8228564086184010517L;
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Override.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Override.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Override.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Override.java Mon Jan 28 14:29:07 2008
@@ -22,11 +22,9 @@
import java.lang.annotation.Target;
/**
- * <p>
* An annotation to indicate that a method is intended to override a superclass
* method. This provides a compile-time assertion that a method actually
* overrides the superclass method.
- * </p>
*
* @since 1.5
*/
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Process.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Process.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Process.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Process.java Mon Jan 28 14:29:07 2008
@@ -17,7 +17,6 @@
package java.lang;
-
import java.io.InputStream;
import java.io.OutputStream;
@@ -27,60 +26,60 @@
*/
public abstract class Process {
- /**
- * Terimates the receiver and closes any associated streams.
- */
- abstract public void destroy();
-
- /**
- * Answers the exit value of the receiving Process. It is available only
- * when the OS subprocess is finished.
- *
- * @return The exit value of the receiver.
- *
- * @throws IllegalThreadStateException
- * If the receiver has not terminated.
- */
- abstract public int exitValue();
-
- /**
- * Answers the receiver's error output stream.
- * <p>
- * Note: This is an InputStream which allows reading of the other threads
- * "stderr".
- *
- * @return The error stream associated with the receiver
- */
- abstract public InputStream getErrorStream();
-
- /**
- * Answers the receiver's standard input stream
- * <p>
- * Note: This is an InputStream which allows reading from the other process'
- * "stdout".
- *
- * @return The receiver's process' stdin.
- */
- abstract public InputStream getInputStream();
-
- /**
- * Answers the receiver's standard output stream
- * <p>
- * Note: This is an OutputStream which allows writing to the other process'
- * "stdin".
- *
- * @return The receiver's process' stdout.
- */
- abstract public OutputStream getOutputStream();
-
- /**
- * Causes the calling thread to wait for the process associated with the
- * receiver to finish executing.
- *
- * @return The exit value of the Process being waited on
- *
- * @throws InterruptedException
- * If the calling thread is interrupted
- */
- abstract public int waitFor() throws InterruptedException;
+ /**
+ * Terminates the receiver and closes any associated streams.
+ */
+ abstract public void destroy();
+
+ /**
+ * Answers the exit value of the receiving Process. It is available only
+ * when the OS subprocess is finished.
+ *
+ * @return The exit value of the receiver.
+ *
+ * @throws IllegalThreadStateException
+ * If the receiver has not terminated.
+ */
+ abstract public int exitValue();
+
+ /**
+ * Answers the receiver's error output stream.
+ * <p>
+ * Note: This is an InputStream which allows reading of the other threads
+ * "stderr".
+ *
+ * @return The error stream associated with the receiver
+ */
+ abstract public InputStream getErrorStream();
+
+ /**
+ * Answers the receiver's standard input stream
+ * <p>
+ * Note: This is an InputStream which allows reading from the other process'
+ * "stdout".
+ *
+ * @return The receiver's process' stdin.
+ */
+ abstract public InputStream getInputStream();
+
+ /**
+ * Answers the receiver's standard output stream
+ * <p>
+ * Note: This is an OutputStream which allows writing to the other process'
+ * "stdin".
+ *
+ * @return The receiver's process' stdout.
+ */
+ abstract public OutputStream getOutputStream();
+
+ /**
+ * Causes the calling thread to wait for the process associated with the
+ * receiver to finish executing.
+ *
+ * @return The exit value of the Process being waited on
+ *
+ * @throws InterruptedException
+ * If the calling thread is interrupted
+ */
+ abstract public int waitFor() throws InterruptedException;
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/StringBuffer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/StringBuffer.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/StringBuffer.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/StringBuffer.java Mon Jan 28 14:29:07 2008
@@ -155,8 +155,8 @@
* the integer
* @return this StringBuffer
*/
- public StringBuffer append(int i) {
- return append(Integer.toString(i));
+ public StringBuffer append(int value) {
+ return append(Integer.toString(value));
}
/**
@@ -203,7 +203,7 @@
/**
* Adds the specified StringBuffer to the end of this StringBuffer.
*
- * @param sbuffer
+ * @param sb
* the StringBuffer
* @return this StringBuffer
*
@@ -472,8 +472,8 @@
* when buffer is null
*/
@Override
- public synchronized void getChars(int start, int end, char[] buffer, int idx) {
- super.getChars(start, end, buffer, idx);
+ public synchronized void getChars(int start, int end, char[] buffer, int index) {
+ super.getChars(start, end, buffer, index);
}
/**
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/StringBuilder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/StringBuilder.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/StringBuilder.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/StringBuilder.java Mon Jan 28 14:29:07 2008
@@ -269,7 +269,7 @@
* according to the rule defined by {@link String#valueOf(char[])}.
* </p>
*
- * @param str The <code>char[]</code> value to append to this object.
+ * @param ch The <code>char[]</code> value to append to this object.
* @return A reference to this object.
*
* @see String#valueOf(char[])
@@ -443,7 +443,7 @@
* </p>
*
* @param offset The index of this object to insert the value.
- * @param b The <code>int</code> value to insert into this object.
+ * @param i The <code>int</code> value to insert into this object.
* @return A reference to this object.
*
* @throws StringIndexOutOfBoundsException if <code>offset</code> is
@@ -465,7 +465,7 @@
* </p>
*
* @param offset The index of this object to insert the value.
- * @param b The <code>long</code> value to insert into this object.
+ * @param l The <code>long</code> value to insert into this object.
* @return A reference to this object.
*
* @throws StringIndexOutOfBoundsException if <code>offset</code> is
@@ -487,7 +487,7 @@
* </p>
*
* @param offset The index of this object to insert the value.
- * @param b The <code>float</code> value to insert into this object.
+ * @param f The <code>float</code> value to insert into this object.
* @return A reference to this object.
*
* @throws StringIndexOutOfBoundsException if <code>offset</code> is
@@ -531,7 +531,7 @@
* </p>
*
* @param offset The index of this object to insert the value.
- * @param b The <code>Object</code> value to insert into this object.
+ * @param obj The <code>Object</code> value to insert into this object.
* @return A reference to this object.
*
* @throws StringIndexOutOfBoundsException if <code>offset</code> is
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/Authenticator.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/Authenticator.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/Authenticator.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/Authenticator.java Mon Jan 28 14:29:07 2008
@@ -26,8 +26,8 @@
* It should override <code>getPasswordAuthentication()</code> which dictates
* how the authentication info should be obtained.
*
- * @see java.net.Authenticator.setDefault(java.net.ConnectionAuthenticator),
- * @see java.net.getPasswordAuthentication()
+ * @see Authenticator#setDefault(Authenticator)
+ * @see Authenticator#getPasswordAuthentication()
*/
public abstract class Authenticator {
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocketImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocketImpl.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocketImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocketImpl.java Mon Jan 28 14:29:07 2008
@@ -135,7 +135,8 @@
*
* @param addr
* the multicast group to be joined
- * @@throws IOException may be thrown while joining a group
+ * @throws IOException
+ * may be thrown while joining a group
*/
protected abstract void join(InetAddress addr) throws IOException;
@@ -148,7 +149,8 @@
* the multicast group to be joined
* @param netInterface
* the network interface on which the addresses should be dropped
- * @@throws IOException may be thrown while joining a group
+ * @throws IOException
+ * may be thrown while joining a group
*/
protected abstract void joinGroup(SocketAddress addr,
NetworkInterface netInterface) throws IOException;
@@ -158,7 +160,8 @@
*
* @param addr
* the multicast group to be left
- * @@throws IOException May be thrown while leaving the group
+ * @throws IOException
+ * May be thrown while leaving the group
*/
protected abstract void leave(InetAddress addr) throws IOException;
@@ -169,7 +172,8 @@
* the multicast group to be left
* @param netInterface
* the network interface on which the addresses should be dropped
- * @@throws IOException May be thrown while leaving the group
+ * @throws IOException
+ * May be thrown while leaving the group
*/
protected abstract void leaveGroup(SocketAddress addr,
NetworkInterface netInterface) throws IOException;
@@ -224,7 +228,7 @@
*
* @param ttl
* the time-to-live, 0<ttl<= 255
- * @@throws IOException The exception thrown while setting the TTL
+ * @throws IOException The exception thrown while setting the TTL
*/
protected abstract void setTimeToLive(int ttl) throws IOException;
@@ -233,7 +237,7 @@
*
* @param ttl
* the time-to-live, 0<ttl<= 255
- * @@throws IOException The exception thrown while setting the TTL
+ * @throws IOException The exception thrown while setting the TTL
* @deprecated Replaced by setTimeToLive
* @see #setTimeToLive(int)
*/
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java Mon Jan 28 14:29:07 2008
@@ -2016,7 +2016,7 @@
* calling rotate(list, 3) or rotate(list, -7) would modify the list to look
* like this: [8, 9, 0, 1, 2, 3, 4, 5, 6, 7]
*
- * @param list
+ * @param lst
* @param dist
* It can be any integer: 0, positive, negative, larger than the
* list size
@@ -2509,10 +2509,12 @@
/**
* Returns a dynamically typesafe view of the specified map.
*
- * @param c
+ * @param m
* the map
- * @param type
- * the type of the elements is permitted to insert
+ * @param keyType
+ * the type of keys permitted to be inserted
+ * @param valueType
+ * the type of values permitted to be inserted
*
* @return a typesafe map
*/
@@ -2524,7 +2526,7 @@
/**
* Returns a dynamically typesafe view of the specified list.
*
- * @param c
+ * @param list
* the list
* @param type
* the type of the elements is permitted to insert
@@ -2555,10 +2557,12 @@
/**
* Returns a dynamically typesafe view of the specified sorted map.
*
- * @param c
+ * @param m
* the sorted map
- * @param type
- * the type of the elements is permitted to insert
+ * @param keyType
+ * the type of keys permitted to be inserted
+ * @param valueType
+ * the type of values permitted to be inserted
*
* @return a typesafe sorted map
*/
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Scanner.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Scanner.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Scanner.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Scanner.java Mon Jan 28 14:29:07 2008
@@ -1704,7 +1704,7 @@
/**
* Remove is not a supported operation on Scanner.
*
- * @throw UnsupportedOperationException if this method is invoked
+ * @throws UnsupportedOperationException if this method is invoked
*/
public void remove() {
throw new UnsupportedOperationException();
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Stack.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Stack.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Stack.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Stack.java Mon Jan 28 14:29:07 2008
@@ -100,7 +100,7 @@
* Returns the index of the first occurrence of the object.
*
* @return the index of the first occurrence of the object
- * @param o
+ * @param object
* the object to be searched
*/
public synchronized int search(Object object) {
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java Mon Jan 28 14:29:07 2008
@@ -49,7 +49,7 @@
* The behaviour of this method is the same as openConnection(URL).
* <code>proxy</code> is not used in FileURLConnection.
*
- * @param u
+ * @param url
* the URL which the connection is pointing to
* @param proxy
* Proxy
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java Mon Jan 28 14:29:07 2008
@@ -189,11 +189,12 @@
}
/**
- * Answers the value corresponding to the specified key, null if no such key
- * exists.
+ * Answers the value corresponding to the specified key.
*
* @param key
- * @return
+ * the key to look up.
+ * @return Answers the value for the given key, or <code>null</code> if no
+ * such key exists.
*/
public String get(String key) {
LinkedList<String> result = keyTable.get(key.toLowerCase());
@@ -206,7 +207,7 @@
/**
* Answers the number of keys stored in this header
*
- * @return
+ * @return the number of keys.
*/
public int length() {
return props.size() / 2;
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java Mon Jan 28 14:29:07 2008
@@ -36,8 +36,9 @@
* @param u
* java.net.URL The URL to which the connection is pointing to
*
- * @thows IOException thrown if an IO error occurs when this method tries to
- * establish connection.
+ * @throws IOException
+ * thrown if an IO error occurs when this method tries to
+ * establish connection.
*/
@Override
protected URLConnection openConnection(URL u) throws IOException {
@@ -75,7 +76,8 @@
file = file.substring(0, file.indexOf('!') + 1) + spec;
} else {
int idx = file.indexOf('!');
- String tmpFile = file.substring(idx + 1, file.lastIndexOf('/') + 1) + spec;
+ String tmpFile = file.substring(idx + 1, file.lastIndexOf('/') + 1)
+ + spec;
tmpFile = URLUtil.canonicalizePath(tmpFile);
file = file.substring(0, idx + 1) + tmpFile;
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java?rev=616090&r1=616089&r2=616090&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java Mon Jan 28 14:29:07 2008
@@ -29,7 +29,7 @@
import java.util.Set;
/**
- *
+ *
* Reductive hash with two keys
*
*/
@@ -37,13 +37,13 @@
static final float DEFAULT_LOAD_FACTOR = 0.75f;
static final int DEFAULT_INITIAL_SIZE = 16;
-
+
private Set<Map.Entry<String, V>> entrySet;
private Collection<V> values;
private int size;
private int arrSize;
private int modCount;
-
+
private Entry<E, K, V>[] arr;
private float loadFactor;
@@ -55,9 +55,10 @@
public TwoKeyHashMap() {
this(DEFAULT_INITIAL_SIZE, DEFAULT_LOAD_FACTOR);
}
-
+
/**
* Constructs an empty HashMap
+ *
* @param initialCapacity
*/
public TwoKeyHashMap(int initialCapacity) {
@@ -65,17 +66,19 @@
}
/**
- * Constructs an empty HashMap
+ * Constructs an empty HashMap
+ *
* @param initialCapacity
* @param initialLoadFactor
*/
@SuppressWarnings("unchecked")
public TwoKeyHashMap(int initialCapacity, float initialLoadFactor) {
- if (initialCapacity < 0) {
+ if (initialCapacity < 0) {
throw new IllegalArgumentException("initialCapacity should be >= 0");
}
if (initialLoadFactor <= 0) {
- throw new IllegalArgumentException("initialLoadFactor should be > 0");
+ throw new IllegalArgumentException(
+ "initialLoadFactor should be > 0");
}
loadFactor = initialLoadFactor;
if (initialCapacity == Integer.MAX_VALUE) {
@@ -85,9 +88,9 @@
threshold = (int) (arrSize * loadFactor);
arr = new Entry[arrSize + 1];
}
-
+
/**
- * Returns a collection view of the values
+ * Returns a collection view of the values
*/
public Collection<V> values() {
if (values == null) {
@@ -95,9 +98,9 @@
}
return values;
}
-
+
/**
- * Returns a collection view of the mappings
+ * Returns a collection view of the mappings
*/
public Set<Map.Entry<String, V>> entrySet() {
if (entrySet == null) {
@@ -105,7 +108,7 @@
}
return entrySet;
}
-
+
/**
* Clears the map
*/
@@ -117,6 +120,7 @@
/**
* Removes the mapping for the keys
+ *
* @param key1
* @param key2
* @return
@@ -125,9 +129,10 @@
Entry<E, K, V> e = removeEntry(key1, key2);
return null != e ? e.value : null;
}
-
+
/**
* Associates the specified value with the specified keys in this map
+ *
* @param key1
* @param key2
* @param value
@@ -153,7 +158,8 @@
Entry<E, K, V> e = arr[index];
while (e != null) {
- if (hash == e.hash && key1.equals(e.getKey1()) && key2.equals(e.getKey2())) {
+ if (hash == e.hash && key1.equals(e.getKey1())
+ && key2.equals(e.getKey2())) {
V oldValue = e.value;
e.value = value;
return oldValue;
@@ -173,7 +179,7 @@
/**
* Rehash the map
- *
+ *
*/
@SuppressWarnings("unchecked")
void rehash() {
@@ -208,10 +214,12 @@
}
/**
- * Returns true if this map contains a mapping for the specified keys
- * @param key1
- * @param key2
- * @return
+ * Answers whether this map contains a mapping for the specified keys.
+ *
+ * @param key1 first key
+ * @param key2 second key
+ * @return true if this map contains a mapping for the specified keys, and
+ * false otherwise.
*/
public boolean containsKey(Object key1, Object key2) {
return findEntry(key1, key2) != null;
@@ -219,6 +227,7 @@
/**
* Return the value by keys
+ *
* @param key1
* @param key2
* @return
@@ -239,14 +248,15 @@
}
/**
- * Returns the number of mappings
+ * Returns the number of mappings
*/
public int size() {
return size;
}
-
+
/**
- * Creates new entry
+ * Creates new entry
+ *
* @param hashCode
* @param key1
* @param key2
@@ -254,13 +264,14 @@
* @param next
* @return
*/
- Entry<E, K, V> createEntry(int hashCode, E key1, K key2,
- V value, Entry<E, K, V> next) {
+ Entry<E, K, V> createEntry(int hashCode, E key1, K key2, V value,
+ Entry<E, K, V> next) {
return new Entry<E, K, V>(hashCode, key1, key2, value, next);
}
/**
* Creates entries iterator
+ *
* @return
*/
Iterator<Map.Entry<String, V>> createEntrySetIterator() {
@@ -269,18 +280,18 @@
/**
* Creates values iterator
+ *
* @return
*/
Iterator<V> createValueCollectionIterator() {
return new ValueIteratorImpl();
}
-
/**
* Entry implementation for the TwoKeyHashMap class
*
*/
- public static class Entry<E, K, V> implements Map.Entry<String, V> {
+ public static class Entry<E, K, V> implements Map.Entry<String, V> {
int hash;
E key1;
K key2;
@@ -294,7 +305,7 @@
this.value = value;
this.next = next;
}
-
+
public String getKey() {
return key1.toString() + key2.toString();
}
@@ -302,7 +313,7 @@
public E getKey1() {
return key1;
}
-
+
public K getKey2() {
return key2;
}
@@ -326,12 +337,11 @@
Object getKey1 = e.getKey1();
Object getKey2 = e.getKey2();
Object getValue = e.getValue();
- if ((key1 == null && getKey1 != null) ||
- (key2 == null && getKey2 != null) ||
- (value == null && getValue != null) ||
- !key1.equals(e.getKey1()) ||
- !key2.equals(e.getKey2()) ||
- !value.equals(getValue)) {
+ if ((key1 == null && getKey1 != null)
+ || (key2 == null && getKey2 != null)
+ || (value == null && getValue != null)
+ || !key1.equals(e.getKey1()) || !key2.equals(e.getKey2())
+ || !value.equals(getValue)) {
return false;
}
return true;
@@ -342,9 +352,9 @@
int hash2 = (key2 == null ? 0 : key2.hashCode());
return (hash1 + hash2) ^ (value == null ? 0 : value.hashCode());
}
-
+
}
-
+
class EntrySetImpl extends AbstractSet<Map.Entry<String, V>> {
public int size() {
return size;
@@ -377,7 +387,7 @@
if (!(obj instanceof Entry)) {
return false;
}
- return removeEntry(((Entry) obj).getKey1(), ((Entry)obj).getKey2()) != null;
+ return removeEntry(((Entry) obj).getKey1(), ((Entry) obj).getKey2()) != null;
}
public Iterator<Map.Entry<String, V>> iterator() {
@@ -427,14 +437,14 @@
found = false;
returned_index = curr;
returned_entry = curr_entry;
- return (Map.Entry<String, V>)curr_entry;
+ return (Map.Entry<String, V>) curr_entry;
}
public void remove() {
if (returned_index == -1) {
throw new IllegalStateException();
}
-
+
if (modCount != startModCount) {
throw new ConcurrentModificationException();
}
@@ -456,7 +466,7 @@
returned_index = -1;
}
}
-
+
private final Entry<E, K, V> findEntry(Object key1, Object key2) {
if (key1 == null && key2 == null) {
return arr[arrSize];
@@ -467,14 +477,15 @@
Entry<E, K, V> e = arr[index];
while (e != null) {
- if (hash == e.hash && key1.equals(e.getKey1()) && key2.equals(e.getKey2())) {
+ if (hash == e.hash && key1.equals(e.getKey1())
+ && key2.equals(e.getKey2())) {
return e;
}
e = e.next;
}
return null;
}
-
+
// Removes entry
private final Entry<E, K, V> removeEntry(Object key1, Object key2) {
if (key1 == null && key2 == null) {
@@ -495,7 +506,8 @@
Entry<E, K, V> e = arr[index];
Entry<E, K, V> prev = e;
while (e != null) {
- if (hash == e.hash && key1.equals(e.getKey1()) && key2.equals(e.getKey2())) {
+ if (hash == e.hash && key1.equals(e.getKey1())
+ && key2.equals(e.getKey2())) {
if (prev == e) {
arr[index] = e.next;
} else {
@@ -531,12 +543,12 @@
public Iterator<V> iterator() {
return createValueCollectionIterator();
}
-
+
public boolean contains(Object obj) {
return containsValue(obj);
}
}
-
+
class ValueIteratorImpl implements Iterator<V> {
private EntryIteratorImpl itr;