morgand 2002/10/14 12:46:22
Modified: jelly/src/java/org/apache/commons/jelly Jelly.java
jelly/src/java/org/apache/commons/jelly/parser
DefaultNamespaceFilter.java XMLParser.java
Log:
instance variable name cleanup
Revision Changes Path
1.20 +7 -7
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Jelly.java
Index: Jelly.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Jelly.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Jelly.java 14 Oct 2002 19:17:01 -0000 1.19
+++ Jelly.java 14 Oct 2002 19:46:22 -0000 1.20
@@ -255,8 +255,8 @@
XMLParser parser = new XMLParser();
parser.setContext(getJellyContext());
- parser.setDefaultNamespaceURI(defaultNamespaceURI);
- parser.setValidating(validateXML);
+ parser.setDefaultNamespaceURI(this.defaultNamespaceURI);
+ parser.setValidating(this.validateXML);
Script script = parser.parse(getUrl().openStream());
script = script.compile();
if (log.isDebugEnabled()) {
1.2 +8 -8
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/DefaultNamespaceFilter.java
Index: DefaultNamespaceFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/DefaultNamespaceFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultNamespaceFilter.java 9 Oct 2002 21:03:08 -0000 1.1
+++ DefaultNamespaceFilter.java 14 Oct 2002 19:46:22 -0000 1.2
@@ -86,7 +86,7 @@
*/
public DefaultNamespaceFilter(String defaultNamespace, XMLReader reader) {
super(reader);
- uriDefault = defaultNamespace;
+ this.uriDefault = defaultNamespace;
}
/**
@@ -101,7 +101,7 @@
throws SAXException {
if (uri.equals("")) {
- super.startPrefixMapping(prefix,uriDefault);
+ super.startPrefixMapping(prefix,this.uriDefault);
} else {
super.startPrefixMapping(prefix,uri);
}
@@ -123,7 +123,7 @@
throws SAXException {
if (uri.equals("")) {
- super.startElement(uriDefault,localName,qName,atts);
+ super.startElement(this.uriDefault,localName,qName,atts);
} else {
super.startElement(uri,localName,qName,atts);
}
@@ -142,7 +142,7 @@
public void endElement(String namespaceURI, String localName, String qName)
throws SAXException {
if (namespaceURI.equals("")) {
- super.endElement(uriDefault,localName,qName);
+ super.endElement(this.uriDefault,localName,qName);
} else {
super.endElement(namespaceURI,localName,qName);
}
1.32 +13 -8
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java
Index: XMLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- XMLParser.java 9 Oct 2002 21:03:08 -0000 1.31
+++ XMLParser.java 14 Oct 2002 19:46:22 -0000 1.32
@@ -213,6 +213,11 @@
/** Flag to indicate if this object has been configured */
private boolean configured;
+ /**
+ * when not null, set the default namespace for
+ * unprefixed elements via the DefaultNamespaceFilter
+ * class
+ */
private String defaultNamespaceURI = null;
/**
@@ -366,7 +371,7 @@
* @param namespace jelly namespace to use (e.g. 'jelly:core')
*/
public void setDefaultNamespaceURI(String namespace) {
- defaultNamespaceURI = namespace;
+ this.defaultNamespaceURI = namespace;
}
/**
@@ -518,8 +523,8 @@
public synchronized XMLReader getXMLReader() throws SAXException {
if (reader == null) {
reader = getParser().getXMLReader();
- if (defaultNamespaceURI != null) {
- reader = new DefaultNamespaceFilter(defaultNamespaceURI,reader);
+ if (this.defaultNamespaceURI != null) {
+ reader = new
DefaultNamespaceFilter(this.defaultNamespaceURI,reader);
}
}
//set up the parse
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
