stefano 2002/06/27 11:26:36
Modified: src/scratchpad/src/org/apache/cocoon/transformation/pagination
PageRules.java
Log:
fix another NPE in case you didn't specify the namespace in the pagesheet
Revision Changes Path
1.5 +10 -5
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/pagination/PageRules.java
Index: PageRules.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/pagination/PageRules.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PageRules.java 27 Jun 2002 17:43:30 -0000 1.4
+++ PageRules.java 27 Jun 2002 18:26:35 -0000 1.5
@@ -59,18 +59,23 @@
*/
public class PageRules {
- public String elementName = "";
- public String elementURI = "";
+ public String elementName;
+ public String elementURI;
public int elementCount = 1;
public int charCount = 0;
public int unitLinks = 0;
public int rangeLink = 0;
public boolean match(String element, String namespace) {
- return (this.elementName.equals(element) &&
this.elementURI.equals(namespace));
+ boolean elementMatches = ((this.elementName != null) &&
this.elementName.equals(element));
+ if (this.elementURI == null) {
+ return elementMatches;
+ } else {
+ return elementMatches && this.elementURI.equals(uri);
+ }
}
public boolean match(String namespace) {
- return this.elementURI.equals(namespace);
+ return ((this.elementURI != null) && (this.elementURI.equals(namespace));
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
