User: rinkrank
Date: 02/04/03 17:03:10
Modified: core/src/xdoclet/web JspTaglibSubTask.java
WebDocletTask.java WebXmlSubTask.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.15 +13 -41 xdoclet/core/src/xdoclet/web/JspTaglibSubTask.java
Index: JspTaglibSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/web/JspTaglibSubTask.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- JspTaglibSubTask.java 4 Apr 2002 00:27:49 -0000 1.14
+++ JspTaglibSubTask.java 4 Apr 2002 01:03:10 -0000 1.15
@@ -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.web;
@@ -46,7 +15,7 @@
*
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created July 12, 2001
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*/
public class JspTaglibSubTask extends XmlSubTask {
@@ -125,8 +94,9 @@
/**
- * Describe what the JspTaglibSubTask constructor does @todo-javadoc Write
- * javadocs for constructor
+ * Describe what the JspTaglibSubTask constructor does
+ *
+ * @todo-javadoc Write javadocs for constructor
*/
public JspTaglibSubTask() {
setTemplateURL(getClass().getResource(DEFAULT_TEMPLATE_FILE));
@@ -345,10 +315,11 @@
/**
- * Describe what the method does @todo-javadoc Write javadocs for method
+ * Describe what the method does
*
- * @exception XDocletException Describe the exception @todo-javadoc Write
- * javadocs for exception
+ * @exception XDocletException Describe the exception
+ * @todo-javadoc Write javadocs for method
+ * @todo-javadoc Write javadocs for exception
*/
public void execute() throws XDocletException {
if (getJspversion().equals("1.1")) {
@@ -367,10 +338,11 @@
/**
- * Describe what the method does @todo-javadoc Write javadocs for method
+ * Describe what the method does
*
- * @exception XDocletException Describe the exception @todo-javadoc Write
- * javadocs for exception
+ * @exception XDocletException Describe the exception
+ * @todo-javadoc Write javadocs for method
+ * @todo-javadoc Write javadocs for exception
*/
protected void engineStarted() throws XDocletException {
System.out.println(Translator.getString("generating_something",
1.19 +36 -59 xdoclet/core/src/xdoclet/web/WebDocletTask.java
Index: WebDocletTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/web/WebDocletTask.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- WebDocletTask.java 4 Apr 2002 00:27:49 -0000 1.18
+++ WebDocletTask.java 4 Apr 2002 01:03:10 -0000 1.19
@@ -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.web;
@@ -49,7 +18,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created July 2, 2001
- * @version $Revision: 1.18 $
+ * @version $Revision: 1.19 $
*/
public class WebDocletTask extends DocletTask {
/**
@@ -87,10 +56,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 WebXmlSubTask createDeploymentdescriptor() {
deploymentdescriptor = new WebXmlSubTask();
@@ -99,10 +69,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 JspTaglibSubTask createJsptaglib() {
jsptaglib = new JspTaglibSubTask();
@@ -111,10 +82,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 JBossWebXmlSubTask createJbosswebxml() {
jbosswebxml = new JBossWebXmlSubTask();
@@ -123,12 +95,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 WeblogicWebXmlSubTask createWeblogicwebxml() throws XDocletException {
weblogicwebxml = new WeblogicWebXmlSubTask();
@@ -137,10 +110,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 StrutsConfigXmlSubTask createStrutsconfigxml() {
strutsconfigxml = new StrutsConfigXmlSubTask();
@@ -149,10 +123,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 WebWorkConfigPropertiesSubTask createWebworkconfigproperties() {
webworkconfig = new WebWorkConfigPropertiesSubTask();
@@ -161,10 +136,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 WebWorkActionDocsSubTask createWebworkactiondocs() {
webworkdocs = new WebWorkActionDocsSubTask();
@@ -173,10 +149,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 JRunWebXmlSubTask createJRunWebXml() {
jrunwebxml = new JRunWebXmlSubTask();
1.19 +25 -50 xdoclet/core/src/xdoclet/web/WebXmlSubTask.java
Index: WebXmlSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/web/WebXmlSubTask.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- WebXmlSubTask.java 4 Apr 2002 00:27:49 -0000 1.18
+++ WebXmlSubTask.java 4 Apr 2002 01:03:10 -0000 1.19
@@ -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.web;
@@ -47,7 +16,7 @@
*
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created June 19, 2001
- * @version $Revision: 1.18 $
+ * @version $Revision: 1.19 $
*/
public class WebXmlSubTask extends XmlSubTask {
/**
@@ -138,8 +107,9 @@
/**
- * Describe what the WebXmlSubTask constructor does @todo-javadoc Write
- * javadocs for constructor
+ * Describe what the WebXmlSubTask constructor does
+ *
+ * @todo-javadoc Write javadocs for constructor
*/
public WebXmlSubTask() {
setTemplateURL(getClass().getResource(DEFAULT_TEMPLATE_FILE));
@@ -358,10 +328,11 @@
/**
- * Describe the method @todo-javadoc Describe the method
+ * Describe the method
*
- * @param cp Describe the method parameter @todo-javadoc Describe the method
- * parameter
+ * @param cp Describe the method parameter
+ * @todo-javadoc Describe the method
+ * @todo-javadoc Describe the method parameter
*/
public void addContextparam(ContextParam cp) {
contextParams.add(cp);
@@ -369,10 +340,11 @@
/**
- * Describe the method @todo-javadoc Describe the method
+ * Describe the method
*
- * @param file Describe the method parameter @todo-javadoc Describe the method
- * parameter
+ * @param file Describe the method parameter
+ * @todo-javadoc Describe the method
+ * @todo-javadoc Describe the method parameter
*/
public void addWelcomefile(WelcomeFile file) {
welcomeFiles.add(file);
@@ -380,10 +352,11 @@
/**
- * Describe the method @todo-javadoc Describe the method
+ * Describe the method
*
- * @param taglib Describe the method parameter @todo-javadoc Describe the
- * method parameter
+ * @param taglib Describe the method parameter
+ * @todo-javadoc Describe the method
+ * @todo-javadoc Describe the method parameter
*/
public void addTaglib(TagLib taglib) {
tagLibs.add(taglib);
@@ -391,10 +364,11 @@
/**
- * Describe what the method does @todo-javadoc Write javadocs for method
+ * Describe what the method does
*
- * @exception XDocletException Describe the exception @todo-javadoc Write
- * javadocs for exception
+ * @exception XDocletException Describe the exception
+ * @todo-javadoc Write javadocs for method
+ * @todo-javadoc Write javadocs for exception
*/
public void execute() throws XDocletException {
if (getServletspec().equals("2.2")) {
@@ -413,10 +387,11 @@
/**
- * Describe what the method does @todo-javadoc Write javadocs for method
+ * Describe what the method does
*
- * @exception XDocletException Describe the exception @todo-javadoc Write
- * javadocs for exception
+ * @exception XDocletException Describe the exception
+ * @todo-javadoc Write javadocs for method
+ * @todo-javadoc Write javadocs for exception
*/
protected void engineStarted() throws XDocletException {
System.out.println(Translator.getString("generating_something", new
String[]{getDestinationFile()}));
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
