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
This commit is contained in:
parent
61f1ed592c
commit
f4f5d1d621
25 changed files with 1138 additions and 1104 deletions
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue