OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

File.java (toURI): Merge from Classpath.

Browse Source 
2004-07-05  Anthony Green  <green@redhat.com>
                                                                                                                                               * java/io/File.java (toURI): Merge from Classpath.

From-SVN: r84145
This commit is contained in:
Anthony Green 2004-07-06 02:52:54 +00:00 committed by Anthony Green
parent 5377d5ba39
commit 23f99379d3
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libjava/ChangeLog
View File

@ -1,3 +1,7 @@
2004-07-05 Anthony Green <green@redhat.com>
* java/io/File.java (toURI): Merge from Classpath.
2004-07-05 Bryce McKinlay <mckinlay@redhat.com>
* gnu/gcj/runtime/VMClassLoader.java (init): Check classpath entry

24
libjava/java/io/File.java
View File

@ -40,6 +40,8 @@ exception statement from your version. */
package java.io;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import gnu.classpath.Configuration;
import gnu.gcj.runtime.FileDeleter;
@ -874,6 +876,28 @@ public class File implements Serializable, Comparable
return path;
}
/**
* @return A <code>URI</code> for this object.
*/
public URI toURI()
{
String abspath = getAbsolutePath();
if (isDirectory())
abspath = abspath + separator;
try
{
return new URI("file", "", abspath.replace(separatorChar, '/'));
}
catch (URISyntaxException use)
{
// Can't happen.
throw (InternalError) new InternalError("Unconvertible file: "
+ this).initCause(use);
}
}
/**
* This method returns a <code>URL</code> with the <code>file:</code>
* protocol that represents this file. The exact form of this URL is