You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2011/09/29 02:48:50 UTC
svn commit: r1177131 - in
/xml/commons/trunk/java/src/org/apache/xml/resolver/readers:
ExtendedXMLCatalogReader.java OASISXMLCatalogReader.java XCatalogReader.java
Author: mrglavas
Date: Thu Sep 29 00:48:49 2011
New Revision: 1177131
URL: http://svn.apache.org/viewvc?rev=1177131&view=rev
Log:
Access static fields in a static way.
Modified:
xml/commons/trunk/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java
xml/commons/trunk/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java
xml/commons/trunk/java/src/org/apache/xml/resolver/readers/XCatalogReader.java
Modified: xml/commons/trunk/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java
URL: http://svn.apache.org/viewvc/xml/commons/trunk/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java?rev=1177131&r1=1177130&r2=1177131&view=diff
==============================================================================
--- xml/commons/trunk/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java (original)
+++ xml/commons/trunk/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java Thu Sep 29 00:48:49 2011
@@ -163,7 +163,7 @@ public class ExtendedXMLCatalogReader ex
String baseURI = (String) baseURIStack.peek();
if (!baseURI.equals(popURI)) {
- entryType = catalog.BASE;
+ entryType = Catalog.BASE;
entryArgs.add(baseURI);
debug.message(4, "(reset) xml:base", baseURI);
Modified: xml/commons/trunk/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java
URL: http://svn.apache.org/viewvc/xml/commons/trunk/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java?rev=1177131&r1=1177130&r2=1177131&view=diff
==============================================================================
--- xml/commons/trunk/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java (original)
+++ xml/commons/trunk/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java Thu Sep 29 00:48:49 2011
@@ -382,14 +382,14 @@ public class OASISXMLCatalogReader exten
}
if (localName.equals("doctype")) {
- entryType = catalog.DOCTYPE;
+ entryType = Catalog.DOCTYPE;
entryArgs.add(atts.getValue("name"));
entryArgs.add(atts.getValue("uri"));
} else if (localName.equals("document")) {
- entryType = catalog.DOCUMENT;
+ entryType = Catalog.DOCUMENT;
entryArgs.add(atts.getValue("uri"));
} else if (localName.equals("dtddecl")) {
- entryType = catalog.DTDDECL;
+ entryType = Catalog.DTDDECL;
entryArgs.add(atts.getValue("publicId"));
entryArgs.add(atts.getValue("uri"));
} else if (localName.equals("entity")) {
@@ -463,7 +463,7 @@ public class OASISXMLCatalogReader exten
String baseURI = (String) baseURIStack.peek();
if (!baseURI.equals(popURI)) {
- entryType = catalog.BASE;
+ entryType = Catalog.BASE;
entryArgs.add(baseURI);
debug.message(4, "(reset) xml:base", baseURI);
@@ -488,7 +488,7 @@ public class OASISXMLCatalogReader exten
String override = (String) overrideStack.peek();
if (!override.equals(popOverride)) {
- entryType = catalog.OVERRIDE;
+ entryType = Catalog.OVERRIDE;
entryArgs.add(override);
overrideStack.push(override);
Modified: xml/commons/trunk/java/src/org/apache/xml/resolver/readers/XCatalogReader.java
URL: http://svn.apache.org/viewvc/xml/commons/trunk/java/src/org/apache/xml/resolver/readers/XCatalogReader.java?rev=1177131&r1=1177130&r2=1177131&view=diff
==============================================================================
--- xml/commons/trunk/java/src/org/apache/xml/resolver/readers/XCatalogReader.java (original)
+++ xml/commons/trunk/java/src/org/apache/xml/resolver/readers/XCatalogReader.java Thu Sep 29 00:48:49 2011
@@ -112,12 +112,12 @@ public class XCatalogReader extends SAXC
Vector entryArgs = new Vector();
if (localName.equals("Base")) {
- entryType = catalog.BASE;
+ entryType = Catalog.BASE;
entryArgs.add(atts.getValue("HRef"));
debug.message(4, "Base", atts.getValue("HRef"));
} else if (localName.equals("Delegate")) {
- entryType = catalog.DELEGATE_PUBLIC;
+ entryType = Catalog.DELEGATE_PUBLIC;
entryArgs.add(atts.getValue("PublicID"));
entryArgs.add(atts.getValue("HRef"));
@@ -125,12 +125,12 @@ public class XCatalogReader extends SAXC
PublicId.normalize(atts.getValue("PublicID")),
atts.getValue("HRef"));
} else if (localName.equals("Extend")) {
- entryType = catalog.CATALOG;
+ entryType = Catalog.CATALOG;
entryArgs.add(atts.getValue("HRef"));
debug.message(4, "Extend", atts.getValue("HRef"));
} else if (localName.equals("Map")) {
- entryType = catalog.PUBLIC;
+ entryType = Catalog.PUBLIC;
entryArgs.add(atts.getValue("PublicID"));
entryArgs.add(atts.getValue("HRef"));
@@ -138,7 +138,7 @@ public class XCatalogReader extends SAXC
PublicId.normalize(atts.getValue("PublicID")),
atts.getValue("HRef"));
} else if (localName.equals("Remap")) {
- entryType = catalog.SYSTEM;
+ entryType = Catalog.SYSTEM;
entryArgs.add(atts.getValue("SystemID"));
entryArgs.add(atts.getValue("HRef"));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org