From 1ea63ef8be1cc54dd0de9d82c684713a1dcf1e06 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 23 Sep 2005 21:31:04 +0000 Subject: Imported Classpath 0.18. * sources.am, Makefile.in: Updated. * Makefile.am (nat_source_files): Removed natProxy.cc. * java/lang/reflect/natProxy.cc: Removed. * gnu/classpath/jdwp/VMFrame.java, gnu/classpath/jdwp/VMIdManager.java, gnu/classpath/jdwp/VMVirtualMachine.java, java/lang/reflect/VMProxy.java: New files. 2005-09-23 Thomas Fitzsimmons * scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC list. 2005-09-23 Thomas Fitzsimmons * gnu/java/net/DefaultContentHandlerFactory.java (getContent): Remove ClasspathToolkit references. 2005-09-23 Thomas Fitzsimmons * gnu/awt/xlib/XCanvasPeer.java: Add new peer methods. * gnu/awt/xlib/XFramePeer.java: Likewise. * gnu/awt/xlib/XGraphicsConfiguration.java: Likewise. 2005-09-23 Thomas Fitzsimmons * Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c. Add classpath/native/jawt/jawt.c. * Makefile.in: Regenerate. * jawt.c: Remove file. * include/Makefile.am (tool_include__HEADERS): Remove jawt.h and jawt_md.h. Add ../classpath/include/jawt.h and ../classpath/include/jawt_md.h. * include/Makefile.in: Regenerate. * include/jawt.h: Regenerate. * include/jawt_md.h: Regenerate. From-SVN: r104586 --- .../java/text/CollationElementIterator.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'libjava/classpath/java/text/CollationElementIterator.java') diff --git a/libjava/classpath/java/text/CollationElementIterator.java b/libjava/classpath/java/text/CollationElementIterator.java index 60b148ef7c1..45c79142cc7 100644 --- a/libjava/classpath/java/text/CollationElementIterator.java +++ b/libjava/classpath/java/text/CollationElementIterator.java @@ -177,9 +177,11 @@ public final class CollationElementIterator * This method returns the primary order value for the given collation * value. * - * @param value The collation value returned from next() or previous(). + * @param order The collation value returned from next() or + * previous(). * - * @return The primary order value of the specified collation value. This is the high 16 bits. + * @return The primary order value of the specified collation value. This is + * the high 16 bits. */ public static int primaryOrder(int order) { @@ -201,9 +203,11 @@ public final class CollationElementIterator * This method returns the secondary order value for the given collation * value. * - * @param value The collation value returned from next() or previous(). + * @param order The collation value returned from next() or + * previous(). * - * @return The secondary order value of the specified collation value. This is the bits 8-15. + * @return The secondary order value of the specified collation value. This + * is the bits 8-15. */ public static short secondaryOrder(int order) { @@ -215,9 +219,11 @@ public final class CollationElementIterator * This method returns the tertiary order value for the given collation * value. * - * @param value The collation value returned from next() or previous(). + * @param order The collation value returned from next() or + * previous(). * - * @return The tertiary order value of the specified collation value. This is the low eight bits. + * @return The tertiary order value of the specified collation value. This + * is the low eight bits. */ public static short tertiaryOrder(int order) { @@ -458,7 +464,7 @@ public final class CollationElementIterator * * @param value The collation order value * - * @param The maximum length of an expansion sequence. + * @return The maximum length of an expansion sequence. */ public int getMaxExpansion(int value) { -- cgit v1.2.3