You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2003/12/23 16:28:33 UTC
cvs commit: cocoon-2.1/src/blocks/proxy/java/org/apache/cocoon/generation HttpProxyGenerator.java
joerg 2003/12/23 07:28:33
Modified: src/java/org/apache/cocoon/environment/commandline
CommandLineRequest.java
src/blocks/velocity/java/org/apache/cocoon/generation
VelocityGenerator.java
src/blocks/axis/java/org/apache/cocoon/components/axis/providers
AvalonProvider.java
src/java/org/apache/cocoon/environment/http HttpCookie.java
HttpSession.java
src/blocks/scratchpad/java/org/apache/cocoon/generation
FlowVelocityGenerator.java JellyGenerator.java
src/java/org/apache/cocoon/servlet/multipart
TokenStream.java
src/blocks/mail/java/org/apache/cocoon/mail
MimeMessageUtil.java MailMessageSender.java
src/blocks/slide/java/org/apache/cocoon/components/source/impl
SlideSourceFactory.java SlideSource.java
src/java/org/apache/cocoon/environment Cookie.java
Session.java Response.java Request.java
src/blocks/jms/java/org/apache/cocoon/components/jms
JMSConnection.java
src/java/org/apache/cocoon/matching PreparableMatcher.java
src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom
JavaScriptAspectWeaver.java
src/blocks/portal/java/org/apache/cocoon/portal/application
PortalApplicationConfig.java
PortalApplicationConfigFactory.java
src/blocks/lucene/java/org/apache/cocoon/components/search
SimpleLuceneCocoonIndexerImpl.java
src/java/org/apache/cocoon/xml/dom DocumentWrapper.java
src/java/org/apache/cocoon/xml XMLUtils.java
src/java/org/apache/cocoon/components/modules/input
AbstractMetaModule.java
src/java/org/apache/cocoon/components/language/markup
CocoonMarkupLanguage.java
AbstractMarkupLanguage.java
src/java/org/apache/cocoon/transformation
I18nTransformer.java AbstractSAXTransformer.java
src/java/org/apache/cocoon/i18n BundleFactory.java
XMLResourceBundle.java
XMLResourceBundleFactory.java
src/deprecated/java/org/apache/cocoon/components/source
AbstractStreamSource.java
src/blocks/scratchpad/java/org/apache/cocoon/environment/portlet
PortletSession.java PortletCookie.java
src/blocks/mail/java/org/apache/cocoon/mail/transformation
SendMailTransformer.java
src/blocks/portal/java/org/apache/cocoon/portal/factory/impl
AbstractProducible.java
src/deprecated/java/org/apache/cocoon/components/source/impl
AvalonToCocoonSourceInvocationHandler.java
AvalonToCocoonSource.java
src/java/org/apache/cocoon/components/xpointer/parser
SimpleCharStream.java
src/java/org/apache/cocoon/sitemap NotifyingGenerator.java
src/test/org/apache/cocoon SitemapComponentTestCase.java
src/blocks/taglib/java/org/apache/cocoon/taglib/core
LoopTagSupport.java
src/blocks/proxy/java/org/apache/cocoon/generation
HttpProxyGenerator.java
Log:
Testing Eclipse 3.0 M6's better capabilities in pointing to Javadoc errors - but you still have to fix them by hand
Revision Changes Path
1.7 +6 -6 cocoon-2.1/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java
Index: CommandLineRequest.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CommandLineRequest.java 21 Dec 2003 22:48:56 -0000 1.6
+++ CommandLineRequest.java 23 Dec 2003 15:28:32 -0000 1.7
@@ -310,7 +310,7 @@
* ID, or <code>null</code> if the request did
* not specify a session ID
*
- * @see #isRequestedSessionIdValid
+ * @see #isRequestedSessionIdValid()
*/
public String getRequestedSessionId() {
return (CommandLineSession.getSession(false) != null) ?
@@ -325,8 +325,8 @@
* in the current session context;
* <code>false</code> otherwise
*
- * @see #getRequestedSessionId
- * @see #getSession
+ * @see #getRequestedSessionId()
+ * @see #getSession()
*/
public boolean isRequestedSessionIdValid() {
return (CommandLineSession.getSession(false) != null);
@@ -340,7 +340,7 @@
* cookie; otherwise, <code>false</code>
*
*
- * @see #getSession
+ * @see #getSession()
*/
public boolean isRequestedSessionIdFromCookie() {
return false;
@@ -355,7 +355,7 @@
* <code>false</code>
*
*
- * @see #getSession
+ * @see #getSession()
*/
public boolean isRequestedSessionIdFromURL() {
return false;
1.11 +15 -14 cocoon-2.1/src/blocks/velocity/java/org/apache/cocoon/generation/VelocityGenerator.java
Index: VelocityGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/velocity/java/org/apache/cocoon/generation/VelocityGenerator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- VelocityGenerator.java 24 Sep 2003 22:34:53 -0000 1.10
+++ VelocityGenerator.java 23 Dec 2003 15:28:32 -0000 1.11
@@ -87,6 +87,7 @@
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.log.LogSystem;
+import org.apache.velocity.runtime.resource.Resource;
import org.apache.velocity.util.introspection.Info;
import org.apache.velocity.util.introspection.UberspectImpl;
import org.apache.velocity.util.introspection.VelMethod;
@@ -653,7 +654,7 @@
* 'context' property is not set.
* @throws ClassCastException if the 'context' property is not
* of type {@link org.apache.avalon.framework.context.Context}.
- * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#init
+ * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#init(ExtendedProperties)
*/
public void init(ExtendedProperties config) {
this.resolverContext = (org.apache.avalon.framework.context.Context) config.get("context");
@@ -664,7 +665,7 @@
/**
* @param systemId the path to the resource
- * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#getResourceStream
+ * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#getResourceStream(String)
*/
public InputStream getResourceStream(String systemId)
throws org.apache.velocity.exception.ResourceNotFoundException {
@@ -678,9 +679,9 @@
}
/**
- * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#isSourceModified
+ * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#isSourceModified(Resource)
*/
- public boolean isSourceModified(org.apache.velocity.runtime.resource.Resource resource) {
+ public boolean isSourceModified(Resource resource) {
long lastModified = 0;
try {
lastModified = resolveSource(resource.getName()).getLastModified();
@@ -693,9 +694,9 @@
}
/**
- * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#getLastModified
+ * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#getLastModified(Resource)
*/
- public long getLastModified(org.apache.velocity.runtime.resource.Resource resource) {
+ public long getLastModified(Resource resource) {
long lastModified = 0;
try {
lastModified = resolveSource(resource.getName()).getLastModified();
@@ -761,7 +762,7 @@
* from the configuration.
*
* @param configuration the class configurations.
- * @see org.apache.avalon.framework.configuration.Configurable#configure
+ * @see org.apache.avalon.framework.configuration.Configurable#configure(Configuration)
*/
public void configure(Configuration configuration) throws ConfigurationException {
this.resolverContext = new DefaultContext();
@@ -834,14 +835,14 @@
}
/**
- * @see org.apache.avalon.framework.activity.Initializable#initialize
+ * @see org.apache.avalon.framework.activity.Initializable#initialize()
*/
public void initialize() throws Exception {
//this.tmplEngine.init();
}
/**
- * @see org.apache.cocoon.sitemap.SitemapModelComponent#setup
+ * @see org.apache.cocoon.sitemap.SitemapModelComponent#setup(SourceResolver, Map, String, Parameters)
*/
public void setup(SourceResolver resolver, Map objectModel, String src, Parameters params)
throws ProcessingException, SAXException, IOException {
@@ -988,7 +989,7 @@
* Free up the VelocityContext associated with the pipeline, and
* release any Source objects resolved by the resource loader.
*
- * @see org.apache.avalon.excalibur.pool.Recyclable#recycle
+ * @see org.apache.avalon.excalibur.pool.Recyclable#recycle()
*/
public void recycle() {
this.activeFlag = false;
@@ -1009,7 +1010,7 @@
/**
* Generate XML data using Velocity template.
*
- * @see org.apache.cocoon.generation.Generator#generate
+ * @see org.apache.cocoon.generation.Generator#generate()
*/
public void generate()
throws IOException, SAXException, ProcessingException {
@@ -1091,7 +1092,7 @@
/**
* This implementation does nothing.
*
- * @see org.apache.velocity.runtime.log.LogSystem#init
+ * @see org.apache.velocity.runtime.log.LogSystem#init(RuntimeServices)
*/
public void init(RuntimeServices rs) throws Exception {
}
@@ -1099,7 +1100,7 @@
/**
* Pass along Velocity log messages to our configured logger.
*
- * @see org.apache.velocity.runtime.log.LogSystem#logVelocityMessage
+ * @see org.apache.velocity.runtime.log.LogSystem#logVelocityMessage(int, String)
*/
public void logVelocityMessage(int level, String message) {
switch (level) {
1.4 +1 -2 cocoon-2.1/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java
Index: AvalonProvider.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AvalonProvider.java 5 Sep 2003 07:10:54 -0000 1.3
+++ AvalonProvider.java 23 Dec 2003 15:28:32 -0000 1.4
@@ -284,7 +284,6 @@
*
* @param object a <code>Component</code> instance
* @param manager a <code>ComponentManager</code> instance
- * @param log a <code>Logger</code> instance
*/
public Handler(final Component object, final ComponentManager manager)
{
1.2 +17 -17 cocoon-2.1/src/java/org/apache/cocoon/environment/http/HttpCookie.java
Index: HttpCookie.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/http/HttpCookie.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpCookie.java 9 Mar 2003 00:09:30 -0000 1.1
+++ HttpCookie.java 23 Dec 2003 15:28:32 -0000 1.2
@@ -136,8 +136,8 @@
* (for example, a comma, space, or semicolon)
* or it is one of the tokens reserved for use
* by the cookie protocol
- * @see #setValue
- * @see #setVersion
+ * @see #setValue(String)
+ * @see #setVersion(int)
*
*/
@@ -166,7 +166,7 @@
* @param purpose a <code>String</code> specifying the comment
* to display to the user
*
- * @see #getComment
+ * @see #getComment()
*
*/
@@ -185,7 +185,7 @@
* @return a <code>String</code> containing the comment,
* or <code>null</code> if none
*
- * @see #setComment
+ * @see #setComment(String)
*
*/
@@ -213,7 +213,7 @@
* within which this cookie is visible;
* form is according to RFC 2109
*
- * @see #getDomain
+ * @see #getDomain()
*
*/
@@ -232,7 +232,7 @@
*
* @return a <code>String</code> containing the domain name
*
- * @see #setDomain
+ * @see #setDomain(String)
*
*/
@@ -263,7 +263,7 @@
* the cookie
*
*
- * @see #getMaxAge
+ * @see #getMaxAge()
*
*/
@@ -286,7 +286,7 @@
* the cookie persists until browser shutdown
*
*
- * @see #setMaxAge
+ * @see #setMaxAge(int)
*
*/
@@ -315,7 +315,7 @@
* @param uri a <code>String</code> specifying a path
*
*
- * @see #getPath
+ * @see #getPath()
*
*/
@@ -336,7 +336,7 @@
* @return a <code>String</code> specifying a path that contains
* a servlet name, for example, <i>/catalog</i>
*
- * @see #setPath
+ * @see #setPath(String)
*
*/
@@ -359,7 +359,7 @@
* to the server using only when using a secure protocol;
* if <code>false</code>, sent on any protocol
*
- * @see #getSecure
+ * @see #getSecure()
*
*/
@@ -379,7 +379,7 @@
* @return <code>true</code> if the browser can use
* any standard protocol; otherwise, <code>false</code>
*
- * @see #setSecure
+ * @see #setSecure(boolean)
*
*/
@@ -423,7 +423,7 @@
* @param newValue a <code>String</code> specifying the new value
*
*
- * @see #getValue
+ * @see #getValue()
* @see Cookie
*
*/
@@ -442,7 +442,7 @@
* @return a <code>String</code> containing the cookie's
* present value
*
- * @see #setValue
+ * @see #setValue(String)
* @see Cookie
*
*/
@@ -467,7 +467,7 @@
* original Netscape specification; 1
* if the cookie complies with RFC 2109
*
- * @see #setVersion
+ * @see #setVersion(int)
*
*/
@@ -492,7 +492,7 @@
* the original Netscape specification;
* 1 if the cookie should comply with RFC 2109
*
- * @see #getVersion
+ * @see #getVersion()
*
*/
1.2 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/environment/http/HttpSession.java
Index: HttpSession.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/http/HttpSession.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpSession.java 9 Mar 2003 00:09:30 -0000 1.1
+++ HttpSession.java 23 Dec 2003 15:28:32 -0000 1.2
@@ -182,7 +182,7 @@
* seconds this session remains open
* between client requests
*
- * @see #setMaxInactiveInterval
+ * @see #setMaxInactiveInterval(int)
*
*
*/
1.4 +15 -14 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation/FlowVelocityGenerator.java
Index: FlowVelocityGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation/FlowVelocityGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FlowVelocityGenerator.java 24 Sep 2003 22:34:53 -0000 1.3
+++ FlowVelocityGenerator.java 23 Dec 2003 15:28:32 -0000 1.4
@@ -87,6 +87,7 @@
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.log.LogSystem;
+import org.apache.velocity.runtime.resource.Resource;
import org.apache.velocity.util.introspection.Info;
import org.apache.velocity.util.introspection.UberspectImpl;
import org.apache.velocity.util.introspection.VelMethod;
@@ -653,7 +654,7 @@
* 'context' property is not set.
* @throws ClassCastException if the 'context' property is not
* of type {@link org.apache.avalon.framework.context.Context}.
- * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#init
+ * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#init(ExtendedProperties)
*/
public void init(ExtendedProperties config) {
this.resolverContext = (org.apache.avalon.framework.context.Context) config.get("context");
@@ -664,7 +665,7 @@
/**
* @param systemId the path to the resource
- * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#getResourceStream
+ * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#getResourceStream(String)
*/
public InputStream getResourceStream(String systemId)
throws org.apache.velocity.exception.ResourceNotFoundException {
@@ -678,9 +679,9 @@
}
/**
- * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#isSourceModified
+ * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#isSourceModified(Resource)
*/
- public boolean isSourceModified(org.apache.velocity.runtime.resource.Resource resource) {
+ public boolean isSourceModified(Resource resource) {
long lastModified = 0;
try {
lastModified = resolveSource(resource.getName()).getLastModified();
@@ -693,9 +694,9 @@
}
/**
- * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#getLastModified
+ * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#getLastModified(Resource)
*/
- public long getLastModified(org.apache.velocity.runtime.resource.Resource resource) {
+ public long getLastModified(Resource resource) {
long lastModified = 0;
try {
lastModified = resolveSource(resource.getName()).getLastModified();
@@ -761,7 +762,7 @@
* from the configuration.
*
* @param configuration the class configurations.
- * @see org.apache.avalon.framework.configuration.Configurable#configure
+ * @see org.apache.avalon.framework.configuration.Configurable#configure(Configuration)
*/
public void configure(Configuration configuration) throws ConfigurationException {
this.resolverContext = new DefaultContext();
@@ -834,14 +835,14 @@
}
/**
- * @see org.apache.avalon.framework.activity.Initializable#initialize
+ * @see org.apache.avalon.framework.activity.Initializable#initialize()
*/
public void initialize() throws Exception {
//this.tmplEngine.init();
}
/**
- * @see org.apache.cocoon.sitemap.SitemapModelComponent#setup
+ * @see org.apache.cocoon.sitemap.SitemapModelComponent#setup(SourceResolver, Map, String, Parameters)
*/
public void setup(SourceResolver resolver, Map objectModel, String src, Parameters params)
throws ProcessingException, SAXException, IOException {
@@ -988,7 +989,7 @@
* Free up the VelocityContext associated with the pipeline, and
* release any Source objects resolved by the resource loader.
*
- * @see org.apache.avalon.excalibur.pool.Recyclable#recycle
+ * @see org.apache.avalon.excalibur.pool.Recyclable#recycle()
*/
public void recycle() {
this.activeFlag = false;
@@ -1009,7 +1010,7 @@
/**
* Generate XML data using Velocity template.
*
- * @see org.apache.cocoon.generation.Generator#generate
+ * @see org.apache.cocoon.generation.Generator#generate()
*/
public void generate()
throws IOException, SAXException, ProcessingException {
@@ -1091,7 +1092,7 @@
/**
* This implementation does nothing.
*
- * @see org.apache.velocity.runtime.log.LogSystem#init
+ * @see org.apache.velocity.runtime.log.LogSystem#init(RuntimeServices)
*/
public void init(RuntimeServices rs) throws Exception {
}
@@ -1099,7 +1100,7 @@
/**
* Pass along Velocity log messages to our configured logger.
*
- * @see org.apache.velocity.runtime.log.LogSystem#logVelocityMessage
+ * @see org.apache.velocity.runtime.log.LogSystem#logVelocityMessage(int, String)
*/
public void logVelocityMessage(int level, String message) {
switch (level) {
1.6 +1 -1 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation/JellyGenerator.java
Index: JellyGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation/JellyGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JellyGenerator.java 23 Dec 2003 12:54:09 -0000 1.5
+++ JellyGenerator.java 23 Dec 2003 15:28:32 -0000 1.6
@@ -94,7 +94,7 @@
}
/**
- * @see org.apache.cocoon.sitemap.SitemapModelComponent#setup
+ * @see org.apache.cocoon.sitemap.SitemapModelComponent#setup(SourceResolver, Map, String, Parameters)
*/
public void setup(SourceResolver resolver, Map objectModel, String src, Parameters params)
throws ProcessingException,SAXException,IOException {
1.3 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/servlet/multipart/TokenStream.java
Index: TokenStream.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/multipart/TokenStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TokenStream.java 24 Sep 2003 21:41:11 -0000 1.2
+++ TokenStream.java 23 Dec 2003 15:28:32 -0000 1.3
@@ -110,7 +110,7 @@
* Creates a new pushback token stream from in.
*
* @param in The input stream
- * @param pushbackSize Size (in bytes) of the pushback buffer
+ * @param size Size (in bytes) of the pushback buffer
*/
public TokenStream(PushbackInputStream in, int size) {
super(in,size);
1.3 +4 -5 cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MimeMessageUtil.java
Index: MimeMessageUtil.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MimeMessageUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MimeMessageUtil.java 11 Mar 2003 19:04:58 -0000 1.2
+++ MimeMessageUtil.java 23 Dec 2003 15:28:32 -0000 1.3
@@ -197,11 +197,10 @@
/**
- * Description of the Method
*
- *@param part Description of the Parameter
- *@param ctPref Description of the Parameter
- *@param v Description of the Parameter
+ *@param part
+ *@param ctPref
+ *@param l
*/
private static void flattenMessageHelper
(MimePart part, ContentTypePreference ctPref, List l) {
1.8 +7 -7 cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java
Index: MailMessageSender.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MailMessageSender.java 15 Nov 2003 04:21:30 -0000 1.7
+++ MailMessageSender.java 23 Dec 2003 15:28:32 -0000 1.8
@@ -137,7 +137,7 @@
* @param obj attachment
* @param type override mime type
* @param name override attachment name
- * @param isURL obj is an instance of String and contains a URL
+ * @param isURI obj is an instance of String and contains a URL
*/
public Attachment(Object obj, String type, String name, boolean isURI) {
this.obj = obj;
@@ -178,7 +178,7 @@
/**
* Return attachment type. The argument overrides the stored type.
- * @param name
+ * @param type attachment type
* @return stored type or otherwise parameter
*/
public String getType(String type) {
@@ -428,10 +428,10 @@
/** Sets the destination address(es) for the message. The address
* is in the format, that
- * {@link javax.mail.internet.InternetAddress#parse} can handle
+ * {@link javax.mail.internet.InternetAddress#parse(String)} can handle
* (one or more email addresses separated by a commas).
* @param to the destination address(es)
- * @see javax.mail.internet.InternetAddress#parse
+ * @see javax.mail.internet.InternetAddress#parse(String)
*/
public void setTo(String to) {
if (!("".equals(to) || "null".equals(to))) {
@@ -444,7 +444,7 @@
* {@link javax.mail.internet.InternetAddress#parse} can handle
* (one or more email addresses separated by a commas).
* @param cc the address(es), which should receive a carbon copy.
- * @see javax.mail.internet.InternetAddress#parse
+ * @see javax.mail.internet.InternetAddress#parse(String)
*/
public void setCc(String cc) {
if (!("".equals(cc) || "null".equals(cc))) {
@@ -457,7 +457,7 @@
* {@link javax.mail.internet.InternetAddress#parse} can handle
* (one or more email addresses separated by a commas).
* @param bcc the address(es), which should receive a black carbon copy.
- * @see javax.mail.internet.InternetAddress#parse
+ * @see javax.mail.internet.InternetAddress#parse(String)
*/
public void setBcc(String bcc) {
if (!("".equals(bcc) || "null".equals(bcc))) {
1.12 +2 -2 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSourceFactory.java
Index: SlideSourceFactory.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSourceFactory.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SlideSourceFactory.java 22 Dec 2003 13:35:06 -0000 1.11
+++ SlideSourceFactory.java 23 Dec 2003 15:28:32 -0000 1.12
@@ -118,7 +118,7 @@
/**
* Get a <code>Source</code> object.
*
- * @param uri URI of the source.
+ * @param location URI of the source.
* @param parameters This is optional.
*
* @return A new source object.
1.15 +3 -9 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSource.java
Index: SlideSource.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSource.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SlideSource.java 22 Dec 2003 13:35:06 -0000 1.14
+++ SlideSource.java 23 Dec 2003 15:28:32 -0000 1.15
@@ -158,11 +158,6 @@
* @param nat Namespace access token
* @param scheme Scheme of the source
* @param path Path of the source.
- * @param sourcecredential Credential, which should be used.
- * @param sourcerevision Revision, which should be used.
- * @param sourcerevisionbranch Branch, which should be used.
- *
- * @throws SourceException If Exception occurs during the initialization.
*/
public SlideSource(NamespaceAccessToken nat,
String scheme,
@@ -792,7 +787,7 @@
/**
* Sets a property for a source.
*
- * @param sourceproperty Property of the source
+ * @param property Property of the source
*
* @throws SourceException If an exception occurs during this operation
*/
@@ -948,7 +943,6 @@
*
* @return The current revision of the source
*
- * @throws SourceException If an exception occurs.
*/
public String getSourceRevision() {
if (m_version != null) {
@@ -960,7 +954,7 @@
/**
* Not implemented.
*
- * @param sourcerevision The revision, which should be used.
+ * @param revision The revision, which should be used.
*
* @throws SourceException If an exception occurs.
*/
1.2 +15 -15 cocoon-2.1/src/java/org/apache/cocoon/environment/Cookie.java
Index: Cookie.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/Cookie.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Cookie.java 9 Mar 2003 00:09:28 -0000 1.1
+++ Cookie.java 23 Dec 2003 15:28:32 -0000 1.2
@@ -102,7 +102,7 @@
* @param purpose a <code>String</code> specifying the comment
* to display to the user
*
- * @see #getComment
+ * @see #getComment()
*
*/
@@ -118,7 +118,7 @@
* @return a <code>String</code> containing the comment,
* or <code>null</code> if none
*
- * @see #setComment
+ * @see #setComment(String)
*
*/
@@ -143,7 +143,7 @@
* within which this cookie is visible;
* form is according to RFC 2109
*
- * @see #getDomain
+ * @see #getDomain()
*
*/
@@ -159,7 +159,7 @@
*
* @return a <code>String</code> containing the domain name
*
- * @see #setDomain
+ * @see #setDomain(String)
*
*/
@@ -187,7 +187,7 @@
* the cookie
*
*
- * @see #getMaxAge
+ * @see #getMaxAge()
*
*/
@@ -207,7 +207,7 @@
* the cookie persists until browser shutdown
*
*
- * @see #setMaxAge
+ * @see #setMaxAge(int)
*
*/
@@ -233,7 +233,7 @@
* @param uri a <code>String</code> specifying a path
*
*
- * @see #getPath
+ * @see #getPath()
*
*/
@@ -251,7 +251,7 @@
* @return a <code>String</code> specifying a path that contains
* a servlet name, for example, <i>/catalog</i>
*
- * @see #setPath
+ * @see #setPath(String)
*
*/
@@ -271,7 +271,7 @@
* to the server using only when using a secure protocol;
* if <code>false</code>, sent on any protocol
*
- * @see #getSecure
+ * @see #getSecure()
*
*/
@@ -288,7 +288,7 @@
* @return <code>true</code> if the browser can use
* any standard protocol; otherwise, <code>false</code>
*
- * @see #setSecure
+ * @see #setSecure(boolean)
*
*/
@@ -326,7 +326,7 @@
* @param newValue a <code>String</code> specifying the new value
*
*
- * @see #getValue
+ * @see #getValue()
* @see Cookie
*
*/
@@ -342,7 +342,7 @@
* @return a <code>String</code> containing the cookie's
* present value
*
- * @see #setValue
+ * @see #setValue(String)
* @see Cookie
*
*/
@@ -364,7 +364,7 @@
* original Netscape specification; 1
* if the cookie complies with RFC 2109
*
- * @see #setVersion
+ * @see #setVersion(int)
*
*/
@@ -386,7 +386,7 @@
* the original Netscape specification;
* 1 if the cookie should comply with RFC 2109
*
- * @see #getVersion
+ * @see #getVersion()
*
*/
1.2 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/environment/Session.java
Index: Session.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/Session.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Session.java 9 Mar 2003 00:09:28 -0000 1.1
+++ Session.java 23 Dec 2003 15:28:32 -0000 1.2
@@ -162,7 +162,7 @@
* seconds this session remains open
* between client requests
*
- * @see #setMaxInactiveInterval
+ * @see #setMaxInactiveInterval(int)
*
*
*/
1.2 +12 -12 cocoon-2.1/src/java/org/apache/cocoon/environment/Response.java
Index: Response.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/Response.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Response.java 9 Mar 2003 00:09:28 -0000 1.1
+++ Response.java 23 Dec 2003 15:28:32 -0000 1.2
@@ -88,7 +88,7 @@
*
* @param loc the locale of the response
*
- * @see #getLocale
+ * @see #getLocale()
*
*/
@@ -98,7 +98,7 @@
* Returns the locale assigned to the response.
*
*
- * @see #setLocale
+ * @see #setLocale(Locale)
*
*/
@@ -188,8 +188,8 @@
* @param name the name of the header to set
* @param date the assigned date value
*
- * @see #containsHeader
- * @see #addDateHeader
+ * @see #containsHeader(String)
+ * @see #addDateHeader(String, long)
*/
void setDateHeader(String name, long date);
@@ -204,7 +204,7 @@
* @param name the name of the header to set
* @param date the additional date value
*
- * @see #setDateHeader
+ * @see #setDateHeader(String, long)
*/
void addDateHeader(String name, long date);
@@ -220,8 +220,8 @@
* @param name the name of the header
* @param value the header value
*
- * @see #containsHeader
- * @see #addHeader
+ * @see #containsHeader(String)
+ * @see #addHeader(String, String)
*/
void setHeader(String name, String value);
@@ -233,7 +233,7 @@
* @param name the name of the header
* @param value the additional header value
*
- * @see #setHeader
+ * @see #setHeader(String, String)
*/
void addHeader(String name, String value);
@@ -248,8 +248,8 @@
* @param name the name of the header to set
* @param value the assigned int value
*
- * @see #containsHeader
- * @see #addIntHeader
+ * @see #containsHeader(String)
+ * @see #addIntHeader(String, int)
*/
void setIntHeader(String name, int value);
@@ -262,7 +262,7 @@
* @param name the name of the header to set
* @param value the additional int value
*
- * @see #setIntHeader
+ * @see #setIntHeader(String, int)
*/
void addIntHeader(String name, int value);
1.5 +9 -9 cocoon-2.1/src/java/org/apache/cocoon/environment/Request.java
Index: Request.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/Request.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Request.java 18 Jul 2003 20:53:50 -0000 1.4
+++ Request.java 23 Dec 2003 15:28:32 -0000 1.5
@@ -217,7 +217,7 @@
* @return a <code>String</code> representing the
* single value of the parameter
*
- * @see #getParameterValues
+ * @see #getParameterValues(String)
*
*/
@@ -255,7 +255,7 @@
* @return an array of <code>String</code> objects
* containing the parameter's values
*
- * @see #getParameter
+ * @see #getParameter(String)
*
*/
@@ -648,7 +648,7 @@
* otherwise, <code>false</code>
*
*
- * @see #getRemoteUser
+ * @see #getRemoteUser()
*
*/
@@ -669,7 +669,7 @@
* ID, or <code>null</code> if the request did
* not specify a session ID
*
- * @see #isRequestedSessionIdValid
+ * @see #isRequestedSessionIdValid()
*
*/
@@ -797,8 +797,8 @@
* in the current session context;
* <code>false</code> otherwise
*
- * @see #getRequestedSessionId
- * @see #getSession
+ * @see #getRequestedSessionId()
+ * @see #getSession()
*
*/
@@ -813,7 +813,7 @@
* cookie; otherwise, <code>false</code>
*
*
- * @see #getSession
+ * @see #getSession()
*
*/
@@ -829,7 +829,7 @@
* <code>false</code>
*
*
- * @see #getSession
+ * @see #getSession()
*
*/
1.6 +2 -2 cocoon-2.1/src/blocks/jms/java/org/apache/cocoon/components/jms/JMSConnection.java
Index: JMSConnection.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/jms/java/org/apache/cocoon/components/jms/JMSConnection.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JMSConnection.java 15 Nov 2003 04:21:29 -0000 1.5
+++ JMSConnection.java 23 Dec 2003 15:28:32 -0000 1.6
@@ -74,7 +74,7 @@
* @param listener
* @param selector
*
- * @throws CacadingException if the connection was not successfully
+ * @throws CascadingException if the connection was not successfully
* initialized, JMSException or NamingException if errors occur during
* JMS methods. It is up to the MessageListener to determine how to
* handle this failure.
1.2 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/matching/PreparableMatcher.java
Index: PreparableMatcher.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/matching/PreparableMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PreparableMatcher.java 9 Mar 2003 00:09:33 -0000 1.1
+++ PreparableMatcher.java 23 Dec 2003 15:28:32 -0000 1.2
@@ -75,7 +75,7 @@
* @param pattern The pattern to prepare. Depending on the implementation the pattern
* can contain wildcards or regular expressions.
* @return an optimized representation of the pattern.
- * @throws a <code>PatternException</code> if the pattern couldn't be prepared.
+ * @throws PatternException if the pattern couldn't be prepared.
*/
Object preparePattern(String pattern) throws PatternException;
1.9 +2 -8 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/JavaScriptAspectWeaver.java
Index: JavaScriptAspectWeaver.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/JavaScriptAspectWeaver.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JavaScriptAspectWeaver.java 24 Sep 2003 22:00:34 -0000 1.8
+++ JavaScriptAspectWeaver.java 23 Dec 2003 15:28:32 -0000 1.9
@@ -653,9 +653,6 @@
}
}
- /**
- * @param string
- */
public void writeToFile( Source source ) throws Exception {
if( source.getScheme().equals( "file" ) ) {
String filename = source.getURI().substring("file:/".length() ) +
@@ -674,7 +671,7 @@
/**
* Add all tokens in the correct order
*
- * @param interceptionsList - sorted list of all available interceptions
+ * @param interceptionGroupList - sorted list of all available interceptions
* @param functionName - name of the intercepted function
* @param eventType - event type
* @param tokensListIt - ListIterator where the new tokens found
@@ -1223,9 +1220,6 @@
this.type = type;
}
- /**
- * @param string
- */
public void setBaseScript(String src) {
this.baseScript = src;
}
1.4 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/application/PortalApplicationConfig.java
Index: PortalApplicationConfig.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/application/PortalApplicationConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PortalApplicationConfig.java 7 Dec 2003 13:27:55 -0000 1.3
+++ PortalApplicationConfig.java 23 Dec 2003 15:28:32 -0000 1.4
@@ -136,7 +136,7 @@
/**
* Returns true, if configuration element is the expected one.
* @param elem a DOM element, that holds the configuration of one portal application
- * @param name the id of the coplet
+ * @param id the id of the coplet
*/
private static boolean isCoplet(Element elem, String id) {
String nameAttr = elem.getAttribute("copletId");
1.3 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/application/PortalApplicationConfigFactory.java
Index: PortalApplicationConfigFactory.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/application/PortalApplicationConfigFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortalApplicationConfigFactory.java 18 Sep 2003 14:38:46 -0000 1.2
+++ PortalApplicationConfigFactory.java 23 Dec 2003 15:28:32 -0000 1.3
@@ -177,7 +177,7 @@
* Returns the PortalApplicationConfig object for a given coplet. This is a modification of
* getConfig with the special feature, that the configuration is parsed again before the
* searched configuration is returned.
- * @param copletId the id of the coplet
+ * @param specialId the id of the coplet
* @return PortalApplicationConfig the config object
*/
private PortalApplicationConfig getSpecialConfig(String specialId)
1.6 +2 -2 cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneCocoonIndexerImpl.java
Index: SimpleLuceneCocoonIndexerImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneCocoonIndexerImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleLuceneCocoonIndexerImpl.java 14 Dec 2003 20:59:08 -0000 1.5
+++ SimpleLuceneCocoonIndexerImpl.java 23 Dec 2003 15:28:32 -0000 1.6
@@ -117,7 +117,7 @@
/**
* configuration default value for lucene's merge factor.
*
- * @see http://www.mail-archive.com/lucene-user@jakarta.apache.org/msg00373.html
+ * @link http://www.mail-archive.com/lucene-user@jakarta.apache.org/msg00373.html
*/
public final static int MERGE_FACTOR_DEFAULT = 10;
1.3 +1 -3 cocoon-2.1/src/java/org/apache/cocoon/xml/dom/DocumentWrapper.java
Index: DocumentWrapper.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/dom/DocumentWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DocumentWrapper.java 15 Aug 2003 15:55:03 -0000 1.2
+++ DocumentWrapper.java 23 Dec 2003 15:28:33 -0000 1.3
@@ -572,7 +572,6 @@
* When it is defined to be <code>null</code>, setting it has no effect.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
- * @exception DOMException
* DOMSTRING_SIZE_ERR: Raised when it would return more characters than
* fit in a <code>DOMString</code> variable on the implementation
* platform.
@@ -881,7 +880,6 @@
* When it is defined to be <code>null</code>, setting it has no effect.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
- * @exception DOMException
* DOMSTRING_SIZE_ERR: Raised when it would return more characters than
* fit in a <code>DOMString</code> variable on the implementation
* platform.
1.5 +13 -13 cocoon-2.1/src/java/org/apache/cocoon/xml/XMLUtils.java
Index: XMLUtils.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/XMLUtils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLUtils.java 24 Oct 2003 13:42:01 -0000 1.4
+++ XMLUtils.java 23 Dec 2003 15:28:33 -0000 1.5
@@ -382,7 +382,7 @@
* @param localName The local name (without prefix)
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
*/
public static void createElement(ContentHandler contentHandler, String localName)
throws SAXException {
@@ -398,7 +398,7 @@
* @param stringValue The content of the Element
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
*/
public static void createElement(ContentHandler contentHandler, String localName, String stringValue)
throws SAXException {
@@ -416,7 +416,7 @@
* Attributes object.
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
* @see org.xml.sax.Attributes
*/
public static void createElement(ContentHandler contentHandler, String localName, Attributes atts)
@@ -436,7 +436,7 @@
* @param stringValue The content of the Element
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
* @see org.xml.sax.Attributes
*/
public static void createElement(ContentHandler contentHandler, String localName, Attributes atts, String stringValue)
@@ -452,7 +452,7 @@
* @param localName The local name (without prefix)
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
*/
public static void createElementNS(ContentHandler contentHandler, String namespaceURI, String localName)
throws SAXException {
@@ -468,7 +468,7 @@
* @param stringValue The content of the Element
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
*/
public static void createElementNS(
ContentHandler contentHandler,
@@ -490,7 +490,7 @@
* Attributes object.
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
* @see org.xml.sax.Attributes
*/
public static void createElementNS(
@@ -514,7 +514,7 @@
* @param stringValue The content of the Element
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
* @see org.xml.sax.Attributes
*/
public static void createElementNS(
@@ -565,7 +565,7 @@
* @param localName The local name (without prefix)
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
*/
public static void startElement(ContentHandler contentHandler, String localName)
throws SAXException {
@@ -580,7 +580,7 @@
* @param localName The local name (without prefix)
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
*/
public static void startElement(ContentHandler contentHandler, String namespaceURI, String localName)
throws SAXException {
@@ -596,7 +596,7 @@
* Attributes object.
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
* @see org.xml.sax.Attributes
*/
public static void startElement(ContentHandler contentHandler, String localName, Attributes atts)
@@ -615,7 +615,7 @@
* Attributes object.
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
* @see org.xml.sax.Attributes
*/
public static void startElement(ContentHandler contentHandler, String namespaceURI, String localName, Attributes atts)
1.6 +7 -7 cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
Index: AbstractMetaModule.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractMetaModule.java 24 Sep 2003 21:41:12 -0000 1.5
+++ AbstractMetaModule.java 23 Dec 2003 15:28:33 -0000 1.6
@@ -235,7 +235,7 @@
/**
* Get names of available attributes in the specified (usually statically
* assigned) Input Module.
- * @see InputModule#getAttributeNames
+ * @see InputModule#getAttributeNames(Configuration, Map)
*/
protected Iterator getNames(Map objectModel,
InputModule staticMod, String staticModName, Configuration staticModConf)
@@ -248,7 +248,7 @@
* Get names of available attributes in one of the specified Input Modules
* (static or dynamic, dynamic preferred). Dynamic IM may be
* <code>null</code>.
- * @see InputModule#getAttributeNames
+ * @see InputModule#getAttributeNames(Configuration, Map)
*/
protected Iterator getNames(Map objectModel,
InputModule staticMod, String staticModName, Configuration staticModConf,
@@ -262,7 +262,7 @@
/**
* Get an attribute's value from a (usually statically assigned) Input
* Module.
- * @see InputModule#getAttribute
+ * @see InputModule#getAttribute(String, Configuration, Map)
*/
protected Object getValue(String attr, Map objectModel,
InputModule staticMod, String staticModName, Configuration staticModConf)
@@ -276,7 +276,7 @@
* Get attribute's value in one of the specified Input Modules
* (static or dynamic, dynamic preferred). Dynamic IM may be
* <code>null</code>.
- * @see InputModule#getAttribute
+ * @see InputModule#getAttribute(String, Configuration, Map)
*/
protected Object getValue(String attr, Map objectModel,
InputModule staticMod, String staticModName, Configuration staticModConf,
@@ -289,7 +289,7 @@
/**
* Get an attribute's values from a (usually statically assigned) Input
* Module.
- * @see InputModule#getAttributeValues
+ * @see InputModule#getAttributeValues(String, Configuration, Map)
*/
protected Object[] getValues(String attr, Map objectModel,
InputModule staticMod, String staticModName, Configuration staticModConf)
@@ -302,7 +302,7 @@
* Get attribute's values in one of the specified Input Modules
* (static or dynamic, dynamic preferred). Dynamic IM may be
* <code>null</code>.
- * @see InputModule#getAttributeValues
+ * @see InputModule#getAttributeValues(String, Configuration, Map)
*/
protected Object[] getValues(String attr, Map objectModel,
InputModule staticMod, String staticModName, Configuration staticModConf,
1.3 +2 -3 cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java
Index: CocoonMarkupLanguage.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CocoonMarkupLanguage.java 22 May 2003 13:02:47 -0000 1.2
+++ CocoonMarkupLanguage.java 23 Dec 2003 15:28:33 -0000 1.3
@@ -164,8 +164,7 @@
* elements for this purpose.
*
* @param location The file path of the dependent file
- * @see <code>AbstractMarkupLanguage</code>, <code>ServerPagesGenerator</code>
- * and <code>AbstractServerPage</code>
+ * @see AbstractMarkupLanguage, ServerPagesGenerator, AbstractServerPage
*/
protected void addDependency(String location) {
dependencies.add(location);
1.3 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractMarkupLanguage.java 22 May 2003 13:02:47 -0000 1.2
+++ AbstractMarkupLanguage.java 23 Dec 2003 15:28:33 -0000 1.3
@@ -329,7 +329,7 @@
* tested for change on each invocation; this information is used to assert whether regeneration is necessary.
*
* @param location The file path of the dependent file
- * @see <code>AbstractMarkupLanguage</code>, <code>ServerPagesGenerator</code> and <code>AbstractServerPage</code>
+ * @see AbstractMarkupLanguage, ServerPagesGenerator, AbstractServerPage
*/
protected abstract void addDependency(String location);
1.21 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/transformation/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/I18nTransformer.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- I18nTransformer.java 22 Dec 2003 13:51:43 -0000 1.20
+++ I18nTransformer.java 23 Dec 2003 15:28:33 -0000 1.21
@@ -2053,7 +2053,7 @@
* mattam: now only used for i:attr.
* A default value is returned if message is not found
*
- * @param catalogueId if not null, this catalogue will be used instead of the default one.
+ * @param catalogueID if not null, this catalogue will be used instead of the default one.
*/
private String getString(String catalogueID, String key, String defaultValue) {
final SaxBuffer res = getMessage(catalogueID, key);
1.7 +3 -3 cocoon-2.1/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
Index: AbstractSAXTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractSAXTransformer.java 21 Oct 2003 12:39:16 -0000 1.6
+++ AbstractSAXTransformer.java 23 Dec 2003 15:28:33 -0000 1.7
@@ -286,7 +286,7 @@
/**
* Process the SAX event. A new document is processed. The hook (method)
* <code>setupTransforming()</code> is invoked.
- * @see org.xml.sax.ContentHandler#startDocument
+ * @see org.xml.sax.ContentHandler#startDocument()
*/
public void startDocument()
throws SAXException {
@@ -305,7 +305,7 @@
/**
* Process the SAX event. The processing of the document is finished.
- * @see org.xml.sax.ContentHandler#endDocument
+ * @see org.xml.sax.ContentHandler#endDocument()
*/
public void endDocument()
throws SAXException {
1.6 +5 -5 cocoon-2.1/src/java/org/apache/cocoon/i18n/BundleFactory.java
Index: BundleFactory.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/i18n/BundleFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BundleFactory.java 12 Dec 2003 05:39:38 -0000 1.5
+++ BundleFactory.java 23 Dec 2003 15:28:33 -0000 1.6
@@ -83,7 +83,7 @@
* and the locale name.
*
* @param base catalogue base location (URI)
- * @param name bundle name
+ * @param bundleName bundle name
* @param locale locale name
* @return the bundle
* @exception ComponentException if a bundle is not found
@@ -95,7 +95,7 @@
* and the locale.
*
* @param base catalogue base location (URI)
- * @param name bundle name
+ * @param bundleName bundle name
* @param locale locale
* @return the bundle
* @exception ComponentException if a bundle is not found
@@ -106,7 +106,7 @@
* Select a bundle based on the bundle name and the locale name from
* the default catalogue.
*
- * @param name bundle name
+ * @param bundleName bundle name
* @param locale locale name
* @return the bundle
* @exception ComponentException if a bundle is not found
@@ -117,7 +117,7 @@
* Select a bundle based on the bundle name and the locale from
* the default catalogue.
*
- * @param name bundle name
+ * @param bundleName bundle name
* @param locale locale
* @return the bundle
* @exception ComponentException if a bundle is not found
1.5 +3 -4 cocoon-2.1/src/java/org/apache/cocoon/i18n/XMLResourceBundle.java
Index: XMLResourceBundle.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/i18n/XMLResourceBundle.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLResourceBundle.java 10 Dec 2003 15:37:37 -0000 1.4
+++ XMLResourceBundle.java 23 Dec 2003 15:28:33 -0000 1.5
@@ -272,7 +272,7 @@
* Compose this instance
*
* @param manager The <code>ServiceManager</code> instance
- * @throws ComponentException if XPath processor is not found
+ * @throws ServiceException
*/
public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
@@ -314,10 +314,9 @@
* Load the XML bundle, based on the source URL.
*
* @param sourceURL source URL of the XML bundle
- * @return the DOM tree
*
* @exception IOException if an IO error occurs while reading the file
- * @exception ParserConfigurationException if no parser is configured
+ * @exception ProcessingException if no parser is configured
* @exception SAXException if an error occurs while parsing the file
*/
protected void load(String sourceURL)
1.8 +4 -6 cocoon-2.1/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
Index: XMLResourceBundleFactory.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLResourceBundleFactory.java 10 Dec 2003 15:37:37 -0000 1.7
+++ XMLResourceBundleFactory.java 23 Dec 2003 15:28:33 -0000 1.8
@@ -211,9 +211,9 @@
* Select a bundle based on the catalogue base location, bundle name,
* and the locale name.
*
- * @param base catalogue base location (URI)
+ * @param directory catalogue base location (URI)
* @param name bundle name
- * @param locale locale name
+ * @param localeName locale name
* @return the bundle
* @exception ComponentException if a bundle is not found
*/
@@ -225,7 +225,7 @@
* Select a bundle based on the catalogue base location, bundle name,
* and the locale.
*
- * @param base catalogue base location (URI)
+ * @param directory catalogue base location (URI)
* @param name bundle name
* @param locale locale
* @return the bundle
@@ -257,7 +257,6 @@
* @param base catalogue location
* @param name bundle name
* @param locale locale
- * @param cacheAtStartup cache all the keys when constructing?
* @return the bundle
*/
private Bundle _select(String base, String name, Locale locale) {
@@ -292,7 +291,6 @@
* @param name bundle name
* @param fileName full path to source XML file
* @param locale locale
- * @param cacheAtStartup cache all the keys when constructing?
* @return the bundle, null if loading failed
*/
private XMLResourceBundle _loadBundle(String name, String fileName, Locale locale) {
1.4 +1 -3 cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/source/AbstractStreamSource.java
Index: AbstractStreamSource.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/source/AbstractStreamSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractStreamSource.java 27 Apr 2003 15:16:15 -0000 1.3
+++ AbstractStreamSource.java 23 Dec 2003 15:28:33 -0000 1.4
@@ -183,8 +183,6 @@
/**
* Stream content to a content handler or to an XMLConsumer.
*
- * @throws ResourceNotFoundException if file not found or
- * HTTP location does not exist.
* @throws SAXException if failed to parse source document.
*/
public void toSAX(ContentHandler handler) throws SAXException {
1.3 +2 -2 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/environment/portlet/PortletSession.java
Index: PortletSession.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/environment/portlet/PortletSession.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletSession.java 3 Dec 2003 13:20:29 -0000 1.2
+++ PortletSession.java 23 Dec 2003 15:28:33 -0000 1.3
@@ -157,7 +157,7 @@
* seconds this session remains open
* between client requests
*
- * @see #setMaxInactiveInterval
+ * @see #setMaxInactiveInterval(int)
*/
public int getMaxInactiveInterval() {
return this.session.getMaxInactiveInterval();
1.3 +12 -12 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/environment/portlet/PortletCookie.java
Index: PortletCookie.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/environment/portlet/PortletCookie.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletCookie.java 3 Dec 2003 13:20:29 -0000 1.2
+++ PortletCookie.java 23 Dec 2003 15:28:33 -0000 1.3
@@ -75,7 +75,7 @@
*
* @param name a <code>String</code> specifying the name of the cookie
* @param value a <code>String</code> specifying the value of the cookie
- * @see #setValue
+ * @see #setValue(String)
*/
public void init(String name, String value) {
if (this.name == null) {
@@ -100,7 +100,7 @@
/**
* @return null
- * @see #setComment
+ * @see #setComment(String)
*/
public String getComment() {
checkState();
@@ -116,7 +116,7 @@
/**
* @return null
- * @see #setDomain
+ * @see #setDomain(String)
*/
public String getDomain() {
checkState();
@@ -132,7 +132,7 @@
/**
* @return Integer.MAX_VALUE
- * @see #setMaxAge
+ * @see #setMaxAge(int)
*/
public int getMaxAge() {
checkState();
@@ -148,7 +148,7 @@
/**
* @return empty string
- * @see #setPath
+ * @see #setPath(String)
*/
public String getPath() {
checkState();
@@ -157,7 +157,7 @@
/**
* This method does nothing
- * @see #getSecure
+ * @see #getSecure()
*/
public void setSecure(boolean flag) {
checkState();
@@ -165,7 +165,7 @@
/**
* @return false
- * @see #setSecure
+ * @see #setSecure(boolean)
*/
public boolean getSecure() {
checkState();
@@ -194,7 +194,7 @@
* on all browsers.
*
* @param newValue a <code>String</code> specifying the new value
- * @see #getValue
+ * @see #getValue()
* @see Cookie
*/
public void setValue(String newValue) {
@@ -207,7 +207,7 @@
*
* @return a <code>String</code> containing the cookie's
* present value
- * @see #setValue
+ * @see #setValue(String)
* @see Cookie
*/
public String getValue() {
@@ -220,7 +220,7 @@
* with.
*
* @return Always 0
- * @see #setVersion
+ * @see #setVersion(int)
*/
public int getVersion() {
checkState();
@@ -232,7 +232,7 @@
* with. This method does nothing, version 0 is always returned in
* getVersion
*
- * @see #getVersion
+ * @see #getVersion()
*/
public void setVersion(int v) {
checkState();
1.8 +2 -2 cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java
Index: SendMailTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SendMailTransformer.java 6 Nov 2003 08:58:58 -0000 1.7
+++ SendMailTransformer.java 23 Dec 2003 15:28:33 -0000 1.8
@@ -507,7 +507,7 @@
}
/**
- * @see http://java.sun.com/products/javamail/1.3/docs/javadocs/com/sun/mail/smtp/package-summary.html
+ * @link http://java.sun.com/products/javamail/1.3/docs/javadocs/com/sun/mail/smtp/package-summary.html
* @throws Exception
*/
private void sendMail(Vector newAddresses, Transport trans)
1.4 +2 -3 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/factory/impl/AbstractProducible.java
Index: AbstractProducible.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/factory/impl/AbstractProducible.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractProducible.java 3 Jul 2003 08:00:00 -0000 1.3
+++ AbstractProducible.java 23 Dec 2003 15:28:33 -0000 1.4
@@ -103,8 +103,7 @@
}
/**
- * Get the unique id of this object
- * @return String Unique id
+ * Set the unique id of this object
*/
public void setId(String id) {
this.id = id;
1.2 +1 -3 cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/source/impl/AvalonToCocoonSourceInvocationHandler.java
Index: AvalonToCocoonSourceInvocationHandler.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/source/impl/AvalonToCocoonSourceInvocationHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AvalonToCocoonSourceInvocationHandler.java 3 Jun 2003 07:29:19 -0000 1.1
+++ AvalonToCocoonSourceInvocationHandler.java 23 Dec 2003 15:28:33 -0000 1.2
@@ -192,8 +192,6 @@
/**
* Stream content to a content handler or to an XMLConsumer.
*
- * @throws ResourceNotFoundException if file not found or
- * HTTP location does not exist.
* @throws SAXException if failed to parse source document.
*/
public void toSAX(ContentHandler handler)
1.4 +1 -3 cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/source/impl/AvalonToCocoonSource.java
Index: AvalonToCocoonSource.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/source/impl/AvalonToCocoonSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AvalonToCocoonSource.java 16 May 2003 07:12:29 -0000 1.3
+++ AvalonToCocoonSource.java 23 Dec 2003 15:28:33 -0000 1.4
@@ -169,8 +169,6 @@
/**
* Stream content to a content handler or to an XMLConsumer.
*
- * @throws ResourceNotFoundException if file not found or
- * HTTP location does not exist.
* @throws SAXException if failed to parse source document.
*/
public void toSAX(ContentHandler handler)
1.3 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java
Index: SimpleCharStream.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleCharStream.java 4 Jul 2003 17:58:30 -0000 1.2
+++ SimpleCharStream.java 23 Dec 2003 15:28:33 -0000 1.3
@@ -264,7 +264,7 @@
/**
* @deprecated
- * @see #getEndColumn
+ * @see #getEndColumn()
*/
public int getColumn() {
@@ -273,7 +273,7 @@
/**
* @deprecated
- * @see #getEndLine
+ * @see #getEndLine()
*/
public int getLine() {
1.3 +1 -2 cocoon-2.1/src/java/org/apache/cocoon/sitemap/NotifyingGenerator.java
Index: NotifyingGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/sitemap/NotifyingGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NotifyingGenerator.java 5 Sep 2003 11:40:41 -0000 1.2
+++ NotifyingGenerator.java 23 Dec 2003 15:28:33 -0000 1.3
@@ -92,7 +92,6 @@
/**
* Generate the notification information in XML format.
*
- * @exception SAXException Description of problem there is creating the output SAX events.
* @throws SAXException when there is a problem creating the
* output SAX events.
*/
1.2 +1 -3 cocoon-2.1/src/test/org/apache/cocoon/SitemapComponentTestCase.java
Index: SitemapComponentTestCase.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/test/org/apache/cocoon/SitemapComponentTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SitemapComponentTestCase.java 26 Nov 2003 16:27:22 -0000 1.1
+++ SitemapComponentTestCase.java 23 Dec 2003 15:28:33 -0000 1.2
@@ -564,7 +564,6 @@
/**
* Assert that the result of an XML comparison is similar.
*
- * @param msg The assertion message
* @param expected The expected XML document
* @param actual The actual XML Document
*/
@@ -598,7 +597,6 @@
/**
* Assert that the result of an XML comparison is identical.
*
- * @param msg The assertion message
* @param expected The expected XML document
* @param actual The actual XML Document
*/
1.4 +2 -4 cocoon-2.1/src/blocks/taglib/java/org/apache/cocoon/taglib/core/LoopTagSupport.java
Index: LoopTagSupport.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/taglib/java/org/apache/cocoon/taglib/core/LoopTagSupport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoopTagSupport.java 24 Sep 2003 22:34:52 -0000 1.3
+++ LoopTagSupport.java 23 Dec 2003 15:28:33 -0000 1.4
@@ -197,8 +197,6 @@
* does not simply call for an Iterator from its subtags.)</p>
*
* @return the java.lang.Object to use in the next round of iteration
- * @exception NoSuchElementException
- * if next() is called but no new elements are available
* @exception org.xml.sax.SAXException
* for other, unexpected exceptions
*/
@@ -216,7 +214,7 @@
* @return <tt>true</tt> if there is at least one more item to iterate
* over, <tt>false</tt> otherwise
* @exception org.xml.sax.SAXException
- * @see #next
+ * @see #next()
*/
protected abstract boolean hasNext() throws SAXException;
1.6 +2 -2 cocoon-2.1/src/blocks/proxy/java/org/apache/cocoon/generation/HttpProxyGenerator.java
Index: HttpProxyGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/proxy/java/org/apache/cocoon/generation/HttpProxyGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HttpProxyGenerator.java 25 Sep 2003 20:07:15 -0000 1.5
+++ HttpProxyGenerator.java 23 Dec 2003 15:28:33 -0000 1.6
@@ -391,7 +391,7 @@
*
* @param list The <code>ArrayList</code> where the parameter is stored.
* @param name The parameter name.
- * @param list The new parameter value.
+ * @param value The new parameter value.
* @return The same <code>List</code> of <code>NameValuePair</code> elements.
*/
private ArrayList overrideParams(ArrayList list, String name, String value) {