From d5dde5342ae3b35beca6e30210610326e195afe0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 10 May 1999 09:23:41 +0000 Subject: [PATCH] natToolkit.cc: Added copyright header. * java/awt/natToolkit.cc: Added copyright header. * java/util/zip/InflaterInputStream.java: Added copyright header. * java/io/FilterWriter.java (FilterWriter): Removed `FIXME' comment. * java/io/SequenceInputStream.java (SequenceInputStream): Removed `FIXME' comment. (getNextStream): Likewise. From-SVN: r26857 --- libjava/ChangeLog | 9 +++++++++ libjava/java/awt/natToolkit.cc | 8 ++++++++ libjava/java/io/FilterWriter.java | 1 - libjava/java/io/SequenceInputStream.java | 2 -- libjava/java/util/zip/InflaterInputStream.java | 8 ++++++++ 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b7d54b391bf..6235e2623d3 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,14 @@ 1999-05-10 Tom Tromey + * java/awt/natToolkit.cc: Added copyright header. + * java/util/zip/InflaterInputStream.java: Added copyright header. + + * java/io/FilterWriter.java (FilterWriter): Removed `FIXME' + comment. + * java/io/SequenceInputStream.java (SequenceInputStream): Removed + `FIXME' comment. + (getNextStream): Likewise. + * java/util/ResourceBundle.java (partialGetBundle): Explicitly use locale.toString(). (getBundle): Don't explicitly throw null pointer exception. diff --git a/libjava/java/awt/natToolkit.cc b/libjava/java/awt/natToolkit.cc index 8a9c0acca24..2d644a6b783 100644 --- a/libjava/java/awt/natToolkit.cc +++ b/libjava/java/awt/natToolkit.cc @@ -1,3 +1,11 @@ +/* Copyright (C) 1999 Cygnus Solutions + + 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. */ + #include /*#define ENABLE_GTK*/ diff --git a/libjava/java/io/FilterWriter.java b/libjava/java/io/FilterWriter.java index 385cc7eee30..d0c167ee1bd 100644 --- a/libjava/java/io/FilterWriter.java +++ b/libjava/java/io/FilterWriter.java @@ -29,7 +29,6 @@ public abstract class FilterWriter extends Writer protected FilterWriter (Writer ox) { - // FIXME: should we really share locks like this? super (ox); out = ox; } diff --git a/libjava/java/io/SequenceInputStream.java b/libjava/java/io/SequenceInputStream.java index 771351784ab..e6c79f3fc10 100644 --- a/libjava/java/io/SequenceInputStream.java +++ b/libjava/java/io/SequenceInputStream.java @@ -33,7 +33,6 @@ public class SequenceInputStream extends InputStream public SequenceInputStream(Enumeration e) { - // FIXME: Assumes that enum contains only InputStreams. enum = e; in = (InputStream) enum.nextElement(); in2 = null; @@ -94,7 +93,6 @@ public class SequenceInputStream extends InputStream { InputStream nextIn = null; - // FIXME: Assumes that enum contains only InputStreams. if (enum != null) { if (enum.hasMoreElements()) diff --git a/libjava/java/util/zip/InflaterInputStream.java b/libjava/java/util/zip/InflaterInputStream.java index e064c9845c8..1b6290a4fc1 100644 --- a/libjava/java/util/zip/InflaterInputStream.java +++ b/libjava/java/util/zip/InflaterInputStream.java @@ -1,3 +1,11 @@ +/* Copyright (C) 1999 Cygnus Solutions + + 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. */ + package java.util.zip; import java.io.*;