From f91d1d48e1dbdee20f0b9ad4b14713e6a3a647e3 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 2 Oct 2001 20:59:31 +0000 Subject: * Makefile.am: Add new classes (core_java_source_files): CharSequence (ordinary_java_source_files): Authenticator, PasswordAuthentication * Makefile.in: regenerate * gcj/javaprims.h: ditto * java/lang/CharSequence: new class from Classpath * java/lang/String.java: implements CharSequence (subSequence (int,int)): new method * java/lang/SubString.java: implements CharSequence (subSequence (int,int)): new method remerge comments with Classpath * java/net/Authenticator.java: new class from Classpath * java/net/PasswordAuthentication.java: ditto git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45969 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/lang/CharSequence.java | 80 +++++++++++++++++++++++++++++++++++++ libjava/java/lang/String.java | 24 ++++++++++- libjava/java/lang/StringBuffer.java | 65 ++++++++++++++++++++++-------- 3 files changed, 152 insertions(+), 17 deletions(-) create mode 100644 libjava/java/lang/CharSequence.java (limited to 'libjava/java/lang') diff --git a/libjava/java/lang/CharSequence.java b/libjava/java/lang/CharSequence.java new file mode 100644 index 00000000000..8ba677e063a --- /dev/null +++ b/libjava/java/lang/CharSequence.java @@ -0,0 +1,80 @@ +/* java.lang.CharSequence -- Anything that has an indexed sequence of chars + Copyright (C) 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +As a special exception, if you link this library with other files to +produce an executable, this library does not by itself cause the +resulting executable to be covered by the GNU General Public License. +This exception does not however invalidate any other reasons why the +executable file might be covered by the GNU General Public License. */ + + +package java.lang; + +/** + * General functions on a sequence of chars. This interface is implemented + * by String, StringBuffer and + * CharBuffer to give a uniform way to get chars at a certain + * index, the number of characters in the sequence and a subrange of the + * chars. Indexes start at 0 and the last index is length()-1. + *

+ * Even when classes implement this interface they are not always + * exchangeble because they might implement their compare, equals or hash + * function differently. This means that in general one should not use a + * CharSequence as keys in collections since two sequences + * with the same chars at the same indexes with the same length might not + * have the same hash code, be equal or be comparable since the are + * represented by different classes. + * + * @author Mark Wielaard (mark@klomp.org) + * + * @since 1.4 + */ + +public interface CharSequence { + + /** + * Returns the character at the given index. + * + * @exception IndexOutOfBoundsException when i < 0 or + * i > length()-1. + */ + char charAt(int i); + + /** + * Returns the length of the sequence. + */ + int length(); + + /** + * Returns a new CharSequence of the indicated range. + * + * @exception IndexOutOfBoundsException when begin < 0, + * end < 0, end > length() or + * begin > end + */ + CharSequence subSequence(int begin, int end); + + /** + * Returns the complete CharSequence as a String. + * Classes that implement this interface should return a String + * which contains only the characters in the sequence in the correct order. + */ + String toString(); +} diff --git a/libjava/java/lang/String.java b/libjava/java/lang/String.java index bed3171fb22..8dadfb59cc0 100644 --- a/libjava/java/lang/String.java +++ b/libjava/java/lang/String.java @@ -22,7 +22,7 @@ import java.util.Locale; * Status: Complete to 1.3. */ -public final class String implements Serializable, Comparable +public final class String implements Serializable, Comparable, CharSequence { private Object data; private int boffset; // Note this is a byte offset - don't use in Java code! @@ -297,6 +297,28 @@ public final class String implements Serializable, Comparable } } + /** + * Creates a substring of this String, starting at a specified index + * and ending at one character before a specified index. + *

+ * To implement CharSequence. + * Calls substring(beginIndex, endIndex). + * + * @param beginIndex index to start substring (base 0) + * @param endIndex index after the last character to be + * copied into the substring + * + * @return new String which is a substring of this String + * + * @exception StringIndexOutOfBoundsException + * if (beginIndex < 0 || endIndex > this.length() || beginIndex > endIndex) + */ + public CharSequence subSequence(int beginIndex, int endIndex) + throws IndexOutOfBoundsException + { + return substring(beginIndex, endIndex); + } + public String substring (int beginIndex) { return substring (beginIndex, count); diff --git a/libjava/java/lang/StringBuffer.java b/libjava/java/lang/StringBuffer.java index 211574a5b7e..38978b1d9bd 100644 --- a/libjava/java/lang/StringBuffer.java +++ b/libjava/java/lang/StringBuffer.java @@ -1,21 +1,32 @@ -// StringBuffer.java - Growable strings. - -/* Copyright (C) 1998, 1999, 2000 Free Software Foundation - - This file is part of libgcj. - -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ +/* StringBuffer.java -- Growable strings + Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +As a special exception, if you link this library with other files to +produce an executable, this library does not by itself cause the +resulting executable to be covered by the GNU General Public License. +This exception does not however invalidate any other reasons why the +executable file might be covered by the GNU General Public License. */ package java.lang; import java.io.Serializable; -/** - * @author Tom Tromey - * @date October 23, 1998. - */ - /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3 * Updated using online JDK 1.2 docs. * Believed complete and correct to JDK 1.2. @@ -57,7 +68,7 @@ import java.io.Serializable; * @author Tom Tromey * @see java.lang.String */ -public final class StringBuffer implements Serializable +public final class StringBuffer implements Serializable, CharSequence { /** Append the String value of the argument to this StringBuffer. * Uses String.valueOf() to convert to @@ -198,7 +209,7 @@ public final class StringBuffer implements Serializable * @param index the index of the character to get, starting at 0. * @return the character at the specified index. * @exception IndexOutOfBoundsException if the desired character index - * is not between 0 and length() - 1 (inclusive). + * is negative or greater then length() - 1. */ public synchronized char charAt (int index) { @@ -653,6 +664,28 @@ public final class StringBuffer implements Serializable return new String (value, beginIndex, endIndex - beginIndex); } + /** + * Creates a substring of this StringBuffer, starting at a specified index + * and ending at one character before a specified index. + *

+ * To implement CharSequence. + * Calls substring(beginIndex, endIndex). + * + * @param beginIndex index to start substring (base 0) + * @param endIndex index after the last character to be + * copied into the substring + * + * @return new String which is a substring of this StringBuffer + * + * @exception StringIndexOutOfBoundsException + * if (beginIndex < 0 || endIndex > this.length() || beginIndex > endIndex) + */ + public CharSequence subSequence (int beginIndex, int endIndex) + { + return substring(beginIndex, endIndex); + } + + /** Convert this StringBuffer to a String. * @return the characters in this StringBuffer */ -- cgit v1.2.3