diff options
| author | Bryce McKinlay <bryce@albatross.co.nz> | 2001-04-02 05:23:10 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-04-02 06:23:10 +0100 |
| commit | 8f58baf480016ba3a3a60b57218104acf05a49bf (patch) | |
| tree | d42597c75d702a648db5a0edd2bb5836d74ce443 /libjava/java/io/File.java | |
| parent | a3406c06c269f8960be29474b19bb1bcb2ac6775 (diff) | |
| download | gcc-8f58baf480016ba3a3a60b57218104acf05a49bf.zip gcc-8f58baf480016ba3a3a60b57218104acf05a49bf.tar.gz gcc-8f58baf480016ba3a3a60b57218104acf05a49bf.tar.bz2 | |
natSystem.cc (init_properties): Revert yesterday's changes to "file.separator"...
* java/lang/natSystem.cc (init_properties): Revert yesterday's changes
to "file.separator", "path.separator", and "java.io.tmpdir" property
initialization.
* java/io/File.java: Likewise.
* java/io/natFile.cc (init_native): Likewise.
* java/io/natFileWin32.cc (init_native): Likewise.
From-SVN: r40994
Diffstat (limited to 'libjava/java/io/File.java')
| -rw-r--r-- | libjava/java/io/File.java | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java index 8d98712..71da255 100644 --- a/libjava/java/io/File.java +++ b/libjava/java/io/File.java @@ -195,11 +195,6 @@ public class File implements Serializable, Comparable FileFilter fileFilter, Class result_type); - // Arguments for the performList function. Specifies whether we want - // File objects or path strings in the returned object array. - private final static int OBJECTS = 0; - private final static int STRINGS = 1; - public String[] list (FilenameFilter filter) { checkRead(); @@ -435,25 +430,23 @@ public class File implements Serializable, Comparable return performSetLastModified(time); } - public static final String separator = null; - public static final String pathSeparator = null; - static final String tmpdir = null; + public static final String pathSeparator + = System.getProperty("path.separator"); + public static final char pathSeparatorChar = pathSeparator.charAt(0); + public static final String separator = System.getProperty("file.separator"); + public static final char separatorChar = separator.charAt(0); + + static final String tmpdir = System.getProperty("java.io.tmpdir"); static int maxPathLen; static boolean caseSensitive; - public static final char separatorChar; - public static final char pathSeparatorChar; - static { init_native(); - pathSeparatorChar = pathSeparator.charAt(0); - separatorChar = separator.charAt(0); } // Native function called at class initialization. This should should - // set the separator, pathSeparator, tmpdir, maxPathLen, and caseSensitive - // variables. + // set the maxPathLen and caseSensitive variables. private static native void init_native(); // The path. |