diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-05-04 15:50:34 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-05-04 15:50:34 +0000 |
| commit | c3a5f1656b89e35bea2f988526098f0d178eda4a (patch) | |
| tree | f8a39214ab1068b5c5daff2e7c514fdafb29c17d /libjava/java/text | |
| parent | fb0c90edba18e44b6c7fefdd9fec99b28a97540c (diff) | |
| download | ppe42-gcc-c3a5f1656b89e35bea2f988526098f0d178eda4a.tar.gz ppe42-gcc-c3a5f1656b89e35bea2f988526098f0d178eda4a.zip | |
* java/util/Locale.java (Locale): Don't explicitly check for
null.
* java/util/Hashtable.java (containsKey): Don't explicitly check
for null.
(get): Likewise.
* java/util/BitSet.java (and, or, xor): Don't explicitly check for
null.
* java/util/zip/ZipEntry.java (ZipEntry): Don't explicitly check
for null.
* java/text/StringCharacterIterator.java
(StringCharacterIterator): Don't check for null.
* java/text/ChoiceFormat.java (setChoices): Don't explicitly check
for null pointer.
* java/net/MulticastSocket.java (joinGroup): Don't explicitly
check for null pointer.
(leaveGroup): Likewise.
* java/net/DatagramPacket.java (DatagramPacket): Removed erroneous
comment.
(setData): Likewise.
* java/lang/ThreadGroup.java (ThreadGroup): Don't explicitly check
for `p==null'.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33671 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/text')
| -rw-r--r-- | libjava/java/text/ChoiceFormat.java | 4 | ||||
| -rw-r--r-- | libjava/java/text/StringCharacterIterator.java | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/libjava/java/text/ChoiceFormat.java b/libjava/java/text/ChoiceFormat.java index 92b697c273f..b3bb8341deb 100644 --- a/libjava/java/text/ChoiceFormat.java +++ b/libjava/java/text/ChoiceFormat.java @@ -1,6 +1,6 @@ // ChoiceFormat.java - Formatter for `switch'-like string substitution. -/* Copyright (C) 1999 Free Software Foundation +/* Copyright (C) 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -257,8 +257,6 @@ public class ChoiceFormat extends NumberFormat public void setChoices (double[] limits, String[] strings) { - if (limits == null || strings == null) - throw new NullPointerException (); if (limits.length != strings.length) throw new IllegalArgumentException (); this.strings = (String[]) strings.clone(); diff --git a/libjava/java/text/StringCharacterIterator.java b/libjava/java/text/StringCharacterIterator.java index c41ce4100fd..dc02ce86282 100644 --- a/libjava/java/text/StringCharacterIterator.java +++ b/libjava/java/text/StringCharacterIterator.java @@ -1,6 +1,6 @@ // StringCharacterIterator.java - Iterate over string of Unicode characters. -/* Copyright (C) 1999 Free Software Foundation +/* Copyright (C) 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -106,20 +106,14 @@ public final class StringCharacterIterator implements CharacterIterator public StringCharacterIterator (String text) { - // FIXME: remove check for null once we have compiler/runtime - // support for NullPointerException. - this (text, 0, text == null ? 0 : text.length(), 0); + this (text, 0, text.length(), 0); } public StringCharacterIterator (String text, int pos) { - // FIXME: remove check for null once we have compiler/runtime - // support for NullPointerException. - this (text, 0, text == null ? 0 : text.length(), pos); + this (text, 0, text.length(), pos); } public StringCharacterIterator (String text, int begin, int end, int pos) { - if (text == null) - throw new NullPointerException (); if (begin < 0 || begin > end || end > text.length() // In 1.1 we would also throw if `pos == end'. || pos < begin || pos > end) |
