summaryrefslogtreecommitdiff
path: root/gnu/java
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2004-10-25 17:03:31 +0000
committerTom Tromey <tromey@redhat.com>2004-10-25 17:03:31 +0000
commit40c8f1fe891769961f46f76e0b01094f14f9a22d (patch)
treed869a079de07c6d7f07bd20d9e8cfc7432d02203 /gnu/java
parent10ce56ab5dd02e65c0b76bcf463521743c8b1f9d (diff)
downloadclasspath-40c8f1fe891769961f46f76e0b01094f14f9a22d.tar.gz
* 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.
Diffstat (limited to 'gnu/java')
-rw-r--r--gnu/java/text/BaseBreakIterator.java11
-rw-r--r--gnu/java/text/CharacterBreakIterator.java3
-rw-r--r--gnu/java/text/LineBreakIterator.java3
-rw-r--r--gnu/java/text/SentenceBreakIterator.java3
-rw-r--r--gnu/java/text/WordBreakIterator.java3
5 files changed, 14 insertions, 9 deletions
diff --git a/gnu/java/text/BaseBreakIterator.java b/gnu/java/text/BaseBreakIterator.java
index 5bb6f6ece..40a698f7c 100644
--- a/gnu/java/text/BaseBreakIterator.java
+++ b/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/gnu/java/text/CharacterBreakIterator.java b/gnu/java/text/CharacterBreakIterator.java
index 5d2036c35..c973f7b87 100644
--- a/gnu/java/text/CharacterBreakIterator.java
+++ b/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/gnu/java/text/LineBreakIterator.java b/gnu/java/text/LineBreakIterator.java
index e1cb49c7d..7f00a95df 100644
--- a/gnu/java/text/LineBreakIterator.java
+++ b/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/gnu/java/text/SentenceBreakIterator.java b/gnu/java/text/SentenceBreakIterator.java
index 405bbc540..3d3958728 100644
--- a/gnu/java/text/SentenceBreakIterator.java
+++ b/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/gnu/java/text/WordBreakIterator.java b/gnu/java/text/WordBreakIterator.java
index 39dbefe6e..85c44da45 100644
--- a/gnu/java/text/WordBreakIterator.java
+++ b/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)