diff options
author | Tom Tromey <tromey@redhat.com> | 2004-10-25 16:56:00 +0000 |
---|---|---|
committer | Tom Tromey <tromey@gcc.gnu.org> | 2004-10-25 16:56:00 +0000 |
commit | 6fc058da980d2f4bbb0036936eef7b11df743565 (patch) | |
tree | a98c39bf5aded670d2cead5a42435254efc9d25a /libjava/gnu/java | |
parent | 5cfffc4e1671d6842360b3d5ff53ee5b1d8c2f8c (diff) | |
download | gcc-6fc058da980d2f4bbb0036936eef7b11df743565.zip gcc-6fc058da980d2f4bbb0036936eef7b11df743565.tar.gz gcc-6fc058da980d2f4bbb0036936eef7b11df743565.tar.bz2 |
WordBreakIterator.java (WordBreakIterator): Don't initialize `iter'.
* gnu/java/text/WordBreakIterator.java (WordBreakIterator): Don't
initialize `iter'.
* gnu/java/text/SentenceBreakIterator.java
(SentenceBreakIterator): Don't initialize `iter'.
* gnu/java/text/LineBreakIterator.java (LineBreakIterator): Don't
initialize `iter'.
* gnu/java/text/CharacterBreakIterator.java
(CharacterBreakIterator): Don't initialize `iter'.
* gnu/java/text/BaseBreakIterator.java (BaseBreakIterator): New
constructor.
* java/text/BreakIterator.java: Updated documentation.
From-SVN: r89539
Diffstat (limited to 'libjava/gnu/java')
-rw-r--r-- | libjava/gnu/java/text/BaseBreakIterator.java | 11 | ||||
-rw-r--r-- | libjava/gnu/java/text/CharacterBreakIterator.java | 3 | ||||
-rw-r--r-- | libjava/gnu/java/text/LineBreakIterator.java | 3 | ||||
-rw-r--r-- | libjava/gnu/java/text/SentenceBreakIterator.java | 3 | ||||
-rw-r--r-- | libjava/gnu/java/text/WordBreakIterator.java | 3 |
5 files changed, 14 insertions, 9 deletions
diff --git a/libjava/gnu/java/text/BaseBreakIterator.java b/libjava/gnu/java/text/BaseBreakIterator.java index 5bb6f6e..40a698f 100644 --- a/libjava/gnu/java/text/BaseBreakIterator.java +++ b/libjava/gnu/java/text/BaseBreakIterator.java @@ -1,5 +1,5 @@ /* BaseBreakIterator.java -- Base class for default BreakIterators - Copyright (C) 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1999, 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,6 +40,7 @@ package gnu.java.text; import java.text.BreakIterator; import java.text.CharacterIterator; +import java.text.StringCharacterIterator; /** * @author Tom Tromey <tromey@cygnus.com> @@ -48,6 +49,14 @@ import java.text.CharacterIterator; public abstract class BaseBreakIterator extends BreakIterator { + public BaseBreakIterator () + { + // It isn't documented, but break iterators are created in a + // working state; their methods won't throw exceptions before + // setText(). + iter = new StringCharacterIterator(""); + } + public int current () { return iter.getIndex(); diff --git a/libjava/gnu/java/text/CharacterBreakIterator.java b/libjava/gnu/java/text/CharacterBreakIterator.java index 5d2036c..c973f7b 100644 --- a/libjava/gnu/java/text/CharacterBreakIterator.java +++ b/libjava/gnu/java/text/CharacterBreakIterator.java @@ -1,5 +1,5 @@ /* CharacterBreakIterator.java - Default character BreakIterator. - Copyright (C) 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1999, 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -69,7 +69,6 @@ public class CharacterBreakIterator extends BaseBreakIterator public CharacterBreakIterator () { - iter = null; // FIXME? } private CharacterBreakIterator (CharacterBreakIterator other) diff --git a/libjava/gnu/java/text/LineBreakIterator.java b/libjava/gnu/java/text/LineBreakIterator.java index e1cb49c7..7f00a95 100644 --- a/libjava/gnu/java/text/LineBreakIterator.java +++ b/libjava/gnu/java/text/LineBreakIterator.java @@ -1,5 +1,5 @@ /* LineBreakIterator.java - Default word BreakIterator. - Copyright (C) 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1999, 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,7 +55,6 @@ public class LineBreakIterator extends BaseBreakIterator public LineBreakIterator () { - iter = null; } private LineBreakIterator (LineBreakIterator other) diff --git a/libjava/gnu/java/text/SentenceBreakIterator.java b/libjava/gnu/java/text/SentenceBreakIterator.java index 405bbc5..3d39587 100644 --- a/libjava/gnu/java/text/SentenceBreakIterator.java +++ b/libjava/gnu/java/text/SentenceBreakIterator.java @@ -1,5 +1,5 @@ /* SentenceBreakIterator.java - Default sentence BreakIterator. - Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2001, 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,7 +55,6 @@ public class SentenceBreakIterator extends BaseBreakIterator public SentenceBreakIterator () { - iter = null; } private SentenceBreakIterator (SentenceBreakIterator other) diff --git a/libjava/gnu/java/text/WordBreakIterator.java b/libjava/gnu/java/text/WordBreakIterator.java index 39dbefe..85c44da 100644 --- a/libjava/gnu/java/text/WordBreakIterator.java +++ b/libjava/gnu/java/text/WordBreakIterator.java @@ -1,5 +1,5 @@ /* WordBreakIterator.java - Default word BreakIterator. - Copyright (C) 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1999, 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,7 +55,6 @@ public class WordBreakIterator extends BaseBreakIterator public WordBreakIterator () { - iter = null; } private WordBreakIterator (WordBreakIterator other) |