Imported GNU Classpath 0.90
Imported GNU Classpath 0.90
* scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
* gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
* java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
* java/lang/Math.java: New override file.
* java/lang/Character.java: Merged from Classpath.
(start, end): Now 'int's.
(canonicalName): New field.
(CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
(UnicodeBlock): Added argument.
(of): New overload.
(forName): New method.
Updated unicode blocks.
(sets): Updated.
* sources.am: Regenerated.
* Makefile.in: Likewise.
From-SVN: r111942
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/* DomDocumentBuilder.java --
|
||||
Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
Copyright (C) 2004,2006 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
@@ -37,9 +37,11 @@ exception statement from your version. */
|
||||
|
||||
package gnu.xml.dom;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.InputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.Reader;
|
||||
import java.net.MalformedURLException;
|
||||
import java.net.URL;
|
||||
import javax.xml.parsers.DocumentBuilder;
|
||||
import org.w3c.dom.Document;
|
||||
@@ -157,8 +159,18 @@ class DomDocumentBuilder
|
||||
}
|
||||
else
|
||||
{
|
||||
URL url = new URL(systemId);
|
||||
input.setByteStream(url.openStream());
|
||||
try
|
||||
{
|
||||
URL url = new URL(systemId);
|
||||
input.setByteStream(url.openStream());
|
||||
}
|
||||
catch (MalformedURLException e)
|
||||
{
|
||||
// Maybe this is a relative file URL
|
||||
File cwd = new File(System.getProperty("user.dir"));
|
||||
URL url = new URL(cwd.toURL(), systemId);
|
||||
input.setByteStream(url.openStream());
|
||||
}
|
||||
}
|
||||
}
|
||||
input.setPublicId(is.getPublicId());
|
||||
|
||||
Reference in New Issue
Block a user