You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-cvs@xml.apache.org by nd...@apache.org on 2002/11/13 21:47:19 UTC
cvs commit: xml-commons/java/src/org/apache/xml/resolver Resolver.java
ndw 2002/11/13 12:47:19
Modified: java/src/org/apache/xml/resolver Resolver.java
Log:
Use catalogManager's debug object instead of static Debug object to print messages
Revision Changes Path
1.2 +9 -9 xml-commons/java/src/org/apache/xml/resolver/Resolver.java
Index: Resolver.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/Resolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Resolver.java 30 Jan 2002 12:24:59 -0000 1.1
+++ Resolver.java 13 Nov 2002 20:47:19 -0000 1.2
@@ -174,14 +174,14 @@
entry.setEntryArg(1, fsi);
- Debug.message(4, "URISUFFIX", suffix, fsi);
+ catalogManager.debug.message(4, "URISUFFIX", suffix, fsi);
} else if (type == SYSTEMSUFFIX) {
String suffix = normalizeURI(entry.getEntryArg(0));
String fsi = makeAbsolute(normalizeURI(entry.getEntryArg(1)));
entry.setEntryArg(1, fsi);
- Debug.message(4, "SYSTEMSUFFIX", suffix, fsi);
+ catalogManager.debug.message(4, "SYSTEMSUFFIX", suffix, fsi);
}
super.addEntry(entry);
@@ -435,17 +435,17 @@
return r;
} catch (CatalogException cex) {
if (cex.getExceptionType() == CatalogException.UNPARSEABLE) {
- Debug.message(1, "Unparseable catalog: " + RFC2483);
+ catalogManager.debug.message(1, "Unparseable catalog: " + RFC2483);
} else if (cex.getExceptionType()
== CatalogException.UNKNOWN_FORMAT) {
- Debug.message(1, "Unknown catalog format: " + RFC2483);
+ catalogManager.debug.message(1, "Unknown catalog format: " + RFC2483);
}
return null;
} catch (MalformedURLException mue) {
- Debug.message(1, "Malformed resolver URL: " + RFC2483);
+ catalogManager.debug.message(1, "Malformed resolver URL: " + RFC2483);
return null;
} catch (IOException ie) {
- Debug.message(1, "I/O Exception opening resolver: " + RFC2483);
+ catalogManager.debug.message(1, "I/O Exception opening resolver: " + RFC2483);
return null;
}
}
@@ -668,12 +668,12 @@
try {
c.parseCatalog(catfile);
} catch (MalformedURLException mue) {
- Debug.message(1, "Malformed Catalog URL", catfile);
+ catalogManager.debug.message(1, "Malformed Catalog URL", catfile);
} catch (FileNotFoundException fnfe) {
- Debug.message(1, "Failed to load catalog, file not found",
+ catalogManager.debug.message(1, "Failed to load catalog, file not found",
catfile);
} catch (IOException ioe) {
- Debug.message(1, "Failed to load catalog, I/O error", catfile);
+ catalogManager.debug.message(1, "Failed to load catalog, I/O error", catfile);
}
catalogs.setElementAt(c, catPos);