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 2007/12/05 13:26:14 UTC
svn commit: r601315 [5/11] - in /harmony/enhanced/classlib/branches/java6:
depends/build/ modules/accessibility/src/main/java/javax/accessibility/
modules/accessibility/src/test/api/java/common/javax/accessibility/
modules/awt/src/main/java/common/java...
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/HashSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/HashSet.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/HashSet.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/HashSet.java Wed Dec 5 04:25:42 2007
@@ -17,7 +17,6 @@
package java.util;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -28,191 +27,192 @@
* adding and removing. The elements can be any objects.
*/
public class HashSet<E> extends AbstractSet<E> implements Set<E>, Cloneable,
- Serializable {
+ Serializable {
- private static final long serialVersionUID = -5024744406713321676L;
+ private static final long serialVersionUID = -5024744406713321676L;
- transient HashMap<E, HashSet<E>> backingMap;
+ transient HashMap<E, HashSet<E>> backingMap;
- /**
- * Constructs a new empty instance of HashSet.
- */
- public HashSet() {
- this(new HashMap<E, HashSet<E>>());
- }
-
- /**
- * Constructs a new instance of HashSet with the specified capacity.
- *
- * @param capacity
- * the initial capacity of this HashSet
- */
- public HashSet(int capacity) {
- this(new HashMap<E, HashSet<E>>(capacity));
- }
-
- /**
- * Constructs a new instance of HashSet with the specified capacity and load
- * factor.
- *
- * @param capacity
- * the initial capacity
- * @param loadFactor
- * the initial load factor
- */
- public HashSet(int capacity, float loadFactor) {
- this(new HashMap<E, HashSet<E>>(capacity, loadFactor));
- }
-
- /**
- * Constructs a new instance of HashSet containing the unique elements in
- * the specified collection.
- *
- * @param collection
- * the collection of elements to add
- */
- public HashSet(Collection<? extends E> collection) {
- this(new HashMap<E, HashSet<E>>(collection.size() < 6 ? 11 : collection.size() * 2));
+ /**
+ * Constructs a new empty instance of HashSet.
+ */
+ public HashSet() {
+ this(new HashMap<E, HashSet<E>>());
+ }
+
+ /**
+ * Constructs a new instance of HashSet with the specified capacity.
+ *
+ * @param capacity
+ * the initial capacity of this HashSet
+ */
+ public HashSet(int capacity) {
+ this(new HashMap<E, HashSet<E>>(capacity));
+ }
+
+ /**
+ * Constructs a new instance of HashSet with the specified capacity and load
+ * factor.
+ *
+ * @param capacity
+ * the initial capacity
+ * @param loadFactor
+ * the initial load factor
+ */
+ public HashSet(int capacity, float loadFactor) {
+ this(new HashMap<E, HashSet<E>>(capacity, loadFactor));
+ }
+
+ /**
+ * Constructs a new instance of HashSet containing the unique elements in
+ * the specified collection.
+ *
+ * @param collection
+ * the collection of elements to add
+ */
+ public HashSet(Collection<? extends E> collection) {
+ this(new HashMap<E, HashSet<E>>(collection.size() < 6 ? 11 : collection
+ .size() * 2));
for (E e : collection) {
add(e);
}
- }
+ }
- HashSet(HashMap<E, HashSet<E>> backingMap) {
- this.backingMap = backingMap;
- }
-
- /**
- * Adds the specified object to this HashSet.
- *
- * @param object
- * the object to add
- * @return true when this HashSet did not already contain the object, false
- * otherwise
- */
- @Override
+ HashSet(HashMap<E, HashSet<E>> backingMap) {
+ this.backingMap = backingMap;
+ }
+
+ /**
+ * Adds the specified object to this HashSet.
+ *
+ * @param object
+ * the object to add
+ * @return true when this HashSet did not already contain the object, false
+ * otherwise
+ */
+ @Override
public boolean add(E object) {
- return backingMap.put(object, this) == null;
- }
+ return backingMap.put(object, this) == null;
+ }
- /**
- * Removes all elements from this HashSet, leaving it empty.
- *
- * @see #isEmpty
- * @see #size
- */
- @Override
+ /**
+ * Removes all elements from this HashSet, leaving it empty.
+ *
+ * @see #isEmpty
+ * @see #size
+ */
+ @Override
public void clear() {
- backingMap.clear();
- }
+ backingMap.clear();
+ }
- /**
- * Answers a new HashSet with the same elements and size as this HashSet.
- *
- * @return a shallow copy of this HashSet
- *
- * @see java.lang.Cloneable
- */
- @Override
+ /**
+ * Answers a new HashSet with the same elements and size as this HashSet.
+ *
+ * @return a shallow copy of this HashSet
+ *
+ * @see java.lang.Cloneable
+ */
+ @Override
@SuppressWarnings("unchecked")
public Object clone() {
- try {
- HashSet<E> clone = (HashSet<E>) super.clone();
- clone.backingMap = (HashMap<E, HashSet<E>>) backingMap.clone();
- return clone;
- } catch (CloneNotSupportedException e) {
- return null;
- }
- }
-
- /**
- * Searches this HashSet for the specified object.
- *
- * @param object
- * the object to search for
- * @return true if <code>object</code> is an element of this HashSet,
- * false otherwise
- */
- @Override
+ try {
+ HashSet<E> clone = (HashSet<E>) super.clone();
+ clone.backingMap = (HashMap<E, HashSet<E>>) backingMap.clone();
+ return clone;
+ } catch (CloneNotSupportedException e) {
+ return null;
+ }
+ }
+
+ /**
+ * Searches this HashSet for the specified object.
+ *
+ * @param object
+ * the object to search for
+ * @return true if <code>object</code> is an element of this HashSet,
+ * false otherwise
+ */
+ @Override
public boolean contains(Object object) {
- return backingMap.containsKey(object);
- }
+ return backingMap.containsKey(object);
+ }
- /**
- * Answers if this HashSet has no elements, a size of zero.
- *
- * @return true if this HashSet has no elements, false otherwise
- *
- * @see #size
- */
- @Override
+ /**
+ * Answers if this HashSet has no elements, a size of zero.
+ *
+ * @return true if this HashSet has no elements, false otherwise
+ *
+ * @see #size
+ */
+ @Override
public boolean isEmpty() {
- return backingMap.isEmpty();
- }
+ return backingMap.isEmpty();
+ }
- /**
- * Answers an Iterator on the elements of this HashSet.
- *
- * @return an Iterator on the elements of this HashSet
- *
- * @see Iterator
- */
- @Override
+ /**
+ * Answers an Iterator on the elements of this HashSet.
+ *
+ * @return an Iterator on the elements of this HashSet
+ *
+ * @see Iterator
+ */
+ @Override
public Iterator<E> iterator() {
- return backingMap.keySet().iterator();
- }
+ return backingMap.keySet().iterator();
+ }
- /**
- * Removes an occurrence of the specified object from this HashSet.
- *
- * @param object
- * the object to remove
- * @return true if this HashSet is modified, false otherwise
- */
- @Override
+ /**
+ * Removes an occurrence of the specified object from this HashSet.
+ *
+ * @param object
+ * the object to remove
+ * @return true if this HashSet is modified, false otherwise
+ */
+ @Override
public boolean remove(Object object) {
- return backingMap.remove(object) != null;
- }
+ return backingMap.remove(object) != null;
+ }
- /**
- * Answers the number of elements in this HashSet.
- *
- * @return the number of elements in this HashSet
- */
- @Override
+ /**
+ * Answers the number of elements in this HashSet.
+ *
+ * @return the number of elements in this HashSet
+ */
+ @Override
public int size() {
- return backingMap.size();
- }
+ return backingMap.size();
+ }
- private void writeObject(ObjectOutputStream stream) throws IOException {
- stream.defaultWriteObject();
- stream.writeInt(backingMap.elementData.length);
- stream.writeFloat(backingMap.loadFactor);
- stream.writeInt(backingMap.elementCount);
- for (int i = backingMap.elementData.length; --i >= 0;) {
- HashMap.Entry<E, HashSet<E>> entry = backingMap.elementData[i];
- while (entry != null) {
- stream.writeObject(entry.key);
- entry = entry.next;
- }
- }
- }
+ private void writeObject(ObjectOutputStream stream) throws IOException {
+ stream.defaultWriteObject();
+ stream.writeInt(backingMap.elementData.length);
+ stream.writeFloat(backingMap.loadFactor);
+ stream.writeInt(backingMap.elementCount);
+ for (int i = backingMap.elementData.length; --i >= 0;) {
+ HashMap.Entry<E, HashSet<E>> entry = backingMap.elementData[i];
+ while (entry != null) {
+ stream.writeObject(entry.key);
+ entry = entry.next;
+ }
+ }
+ }
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
private void readObject(ObjectInputStream stream) throws IOException,
- ClassNotFoundException {
- stream.defaultReadObject();
- int length = stream.readInt();
- float loadFactor = stream.readFloat();
- backingMap = createBackingMap(length, loadFactor);
- int elementCount = stream.readInt();
- for (int i = elementCount; --i >= 0;) {
- E key = (E)stream.readObject();
- backingMap.put(key, this);
- }
- }
-
- HashMap<E, HashSet<E>> createBackingMap(int capacity, float loadFactor) {
- return new HashMap<E, HashSet<E>>(capacity, loadFactor);
- }
+ ClassNotFoundException {
+ stream.defaultReadObject();
+ int length = stream.readInt();
+ float loadFactor = stream.readFloat();
+ backingMap = createBackingMap(length, loadFactor);
+ int elementCount = stream.readInt();
+ for (int i = elementCount; --i >= 0;) {
+ E key = (E) stream.readObject();
+ backingMap.put(key, this);
+ }
+ }
+
+ HashMap<E, HashSet<E>> createBackingMap(int capacity, float loadFactor) {
+ return new HashMap<E, HashSet<E>>(capacity, loadFactor);
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatCodePointException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatCodePointException.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatCodePointException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatCodePointException.java Wed Dec 5 04:25:42 2007
@@ -24,44 +24,45 @@
* Formatter.
*/
public class IllegalFormatCodePointException extends IllegalFormatException
- implements Serializable {
- private static final long serialVersionUID = 19080630L;
+ implements Serializable {
- private int c;
+ private static final long serialVersionUID = 19080630L;
- /**
- * Constructs an IllegalFormatCodePointException which is specified by the
- * invalid Unicode code point.
- *
- * @param c
- * The invalid Unicode code point.
- */
- public IllegalFormatCodePointException(int c) {
- this.c = c;
- }
+ private int c;
- /**
- * Return the invalid Unicode code point.
- *
- * @return The invalid Unicode code point.
- */
- public int getCodePoint() {
- return c;
- }
+ /**
+ * Constructs an IllegalFormatCodePointException which is specified by the
+ * invalid Unicode code point.
+ *
+ * @param c
+ * The invalid Unicode code point.
+ */
+ public IllegalFormatCodePointException(int c) {
+ this.c = c;
+ }
- /**
- * Return the message string of the IllegalFormatCodePointException.
- *
- * @return The message string of the IllegalFormatCodePointException.
- */
- @Override
+ /**
+ * Return the invalid Unicode code point.
+ *
+ * @return The invalid Unicode code point.
+ */
+ public int getCodePoint() {
+ return c;
+ }
+
+ /**
+ * Return the message string of the IllegalFormatCodePointException.
+ *
+ * @return The message string of the IllegalFormatCodePointException.
+ */
+ @Override
public String getMessage() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("Code point is ");
- char[] chars = Character.toChars(c);
- for (int i = 0; i < chars.length; i++) {
- buffer.append(chars[i]);
- }
- return buffer.toString();
- }
+ StringBuilder buffer = new StringBuilder();
+ buffer.append("Code point is ");
+ char[] chars = Character.toChars(c);
+ for (int i = 0; i < chars.length; i++) {
+ buffer.append(chars[i]);
+ }
+ return buffer.toString();
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatConversionException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatConversionException.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatConversionException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatConversionException.java Wed Dec 5 04:25:42 2007
@@ -21,63 +21,65 @@
/**
* The unchecked exception will be thrown out when the parameter is incompatible
* with the corresponding format specifier.
+ *
* @since 1.5
*/
public class IllegalFormatConversionException extends IllegalFormatException
- implements Serializable {
- private static final long serialVersionUID = 17000126L;
+ implements Serializable {
- private char c;
+ private static final long serialVersionUID = 17000126L;
- private Class<?> arg;
+ private char c;
- /**
- * Constructs an IllegalFormatConversionException with the class of the
- * mismatched conversion and corresponding parameter.
- *
- * @param c
- * The class of the mismatched conversion.
- * @param arg
- * The corresponding parameter.
- */
- public IllegalFormatConversionException(char c, Class<?> arg) {
- this.c = c;
- if (arg == null) {
- throw new NullPointerException();
- }
- this.arg = arg;
- }
-
- /**
- * Return the class of the mismatched parameter.
- *
- * @return The class of the mismatched parameter.
- */
- public Class<?> getArgumentClass() {
- return arg;
- }
-
- /**
- * Return the incompatible conversion.
- *
- * @return The incompatible conversion.
- */
- public char getConversion() {
- return c;
- }
-
- /**
- * Return the message string of the IllegalFormatConversionException.
- *
- * @return The message string of the IllegalFormatConversionException.
- */
- @Override
+ private Class<?> arg;
+
+ /**
+ * Constructs an IllegalFormatConversionException with the class of the
+ * mismatched conversion and corresponding parameter.
+ *
+ * @param c
+ * The class of the mismatched conversion.
+ * @param arg
+ * The corresponding parameter.
+ */
+ public IllegalFormatConversionException(char c, Class<?> arg) {
+ this.c = c;
+ if (arg == null) {
+ throw new NullPointerException();
+ }
+ this.arg = arg;
+ }
+
+ /**
+ * Return the class of the mismatched parameter.
+ *
+ * @return The class of the mismatched parameter.
+ */
+ public Class<?> getArgumentClass() {
+ return arg;
+ }
+
+ /**
+ * Return the incompatible conversion.
+ *
+ * @return The incompatible conversion.
+ */
+ public char getConversion() {
+ return c;
+ }
+
+ /**
+ * Return the message string of the IllegalFormatConversionException.
+ *
+ * @return The message string of the IllegalFormatConversionException.
+ */
+ @Override
public String getMessage() {
- StringBuilder buffer = new StringBuilder();
- buffer.append(c);
- buffer.append(" is incompatible with ");
- buffer.append(arg.getName());
- return buffer.toString();
- }
+ StringBuilder buffer = new StringBuilder();
+ buffer.append(c);
+ buffer.append(" is incompatible with ");
+ buffer.append(arg.getName());
+ return buffer.toString();
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatException.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatException.java Wed Dec 5 04:25:42 2007
@@ -24,12 +24,12 @@
* is allowed to be instantiated.
*/
public class IllegalFormatException extends IllegalArgumentException implements
- Serializable {
+ Serializable {
- private static final long serialVersionUID = 18830826L;
+ private static final long serialVersionUID = 18830826L;
- // the constructor is not callable from outside from the package
- IllegalFormatException() {
- // do nothing
- }
+ // the constructor is not callable from outside from the package
+ IllegalFormatException() {
+ // do nothing
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatFlagsException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatFlagsException.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatFlagsException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatFlagsException.java Wed Dec 5 04:25:42 2007
@@ -19,51 +19,49 @@
import java.io.Serializable;
/**
- *
* The unchecked exception will be thrown out if the combination of the format
* flags is illegal.
- *
*/
public class IllegalFormatFlagsException extends IllegalFormatException
- implements Serializable {
- private static final long serialVersionUID = 790824L;
+ implements Serializable {
- private String flags;
+ private static final long serialVersionUID = 790824L;
- /**
- * Constructs an IllegalFormatFlagsException with the specified flags.
- *
- * @param f
- * The specified flags.
- */
- public IllegalFormatFlagsException(String f) {
- if (null == f) {
- throw new NullPointerException();
- }
- flags = f;
- }
+ private String flags;
- /**
- * Return the flags that are illegal.
- *
- * @return The flags that are illegal.
- */
- public String getFlags() {
- return flags;
- }
+ /**
+ * Constructs an IllegalFormatFlagsException with the specified flags.
+ *
+ * @param f
+ * The specified flags.
+ */
+ public IllegalFormatFlagsException(String f) {
+ if (null == f) {
+ throw new NullPointerException();
+ }
+ flags = f;
+ }
- /**
- * Return the message string of the IllegalFormatFlagsException.
- *
- * @return The message string of the IllegalFormatFlagsException.
- */
- @Override
- public String getMessage() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("Flags = '");
- buffer.append(flags);
- buffer.append("'");
- return buffer.toString();
- }
+ /**
+ * Return the flags that are illegal.
+ *
+ * @return The flags that are illegal.
+ */
+ public String getFlags() {
+ return flags;
+ }
+ /**
+ * Return the message string of the IllegalFormatFlagsException.
+ *
+ * @return The message string of the IllegalFormatFlagsException.
+ */
+ @Override
+ public String getMessage() {
+ StringBuilder buffer = new StringBuilder();
+ buffer.append("Flags = '");
+ buffer.append(flags);
+ buffer.append("'");
+ return buffer.toString();
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatPrecisionException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatPrecisionException.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatPrecisionException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatPrecisionException.java Wed Dec 5 04:25:42 2007
@@ -17,45 +17,43 @@
package java.util;
/**
- *
* The unchecked exception will be thrown out when the precision is a negative
* other than -1, or the conversion does not support a precision or other cases
* when the precision is not supported.
- *
*/
-
public class IllegalFormatPrecisionException extends IllegalFormatException {
- private static final long serialVersionUID = 18711008L;
- private int p;
+ private static final long serialVersionUID = 18711008L;
+
+ private int p;
- /**
- * Constructs a IllegalFormatPrecisionException with specified precision.
- *
- * @param p
- * The precision.
- */
- public IllegalFormatPrecisionException(int p) {
- this.p = p;
- }
+ /**
+ * Constructs a IllegalFormatPrecisionException with specified precision.
+ *
+ * @param p
+ * The precision.
+ */
+ public IllegalFormatPrecisionException(int p) {
+ this.p = p;
+ }
- /**
- * Returns the precision associated with the exception.
- *
- * @return the precision.
- */
- public int getPrecision() {
- return p;
- }
+ /**
+ * Returns the precision associated with the exception.
+ *
+ * @return the precision.
+ */
+ public int getPrecision() {
+ return p;
+ }
- /**
- * Returns the message of the exception.
- *
- * @return The message of the exception.
- */
- @Override
+ /**
+ * Returns the message of the exception.
+ *
+ * @return The message of the exception.
+ */
+ @Override
public String getMessage() {
- return String.valueOf(p);
- }
+ return String.valueOf(p);
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatWidthException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatWidthException.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatWidthException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatWidthException.java Wed Dec 5 04:25:42 2007
@@ -17,44 +17,42 @@
package java.util;
/**
- *
* The unchecked exception will be thrown out when the width is a negative other
* than -1, or the conversion does not support a width or other cases when the
* width is not supported.
- *
*/
public class IllegalFormatWidthException extends IllegalFormatException {
- private static final long serialVersionUID = 16660902L;
+ private static final long serialVersionUID = 16660902L;
- private int w;
+ private int w;
- /**
- * Constructs a IllegalFormatWidthException with specified width.
- *
- * @param w
- * The width.
- */
- public IllegalFormatWidthException(int w) {
- this.w = w;
- }
+ /**
+ * Constructs a IllegalFormatWidthException with specified width.
+ *
+ * @param w
+ * The width.
+ */
+ public IllegalFormatWidthException(int w) {
+ this.w = w;
+ }
- /**
- * Returns the width associated with the exception.
- *
- * @return the width.
- */
- public int getWidth() {
- return w;
- }
+ /**
+ * Returns the width associated with the exception.
+ *
+ * @return the width.
+ */
+ public int getWidth() {
+ return w;
+ }
- /**
- * Returns the message of the exception.
- *
- * @return The message of the exception.
- */
- @Override
+ /**
+ * Returns the message of the exception.
+ *
+ * @return The message of the exception.
+ */
+ @Override
public String getMessage() {
- return String.valueOf(w);
- }
+ return String.valueOf(w);
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/InputMismatchException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/InputMismatchException.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/InputMismatchException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/InputMismatchException.java Wed Dec 5 04:25:42 2007
@@ -24,25 +24,25 @@
* @see Scanner
*/
public class InputMismatchException extends NoSuchElementException implements
- Serializable {
+ Serializable {
- static final long serialVersionUID = 8811230760997066428L;
-
- /**
- * Constructs a InputMismatchException with no error message
- *
- */
- public InputMismatchException() {
- super();
- }
+ static final long serialVersionUID = 8811230760997066428L;
- /**
- * Constructs a InputMismatchException with msg as its error message
- *
- * @param msg
- * The specified error message
- */
- public InputMismatchException(String msg) {
- super(msg);
- }
+ /**
+ * Constructs a InputMismatchException with no error message
+ *
+ */
+ public InputMismatchException() {
+ super();
+ }
+
+ /**
+ * Constructs a InputMismatchException with msg as its error message
+ *
+ * @param msg
+ * The specified error message
+ */
+ public InputMismatchException(String msg) {
+ super(msg);
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Iterator.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Iterator.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Iterator.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Iterator.java Wed Dec 5 04:25:42 2007
@@ -17,43 +17,42 @@
package java.util;
-
/**
* An Iterator is used to sequence over a collection of objects.
*/
public interface Iterator<E> {
- /**
- * Answers if there are more elements to iterate.
- *
- * @return true if there are more elements, false otherwise
- *
- * @see #next
- */
- public boolean hasNext();
+ /**
+ * Answers if there are more elements to iterate.
+ *
+ * @return true if there are more elements, false otherwise
+ *
+ * @see #next
+ */
+ public boolean hasNext();
- /**
- * Answers the next object in the iteration.
- *
- * @return the next object
- *
- * @exception NoSuchElementException
- * when there are no more elements
- *
- * @see #hasNext
- */
- public E next();
+ /**
+ * Answers the next object in the iteration.
+ *
+ * @return the next object
+ *
+ * @exception NoSuchElementException
+ * when there are no more elements
+ *
+ * @see #hasNext
+ */
+ public E next();
- /**
- * Removes the last object returned by <code>next</code> from the
- * collection.
- *
- * @exception UnsupportedOperationException
- * when removing is not supported by the collection being
- * iterated
- * @exception IllegalStateException
- * when <code>next</code> has not been called, or
- * <code>remove</code> has already been called after the
- * last call to <code>next</code>
- */
- public void remove();
+ /**
+ * Removes the last object returned by <code>next</code> from the
+ * collection.
+ *
+ * @exception UnsupportedOperationException
+ * when removing is not supported by the collection being
+ * iterated
+ * @exception IllegalStateException
+ * when <code>next</code> has not been called, or
+ * <code>remove</code> has already been called after the
+ * last call to <code>next</code>
+ */
+ public void remove();
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/LinkedHashSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/LinkedHashSet.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/LinkedHashSet.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/LinkedHashSet.java Wed Dec 5 04:25:42 2007
@@ -17,72 +17,74 @@
package java.util;
-
import java.io.Serializable;
/**
- * LinkedHashSet is a variant on HashSet. Its entries are kept in a doubly-linked list.
- * The iteration order is the order in which entries were inserted.
+ * LinkedHashSet is a variant on HashSet. Its entries are kept in a
+ * doubly-linked list. The iteration order is the order in which entries were
+ * inserted.
* <p>
* Null elements are allowed, and all the optional Set operations are supported.
* <p>
- * Like HashSet, LinkedHashSet is not thread safe, so access by multiple threads must be synchronized
- * by an external mechanism such as Collections.synchronizedSet.
+ * Like HashSet, LinkedHashSet is not thread safe, so access by multiple threads
+ * must be synchronized by an external mechanism such as
+ * Collections.synchronizedSet.
+ *
* @since 1.4
*/
public class LinkedHashSet<E> extends HashSet<E> implements Set<E>, Cloneable,
- Serializable {
-
- private static final long serialVersionUID = -2851667679971038690L;
-
- /**
- * Constructs a new empty instance of LinkedHashSet.
- */
- public LinkedHashSet() {
- super(new LinkedHashMap<E, HashSet<E>>());
- }
-
- /**
- * Constructs a new instance of LinkedHashSet with the specified capacity.
- *
- * @param capacity
- * the initial capacity of this HashSet
- */
- public LinkedHashSet(int capacity) {
- super(new LinkedHashMap<E, HashSet<E>>(capacity));
- }
-
- /**
- * Constructs a new instance of LinkedHashSet with the specified capacity
- * and load factor.
- *
- * @param capacity
- * the initial capacity
- * @param loadFactor
- * the initial load factor
- */
- public LinkedHashSet(int capacity, float loadFactor) {
- super(new LinkedHashMap<E, HashSet<E>>(capacity, loadFactor));
- }
-
- /**
- * Constructs a new instance of LinkedHashSet containing the unique elements
- * in the specified collection.
- *
- * @param collection
- * the collection of elements to add
- */
- public LinkedHashSet(Collection<? extends E> collection) {
- super(new LinkedHashMap<E, HashSet<E>>(collection.size() < 6 ? 11
- : collection.size() * 2));
+ Serializable {
+
+ private static final long serialVersionUID = -2851667679971038690L;
+
+ /**
+ * Constructs a new empty instance of LinkedHashSet.
+ */
+ public LinkedHashSet() {
+ super(new LinkedHashMap<E, HashSet<E>>());
+ }
+
+ /**
+ * Constructs a new instance of LinkedHashSet with the specified capacity.
+ *
+ * @param capacity
+ * the initial capacity of this HashSet
+ */
+ public LinkedHashSet(int capacity) {
+ super(new LinkedHashMap<E, HashSet<E>>(capacity));
+ }
+
+ /**
+ * Constructs a new instance of LinkedHashSet with the specified capacity
+ * and load factor.
+ *
+ * @param capacity
+ * the initial capacity
+ * @param loadFactor
+ * the initial load factor
+ */
+ public LinkedHashSet(int capacity, float loadFactor) {
+ super(new LinkedHashMap<E, HashSet<E>>(capacity, loadFactor));
+ }
+
+ /**
+ * Constructs a new instance of LinkedHashSet containing the unique elements
+ * in the specified collection.
+ *
+ * @param collection
+ * the collection of elements to add
+ */
+ public LinkedHashSet(Collection<? extends E> collection) {
+ super(new LinkedHashMap<E, HashSet<E>>(collection.size() < 6 ? 11
+ : collection.size() * 2));
for (E e : collection) {
add(e);
}
- }
+ }
- /* overrides method in HashMap */
- @Override
+ /* overrides method in HashMap */
+ @Override
HashMap<E, HashSet<E>> createBackingMap(int capacity, float loadFactor) {
- return new LinkedHashMap<E, HashSet<E>>(capacity, loadFactor);
- }
+ return new LinkedHashMap<E, HashSet<E>>(capacity, loadFactor);
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/LinkedList.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/LinkedList.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/LinkedList.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/LinkedList.java Wed Dec 5 04:25:42 2007
@@ -17,7 +17,6 @@
package java.util;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -28,6 +27,7 @@
* LinkedList is an implementation of List, backed by a linked list. All
* optional operations are supported, adding, removing and replacing. The
* elements can be any objects.
+ *
* @since 1.2
*/
public class LinkedList<E> extends AbstractSequentialList<E> implements
@@ -244,8 +244,8 @@
}
/**
- * Constructs a new instance of <code>LinkedList</code> that holds
- * all of the elements contained in the supplied <code>collection</code>
+ * Constructs a new instance of <code>LinkedList</code> that holds all of
+ * the elements contained in the supplied <code>collection</code>
* argument. The order of the elements in this new <code>LinkedList</code>
* will be determined by the iteration order of <code>collection</code>.
*
@@ -322,12 +322,14 @@
* in this LinkedList. The objects are added in the order they are returned
* from the <code>Collection</code> iterator.
*
- * @param location the index at which to insert
- * @param collection the Collection of objects
+ * @param location
+ * the index at which to insert
+ * @param collection
+ * the Collection of objects
* @return true if this LinkedList is modified, false otherwise
*
- * @exception IndexOutOfBoundsException when
- * <code>location < 0 || > size()</code>
+ * @exception IndexOutOfBoundsException
+ * when <code>location < 0 || > size()</code>
*/
@Override
public boolean addAll(int location, Collection<? extends E> collection) {
@@ -360,7 +362,6 @@
modCount++;
return true;
}
-
/**
* Adds the objects in the specified Collection to this LinkedList.
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/List.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/List.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/List.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/List.java Wed Dec 5 04:25:42 2007
@@ -17,339 +17,339 @@
package java.util;
-
/**
* List is a collection which maintains an ordering for its elements. Every
* element in the list has an index.
*/
public interface List<E> extends Collection<E> {
- /**
- * Inserts the specified object into this Vector at the specified location.
- * The object is inserted before any previous element at the specified
- * location. If the location is equal to the size of this List, the object
- * is added at the end.
- *
- * @param location
- * the index at which to insert
- * @param object
- * the object to add
- *
- * @exception UnsupportedOperationException
- * when adding to this List is not supported
- * @exception ClassCastException
- * when the class of the object is inappropriate for this
- * List
- * @exception IllegalArgumentException
- * when the object cannot be added to this List
- * @exception IndexOutOfBoundsException
- * when <code>location < 0 || >= size()</code>
- */
- public void add(int location, E object);
-
- /**
- * Adds the specified object at the end of this List.
- *
- * @param object
- * the object to add
- * @return true
- *
- * @exception UnsupportedOperationException
- * when adding to this List is not supported
- * @exception ClassCastException
- * when the class of the object is inappropriate for this
- * List
- * @exception IllegalArgumentException
- * when the object cannot be added to this List
- */
- public boolean add(E object);
-
- /**
- * Inserts the objects in the specified Collection at the specified location
- * in this List. The objects are added in the order they are returned from
- * the Collection iterator.
- *
- * @param location
- * the index at which to insert
- * @param collection
- * the Collection of objects
- * @return true if this List is modified, false otherwise
- *
- * @exception UnsupportedOperationException
- * when adding to this List is not supported
- * @exception ClassCastException
- * when the class of an object is inappropriate for this List
- * @exception IllegalArgumentException
- * when an object cannot be added to this List
- * @exception IndexOutOfBoundsException
- * when <code>location < 0 || >= size()</code>
- */
- public boolean addAll(int location, Collection<? extends E> collection);
-
- /**
- * Adds the objects in the specified Collection to the end of this List. The
- * objects are added in the order they are returned from the Collection
- * iterator.
- *
- * @param collection
- * the Collection of objects
- * @return true if this List is modified, false otherwise
- *
- * @exception UnsupportedOperationException
- * when adding to this List is not supported
- * @exception ClassCastException
- * when the class of an object is inappropriate for this List
- * @exception IllegalArgumentException
- * when an object cannot be added to this List
- */
- public boolean addAll(Collection<? extends E> collection);
-
- /**
- * Removes all elements from this List, leaving it empty.
- *
- * @exception UnsupportedOperationException
- * when removing from this List is not supported
- *
- * @see #isEmpty
- * @see #size
- */
- public void clear();
-
- /**
- * Searches this List for the specified object.
- *
- * @param object
- * the object to search for
- * @return true if object is an element of this List, false otherwise
- */
- public boolean contains(Object object);
-
- /**
- * Searches this List for all objects in the specified Collection.
- *
- * @param collection
- * the Collection of objects
- * @return true if all objects in the specified Collection are elements of
- * this List, false otherwise
- */
- public boolean containsAll(Collection<?> collection);
-
- /**
- * Compares the argument to the receiver, and answers true if they represent
- * the <em>same</em> object using a class specific comparison.
- *
- * @param object
- * Object the object to compare with this object.
- * @return boolean <code>true</code> if the object is the same as this
- * object <code>false</code> if it is different from this object.
- * @see #hashCode
- */
- public boolean equals(Object object);
-
- /**
- * Answers the element at the specified location in this List.
- *
- * @param location
- * the index of the element to return
- * @return the element at the specified location
- *
- * @exception IndexOutOfBoundsException
- * when <code>location < 0 || >= size()</code>
- */
- public E get(int location);
-
- /**
- * Answers an integer hash code for the receiver. Objects which are equal
- * answer the same value for this method.
- *
- * @return the receiver's hash
- *
- * @see #equals
- */
- public int hashCode();
-
- /**
- * Searches this List for the specified object and returns the index of the
- * first occurrence.
- *
- * @param object
- * the object to search for
- * @return the index of the first occurrence of the object
- */
- public int indexOf(Object object);
-
- /**
- * Answers if this List has no elements, a size of zero.
- *
- * @return true if this List has no elements, false otherwise
- *
- * @see #size
- */
- public boolean isEmpty();
-
- /**
- * Answers an Iterator on the elements of this List. The elements are
- * iterated in the same order that they occur in the List.
- *
- * @return an Iterator on the elements of this List
- *
- * @see Iterator
- */
- public Iterator<E> iterator();
-
- /**
- * Searches this List for the specified object and returns the index of the
- * last occurrence.
- *
- * @param object
- * the object to search for
- * @return the index of the last occurrence of the object
- */
- public int lastIndexOf(Object object);
-
- /**
- * Answers a ListIterator on the elements of this List. The elements are
- * iterated in the same order that they occur in the List.
- *
- * @return a ListIterator on the elements of this List
- *
- * @see ListIterator
- */
- public ListIterator<E> listIterator();
-
- /**
- * Answers a ListIterator on the elements of this List. The elements are
- * iterated in the same order that they occur in the List. The iteration
- * starts at the specified location.
- *
- * @param location
- * the index at which to start the iteration
- * @return a ListIterator on the elements of this List
- *
- * @exception IndexOutOfBoundsException
- * when <code>location < 0 || >= size()</code>
- *
- * @see ListIterator
- */
- public ListIterator<E> listIterator(int location);
-
- /**
- * Removes the object at the specified location from this List.
- *
- * @param location
- * the index of the object to remove
- * @return the removed object
- *
- * @exception UnsupportedOperationException
- * when removing from this List is not supported
- * @exception IndexOutOfBoundsException
- * when <code>location < 0 || >= size()</code>
- */
- public E remove(int location);
-
- /**
- * Removes the first occurrence of the specified object from this List.
- *
- * @param object
- * the object to remove
- * @return true if this List is modified, false otherwise
- *
- * @exception UnsupportedOperationException
- * when removing from this List is not supported
- */
- public boolean remove(Object object);
-
- /**
- * Removes all occurrences in this List of each object in the specified
- * Collection.
- *
- * @param collection
- * the Collection of objects to remove
- * @return true if this List is modified, false otherwise
- *
- * @exception UnsupportedOperationException
- * when removing from this List is not supported
- */
- public boolean removeAll(Collection<?> collection);
-
- /**
- * Removes all objects from this List that are not contained in the
- * specified Collection.
- *
- * @param collection
- * the Collection of objects to retain
- * @return true if this List is modified, false otherwise
- *
- * @exception UnsupportedOperationException
- * when removing from this List is not supported
- */
- public boolean retainAll(Collection<?> collection);
-
- /**
- * Replaces the element at the specified location in this List with the
- * specified object.
- *
- * @param location
- * the index at which to put the specified object
- * @param object
- * the object to add
- * @return the previous element at the index
- *
- * @exception UnsupportedOperationException
- * when replacing elements in this List is not supported
- * @exception ClassCastException
- * when the class of an object is inappropriate for this List
- * @exception IllegalArgumentException
- * when an object cannot be added to this List
- * @exception IndexOutOfBoundsException
- * when <code>location < 0 || >= size()</code>
- */
- public E set(int location, E object);
-
- /**
- * Answers the number of elements in this List.
- *
- * @return the number of elements in this List
- */
- public int size();
-
- /**
- * Answers a List of the specified portion of this List from the start index
- * to one less than the end index. The returned List is backed by this list
- * so changes to one are reflected by the other.
- *
- * @param start
- * the index at which to start the sublist
- * @param end
- * the index one past the end of the sublist
- * @return a List of a portion of this List
- *
- * @exception IndexOutOfBoundsException
- * when <code>start < 0, start > end</code> or
- * <code>end > size()</code>
- */
- public List<E> subList(int start, int end);
-
- /**
- * Answers an array containing all elements contained in this List.
- *
- * @return an array of the elements from this List
- */
- public Object[] toArray();
-
- /**
- * Answers an array containing all elements contained in this List. If the
- * specified array is large enough to hold the elements, the specified array
- * is used, otherwise an array of the same type is created. If the specified
- * array is used and is larger than this List, the array element following
- * the collection elements is set to null.
- *
- * @param array
- * the array
- * @return an array of the elements from this List
- *
- * @exception ArrayStoreException
- * when the type of an element in this List cannot be stored
- * in the type of the specified array
- */
- public <T> T[] toArray(T[] array);
+
+ /**
+ * Inserts the specified object into this Vector at the specified location.
+ * The object is inserted before any previous element at the specified
+ * location. If the location is equal to the size of this List, the object
+ * is added at the end.
+ *
+ * @param location
+ * the index at which to insert
+ * @param object
+ * the object to add
+ *
+ * @exception UnsupportedOperationException
+ * when adding to this List is not supported
+ * @exception ClassCastException
+ * when the class of the object is inappropriate for this
+ * List
+ * @exception IllegalArgumentException
+ * when the object cannot be added to this List
+ * @exception IndexOutOfBoundsException
+ * when <code>location < 0 || >= size()</code>
+ */
+ public void add(int location, E object);
+
+ /**
+ * Adds the specified object at the end of this List.
+ *
+ * @param object
+ * the object to add
+ * @return true
+ *
+ * @exception UnsupportedOperationException
+ * when adding to this List is not supported
+ * @exception ClassCastException
+ * when the class of the object is inappropriate for this
+ * List
+ * @exception IllegalArgumentException
+ * when the object cannot be added to this List
+ */
+ public boolean add(E object);
+
+ /**
+ * Inserts the objects in the specified Collection at the specified location
+ * in this List. The objects are added in the order they are returned from
+ * the Collection iterator.
+ *
+ * @param location
+ * the index at which to insert
+ * @param collection
+ * the Collection of objects
+ * @return true if this List is modified, false otherwise
+ *
+ * @exception UnsupportedOperationException
+ * when adding to this List is not supported
+ * @exception ClassCastException
+ * when the class of an object is inappropriate for this List
+ * @exception IllegalArgumentException
+ * when an object cannot be added to this List
+ * @exception IndexOutOfBoundsException
+ * when <code>location < 0 || >= size()</code>
+ */
+ public boolean addAll(int location, Collection<? extends E> collection);
+
+ /**
+ * Adds the objects in the specified Collection to the end of this List. The
+ * objects are added in the order they are returned from the Collection
+ * iterator.
+ *
+ * @param collection
+ * the Collection of objects
+ * @return true if this List is modified, false otherwise
+ *
+ * @exception UnsupportedOperationException
+ * when adding to this List is not supported
+ * @exception ClassCastException
+ * when the class of an object is inappropriate for this List
+ * @exception IllegalArgumentException
+ * when an object cannot be added to this List
+ */
+ public boolean addAll(Collection<? extends E> collection);
+
+ /**
+ * Removes all elements from this List, leaving it empty.
+ *
+ * @exception UnsupportedOperationException
+ * when removing from this List is not supported
+ *
+ * @see #isEmpty
+ * @see #size
+ */
+ public void clear();
+
+ /**
+ * Searches this List for the specified object.
+ *
+ * @param object
+ * the object to search for
+ * @return true if object is an element of this List, false otherwise
+ */
+ public boolean contains(Object object);
+
+ /**
+ * Searches this List for all objects in the specified Collection.
+ *
+ * @param collection
+ * the Collection of objects
+ * @return true if all objects in the specified Collection are elements of
+ * this List, false otherwise
+ */
+ public boolean containsAll(Collection<?> collection);
+
+ /**
+ * Compares the argument to the receiver, and answers true if they represent
+ * the <em>same</em> object using a class specific comparison.
+ *
+ * @param object
+ * Object the object to compare with this object.
+ * @return boolean <code>true</code> if the object is the same as this
+ * object <code>false</code> if it is different from this object.
+ * @see #hashCode
+ */
+ public boolean equals(Object object);
+
+ /**
+ * Answers the element at the specified location in this List.
+ *
+ * @param location
+ * the index of the element to return
+ * @return the element at the specified location
+ *
+ * @exception IndexOutOfBoundsException
+ * when <code>location < 0 || >= size()</code>
+ */
+ public E get(int location);
+
+ /**
+ * Answers an integer hash code for the receiver. Objects which are equal
+ * answer the same value for this method.
+ *
+ * @return the receiver's hash
+ *
+ * @see #equals
+ */
+ public int hashCode();
+
+ /**
+ * Searches this List for the specified object and returns the index of the
+ * first occurrence.
+ *
+ * @param object
+ * the object to search for
+ * @return the index of the first occurrence of the object
+ */
+ public int indexOf(Object object);
+
+ /**
+ * Answers if this List has no elements, a size of zero.
+ *
+ * @return true if this List has no elements, false otherwise
+ *
+ * @see #size
+ */
+ public boolean isEmpty();
+
+ /**
+ * Answers an Iterator on the elements of this List. The elements are
+ * iterated in the same order that they occur in the List.
+ *
+ * @return an Iterator on the elements of this List
+ *
+ * @see Iterator
+ */
+ public Iterator<E> iterator();
+
+ /**
+ * Searches this List for the specified object and returns the index of the
+ * last occurrence.
+ *
+ * @param object
+ * the object to search for
+ * @return the index of the last occurrence of the object
+ */
+ public int lastIndexOf(Object object);
+
+ /**
+ * Answers a ListIterator on the elements of this List. The elements are
+ * iterated in the same order that they occur in the List.
+ *
+ * @return a ListIterator on the elements of this List
+ *
+ * @see ListIterator
+ */
+ public ListIterator<E> listIterator();
+
+ /**
+ * Answers a ListIterator on the elements of this List. The elements are
+ * iterated in the same order that they occur in the List. The iteration
+ * starts at the specified location.
+ *
+ * @param location
+ * the index at which to start the iteration
+ * @return a ListIterator on the elements of this List
+ *
+ * @exception IndexOutOfBoundsException
+ * when <code>location < 0 || >= size()</code>
+ *
+ * @see ListIterator
+ */
+ public ListIterator<E> listIterator(int location);
+
+ /**
+ * Removes the object at the specified location from this List.
+ *
+ * @param location
+ * the index of the object to remove
+ * @return the removed object
+ *
+ * @exception UnsupportedOperationException
+ * when removing from this List is not supported
+ * @exception IndexOutOfBoundsException
+ * when <code>location < 0 || >= size()</code>
+ */
+ public E remove(int location);
+
+ /**
+ * Removes the first occurrence of the specified object from this List.
+ *
+ * @param object
+ * the object to remove
+ * @return true if this List is modified, false otherwise
+ *
+ * @exception UnsupportedOperationException
+ * when removing from this List is not supported
+ */
+ public boolean remove(Object object);
+
+ /**
+ * Removes all occurrences in this List of each object in the specified
+ * Collection.
+ *
+ * @param collection
+ * the Collection of objects to remove
+ * @return true if this List is modified, false otherwise
+ *
+ * @exception UnsupportedOperationException
+ * when removing from this List is not supported
+ */
+ public boolean removeAll(Collection<?> collection);
+
+ /**
+ * Removes all objects from this List that are not contained in the
+ * specified Collection.
+ *
+ * @param collection
+ * the Collection of objects to retain
+ * @return true if this List is modified, false otherwise
+ *
+ * @exception UnsupportedOperationException
+ * when removing from this List is not supported
+ */
+ public boolean retainAll(Collection<?> collection);
+
+ /**
+ * Replaces the element at the specified location in this List with the
+ * specified object.
+ *
+ * @param location
+ * the index at which to put the specified object
+ * @param object
+ * the object to add
+ * @return the previous element at the index
+ *
+ * @exception UnsupportedOperationException
+ * when replacing elements in this List is not supported
+ * @exception ClassCastException
+ * when the class of an object is inappropriate for this List
+ * @exception IllegalArgumentException
+ * when an object cannot be added to this List
+ * @exception IndexOutOfBoundsException
+ * when <code>location < 0 || >= size()</code>
+ */
+ public E set(int location, E object);
+
+ /**
+ * Answers the number of elements in this List.
+ *
+ * @return the number of elements in this List
+ */
+ public int size();
+
+ /**
+ * Answers a List of the specified portion of this List from the start index
+ * to one less than the end index. The returned List is backed by this list
+ * so changes to one are reflected by the other.
+ *
+ * @param start
+ * the index at which to start the sublist
+ * @param end
+ * the index one past the end of the sublist
+ * @return a List of a portion of this List
+ *
+ * @exception IndexOutOfBoundsException
+ * when <code>start < 0, start > end</code> or
+ * <code>end > size()</code>
+ */
+ public List<E> subList(int start, int end);
+
+ /**
+ * Answers an array containing all elements contained in this List.
+ *
+ * @return an array of the elements from this List
+ */
+ public Object[] toArray();
+
+ /**
+ * Answers an array containing all elements contained in this List. If the
+ * specified array is large enough to hold the elements, the specified array
+ * is used, otherwise an array of the same type is created. If the specified
+ * array is used and is larger than this List, the array element following
+ * the collection elements is set to null.
+ *
+ * @param array
+ * the array
+ * @return an array of the elements from this List
+ *
+ * @exception ArrayStoreException
+ * when the type of an element in this List cannot be stored
+ * in the type of the specified array
+ */
+ public <T> T[] toArray(T[] array);
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ListIterator.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ListIterator.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ListIterator.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ListIterator.java Wed Dec 5 04:25:42 2007
@@ -17,128 +17,127 @@
package java.util;
-
/**
* An ListIterator is used to sequence over a List of objects. ListIterator can
* move backwards or forwards through the List.
*/
public interface ListIterator<E> extends Iterator<E> {
-
- /**
- * Inserts the specified object into the list between <code>next</code>
- * and <code>previous</code>. The object inserted will be the previous
- * object.
- *
- * @param object
- * the object to insert
- *
- * @exception UnsupportedOperationException
- * when adding is not supported by the list being iterated
- * @exception ClassCastException
- * when the class of the object is inappropriate for the list
- * @exception IllegalArgumentException
- * when the object cannot be added to the list
- */
- void add(E object);
-
- /**
- * Answers if there are more elements to iterate.
- *
- * @return true if there are more elements, false otherwise
- *
- * @see #next
- */
- public boolean hasNext();
-
- /**
- * Answers if there are previous elements to iterate.
- *
- * @return true if there are previous elements, false otherwise
- *
- * @see #previous
- */
- public boolean hasPrevious();
-
- /**
- * Answers the next object in the iteration.
- *
- * @return the next object
- *
- * @exception NoSuchElementException
- * when there are no more elements
- *
- * @see #hasNext
- */
- public E next();
-
- /**
- * Answers the index of the next object in the iteration.
- *
- * @return the index of the next object
- *
- * @exception NoSuchElementException
- * when there are no more elements
- *
- * @see #next
- */
- public int nextIndex();
-
- /**
- * Answers the previous object in the iteration.
- *
- * @return the previous object
- *
- * @exception NoSuchElementException
- * when there are no previous elements
- *
- * @see #hasPrevious
- */
- public E previous();
-
- /**
- * Answers the index of the previous object in the iteration.
- *
- * @return the index of the previous object
- *
- * @exception NoSuchElementException
- * when there are no previous elements
- *
- * @see #previous
- */
- public int previousIndex();
-
- /**
- * Removes the last object returned by <code>next</code> or
- * <code>previous</code> from the list.
- *
- * @exception UnsupportedOperationException
- * when removing is not supported by the list being iterated
- * @exception IllegalStateException
- * when <code>next</code> or <code>previous</code> have
- * not been called, or <code>remove</code> or
- * <code>add</code> have already been called after the last
- * call to <code>next</code> or <code>previous</code>
- */
- public void remove();
-
- /**
- * Replaces the last object returned by <code>next</code> or
- * <code>previous</code> with the specified object.
- *
- * @param object
- * the object to add
- *
- * @exception UnsupportedOperationException
- * when adding is not supported by the list being iterated
- * @exception ClassCastException
- * when the class of the object is inappropriate for the list
- * @exception IllegalArgumentException
- * when the object cannot be added to the list
- * @exception IllegalStateException
- * when <code>next</code> or <code>previous</code> have
- * not been called, or <code>remove</code> or
- * <code>add</code> have already been called after the last
- * call to <code>next</code> or <code>previous</code>
- */
- void set(E object);
+
+ /**
+ * Inserts the specified object into the list between <code>next</code>
+ * and <code>previous</code>. The object inserted will be the previous
+ * object.
+ *
+ * @param object
+ * the object to insert
+ *
+ * @exception UnsupportedOperationException
+ * when adding is not supported by the list being iterated
+ * @exception ClassCastException
+ * when the class of the object is inappropriate for the list
+ * @exception IllegalArgumentException
+ * when the object cannot be added to the list
+ */
+ void add(E object);
+
+ /**
+ * Answers if there are more elements to iterate.
+ *
+ * @return true if there are more elements, false otherwise
+ *
+ * @see #next
+ */
+ public boolean hasNext();
+
+ /**
+ * Answers if there are previous elements to iterate.
+ *
+ * @return true if there are previous elements, false otherwise
+ *
+ * @see #previous
+ */
+ public boolean hasPrevious();
+
+ /**
+ * Answers the next object in the iteration.
+ *
+ * @return the next object
+ *
+ * @exception NoSuchElementException
+ * when there are no more elements
+ *
+ * @see #hasNext
+ */
+ public E next();
+
+ /**
+ * Answers the index of the next object in the iteration.
+ *
+ * @return the index of the next object
+ *
+ * @exception NoSuchElementException
+ * when there are no more elements
+ *
+ * @see #next
+ */
+ public int nextIndex();
+
+ /**
+ * Answers the previous object in the iteration.
+ *
+ * @return the previous object
+ *
+ * @exception NoSuchElementException
+ * when there are no previous elements
+ *
+ * @see #hasPrevious
+ */
+ public E previous();
+
+ /**
+ * Answers the index of the previous object in the iteration.
+ *
+ * @return the index of the previous object
+ *
+ * @exception NoSuchElementException
+ * when there are no previous elements
+ *
+ * @see #previous
+ */
+ public int previousIndex();
+
+ /**
+ * Removes the last object returned by <code>next</code> or
+ * <code>previous</code> from the list.
+ *
+ * @exception UnsupportedOperationException
+ * when removing is not supported by the list being iterated
+ * @exception IllegalStateException
+ * when <code>next</code> or <code>previous</code> have
+ * not been called, or <code>remove</code> or
+ * <code>add</code> have already been called after the last
+ * call to <code>next</code> or <code>previous</code>
+ */
+ public void remove();
+
+ /**
+ * Replaces the last object returned by <code>next</code> or
+ * <code>previous</code> with the specified object.
+ *
+ * @param object
+ * the object to add
+ *
+ * @exception UnsupportedOperationException
+ * when adding is not supported by the list being iterated
+ * @exception ClassCastException
+ * when the class of the object is inappropriate for the list
+ * @exception IllegalArgumentException
+ * when the object cannot be added to the list
+ * @exception IllegalStateException
+ * when <code>next</code> or <code>previous</code> have
+ * not been called, or <code>remove</code> or
+ * <code>add</code> have already been called after the last
+ * call to <code>next</code> or <code>previous</code>
+ */
+ void set(E object);
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Locale.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Locale.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Locale.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Locale.java Wed Dec 5 04:25:42 2007
@@ -171,8 +171,8 @@
.doPrivileged(new PriviAction<String>("user.language", "en")); //$NON-NLS-1$ //$NON-NLS-2$
String region = AccessController.doPrivileged(new PriviAction<String>(
"user.country", "US")); //$NON-NLS-1$ //$NON-NLS-2$
- String variant = AccessController
- .doPrivileged(new PriviAction<String>("user.variant", "")); //$NON-NLS-1$ //$NON-NLS-2$
+ String variant = AccessController.doPrivileged(new PriviAction<String>(
+ "user.variant", "")); //$NON-NLS-1$ //$NON-NLS-2$
defaultLocale = new Locale(language, region, variant);
}
@@ -192,6 +192,7 @@
/**
* Constructs a new Locale using the specified language.
+ *
* @param language
*
*/
@@ -201,6 +202,7 @@
/**
* Constructs a new Locale using the specified language and country codes.
+ *
* @param language
* @param country
*
@@ -216,9 +218,9 @@
* @param language
* @param country
* @param variant
- * @throws NullPointerException if <code>language</code>,
- * <code>country</code> or <code>variant</code> is
- * <code>null</code>.
+ * @throws NullPointerException
+ * if <code>language</code>, <code>country</code> or
+ * <code>variant</code> is <code>null</code>.
*/
public Locale(String language, String country, String variant) {
if (language == null || country == null || variant == null) {
@@ -317,7 +319,8 @@
String name = list[i];
if (name.startsWith(classPrefix)
&& name.endsWith(".class")) { //$NON-NLS-1$
- result.add(name.substring(0,
+ result
+ .add(name.substring(0,
name.length() - 6));
}
}
@@ -333,7 +336,8 @@
String name = e.getName();
if (name.startsWith(prefix)
&& name.endsWith(".class")) {//$NON-NLS-1$
- result.add(name.substring(last+1, name.length() - 6));
+ result.add(name.substring(last + 1, name
+ .length() - 6));
}
}
zip.close();
@@ -349,8 +353,8 @@
int index = name.indexOf('_');
int nextIndex = name.indexOf('_', index + 1);
if (nextIndex == -1) {
- locales[i++] = new Locale(name
- .substring(index + 1, name.length()), ""); //$NON-NLS-1$
+ locales[i++] = new Locale(name.substring(index + 1, name
+ .length()), ""); //$NON-NLS-1$
}else{
String language = name.substring(index + 1, nextIndex);
String variant;
@@ -642,7 +646,8 @@
*/
public static String[] getISOLanguages() {
ListResourceBundle bundle = new Language();
- Enumeration<String> keys = bundle.getKeys(); // to initialize the table
+ Enumeration<String> keys = bundle.getKeys(); // to initialize the
+ // table
String[] result = new String[bundle.table.size()];
int index = 0;
while (keys.hasMoreElements()) {
@@ -730,9 +735,11 @@
}
static ResourceBundle getBundle(final String clName, final Locale locale) {
- return AccessController.doPrivileged(new PrivilegedAction<ResourceBundle>() {
+ return AccessController
+ .doPrivileged(new PrivilegedAction<ResourceBundle>() {
public ResourceBundle run() {
- return ResourceBundle.getBundle("org.apache.harmony.luni.internal.locale." //$NON-NLS-1$
+ return ResourceBundle.getBundle(
+ "org.apache.harmony.luni.internal.locale." //$NON-NLS-1$
+ clName, locale);
}
});
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MapEntry.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MapEntry.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MapEntry.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MapEntry.java Wed Dec 5 04:25:42 2007
@@ -17,72 +17,71 @@
package java.util;
-
/**
* MapEntry is an internal class which provides an implementation of Map.Entry.
*/
-class MapEntry<K,V> implements Map.Entry<K,V>, Cloneable {
-
- K key;
+class MapEntry<K, V> implements Map.Entry<K, V>, Cloneable {
+
+ K key;
V value;
- interface Type<RT,KT,VT> {
- RT get(MapEntry<KT,VT> entry);
- }
-
- MapEntry(K theKey) {
- key = theKey;
- }
-
- MapEntry(K theKey, V theValue) {
- key = theKey;
- value = theValue;
- }
+ interface Type<RT, KT, VT> {
+ RT get(MapEntry<KT, VT> entry);
+ }
+
+ MapEntry(K theKey) {
+ key = theKey;
+ }
+
+ MapEntry(K theKey, V theValue) {
+ key = theKey;
+ value = theValue;
+ }
- @Override
+ @Override
public Object clone() {
- try {
- return super.clone();
- } catch (CloneNotSupportedException e) {
- return null;
- }
- }
+ try {
+ return super.clone();
+ } catch (CloneNotSupportedException e) {
+ return null;
+ }
+ }
- @Override
+ @Override
public boolean equals(Object object) {
- if (this == object) {
+ if (this == object) {
return true;
}
- if (object instanceof Map.Entry) {
- Map.Entry<?, ?> entry = (Map.Entry<?, ?>) object;
- return (key == null ? entry.getKey() == null : key.equals(entry
- .getKey()))
- && (value == null ? entry.getValue() == null : value
- .equals(entry.getValue()));
- }
+ if (object instanceof Map.Entry) {
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>) object;
+ return (key == null ? entry.getKey() == null : key.equals(entry
+ .getKey()))
+ && (value == null ? entry.getValue() == null : value
+ .equals(entry.getValue()));
+ }
return false;
- }
+ }
- public K getKey() {
- return key;
- }
+ public K getKey() {
+ return key;
+ }
- public V getValue() {
- return value;
- }
+ public V getValue() {
+ return value;
+ }
- @Override
+ @Override
public int hashCode() {
- return (key == null ? 0 : key.hashCode())
- ^ (value == null ? 0 : value.hashCode());
- }
-
- public V setValue(V object) {
- V result = value;
- value = object;
- return result;
- }
-
+ return (key == null ? 0 : key.hashCode())
+ ^ (value == null ? 0 : value.hashCode());
+ }
+
+ public V setValue(V object) {
+ V result = value;
+ value = object;
+ return result;
+ }
+
@Override
public String toString() {
return key + "=" + value;
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingFormatArgumentException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingFormatArgumentException.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingFormatArgumentException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingFormatArgumentException.java Wed Dec 5 04:25:42 2007
@@ -20,43 +20,44 @@
/**
* The unchecked exception will be thrown out if there no corresponding argument
- * with the specified conversion or an argument index that refers to a
- * missing argument.
+ * with the specified conversion or an argument index that refers to a missing
+ * argument.
*/
public class MissingFormatArgumentException extends IllegalFormatException {
- private static final long serialVersionUID = 19190115L;
- private String s;
+ private static final long serialVersionUID = 19190115L;
- /**
- * Constructs an MissingFormatArgumentException with the specified
- * conversion that lacks the argument.
- *
- * @param s
- * The specified conversion that lacks the argument.
- */
- public MissingFormatArgumentException(String s) {
- if (null == s) {
- throw new NullPointerException();
- }
- this.s = s;
- }
+ private String s;
- /**
- * Returns the conversion associated with the exception.
- *
- * @return The conversion associated with the exception.
- */
- public String getFormatSpecifier() {
- return s;
- }
+ /**
+ * Constructs an MissingFormatArgumentException with the specified
+ * conversion that lacks the argument.
+ *
+ * @param s
+ * The specified conversion that lacks the argument.
+ */
+ public MissingFormatArgumentException(String s) {
+ if (null == s) {
+ throw new NullPointerException();
+ }
+ this.s = s;
+ }
- /**
- * Returns the message of the exception.
- *
- * @return The message of the exception.
- */
- @Override
+ /**
+ * Returns the conversion associated with the exception.
+ *
+ * @return The conversion associated with the exception.
+ */
+ public String getFormatSpecifier() {
+ return s;
+ }
+
+ /**
+ * Returns the message of the exception.
+ *
+ * @return The message of the exception.
+ */
+ @Override
public String getMessage() {
return Msg.getString("K0348", s);
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingFormatWidthException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingFormatWidthException.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingFormatWidthException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingFormatWidthException.java Wed Dec 5 04:25:42 2007
@@ -19,45 +19,44 @@
/**
* The unchecked exception will be thrown out if the format width is missing but
* is required.
- *
- *
*/
public class MissingFormatWidthException extends IllegalFormatException {
- private static final long serialVersionUID = 15560123L;
- private String s;
+ private static final long serialVersionUID = 15560123L;
- /**
- * Constructs a MissingFormatWidthException with the specified format
- * specifier.
- *
- * @param s
- * The specified format specifier.
- */
- public MissingFormatWidthException(String s) {
- if (null == s) {
- throw new NullPointerException();
- }
- this.s = s;
- }
+ private String s;
- /**
- * Returns the format specifier associated with the exception.
- *
- * @return The format specifier associated with the exception.
- */
- public String getFormatSpecifier() {
- return s;
- }
+ /**
+ * Constructs a MissingFormatWidthException with the specified format
+ * specifier.
+ *
+ * @param s
+ * The specified format specifier.
+ */
+ public MissingFormatWidthException(String s) {
+ if (null == s) {
+ throw new NullPointerException();
+ }
+ this.s = s;
+ }
- /**
- * Returns the message of the exception.
- *
- * @return The message of the exception.
- */
- @Override
+ /**
+ * Returns the format specifier associated with the exception.
+ *
+ * @return The format specifier associated with the exception.
+ */
+ public String getFormatSpecifier() {
+ return s;
+ }
+
+ /**
+ * Returns the message of the exception.
+ *
+ * @return The message of the exception.
+ */
+ @Override
public String getMessage() {
- return s;
- }
+ return s;
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingResourceException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingResourceException.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingResourceException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingResourceException.java Wed Dec 5 04:25:42 2007
@@ -17,7 +17,6 @@
package java.util;
-
/**
* This runtime exception is thrown by ResourceBundle when a resouce bundle
* cannot be found or a resource is missing from a resource bundle.
@@ -26,47 +25,47 @@
*/
public class MissingResourceException extends RuntimeException {
- private static final long serialVersionUID = -4876345176062000401L;
-
- String className, key;
-
- /**
- * Constructs a new instance of this class with its walkback, message, the
- * class name of the resource bundle and the name of the missing resource.
- *
- * @param detailMessage
- * String The detail message for the exception.
- * @param className
- * String The class name of the resource bundle.
- * @param resourceName
- * String The name of the missing resource.
- */
- public MissingResourceException(String detailMessage, String className,
- String resourceName) {
- super(detailMessage);
- this.className = className;
- key = resourceName;
- }
+ private static final long serialVersionUID = -4876345176062000401L;
- /**
- * Answers the class name of the resource bundle from which a resource could
- * not be found, or in the case of a missing resource, the name of the
- * missing resource bundle.
- *
- * @return String The class name of the resource bundle.
- */
- public String getClassName() {
- return className;
- }
+ String className, key;
- /**
- * Answers the name of the missing resource, or an empty string if the
- * resource bundle is missing.
- *
- * @return String The name of the missing resource.
- */
- public String getKey() {
- return key;
- }
+ /**
+ * Constructs a new instance of this class with its walkback, message, the
+ * class name of the resource bundle and the name of the missing resource.
+ *
+ * @param detailMessage
+ * String The detail message for the exception.
+ * @param className
+ * String The class name of the resource bundle.
+ * @param resourceName
+ * String The name of the missing resource.
+ */
+ public MissingResourceException(String detailMessage, String className,
+ String resourceName) {
+ super(detailMessage);
+ this.className = className;
+ key = resourceName;
+ }
+
+ /**
+ * Answers the class name of the resource bundle from which a resource could
+ * not be found, or in the case of a missing resource, the name of the
+ * missing resource bundle.
+ *
+ * @return String The class name of the resource bundle.
+ */
+ public String getClassName() {
+ return className;
+ }
+
+ /**
+ * Answers the name of the missing resource, or an empty string if the
+ * resource bundle is missing.
+ *
+ * @return String The name of the missing resource.
+ */
+ public String getKey() {
+ return key;
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/NoSuchElementException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/NoSuchElementException.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/NoSuchElementException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/NoSuchElementException.java Wed Dec 5 04:25:42 2007
@@ -17,7 +17,6 @@
package java.util;
-
/**
* This runtime exception is thrown when trying to retrieve an element past the
* end of an Enumeration, or the first or last element from an empty Vector.
@@ -27,24 +26,24 @@
*/
public class NoSuchElementException extends RuntimeException {
- private static final long serialVersionUID = 6769829250639411880L;
+ private static final long serialVersionUID = 6769829250639411880L;
- /**
- * Constructs a new instance of this class with its walkback filled in.
- */
- public NoSuchElementException() {
- super();
- }
+ /**
+ * Constructs a new instance of this class with its walkback filled in.
+ */
+ public NoSuchElementException() {
+ 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 NoSuchElementException(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 NoSuchElementException(String detailMessage) {
+ super(detailMessage);
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Observer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Observer.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Observer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Observer.java Wed Dec 5 04:25:42 2007
@@ -17,18 +17,20 @@
package java.util;
-
/**
* Observer must be implemented by objects which are added to an Observable.
*/
public interface Observer {
- /*
- * When the specified observable object's <code>notifyObservers</code>
- * method is called and the observable object has changed, this method is
- * called.
- *
- * @param observable the observable object @param data the data passed to
- * <code>notifyObservers</code>
- */
- void update(Observable observable, Object data);
+
+ /**
+ * When the specified observable object's <code>notifyObservers</code>
+ * method is called and the observable object has changed, this method is
+ * called.
+ *
+ * @param observable
+ * the observable object
+ * @param data
+ * the data passed to <code>notifyObservers</code>
+ */
+ void update(Observable observable, Object data);
}