Browse Source

Avoid deconstructing and reconstructing the base URI of the

configuration; the location string is obtained from a sax.Locator with
system ID, line number and optionally column number
(avalon.framework.configuration.SAXConfigurationHandler.getLocationString),
and can be used as a URI string directly.


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1061362 13f79535-47bb-0310-9956-ffa450edef68
tags/fop-1_1rc1old
Simon Pepping 13 years ago
parent
commit
03f05c5dc5
1 changed files with 2 additions and 8 deletions
  1. 2
    8
      src/java/org/apache/fop/apps/FopFactoryConfigurator.java

+ 2
- 8
src/java/org/apache/fop/apps/FopFactoryConfigurator.java View File

@@ -378,15 +378,9 @@ public class FopFactoryConfigurator {

private void setBaseURI() throws FOPException {
String loc = cfg.getLocation();
String[] locationParts = (loc != null ? cfg.getLocation().split(":") : null);
try {
if (locationParts != null && locationParts.length >= 2
&& "file".equals(locationParts[0])) {
StringBuilder sb = new StringBuilder(locationParts[1]);
for (int idx = 2; idx < locationParts.length; idx++) {
sb.append(":").append(locationParts[idx]);
}
baseURI = new URI(locationParts[0], sb.toString(), null);
if (loc != null && loc.startsWith("file:")) {
baseURI = new URI(loc);
baseURI = baseURI.resolve(".").normalize();
}
if (baseURI == null) {

Loading…
Cancel
Save