[Xdoclet-devel] CVS update: xdoclet/core/src/xdoclet/tagshandler MethodTagsHandler.java ParameterTagsHandler.java

[Ara Abrahamian]

  User: ara_e_w 
  Date: 02/07/09 12:33:22

  Modified:    core/src/xdoclet/tagshandler MethodTagsHandler.java
                        ParameterTagsHandler.java
  Log:
  - fixes the "method-params-not-fully-qualifiedin ejb-jar.xml" bug
  - make the ejb:finder signature full qualified in samples
  
  Revision  Changes    Path
  1.13      +5 -3      xdoclet/core/src/xdoclet/tagshandler/MethodTagsHandler.java
  
  Index: MethodTagsHandler.java
  ===================================================================
  RCS file: 
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/MethodTagsHandler.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -w -r1.12 -r1.13
  --- MethodTagsHandler.java    5 Jul 2002 20:18:31 -0000       1.12
  +++ MethodTagsHandler.java    9 Jul 2002 19:33:21 -0000       1.13
  @@ -12,9 +12,11 @@
   import org.apache.commons.logging.Log;
   
   import xjavadoc.*;
  +import xdoclet.DocletContext;
   
   import xdoclet.XDocletException;
   import xdoclet.XDocletMessages;
  +import xdoclet.XmlSubTask;
   import xdoclet.util.DocletUtil;
   import xdoclet.util.LogUtil;
   import xdoclet.util.Translator;
  @@ -24,18 +26,18 @@
    * @author               Ara Abrahamian ([EMAIL PROTECTED])
    * @created              Oct 15, 2001
    * @xdoclet.taghandler   namespace="Method"
  - * @version              $Revision: 1.12 $
  + * @version              $Revision: 1.13 $
    */
   public class MethodTagsHandler extends AbstractProgramElementTagsHandler
   {
       public static String getMethodTypeFor(XMethod method)
       {
  -        return getMethodTypeFor(method, true);
  +        return getMethodTypeFor(method, false);
       }
   
       public static String getMethodTypeFor(XMethod method, boolean full_qualified)
       {
  -        boolean should_be_in_full_qualified_format = full_qualified == true || 
method.isReturnTypeDefinedInFullQualifiedFormat() == true;
  +        boolean should_be_in_full_qualified_format = full_qualified == true || 
method.isReturnTypeDefinedInFullQualifiedFormat() == true || 
(DocletContext.getInstance().getActiveSubTask() instanceof XmlSubTask);
           String return_type = should_be_in_full_qualified_format ? 
method.getReturnType().getQualifiedName() : method.getReturnType().getName();
   
           //TODO: do more check here: if it's imported->not in full qualified format,
  
  
  
  1.6       +6 -4      xdoclet/core/src/xdoclet/tagshandler/ParameterTagsHandler.java
  
  Index: ParameterTagsHandler.java
  ===================================================================
  RCS file: 
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/ParameterTagsHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- ParameterTagsHandler.java 5 Jul 2002 12:59:06 -0000       1.5
  +++ ParameterTagsHandler.java 9 Jul 2002 19:33:21 -0000       1.6
  @@ -10,15 +10,17 @@
   import xjavadoc.XExecutableMember;
   import xjavadoc.XParameter;
   import xjavadoc.XTag;
  +import xdoclet.DocletContext;
   
   import xdoclet.XDocletException;
  +import xdoclet.XmlSubTask;
   import xdoclet.util.TypeConversionUtil;
   
   /**
    * @author               Ara Abrahamian ([EMAIL PROTECTED])
    * @created              Oct 15, 2001
    * @xdoclet.taghandler   namespace="Parameter"
  - * @version              $Revision: 1.5 $
  + * @version              $Revision: 1.6 $
    */
   public class ParameterTagsHandler extends AbstractProgramElementTagsHandler
   {
  @@ -39,12 +41,12 @@
   
       public static String getMethodParamTypeFor(XParameter param)
       {
  -        return getMethodParamTypeFor(param, true);
  +        return getMethodParamTypeFor(param, false);
       }
   
       public static String getMethodParamTypeFor(XParameter param, boolean 
full_qualified)
       {
  -        boolean should_be_in_full_qualified_format = full_qualified == true || 
param.isTypeDefinedInFullQualifiedFormat() == true;
  +        boolean should_be_in_full_qualified_format = full_qualified == true || 
param.isTypeDefinedInFullQualifiedFormat() == true || 
(DocletContext.getInstance().getActiveSubTask() instanceof XmlSubTask);
           String return_type = should_be_in_full_qualified_format ? 
param.getType().getQualifiedName() : param.getType().getName();
   
           return return_type + param.getDimensionAsString();
  @@ -63,7 +65,7 @@
       {
           boolean full_qualified_format = 
TypeConversionUtil.stringToBoolean(attributes.getProperty("fullQualifiedFormat"), 
false);
   
  -        return getMethodParamTypeFor(currentMethodParameter, full_qualified_format) 
+ currentMethodParameter.getDimensionAsString();
  +        return getMethodParamTypeFor(currentMethodParameter, full_qualified_format);
       }
   
       /**
  
  
  


-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Stuff, things, and much much more.
http://thinkgeek.com/sf
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel