jvanzyl 2002/07/15 07:02:07
Modified: src/plugins-build/jxr/src/java/org/apache/maven/jxr
CodeTransform.java
Log:
o Catch a boundary problem that will be fixed when we hook in the
JavaCC parser.
Revision Changes Path
1.2 +21 -7
jakarta-turbine-maven/src/plugins-build/jxr/src/java/org/apache/maven/jxr/CodeTransform.java
Index: CodeTransform.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/jxr/src/java/org/apache/maven/jxr/CodeTransform.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CodeTransform.java 14 Jul 2002 19:09:23 -0000 1.1
+++ CodeTransform.java 15 Jul 2002 14:02:07 -0000 1.2
@@ -1052,17 +1052,31 @@
//this is an explicit Class import
String packageLine = pkg.toString();
+
+ // This catches a boundary problem where you have something like:
+ //
+ // Foo foo = FooMaster.getFooInstance().
+ // danceLittleFoo();
+ //
+ // This breaks Jxr and won't be a problem when we hook
+ // in the real parser.
+
+ int a = packageLine.lastIndexOf(".") + 1;
+ int b = packageLine.length() - 1;
+
+ if (a > b + 1)
+ {
+ classname = packageLine.substring(packageLine.lastIndexOf(".")
+ 1, packageLine.length() - 1);
- classname = packageLine.substring(packageLine.lastIndexOf(".") + 1,
packageLine.length() - 1);
+ int end = pkg.lastIndexOf(".");
- int end = pkg.lastIndexOf(".");
+ if (end == -1)
+ {
+ end = pkg.length() - 1;
+ }
- if (end == -1)
- {
- end = pkg.length() - 1;
+ pkg = pkg.substring(0, end);
}
-
- pkg = pkg.substring(0, end);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
