diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/nio/DirectByteBufferImpl.java | 25 | ||||
| -rw-r--r-- | libjava/java/text/DateFormat.java | 2 | ||||
| -rw-r--r-- | libjava/java/text/SimpleDateFormat.java | 7 | ||||
| -rw-r--r-- | libjava/java/util/Calendar.java | 6 | ||||
| -rw-r--r-- | libjava/java/util/SimpleTimeZone.java | 5 |
5 files changed, 24 insertions, 21 deletions
diff --git a/libjava/java/nio/DirectByteBufferImpl.java b/libjava/java/nio/DirectByteBufferImpl.java index d2871641191..83279382a22 100644 --- a/libjava/java/nio/DirectByteBufferImpl.java +++ b/libjava/java/nio/DirectByteBufferImpl.java @@ -42,18 +42,19 @@ import gnu.gcj.RawData; abstract class DirectByteBufferImpl extends ByteBuffer { - /** The owner is used to keep alive the object that actually owns the - * memory. There are three possibilities: - * 1) owner == this: We allocated the memory and we should free it, - * but *only* in finalize (if we've been sliced - * other objects will also have access to the - * memory). - * 2) owner == null: The byte buffer was created thru - * JNI.NewDirectByteBuffer. The JNI code is - * responsible for freeing the memory. - * 3) owner == some other object: The other object allocated the - * memory and should free it. - */ + /** + * The owner is used to keep alive the object that actually owns the + * memory. There are three possibilities: + * 1) owner == this: We allocated the memory and we should free it, + * but *only* in finalize (if we've been sliced + * other objects will also have access to the + * memory). + * 2) owner == null: The byte buffer was created thru + * JNI.NewDirectByteBuffer. The JNI code is + * responsible for freeing the memory. + * 3) owner == some other object: The other object allocated the + * memory and should free it. + */ private final Object owner; static final class ReadOnly extends DirectByteBufferImpl diff --git a/libjava/java/text/DateFormat.java b/libjava/java/text/DateFormat.java index f19817ee2da..1571672dc43 100644 --- a/libjava/java/text/DateFormat.java +++ b/libjava/java/text/DateFormat.java @@ -494,7 +494,7 @@ public abstract class DateFormat extends Format implements Cloneable * This method returns a list of available locales supported by this * class. */ - public static Locale[] getAvailableLocales () + public static Locale[] getAvailableLocales() { // FIXME Locale[] l = new Locale[1]; diff --git a/libjava/java/text/SimpleDateFormat.java b/libjava/java/text/SimpleDateFormat.java index d8e15f2aeca..ce833b661a8 100644 --- a/libjava/java/text/SimpleDateFormat.java +++ b/libjava/java/text/SimpleDateFormat.java @@ -45,8 +45,8 @@ import gnu.java.text.FormatBuffer; import gnu.java.text.FormatCharacterIterator; import gnu.java.text.StringFormatBuffer; -import java.io.InvalidObjectException; import java.io.IOException; +import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.util.ArrayList; import java.util.Calendar; @@ -97,7 +97,8 @@ public class SimpleDateFormat extends DateFormat * @param s the size of the field. * @param c the character used. */ - public CompiledField(int f, int s, char c) { + public CompiledField(int f, int s, char c) + { field = f; size = s; character = c; @@ -169,7 +170,7 @@ public class SimpleDateFormat extends DateFormat * @see DateFormatSymbols * @serial The localisation data. May not be null. */ - private DateFormatSymbols formatData; // formatData + private DateFormatSymbols formatData; /** * The date representing the start of the century diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java index 8a37c5e695e..0e9284c7c21 100644 --- a/libjava/java/util/Calendar.java +++ b/libjava/java/util/Calendar.java @@ -1,5 +1,5 @@ /* Calendar.java -- - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -398,10 +398,10 @@ public abstract class Calendar implements Serializable, Cloneable * The version of the serialized data on the stream. * <dl><dt>0 or not present</dt> * <dd> JDK 1.1.5 or later.</dd> - * <dl><dt>1</dt> + * <dt>1</dt> * <dd>JDK 1.1.6 or later. This always writes a correct `time' value * on the stream, as well as the other fields, to be compatible with - * earlier versions</dd> + * earlier versions</dd></dl> * @since JDK1.1.6 * @serial */ diff --git a/libjava/java/util/SimpleTimeZone.java b/libjava/java/util/SimpleTimeZone.java index e50d92fab49..4da1847a29c 100644 --- a/libjava/java/util/SimpleTimeZone.java +++ b/libjava/java/util/SimpleTimeZone.java @@ -1,5 +1,5 @@ /* java.util.SimpleTimeZone - Copyright (C) 1998, 1999, 2000, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -71,7 +71,7 @@ public class SimpleTimeZone extends TimeZone /** * The daylight savings offset. This is a positive offset in * milliseconds with respect to standard time. Typically this - * is one hour, but for some time zones this may be half an our. + * is one hour, but for some time zones this may be half an hour. * @serial * @since JDK1.1.4 */ @@ -228,6 +228,7 @@ public class SimpleTimeZone extends TimeZone * startMode, endMode and dstSavings. And there is a optional section * as described in writeObject. * </dd> + * </dl> * * XXX - JDK 1.2 Beta 4 docu states 1.1.4, but my 1.1.5 has the old * version. |