User: rinkrank
  Date: 02/04/03 17:03:09

  Modified:    core/src/xdoclet/ejb/tags/vendor
                        JBossRelationTagsHandler.java JBossTagsHandler.java
                        MVCSoftTagsHandler.java StrutsFormTagsHandler.java
                        WeblogicRelationTagsHandler.java
  Log:
  The pretty settings from xjavadoc were (are still) applied to xdoclet sources.
  It seems JRefactory only loads it once. Since the xdoclet build now invokes xjavadoc
  build first, xjavadoc settings are used. I'm sorry if I have messed up the 
formatting.
  This commit has modified the header (so that BEKK is not included).
  
  Revision  Changes    Path
  1.7       +102 -116  
xdoclet/core/src/xdoclet/ejb/tags/vendor/JBossRelationTagsHandler.java
  
  Index: JBossRelationTagsHandler.java
  ===================================================================
  RCS file: 
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/tags/vendor/JBossRelationTagsHandler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -r1.6 -r1.7
  --- JBossRelationTagsHandler.java     4 Apr 2002 00:27:48 -0000       1.6
  +++ JBossRelationTagsHandler.java     4 Apr 2002 01:03:09 -0000       1.7
  @@ -1,37 +1,6 @@
   /*
  - * Copyright (c) 2001, Aslak Helles�y, BEKK Consulting
  + * Copyright (c) 2001,2002 The XDoclet team
    * All rights reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without modification,
  - * are permitted provided that the following conditions are met:
  - *
  - * - Redistributions of source code must retain the above copyright notice,
  - *   this list of conditions and the following disclaimer.
  - *
  - * - Redistributions in binary form must reproduce the above copyright
  - *   notice, this list of conditions and the following disclaimer in the
  - *   documentation and/or other materials provided with the distribution.
  - *
  - * - Neither the name of BEKK Consulting nor the names of its
  - *   contributors may be used to endorse or promote products derived from
  - *   this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
  - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  - * DAMAGE.
  - */
  -
  -/*
  - * Change log
  - *
    */
   package xdoclet.ejb.tags.vendor;
   
  @@ -44,7 +13,7 @@
   /**
    * @author <a href="mailto:[EMAIL PROTECTED]";>David Budworth</a>
    * @created Feb 4, 2002
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public class JBossRelationTagsHandler extends RelationTagsHandler {
        /**
  @@ -58,12 +27,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void ifNotLeftHasFK(String template) throws XDocletException {
                if (!leftHasFK()) {
  @@ -73,12 +43,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void ifNotRightHasFK(String template) throws XDocletException {
                if (!rightHasFK()) {
  @@ -88,12 +59,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void ifLeftHasFK(String template) throws XDocletException {
                if (leftHasFK()) {
  @@ -103,12 +75,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void ifRightHasFK(String template) throws XDocletException {
                if (rightHasFK()) {
  @@ -118,12 +91,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void forAllLeftForeignKeys(String template) throws XDocletException {
                forAllForeignKeys(template, true);
  @@ -131,12 +105,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void forAllRightForeignKeys(String template) throws XDocletException {
                forAllForeignKeys(template, false);
  @@ -144,10 +119,11 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  +      * @return Describe the return value
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
         */
        public String relatedPKField() {
                return currentFKRelField;
  @@ -155,10 +131,11 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  +      * @return Describe the return value
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
         */
        public String fkColumn() {
                return currentFKCol;
  @@ -166,12 +143,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void ifLeftHasFKConstraint(String template) throws XDocletException {
                if (leftHasFKConstraint()) {
  @@ -181,12 +159,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void ifRightHasFKConstraint(String template) throws XDocletException {
                if (rightHasFKConstraint()) {
  @@ -196,12 +175,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        public String leftFKConstraint() throws XDocletException {
                return getTagValue(
  @@ -217,12 +197,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        public String rightFKConstraint() throws XDocletException {
                if (currentRelation.isBidirectional()) {
  @@ -251,12 +232,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        private boolean leftHasFKConstraint() throws XDocletException {
                if (currentRelation.getLeftMethod() == null) {
  @@ -275,12 +257,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        private boolean rightHasFKConstraint() throws XDocletException {
                if (currentRelation.isBidirectional()) {
  @@ -312,12 +295,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        private boolean leftHasFK() throws XDocletException {
                if (currentRelation.getLeftMethod() == null) {
  @@ -328,12 +312,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        private boolean rightHasFK() throws XDocletException {
                if (currentRelation.isBidirectional()) {
  @@ -349,14 +334,15 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @param left Describe what the parameter does @todo-javadoc Write javadocs
  -      *      for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @param left Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        private void forAllForeignKeys(String template, boolean left) throws 
XDocletException {
                XTag[] fktags = null;
  
  
  
  1.6       +9 -38     xdoclet/core/src/xdoclet/ejb/tags/vendor/JBossTagsHandler.java
  
  Index: JBossTagsHandler.java
  ===================================================================
  RCS file: 
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/tags/vendor/JBossTagsHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- JBossTagsHandler.java     4 Apr 2002 00:27:48 -0000       1.5
  +++ JBossTagsHandler.java     4 Apr 2002 01:03:09 -0000       1.6
  @@ -1,37 +1,6 @@
   /*
  - * Copyright (c) 2001, Aslak Helles�y, BEKK Consulting
  + * Copyright (c) 2001,2002 The XDoclet team
    * All rights reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without modification,
  - * are permitted provided that the following conditions are met:
  - *
  - * - Redistributions of source code must retain the above copyright notice,
  - *   this list of conditions and the following disclaimer.
  - *
  - * - Redistributions in binary form must reproduce the above copyright
  - *   notice, this list of conditions and the following disclaimer in the
  - *   documentation and/or other materials provided with the distribution.
  - *
  - * - Neither the name of BEKK Consulting nor the names of its
  - *   contributors may be used to endorse or promote products derived from
  - *   this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
  - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  - * DAMAGE.
  - */
  -
  -/*
  - * Change log
  - *
    */
   package xdoclet.ejb.tags.vendor;
   
  @@ -53,16 +22,17 @@
   /**
    * @author Dmitri Colebatch ([EMAIL PROTECTED])
    * @created October 18, 2001
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public class JBossTagsHandler extends ClassTagsHandler {
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        public String jBossResourceClassName() throws XDocletException {
                Category cat = Log.getCategory(JBossTagsHandler.class, 
"jBossResourceClassName");
  @@ -91,6 +61,7 @@
        public void ifHasDVC(String template) throws XDocletException {
                boolean hasDVC = false;
                XClass[] classes = null;
  +
                try {
                        classes = XJavaDoc.getInstance().sourceClasses();
                } catch (XJavaDocException e) {
  
  
  
  1.5       +77 -96    xdoclet/core/src/xdoclet/ejb/tags/vendor/MVCSoftTagsHandler.java
  
  Index: MVCSoftTagsHandler.java
  ===================================================================
  RCS file: 
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/tags/vendor/MVCSoftTagsHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- MVCSoftTagsHandler.java   4 Apr 2002 00:27:48 -0000       1.4
  +++ MVCSoftTagsHandler.java   4 Apr 2002 01:03:09 -0000       1.5
  @@ -1,37 +1,6 @@
   /*
  - * Copyright (c) 2001, Aslak Helles�y, BEKK Consulting
  + * Copyright (c) 2001,2002 The XDoclet team
    * All rights reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without modification,
  - * are permitted provided that the following conditions are met:
  - *
  - * - Redistributions of source code must retain the above copyright notice,
  - *   this list of conditions and the following disclaimer.
  - *
  - * - Redistributions in binary form must reproduce the above copyright
  - *   notice, this list of conditions and the following disclaimer in the
  - *   documentation and/or other materials provided with the distribution.
  - *
  - * - Neither the name of BEKK Consulting nor the names of its
  - *   contributors may be used to endorse or promote products derived from
  - *   this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
  - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  - * DAMAGE.
  - */
  -
  -/*
  - * Change log
  - *
    */
   package xdoclet.ejb.tags.vendor;
   
  @@ -76,12 +45,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        public String methodParamType() throws XDocletException {
                return currentQueryMethodParameter.type().qualifiedName();
  @@ -89,12 +59,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void forAllQueryMethodParams(String template) throws XDocletException {
                XParameter[] parameters = getCurrentMethod().parameters();
  @@ -108,12 +79,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        public String fieldName() throws XDocletException {
                String token = currentToken(new java.util.Properties());
  @@ -129,12 +101,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        public String sortDirection() throws XDocletException {
                String token = currentToken(new java.util.Properties());
  @@ -160,12 +133,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void ifHasSortDirection(String template) throws XDocletException {
                if (!sortDirection().equals("")) {
  @@ -175,12 +149,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void forEachRoleMapping(String template) throws XDocletException {
                String aliases = getKeyAliases();
  @@ -208,12 +183,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void forSingleRoleMapping(String template) throws XDocletException {
                String aliases = getKeyAliases();
  @@ -227,12 +203,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void forAllAliases(String template) throws XDocletException {
                while (currentAliases.hasMoreTokens()) {
  @@ -250,12 +227,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        public String roleName() throws XDocletException {
                return currentRoleName;
  @@ -263,12 +241,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        public String keyFieldName() throws XDocletException {
                return currentFieldName;
  @@ -276,12 +255,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        public String colName() throws XDocletException {
                return currentColName;
  @@ -292,8 +272,8 @@
         * Gets the KeyAliases attribute of the MVCSoftTagsHandler object
         *
         * @return The KeyAliases value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for exception
         */
        private String getKeyAliases() throws XDocletException {
                return getCurrentMethod().doc().tagAttributeValue("mvcsoft:relation", 
"key-aliases", false);
  @@ -301,14 +281,15 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param token Describe what the parameter does @todo-javadoc Write javadocs
  -      *      for method parameter
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param token Describe what the parameter does
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        private void doForExtendedRole(String token, String template) throws 
XDocletException {
                int idx = token.indexOf(":");
  
  
  
  1.17      +11 -41    
xdoclet/core/src/xdoclet/ejb/tags/vendor/StrutsFormTagsHandler.java
  
  Index: StrutsFormTagsHandler.java
  ===================================================================
  RCS file: 
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/tags/vendor/StrutsFormTagsHandler.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -w -r1.16 -r1.17
  --- StrutsFormTagsHandler.java        4 Apr 2002 00:27:48 -0000       1.16
  +++ StrutsFormTagsHandler.java        4 Apr 2002 01:03:09 -0000       1.17
  @@ -1,37 +1,6 @@
   /*
  - * Copyright (c) 2001, Aslak Helles�y, BEKK Consulting
  + * Copyright (c) 2001,2002 The XDoclet team
    * All rights reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without modification,
  - * are permitted provided that the following conditions are met:
  - *
  - * - Redistributions of source code must retain the above copyright notice,
  - *   this list of conditions and the following disclaimer.
  - *
  - * - Redistributions in binary form must reproduce the above copyright
  - *   notice, this list of conditions and the following disclaimer in the
  - *   documentation and/or other materials provided with the distribution.
  - *
  - * - Neither the name of BEKK Consulting nor the names of its
  - *   contributors may be used to endorse or promote products derived from
  - *   this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
  - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  - * DAMAGE.
  - */
  -
  -/*
  - * Change log
  - *
    */
   package xdoclet.ejb.tags.vendor;
   
  @@ -64,7 +33,7 @@
   /**
    * @author Dmitri Colebatch ([EMAIL PROTECTED])
    * @created Oct 19, 2001
  - * @version $Revision: 1.16 $
  + * @version $Revision: 1.17 $
    */
   public class StrutsFormTagsHandler extends EjbTagsHandler {
   
  @@ -210,11 +179,11 @@
        /**
         * Gets the StrutsFormClassFor attribute of the StrutsFormTagsHandler class
         *
  -      * @param clazz Describe what the parameter does @todo-javadoc Write javadocs
  -      *      for method parameter
  +      * @param clazz Describe what the parameter does
         * @return The StrutsFormClassFor value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public static String getStrutsFormClassFor(XClass clazz) throws 
XDocletException {
                String packageName = clazz.containingPackage().name();
  @@ -227,17 +196,18 @@
        /**
         * Gets the StrutsFormClassName attribute of the StrutsFormTagsHandler class
         *
  -      * @param clazz Describe what the parameter does @todo-javadoc Write javadocs
  -      *      for method parameter
  +      * @param clazz Describe what the parameter does
         * @return The StrutsFormClassName value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public static String getStrutsFormClassName(XClass clazz) throws 
XDocletException {
                XTag currentTag = 
((StrutsFormSubTask)DocletContext.getInstance().getSubTaskBy(StrutsFormSubTask.SUBTASK_NAME)).getCurrentFormTag();
   
                // check if there is a name parameter
                String name = currentTag.attributeValue("name");
  +
                if (name == null) {
                        return getShortEjbNameFor(clazz) + "Form";
                }
  
  
  
  1.12      +59 -79    
xdoclet/core/src/xdoclet/ejb/tags/vendor/WeblogicRelationTagsHandler.java
  
  Index: WeblogicRelationTagsHandler.java
  ===================================================================
  RCS file: 
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/tags/vendor/WeblogicRelationTagsHandler.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -w -r1.11 -r1.12
  --- WeblogicRelationTagsHandler.java  4 Apr 2002 00:27:48 -0000       1.11
  +++ WeblogicRelationTagsHandler.java  4 Apr 2002 01:03:09 -0000       1.12
  @@ -1,37 +1,6 @@
   /*
  - * Copyright (c) 2001, Aslak Helles�y, BEKK Consulting
  + * Copyright (c) 2001,2002 The XDoclet team
    * All rights reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without modification,
  - * are permitted provided that the following conditions are met:
  - *
  - * - Redistributions of source code must retain the above copyright notice,
  - *   this list of conditions and the following disclaimer.
  - *
  - * - Redistributions in binary form must reproduce the above copyright
  - *   notice, this list of conditions and the following disclaimer in the
  - *   documentation and/or other materials provided with the distribution.
  - *
  - * - Neither the name of BEKK Consulting nor the names of its
  - *   contributors may be used to endorse or promote products derived from
  - *   this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
  - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  - * DAMAGE.
  - */
  -
  -/*
  - * Change log
  - *
    */
   package xdoclet.ejb.tags.vendor;
   
  @@ -47,7 +16,7 @@
   /**
    * @author <a href="mailto:[EMAIL PROTECTED]";>Aslak Helles�y</a>
    * @created Sept 11, 2001
  - * @version $Revision: 1.11 $
  + * @version $Revision: 1.12 $
    */
   public class WeblogicRelationTagsHandler extends RelationTagsHandler {
        /**
  @@ -61,12 +30,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void forAllLeftColumnMaps(String template) throws XDocletException {
                XTag[] columnMapTags = null;
  @@ -95,12 +65,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void forAllRightColumnMaps(String template) throws XDocletException {
                XTag[] columnMapTags = null;
  @@ -135,6 +106,7 @@
        public void ensureColumnMapTagsRight() {
                boolean leftHasTargetColumnMapTags = false;
                boolean rightHasColumnMapTags = false;
  +
                if (currentRelation.getLeftMethod() != null) {
                        leftHasTargetColumnMapTags = 
currentRelation.getLeftMethod().doc().tags("weblogic:target-column-map").length != 0;
                }
  @@ -148,12 +120,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        public String joinTableName() throws XDocletException {
                // We say mandatory is false (last parameter), so we can provide a 
more detailed error message.
  @@ -178,12 +151,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        public String leftGroupName() throws XDocletException {
                return 
currentRelation.getLeftMethod().doc().tagAttributeValue("weblogic:relation", 
"group-name", false);
  @@ -191,12 +165,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void ifHasLeftGroupName(String template) throws XDocletException {
                if (leftGroupName() != null) {
  @@ -206,12 +181,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @return Describe the return value
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
  +      * @todo-javadoc Write javadocs for exception
         */
        public String rightGroupName() throws XDocletException {
                String groupName = null;
  @@ -229,12 +205,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void ifHasRightGroupName(String template) throws XDocletException {
                if (rightGroupName() != null) {
  @@ -244,12 +221,13 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @param template Describe what the parameter does @todo-javadoc Write
  -      *      javadocs for method parameter
  -      * @exception XDocletException Describe the exception @todo-javadoc Write
  -      *      javadocs for exception
  +      * @param template Describe what the parameter does
  +      * @exception XDocletException Describe the exception
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for method parameter
  +      * @todo-javadoc Write javadocs for exception
         */
        public void ifHasKeyColumn(String template) throws XDocletException {
                if (keyColumn() != null) {
  @@ -259,10 +237,11 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  +      * @return Describe the return value
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
         */
        public String keyColumn() {
                return currentKeyColumn;
  @@ -270,10 +249,11 @@
   
   
        /**
  -      * Describe what the method does @todo-javadoc Write javadocs for method
  +      * Describe what the method does
         *
  -      * @return Describe the return value @todo-javadoc Write javadocs for return
  -      *      value
  +      * @return Describe the return value
  +      * @todo-javadoc Write javadocs for method
  +      * @todo-javadoc Write javadocs for return value
         */
        public String foreignKeyColumn() {
                return currentForeignKeyColumn;
  
  
  

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

Reply via email to