diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-03-18 06:00:25 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-03-18 06:00:25 +0000 |
| commit | f4f5d1d62161cc99ecfc68495d501342aa1e61dc (patch) | |
| tree | 9f83602fa5fd87c7741475487fab1b0b3a3e47ab /libjava/java/io/ObjectStreamField.java | |
| parent | 61f1ed592c606d1d2ae272292ad4dbe37d71d78b (diff) | |
| download | gcc-f4f5d1d62161cc99ecfc68495d501342aa1e61dc.zip gcc-f4f5d1d62161cc99ecfc68495d501342aa1e61dc.tar.gz gcc-f4f5d1d62161cc99ecfc68495d501342aa1e61dc.tar.bz2 | |
BufferedReader.java, [...]: Merged from classpath.
2003-03-18 Michael Koch <konqueror@gmx.de>
* java/io/BufferedReader.java,
java/io/BufferedWriter.java,
java/io/ByteArrayOutputStream.java,
java/io/FileFilter.java,
java/io/FilePermission.java,
java/io/FileReader.java,
java/io/FileWriter.java,
java/io/FilenameFilter.java,
java/io/FilterInputStream.java,
java/io/FilterOutputStream.java,
java/io/FilterReader.java,
java/io/FilterWriter.java,
java/io/ObjectInput.java,
java/io/ObjectInputValidation.java,
java/io/ObjectOutput.java,
java/io/ObjectStreamField.java,
java/io/PipedInputStream.java,
java/io/PipedReader.java,
java/io/PrintWriter.java,
java/io/PushbackReader.java,
java/io/Reader.java,
java/io/SerializablePermission.java,
java/io/StringReader.java,
java/io/Writer.java:
Merged from classpath.
From-SVN: r64525
Diffstat (limited to 'libjava/java/io/ObjectStreamField.java')
| -rw-r--r-- | libjava/java/io/ObjectStreamField.java | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/libjava/java/io/ObjectStreamField.java b/libjava/java/io/ObjectStreamField.java index bb78a78..56f0d1a 100644 --- a/libjava/java/io/ObjectStreamField.java +++ b/libjava/java/io/ObjectStreamField.java @@ -1,5 +1,5 @@ /* ObjectStreamField.java -- Class used to store name and class of fields - Copyright (C) 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,17 +51,21 @@ public class ObjectStreamField implements java.lang.Comparable } /** - * There're many cases you can't get java.lang.Class from typename if your context + * There're many cases you can't get java.lang.Class from typename + * if your context * class loader can't load it, then use typename to construct the field */ ObjectStreamField (String name, String typename){ this.name = name; this.typename = typename; - try{ - type = TypeSignature.getClassForEncoding(typename); - }catch(ClassNotFoundException e){ - type = Object.class; //?? - } + try + { + type = TypeSignature.getClassForEncoding(typename); + } + catch(ClassNotFoundException e) + { + type = Object.class; //FIXME: ??? + } } public String getName () @@ -125,3 +129,4 @@ public class ObjectStreamField implements java.lang.Comparable private String typename; private int offset = -1; // XXX make sure this is correct } + |