User: ara_e_w 
  Date: 02/05/26 13:29:53

  Modified:    modules/ejb/src/xdoclet/modules/ejb Tag:
                        MODULE_REFACTORING_BRANCH EjbTagsHandler.java
  Log:
  xjavadoc javabeaninifiction refactoring
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.8   +37 -37    
xdoclet/modules/ejb/src/xdoclet/modules/ejb/Attic/EjbTagsHandler.java
  
  Index: EjbTagsHandler.java
  ===================================================================
  RCS file: 
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/Attic/EjbTagsHandler.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -w -r1.1.2.7 -r1.1.2.8
  --- EjbTagsHandler.java       15 May 2002 16:47:46 -0000      1.1.2.7
  +++ EjbTagsHandler.java       26 May 2002 20:29:53 -0000      1.1.2.8
  @@ -44,7 +44,7 @@
    * @author               Ara Abrahamian ([EMAIL PROTECTED])
    * @created              Oct 15, 2001
    * @xdoclet:taghandler   namespace="Ejb"
  - * @version              $Revision: 1.1.2.7 $
  + * @version              $Revision: 1.1.2.8 $
    */
   public class EjbTagsHandler extends XDocletTagSupport
   {
  @@ -61,10 +61,10 @@
       {
           Log log = LogUtil.getLog(EjbTagsHandler.class, "ifIsAConcreteEJBean");
   
  -        XTag beanTag = clazz.doc().tag("ejb:bean");
  +        XTag beanTag = clazz.getDoc().getTag("ejb:bean");
   
           if (beanTag != null) {
  -            String generateStr = beanTag.attributeValue("generate");
  +            String generateStr = beanTag.getAttributeValue("generate");
   
               if (generateStr != null) {
                   boolean generate = TypeConversionUtil.stringToBoolean(generateStr, 
true);
  @@ -80,7 +80,7 @@
               }
   
               // ejb:beam name specified, so it's a concrete ejb
  -            if (beanTag.attributeValue("name") != null) {
  +            if (beanTag.getAttributeValue("name") != null) {
                   return true;
               }
           }
  @@ -145,7 +145,7 @@
                       return true;
                   }
   
  -                String currentClassName = clazz.qualifiedName();
  +                String currentClassName = clazz.getQualifiedName();
   
                   throw new 
XDocletException(Translator.getString("xdoclet.modules.ejb.Messages", 
"class_not_abstract",
                       new String[]{currentClassName, SessionSubTask.SUBTASK_NAME}));
  @@ -168,15 +168,15 @@
        */
       public static String getEjbNameFor(XClass clazz) throws XDocletException
       {
  -        XTag beanTag = clazz.doc().tag("ejb:bean");
  +        XTag beanTag = clazz.getDoc().getTag("ejb:bean");
           String paramValue = null;
   
           if (beanTag != null) {
  -            paramValue = beanTag.attributeValue("name");
  +            paramValue = beanTag.getAttributeValue("name");
           }
   
           if (paramValue == null) {
  -            String className = clazz.qualifiedName();
  +            String className = clazz.getQualifiedName();
   
               className.replace('.', '/');
   
  @@ -259,7 +259,7 @@
       {
           String value = getTagValue(
               FOR_CLASS,
  -            clazz.doc(),
  +            clazz.getDoc(),
               "ejb:bean",
               "view-type",
               "remote,local,both",
  @@ -290,7 +290,7 @@
       {
           String value = getTagValue(
               FOR_CLASS,
  -            clazz.doc(),
  +            clazz.getDoc(),
               "ejb:bean",
               "view-type",
               "remote,local,both",
  @@ -413,14 +413,14 @@
       {
           try {
               // check if it's abstract and has a non-xdoclet-generated derived class
  -            String fullClassName = currentClass.qualifiedName();
  -            XClass[] classes = XJavaDoc.getInstance().sourceClasses();
  +            String fullClassName = currentClass.getQualifiedName();
  +            XClass[] classes = XJavaDoc.getInstance().getSourceClasses();
   
               for (int i = 0; i < classes.length; i++) {
                   XClass clazz = classes[i];
   
  -                if (fullClassName.equals(clazz.qualifiedName()) == false &&
  -                    !clazz.doc().hasTag("xdoclet-generated") &&
  +                if (fullClassName.equals(clazz.getQualifiedName()) == false &&
  +                    !clazz.getDoc().hasTag("xdoclet-generated") &&
                       TypeTagsHandler.isOfType(clazz, fullClassName, 
TypeTagsHandler.TYPE_HIERARCHY)) {
                       return true;
                   }
  @@ -469,7 +469,7 @@
       {
           String ejbRefName = null;
   
  -        String refName = getCurrentClassTag().attributeValue("ref-name");
  +        String refName = getCurrentClassTag().getAttributeValue("ref-name");
   
           if (refName != null) {
               ejbRefName = refName;
  @@ -477,7 +477,7 @@
           else {
               ejbRefName = getEjbNameFor(getCurrentClass());
   
  -            String type = getCurrentClassTag().attributeValue("view-type");
  +            String type = getCurrentClassTag().getAttributeValue("view-type");
   
               if (type != null && type.equals("local") && 
isLocalEjb(getCurrentClass()) && isRemoteEjb(getCurrentClass())) {
                   ejbRefName = ejbRefName + LOCAL_SUFFIX;
  @@ -497,13 +497,13 @@
       public String ejbExternalRefName() throws XDocletException
       {
           String ejbRefName = null;
  -        String refName = getCurrentClassTag().attributeValue("ref-name");
  +        String refName = getCurrentClassTag().getAttributeValue("ref-name");
   
           if (refName != null) {
               ejbRefName = refName;
           }
           else {
  -            ejbRefName = getCurrentClassTag().attributeValue("ejb-name");
  +            ejbRefName = getCurrentClassTag().getAttributeValue("ejb-name");
           }
   
           return prefixWithEjbSlash(ejbRefName);
  @@ -549,7 +549,7 @@
       public void forAllBeans(String template) throws XDocletException
       {
           try {
  -            XClass[] classes = XJavaDoc.getInstance().sourceClasses();
  +            XClass[] classes = XJavaDoc.getInstance().getSourceClasses();
   
               for (int i = 0; i < classes.length; i++) {
                   setCurrentClass(classes[i]);
  @@ -631,7 +631,7 @@
                   return SessionTagsHandler.getSessionClassFor(getCurrentClass());
               }
               else {
  -                return getCurrentClass().qualifiedName();
  +                return getCurrentClass().getQualifiedName();
               }
           }
           else if (BmpTagsHandler.isEntityBmp(getCurrentClass())) {
  @@ -639,7 +639,7 @@
                   return BmpTagsHandler.getEntityBmpClassFor(getCurrentClass());
               }
               else {
  -                return getCurrentClass().qualifiedName();
  +                return getCurrentClass().getQualifiedName();
               }
           }
           else if (CmpTagsHandler.isEntityCmp(getCurrentClass())) {
  @@ -647,7 +647,7 @@
                   return CmpTagsHandler.getEntityCmpClassFor(getCurrentClass());
               }
               else {
  -                return getCurrentClass().qualifiedName();
  +                return getCurrentClass().getQualifiedName();
               }
           }
           else if (MdbTagsHandler.isMessageDriven(getCurrentClass())) {
  @@ -818,14 +818,14 @@
           Log log = LogUtil.getLog(EjbTagsHandler.class, "extendsFromFor");
   
           // see ejb:pk/etc generate="?" in superclass
  -        XClass superclass = clazz.superclass();
  +        XClass superclass = clazz.getSuperclass();
   
           boolean generateSuper;
   
  -        if (superclass.doc().hasTag(tagName)) {
  +        if (superclass.getDoc().hasTag(tagName)) {
               String generateSuperStr = getTagValue(
                   FOR_CLASS,
  -                superclass.doc(),
  +                superclass.getDoc(),
                   tagName,
                   "generate",
                   null,
  @@ -840,16 +840,16 @@
               // Two Cases : PersonBean and BaseEntityBean
               generateSuper = false;
   
  -            XClass[] interfaces = clazz.superclass().interfaces();
  +            XClass[] interfaces = clazz.getSuperclass().getInterfaces();
   
               for (int i = 0; i < interfaces.length; i++) {
                   XClass intf = interfaces[i];
   
                   // if superclass is not javax.ejb.EntityBean then we have a 
superclass which
                   // is itself deriving from javax.ejb.EntityBean
  -                if (intf.qualifiedName().equals("javax.ejb.EntityBean") ||
  -                    intf.qualifiedName().equals("javax.ejb.SessionBean") ||
  -                    intf.qualifiedName().equals("javax.ejb.MessageDrivenBean")) {
  +                if (intf.getQualifiedName().equals("javax.ejb.EntityBean") ||
  +                    intf.getQualifiedName().equals("javax.ejb.SessionBean") ||
  +                    intf.getQualifiedName().equals("javax.ejb.MessageDrivenBean")) {
                       //it derives from javax.ejb.*Bean and no superclass for pk/etc 
class is explicitly defined
                       generateSuper = true;
                   }
  @@ -861,7 +861,7 @@
           // so extends attribute is inherited only if superclass's pk/etc is not to 
be generated
           String extendsValue = getTagValue(
               FOR_CLASS,
  -            clazz.doc(),
  +            clazz.getDoc(),
               tagName,
               extendsParamName,
               null,
  @@ -879,7 +879,7 @@
               // that bean's pk class too (if generate="true" for superclass's pk/etc 
class)
   
               // java.lang.Object (the only that have no superclass)
  -            if (superclass.superclass() == null) {
  +            if (superclass.getSuperclass() == null) {
                   return defaultBaseClassName;
               }
               // if a superclass with generate="true"
  @@ -887,7 +887,7 @@
                   String className = getDependentClassFor(superclass, type);
   
                   if (log.isDebugEnabled()) {
  -                    log.debug("DCF = " + className + ' ' + superclass.superclass());
  +                    log.debug("DCF = " + className + ' ' + 
superclass.getSuperclass());
                   }
                   if (className != null) {
                       return className;
  @@ -915,7 +915,7 @@
       {
           Log log = LogUtil.getLog(EjbTagsHandler.class, 
"shouldTraverseSuperclassForDependentClass");
   
  -        if (clazz.qualifiedName().equals("java.lang.Object")) {
  +        if (clazz.getQualifiedName().equals("java.lang.Object")) {
               log.debug("clazz = java.lang.Object");
   
               return true;
  @@ -923,18 +923,18 @@
   
           if (!TypeTagsHandler.isOfType(clazz, "javax.ejb.EntityBean", 
TypeTagsHandler.TYPE_HIERARCHY)
               && !TypeTagsHandler.isOfType(clazz, "javax.ejb.SessionBean", 
TypeTagsHandler.TYPE_HIERARCHY)) {
  -            log.debug(clazz.qualifiedName() + " is _not_ of type 
javax.ejb.EntityBean,javax.ejb.SessionBean");
  +            log.debug(clazz.getQualifiedName() + " is _not_ of type 
javax.ejb.EntityBean,javax.ejb.SessionBean");
   
               return true;
           }
           else {
  -            log.debug(clazz.qualifiedName() + " _is_ of type 
javax.ejb.EntityBean,javax.ejb.SessionBean");
  +            log.debug(clazz.getQualifiedName() + " _is_ of type 
javax.ejb.EntityBean,javax.ejb.SessionBean");
           }
   
           // see ejb:bean generate="?" in superclass
           String generateBeanStr = getTagValue(
               FOR_CLASS,
  -            clazz.doc(),
  +            clazz.getDoc(),
               "ejb:bean",
               "generate",
               null,
  @@ -957,7 +957,7 @@
               // see ejb:pk/etc generate="?" in superclass
               String generateStr = getTagValue(
                   FOR_CLASS,
  -                clazz.doc(),
  +                clazz.getDoc(),
                   tagName,
                   "generate",
                   null,
  
  
  

_______________________________________________________________

Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -- http://devcon.sprintpcs.com/adp/index.cfm

_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to