bwalding 2003/03/10 06:18:41
Modified: src/plugins-build/xdoc/src/main/org/apache/maven
NavBean.java
Log:
o MAVEN-320: Make it handle slightly less conformant hrefs. Feels a bit dirty to me.
Revision Changes Path
1.4 +14 -2
jakarta-turbine-maven/src/plugins-build/xdoc/src/main/org/apache/maven/NavBean.java
Index: NavBean.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/src/main/org/apache/maven/NavBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NavBean.java 18 Feb 2003 14:21:35 -0000 1.3
+++ NavBean.java 10 Mar 2003 14:18:41 -0000 1.4
@@ -128,8 +128,17 @@
return false;
}
- String xpath = ".//[EMAIL PROTECTED]'" + location + "']";
+ //System.out.println(elem.asXML());
+ String xpath;
+ if (location.startsWith("/") || location.startsWith(".")) {
+ xpath = ".//[EMAIL PROTECTED]'" + location + "']";
+ } else {
+ xpath = ".//[EMAIL PROTECTED]'/" + location + "']";
+
+ }
+
+
List l = elem.selectNodes(xpath);
if (l.size() != 0)
@@ -167,6 +176,9 @@
*/
public void setLocation(String location)
{
+ if (!location.startsWith("/"))
+ location = "/" + location;
+
this.location = location;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
