[Xdoclet-devel] CVS: xdoclet/modules/java/src/xdoclet/modules/java/javabean/resources beaninfo.xdt,1.14,1.15

[Mike]

Update of 
/cvsroot/xdoclet/xdoclet/modules/java/src/xdoclet/modules/java/javabean/resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9622

Modified Files:
        beaninfo.xdt 
Log Message:
Fix Bug XDT-1563

Index: beaninfo.xdt
===================================================================
RCS file: 
/cvsroot/xdoclet/xdoclet/modules/java/src/xdoclet/modules/java/javabean/resources/beaninfo.xdt,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** beaninfo.xdt        7 Jul 2005 08:55:00 -0000       1.14
--- beaninfo.xdt        2 Nov 2005 09:18:08 -0000       1.15
***************
*** 309,312 ****
--- 309,323 ----
        for (int j = 0; j != m.length; j++) {
           if (m[j].getName().equals("<XDtMethod:methodName/>")) {
+                       int paramNum=0;
+                       final Class[] params = m[j].getParameterTypes();
+          
+                       <XDtParameter:forAllMethodParams>
+                       if (params.length <= paramNum)
+                               continue; // too few parameters
+                       if 
(!params[paramNum++].equals(<XDtParameter:methodParamType/>.class))
+                               continue;
+                       </XDtParameter:forAllMethodParams>
+                       if (params.length != paramNum)
+                               continue; // to much parameter
              method = m[j];
              break;
***************
*** 318,329 ****
           
           <XDtMethod:ifHasMethodTag tagName="javabean.method" paramName="name">
!          String methodName = "<XDtMethod:methodTagValue 
tagName="javabean.method" paramName="name"/>";
           </XDtMethod:ifHasMethodTag>
           <XDtMethod:ifDoesntHaveMethodTag tagName="javabean.method" 
paramName="name">
!          String methodName = "<XDtMethod:methodName/>";
           </XDtMethod:ifDoesntHaveMethodTag>
!          ParameterDescriptor[] pd = new 
ParameterDescriptor[method.getParameterTypes().length];
           int pidx = 0;
- 
           <XDtMethod:ifHasMethodTag tagName="javabean.param">
              <XDtMethod:forAllMethodTags tagName="javabean.param">
--- 329,339 ----
           
           <XDtMethod:ifHasMethodTag tagName="javabean.method" paramName="name">
!          final String methodName = "<XDtMethod:methodTagValue 
tagName="javabean.method" paramName="name"/>";
           </XDtMethod:ifHasMethodTag>
           <XDtMethod:ifDoesntHaveMethodTag tagName="javabean.method" 
paramName="name">
!          final String methodName = "<XDtMethod:methodName/>";
           </XDtMethod:ifDoesntHaveMethodTag>
!          final ParameterDescriptor[] pd = new 
ParameterDescriptor[method.getParameterTypes().length];
           int pidx = 0;
           <XDtMethod:ifHasMethodTag tagName="javabean.param">
              <XDtMethod:forAllMethodTags tagName="javabean.param">



-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel