joerg 2004/02/19 14:13:29
Modified: src/java/org/apache/cocoon/xml XMLBaseSupport.java
ParamSaxBuffer.java
src/java/org/apache/cocoon/components/language/markup/xsp
XSPModuleHelper.java
src/blocks/woody/java/org/apache/cocoon/woody/formmodel
Field.java Repeater.java Upload.java Form.java
MultiValueField.java Widget.java
src/java/org/apache/cocoon/environment/http HttpCookie.java
HttpRequest.java
src/blocks/woody/java/org/apache/cocoon/woody/binding
JXPathBindingBuilderBase.java
src/java/org/apache/cocoon/components/modules/output
OutputModule.java AbstractOutputModule.java
src/java/org/apache/cocoon/environment Cookie.java
src/java/org/apache/cocoon/components/modules/input
XMLFileModule.java GlobalInputModule.java
InputModule.java
src/blocks/slide/java/org/apache/cocoon/components/source/impl
SlideSource.java
src/blocks/databases/java/org/apache/cocoon/components/modules/database
McKoiSequenceModule.java
HsqlIdentityAutoIncrementModule.java
MysqlAutoIncrementModule.java
PgsqlAutoIncrementModule.java
src/blocks/lucene/java/org/apache/cocoon/components/search
SimpleLuceneCocoonIndexerImpl.java
src/java/org/apache/cocoon/components/xpointer XPointer.java
src/blocks/woody/java/org/apache/cocoon/woody/event
AbstractFormHandler.java
src/blocks/scratchpad/java/org/apache/cocoon/environment/portlet
RenderResponse.java PortletEnvironment.java
RenderRequest.java
src/blocks/repository/java/org/apache/cocoon/components/source/impl
RepositorySource.java
src/blocks/woody/java/org/apache/cocoon/woody/datatype
Datatype.java
src/blocks/woody/java/org/apache/cocoon/woody/datatype/validationruleimpl
ValueCountValidationRule.java
src/java/org/apache/cocoon/components
SitemapConfigurable.java
src/blocks/mail/java/org/apache/cocoon/mail/datasource
FilePartDataSource.java
src/deprecated/java/org/apache/cocoon/components/xslt
XSLTProcessor.java
src/blocks/woody/java/org/apache/cocoon/woody/datatype/convertor
LocaleMap.java
src/blocks/woody/java/org/apache/cocoon/woody/util
DomHelper.java
src/blocks/woody/java/org/apache/cocoon/woody/validation
WidgetValidatorBuilder.java
Log:
fixing JavaDoc errors/warnings
Revision Changes Path
1.5 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/xml/XMLBaseSupport.java
Index: XMLBaseSupport.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/XMLBaseSupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLBaseSupport.java 23 Sep 2003 22:46:44 -0000 1.4
+++ XMLBaseSupport.java 19 Feb 2004 22:13:27 -0000 1.5
@@ -65,10 +65,10 @@
*
* <p>Usage:
* <ul>
- * <li>set location of the containing document by calling [EMAIL PROTECTED]
#setDocumentLocation}.
+ * <li>set location of the containing document by calling [EMAIL PROTECTED]
#setDocumentLocation(String)}.
* This is usually done when getting setDocumentLocator SAX event.
* <li>forward each startElement and endElement event to this object.
- * <li>to resolve a relative URL against the current base, call [EMAIL
PROTECTED] #makeAbsolute}.
+ * <li>to resolve a relative URL against the current base, call [EMAIL
PROTECTED] #makeAbsolute(String)}.
* </ul>
*
* <p>External entities are not yet taken into account when determing the
current base.
1.2 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/xml/ParamSaxBuffer.java
Index: ParamSaxBuffer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/ParamSaxBuffer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParamSaxBuffer.java 9 Dec 2003 21:05:42 -0000 1.1
+++ ParamSaxBuffer.java 19 Feb 2004 22:13:27 -0000 1.2
@@ -61,7 +61,7 @@
*
* Any <code>{name}</code> expression inside of the character events can be
* replaced by the content of another SaxBuffer if it is present in the map
- * passed to the [EMAIL PROTECTED] toSAX(ContentHandler, Map)} method.
+ * passed to the [EMAIL PROTECTED] #toSAX(ContentHandler, Map)} method.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
* @version CVS $Id$
1.7 +6 -5
cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/XSPModuleHelper.java
Index: XSPModuleHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/XSPModuleHelper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSPModuleHelper.java 21 Oct 2003 13:23:27 -0000 1.6
+++ XSPModuleHelper.java 19 Feb 2004 22:13:27 -0000 1.7
@@ -200,7 +200,7 @@
/**
* Initializes the instance for first use. Stores references to
* service manager and service selector in instance
- *
+ *
* @param manager a <code>ServiceManager</code> value
* @exception RuntimeException if an error occurs
*/
@@ -264,9 +264,10 @@
return result;
}
- /** Get an array of values from a module. Same as [EMAIL PROTECTED]
- * #getAttributeValues(Map, Configuration, String, String, Object[])}
with a
- * <code>null</code> configuration.
+ /**
+ * Get an array of values from a module. Same as
+ * [EMAIL PROTECTED] #getAttributeValues(Map, Configuration, String,
String, Object[])}
+ * with a <code>null</code> configuration.
*/
public Object[] getAttributeValues(Map objectModel, String module,
String name, Object[] deflt) throws RuntimeException {
return getAttributeValues(objectModel, null, module, name, deflt);
1.24 +2 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/Field.java
Index: Field.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/Field.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Field.java 10 Feb 2004 23:35:32 -0000 1.23
+++ Field.java 19 Feb 2004 22:13:27 -0000 1.24
@@ -235,7 +235,7 @@
/**
* Returns the validation error, if any. There will always be a
validation error in case the
- * [EMAIL PROTECTED] #validate} method returned false.
+ * [EMAIL PROTECTED] #validate(FormContext)} method returned false.
*/
public ValidationError getValidationError() {
return validationError;
1.20 +2 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/Repeater.java
Index: Repeater.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/Repeater.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Repeater.java 12 Feb 2004 07:32:29 -0000 1.19
+++ Repeater.java 19 Feb 2004 22:13:27 -0000 1.20
@@ -70,7 +70,7 @@
* containing the actual repeated widgets. However, in practice, you won't
need
* to use the RepeaterRow widget directly.
*
- * <p>Using the methods [EMAIL PROTECTED] #getSize} and [EMAIL PROTECTED]
#getWidget(int, java.lang.String)}
+ * <p>Using the methods [EMAIL PROTECTED] #getSize()} and [EMAIL PROTECTED]
#getWidget(int, java.lang.String)}
* you can access all of the repeated widget instances.
*
* @version $Id$
1.5 +2 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/Upload.java
Index: Upload.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/Upload.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Upload.java 9 Feb 2004 11:28:34 -0000 1.4
+++ Upload.java 19 Feb 2004 22:13:27 -0000 1.5
@@ -154,7 +154,7 @@
/**
* Returns the validation error, if any. There will always be a
validation error in case the
- * [EMAIL PROTECTED] #validate} method returned false.
+ * [EMAIL PROTECTED] #validate(FormContext)} method returned false.
*/
public ValidationError getValidationError() {
return validationError;
1.17 +3 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/Form.java
Index: Form.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/Form.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Form.java 4 Feb 2004 17:25:57 -0000 1.16
+++ Form.java 19 Feb 2004 22:13:27 -0000 1.17
@@ -204,7 +204,8 @@
* <p>
* Form processing consists in multiple steps:
* <ul>
- * <li>all widgets read their value from the request (i.e. [EMAIL
PROTECTED] #readFromRequest} is called recursively on
+ * <li>all widgets read their value from the request (i.e.
+ * [EMAIL PROTECTED] #readFromRequest(FormContext)} is called
recursively on
* the whole widget tree)
* <li>if there is an action event, call the FormHandler
* <li>perform validation.
1.17 +2 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/MultiValueField.java
Index: MultiValueField.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/MultiValueField.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- MultiValueField.java 11 Feb 2004 10:43:30 -0000 1.16
+++ MultiValueField.java 19 Feb 2004 22:13:27 -0000 1.17
@@ -74,7 +74,7 @@
*
* <p>A MultiValueField also has a [EMAIL PROTECTED]
org.apache.cocoon.woody.datatype.Datatype Datatype}
* associated with it. In case of MultiValueFields, this Datatype will
always be an array
- * type, thus [EMAIL PROTECTED]
org.apache.cocoon.woody.datatype.Datatype#isArrayType Datatype#isArrayType} will
+ * type, thus [EMAIL PROTECTED]
org.apache.cocoon.woody.datatype.Datatype#isArrayType()} will
* always return true, and this in return has an influence on the kind of
validation rules that
* can be used with the Datatype (see [EMAIL PROTECTED]
org.apache.cocoon.woody.datatype.Datatype Datatype}
* description for more information).
1.8 +14 -17
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/Widget.java
Index: Widget.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/Widget.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Widget.java 31 Dec 2003 11:41:41 -0000 1.7
+++ Widget.java 19 Feb 2004 22:13:27 -0000 1.8
@@ -62,12 +62,12 @@
* of widgets. Each widget:
*
* <ul>
- * <li>has an id, unique within its parent context widget. See [EMAIL
PROTECTED] #getId}.</li>
- * <li>can have children (see [EMAIL PROTECTED] #getWidget}, and can have a
parent (see [EMAIL PROTECTED] #getParent}.</li>
- * <li>can hold a value (which can be any kind of object). See [EMAIL
PROTECTED] #getValue}.</li>
+ * <li>has an id, unique within its parent context widget. See [EMAIL
PROTECTED] #getId()}.</li>
+ * <li>can have children (see [EMAIL PROTECTED] #getWidget(String)}, and
can have a parent (see [EMAIL PROTECTED] #getParent()}.</li>
+ * <li>can hold a value (which can be any kind of object). See [EMAIL
PROTECTED] #getValue()}.</li>
* <li>can read its value from a request object (and convert it from a
string to its native type).
- * See [EMAIL PROTECTED] #readFromRequest}.</li>
- * <li>can validate itself. See [EMAIL PROTECTED] #validate}.</li>
+ * See [EMAIL PROTECTED] #readFromRequest(FormContext)}.</li>
+ * <li>can validate itself. See [EMAIL PROTECTED]
#validate(FormContext)}.</li>
* <li>can generate an XML representation of itself.</li>
* </ul>
*
@@ -77,10 +77,10 @@
* <p>A widget can have only a value, or only child widgets, or can have
both a value and child
* widgets, or can have neither. This all depends on the widget
implementation.</p>
*
- * <p>When a request is submitted, first the [EMAIL PROTECTED]
#readFromRequest} method of all widgets
- * will be called so that they can read their value(s). Next, the [EMAIL
PROTECTED] #validate} method will
+ * <p>When a request is submitted, first the [EMAIL PROTECTED]
#readFromRequest(FormContext)} method of all widgets
+ * will be called so that they can read their value(s). Next, the [EMAIL
PROTECTED] #validate(FormContext)} method will
* be called. Doing this in two steps allows the validation to compare
values between widgets.
- * See also the method [EMAIL PROTECTED] Form#process}.</p>
+ * See also the method [EMAIL PROTECTED] Form#process(FormContext)}.</p>
*
* <p>A Widget is created by calling the createInstance method on the a
* [EMAIL PROTECTED] WidgetDefinition}. A Widget holds all the data that is
specific for
@@ -124,7 +124,7 @@
/**
* Gets the namespace of this widget. The combination of a widget's
namespace
- * with its id (see [EMAIL PROTECTED] #getId} gives the widget a
form-wide unique name.
+ * with its id (see [EMAIL PROTECTED] #getId()} gives the widget a
form-wide unique name.
* In practice, the namespace consists of the id's of the widget's
parent widgets,
* separated by dots.
*/
@@ -146,7 +146,7 @@
/**
* Validates this widget and returns the outcome. Possible error
messages are
* remembered by the widget itself and will be part of the XML produced
by
- * this widget in its [EMAIL PROTECTED] #generateSaxFragment} method.
+ * this widget in its [EMAIL PROTECTED]
#generateSaxFragment(ContentHandler, Locale)} method.
*/
public boolean validate(FormContext formContext);
@@ -164,11 +164,8 @@
public void generateLabel(ContentHandler contentHandler) throws
SAXException;
/**
- * Returns the value of the widget. For some widgets (notably
ContainerWidgets) this may not make sense, those
- * should then simply return null here.
- * <p>
- * Object having a value, but whose value is invalid, will return
- * [EMAIL PROTECTED] org.apache.cocoon.woody.Constants#INVALID_VALUE}.
+ * Returns the value of the widget. For some widgets (notably
ContainerWidgets)
+ * this may not make sense, those should then simply return null here.
*/
public Object getValue();
@@ -179,7 +176,7 @@
public void setValue(Object object);
/**
- * Returns wether this widget is required to be filled in. As with
[EMAIL PROTECTED] #getValue}, for some
+ * Returns wether this widget is required to be filled in. As with
[EMAIL PROTECTED] #getValue()}, for some
* widgets this may not make sense, those should return false here.
*/
public boolean isRequired();
1.3 +3 -3
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HttpCookie.java 23 Dec 2003 15:28:32 -0000 1.2
+++ HttpCookie.java 19 Feb 2004 22:13:27 -0000 1.3
@@ -66,7 +66,7 @@
* of your servlets.
*
* <p>The servlet sends cookies to the browser by using the
- * [EMAIL PROTECTED] HttpResponse#addCookie} method, which adds
+ * [EMAIL PROTECTED] HttpResponse#addCookie(Cookie)} method, which adds
* fields to HTTP response headers to send cookies to the
* browser, one at a time. The browser is expected to
* support 20 cookies for each Web server, 300 cookies total, and
@@ -74,7 +74,7 @@
*
* <p>The browser returns cookies to the servlet by adding
* fields to HTTP request headers. Cookies can be retrieved
- * from a request by using the [EMAIL PROTECTED] HttpRequest#getCookies}
method.
+ * from a request by using the [EMAIL PROTECTED] HttpRequest#getCookies()}
method.
* Several cookies might have the same name but different path attributes.
*
* <p>Cookies affect the caching of the Web pages that use them.
1.7 +5 -6
cocoon-2.1/src/java/org/apache/cocoon/environment/http/HttpRequest.java
Index: HttpRequest.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/http/HttpRequest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HttpRequest.java 31 Oct 2003 21:38:36 -0000 1.6
+++ HttpRequest.java 19 Feb 2004 22:13:27 -0000 1.7
@@ -280,9 +280,8 @@
}
/**
- * @deprecated As of Version 2.1 of the Java Servlet
- * API, use [EMAIL PROTECTED] #isRequestedSessionIdFromURL}
- *instead.
+ * @deprecated As of Version 2.1 of the Java Servlet API, use
+ * [EMAIL PROTECTED] #isRequestedSessionIdFromURL()} instead.
*/
public boolean isRequestedSessionIdFromUrl() {
return this.req.isRequestedSessionIdFromURL();
@@ -420,8 +419,8 @@
}
/**
- * @deprecated As of Version 2.1 of the Java Servlet API,
- * use [EMAIL PROTECTED] javax.servlet.ServletContext#getRealPath}
instead.
+ * @deprecated As of Version 2.1 of the Java Servlet API, use
+ * [EMAIL PROTECTED]
javax.servlet.ServletContext#getRealPath(java.lang.String)}instead.
*/
public String getRealPath(String path) {
return this.req.getRealPath(path);
1.3 +2 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXPathBindingBuilderBase.java
Index: JXPathBindingBuilderBase.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXPathBindingBuilderBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JXPathBindingBuilderBase.java 6 Feb 2004 16:06:32 -0000 1.2
+++ JXPathBindingBuilderBase.java 19 Feb 2004 22:13:27 -0000 1.3
@@ -62,7 +62,7 @@
*
* Common supported configurations:
* <ul>
- * <li>Attribute direction="load|save|both": [EMAIL PROTECTED]
#getDirectionAttributes(Element)}</li>
+ * <li>Attribute direction="load|save|both": [EMAIL PROTECTED]
#getCommonAttributes(Element)}</li>
* </ul>
*
* @version CVS $Id$
1.2 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/modules/output/OutputModule.java
Index: OutputModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/output/OutputModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OutputModule.java 9 Mar 2003 00:09:05 -0000 1.1
+++ OutputModule.java 19 Feb 2004 22:13:28 -0000 1.2
@@ -100,7 +100,7 @@
/**
* Signal that the database transaction completed
- * successfully. See notes on [EMAIL PROTECTED] #rollback rollback}.
+ * successfully. See notes on [EMAIL PROTECTED] #rollback(Configuration,
Map, Exception)}.
* */
void commit( Configuration modeConf, Map objectModel );
1.3 +6 -6
cocoon-2.1/src/java/org/apache/cocoon/components/modules/output/AbstractOutputModule.java
Index: AbstractOutputModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/output/AbstractOutputModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractOutputModule.java 12 Mar 2003 13:27:34 -0000 1.2
+++ AbstractOutputModule.java 19 Feb 2004 22:13:28 -0000 1.3
@@ -110,7 +110,7 @@
/**
* Utility method to store parameters in a map as request attribute
until
- * either [EMAIL PROTECTED] #rollback rollback} or [EMAIL PROTECTED]
#prepareCommit prepareCommit}
+ * either [EMAIL PROTECTED] #rollback(Map, String)} or [EMAIL PROTECTED]
#prepareCommit(Map, String)}
* is called.
* @param objectModel - the objectModel
* @param trans_place - request attribute name used for the transient
data
@@ -146,8 +146,8 @@
/**
* Returns a whether an transient attribute already exists.
- * [EMAIL PROTECTED] #transientSetAttribute transientSetAttribute} since
the last call to
- * [EMAIL PROTECTED] #rollback rollback} or [EMAIL PROTECTED]
#prepareCommit prepareCommit}
+ * [EMAIL PROTECTED] #transientSetAttribute(Map, String, String,
Object)} since the last call to
+ * [EMAIL PROTECTED] #rollback(Map, String)} or [EMAIL PROTECTED]
#prepareCommit(Map, String)}
* @param objectModel - the objectModel
* @param trans_place - request attribute name used for the transient
data
*/
@@ -164,8 +164,8 @@
/**
* Returns a map containing all transient attributes and remove them
i.e. attributes set with
- * [EMAIL PROTECTED] #transientSetAttribute transientSetAttribute} since
the last call to
- * [EMAIL PROTECTED] #rollback rollback} or [EMAIL PROTECTED]
#prepareCommit prepareCommit}
+ * [EMAIL PROTECTED] #transientSetAttribute(Map, String, String,
Object)} since the last call to
+ * [EMAIL PROTECTED] #rollback(Map, String)} or [EMAIL PROTECTED]
#prepareCommit(Map, String)}
* @param objectModel - the objectModel
* @param trans_place - request attribute name used for the transient
data
*/
1.3 +3 -3
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Cookie.java 23 Dec 2003 15:28:32 -0000 1.2
+++ Cookie.java 19 Feb 2004 22:13:28 -0000 1.3
@@ -64,7 +64,7 @@
* of your servlets.
*
* <p>The servlet sends cookies to the browser by using the
- * [EMAIL PROTECTED] Response#addCookie} method, which adds
+ * [EMAIL PROTECTED] Response#addCookie(Cookie)} method, which adds
* fields to HTTP response headers to send cookies to the
* browser, one at a time. The browser is expected to
* support 20 cookies for each Web server, 300 cookies total, and
@@ -72,7 +72,7 @@
*
* <p>The browser returns cookies to the servlet by adding
* fields to HTTP request headers. Cookies can be retrieved
- * from a request by using the [EMAIL PROTECTED] Request#getCookies} method.
+ * from a request by using the [EMAIL PROTECTED] Request#getCookies()}
method.
* Several cookies might have the same name but different path attributes.
*
* <p>Cookies affect the caching of the Web pages that use them.
1.13 +5 -5
cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java
Index: XMLFileModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLFileModule.java 15 Feb 2004 19:12:44 -0000 1.12
+++ XMLFileModule.java 19 Feb 2004 22:13:28 -0000 1.13
@@ -59,7 +59,7 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.source.SourceUtil;
-import org.apache.commons.collections.ReferenceMap;
+import org.apache.commons.collections.map.ReferenceMap;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.SourceValidity;
@@ -257,7 +257,7 @@
* </...>
* Each <file> pre-loads an XML DOM for querying. Typically only one
* <file> is specified, and its <i>src</i> is used as a default if not
- * overridden in the [EMAIL PROTECTED] #getContextObject dynamic
configuration}
+ * overridden in the [EMAIL PROTECTED] #getContextObject(Configuration,
Map)}
*
* @param config a <code>Configuration</code> value, as described above.
* @exception ConfigurationException if an error occurs
@@ -300,8 +300,8 @@
/**
* Get the DOM object that JXPath will operate on when evaluating
* attributes. This DOM is loaded from a Source, specified in the
- * modeConf, or (if modeConf is null) from the [EMAIL PROTECTED]
#configure static
- * configuration}.
+ * modeConf, or (if modeConf is null) from the
+ * [EMAIL PROTECTED] #configure(Configuration)}.
* @param modeConf The dynamic configuration for the current operation.
May
* be <code>null</code>, in which case static (cocoon.xconf)
configuration
* is used. Configuration is expected to have a <file> child node,
and
1.3 +9 -8
cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/GlobalInputModule.java
Index: GlobalInputModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/GlobalInputModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GlobalInputModule.java 7 Jan 2004 10:33:54 -0000 1.2
+++ GlobalInputModule.java 19 Feb 2004 22:13:28 -0000 1.3
@@ -85,10 +85,10 @@
/**
* Standard access to an attribute's value. If more than one value
* exists, the first is returned. If the value does not exist,
- * null is returned. To get all values, use [EMAIL PROTECTED]
- * #getAttributeValues getAttributeSet} or [EMAIL PROTECTED]
- * #getAttributeNames getAttributeNames} and [EMAIL PROTECTED]
#getAttribute
- * getAttribute} to get them one by one.
+ * null is returned. To get all values, use
+ * [EMAIL PROTECTED] #getAttributeValues(String, Configuration, Map)} or
+ * [EMAIL PROTECTED] #getAttributeNames(Configuration, Map)} and
+ * [EMAIL PROTECTED] #getAttribute(String, Configuration, Map)} to get
them one by one.
* @param name a String that specifies what the caller thinks
* would identify an attribute. This is mainly a fallback if no
* modeConf is present.
@@ -135,9 +135,10 @@
/**
* Returns an array of String objects containing all of the values
* the given attribute has, or null if the attribute does not
- * exist. As an alternative, [EMAIL PROTECTED] #getAttributeNames
- * getAttributeNames} together with [EMAIL PROTECTED] #getAttribute
- * getAttribute} can be used to get the values one by one.
+ * exist. As an alternative,
+ * [EMAIL PROTECTED] #getAttributeNames(Configuration, Map)} together
with
+ * [EMAIL PROTECTED] #getAttribute(String, Configuration, Map)} can be
used to get the
+ * values one by one.
* @param name a String that specifies what the caller thinks
* would identify an attributes. This is mainly a fallback
* if no modeConf is present.
1.2 +9 -8
cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/InputModule.java
Index: InputModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/InputModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InputModule.java 9 Mar 2003 00:09:03 -0000 1.1
+++ InputModule.java 19 Feb 2004 22:13:28 -0000 1.2
@@ -74,10 +74,10 @@
/**
* Standard access to an attribute's value. If more than one value
* exists, the first is returned. If the value does not exist,
- * null is returned. To get all values, use [EMAIL PROTECTED]
- * #getAttributeValues getAttributeSet} or [EMAIL PROTECTED]
- * #getAttributeNames getAttributeNames} and [EMAIL PROTECTED]
#getAttribute
- * getAttribute} to get them one by one.
+ * null is returned. To get all values, use
+ * [EMAIL PROTECTED] #getAttributeValues(String, Configuration, Map)} or
+ * [EMAIL PROTECTED] #getAttributeNames(Configuration, Map)} and
+ * [EMAIL PROTECTED] #getAttribute(String, Configuration, Map)} to get
them one by one.
* @param name a String that specifies what the caller thinks
* would identify an attribute. This is mainly a fallback if no
* modeConf is present.
@@ -102,9 +102,10 @@
/**
* Returns an array of String objects containing all of the values
* the given attribute has, or null if the attribute does not
- * exist. As an alternative, [EMAIL PROTECTED] #getAttributeNames
- * getAttributeNames} together with [EMAIL PROTECTED] #getAttribute
- * getAttribute} can be used to get the values one by one.
+ * exist. As an alternative,
+ * [EMAIL PROTECTED] #getAttributeNames(Configuration, Map)} together
with
+ * [EMAIL PROTECTED] #getAttribute(String, Configuration, Map)} can be
used to get the
+ * values one by one.
* @param name a String that specifies what the caller thinks
* would identify an attributes. This is mainly a fallback
* if no modeConf is present.
1.18 +3 -3
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SlideSource.java 27 Jan 2004 14:31:40 -0000 1.17
+++ SlideSource.java 19 Feb 2004 22:13:28 -0000 1.18
@@ -668,7 +668,7 @@
/**
* Can the data sent to an <code>OutputStream</code> returned by
- * [EMAIL PROTECTED] #getOutputStream()} be cancelled ?
+ * [EMAIL PROTECTED] SlideSource#getOutputStream()} be cancelled ?
*
* @return true if the stream can be cancelled
*/
@@ -678,7 +678,7 @@
/**
* Cancel the data sent to an <code>OutputStream</code> returned by
- * [EMAIL PROTECTED] #getOutputStream()}.
+ * [EMAIL PROTECTED] SlideSource#getOutputStream()}.
* <p>
* After cancel, the stream should no more be used.
*
1.2 +6 -6
cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/modules/database/McKoiSequenceModule.java
Index: McKoiSequenceModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/modules/database/McKoiSequenceModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- McKoiSequenceModule.java 18 Oct 2003 18:26:14 -0000 1.1
+++ McKoiSequenceModule.java 19 Feb 2004 22:13:28 -0000 1.2
@@ -63,11 +63,11 @@
/**
* Abstraction layer to encapsulate different DBMS behaviour for
autoincrement columns.
*
- * Here: [EMAIL PROTECTED] <a href="http://www.mckoi.org">McKoi</a>}
- * sequences. The default sequence name is constructed from the table
- * name, a "_", the column name, and the suffix "_seq". To use a
- * different sequence name, set an attribute "sequence" for the
- * modeConf e.g. <mode name="auto" type="auto"
sequence="my_sequence"/>.
+ * Here: <a href="http://www.mckoi.org">McKoi</a> sequences. The default
+ * sequence name is constructed from the table name, a "_", the column name,
and
+ * the suffix "_seq". To use a different sequence name, set an attribute
+ * "sequence" for the modeConf e.g. <mode name="auto" type="auto"
+ * sequence="my_sequence"/>.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
* @version CVS $Id$
1.2 +2 -2
cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/modules/database/HsqlIdentityAutoIncrementModule.java
Index: HsqlIdentityAutoIncrementModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/modules/database/HsqlIdentityAutoIncrementModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HsqlIdentityAutoIncrementModule.java 9 Mar 2003 00:03:08 -0000
1.1
+++ HsqlIdentityAutoIncrementModule.java 19 Feb 2004 22:13:28 -0000
1.2
@@ -65,7 +65,7 @@
/**
* Abstraction layer to encapsulate different DBMS behaviour for
autoincrement columns.
*
- * Here: [EMAIL PROTECTED] <a
href="http://hsqldb.sourceforge.net">HSQLDB</a>} 1.6 IDENTITY columns
+ * Here: <a href="http://hsqldb.sourceforge.net">HSQLDB</a> 1.6 IDENTITY
columns
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
* @version CVS $Id$
1.2 +2 -2
cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/modules/database/MysqlAutoIncrementModule.java
Index: MysqlAutoIncrementModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/modules/database/MysqlAutoIncrementModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MysqlAutoIncrementModule.java 9 Mar 2003 00:03:09 -0000 1.1
+++ MysqlAutoIncrementModule.java 19 Feb 2004 22:13:28 -0000 1.2
@@ -65,7 +65,7 @@
/**
* Abstraction layer to encapsulate different DBMS behaviour for
autoincrement columns.
*
- * Here: [EMAIL PROTECTED] <a href="http://www.mysql.com">MYSQL</a>}
AUTO_INCREMENT columns
+ * Here: <a href="http://www.mysql.com">MYSQL</a> AUTO_INCREMENT columns
*
* @author <a href="mailto:[EMAIL PROTECTED]">Tim Myers</a>
* @version CVS $Id$
1.3 +2 -2
cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/modules/database/PgsqlAutoIncrementModule.java
Index: PgsqlAutoIncrementModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/modules/database/PgsqlAutoIncrementModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PgsqlAutoIncrementModule.java 24 Sep 2003 21:54:48 -0000 1.2
+++ PgsqlAutoIncrementModule.java 19 Feb 2004 22:13:28 -0000 1.3
@@ -65,7 +65,7 @@
/**
* Abstraction layer to encapsulate different DBMS behaviour for
autoincrement columns.
*
- * Here: [EMAIL PROTECTED] <a href="http://www.postgres.org">PostgreSQL</a>}
+ * Here: <a href="http://www.postgres.org">PostgreSQL</a>
* sequences. The default sequence name is constructed from the table
* name, a "_", the column name, and the suffix "_seq". To use a
* different sequence name, set an attribute "sequence" for the
1.9 +3 -4
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SimpleLuceneCocoonIndexerImpl.java 6 Jan 2004 13:39:11 -0000
1.8
+++ SimpleLuceneCocoonIndexerImpl.java 19 Feb 2004 22:13:28 -0000
1.9
@@ -115,9 +115,8 @@
public final static String MERGE_FACTOR_CONFIG = "merge-factor";
/**
- * configuration default value for lucene's merge factor.
- *
- * @link
http://www.mail-archive.com/[email protected]/msg00373.html
+ * configuration default value for
+ * <a
href="http://www.mail-archive.com/[email protected]/msg00373.html">lucene's
merge factor</a>.
*/
public final static int MERGE_FACTOR_DEFAULT = 10;
1.3 +1 -1
cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/XPointer.java
Index: XPointer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/XPointer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPointer.java 26 Nov 2003 21:35:02 -0000 1.2
+++ XPointer.java 19 Feb 2004 22:13:28 -0000 1.3
@@ -63,7 +63,7 @@
* http://www.w3.org/TR/2003/REC-xptr-framework-20030325</a>.
*
* <p>To create an instance of this class, call
- * [EMAIL PROTECTED]
org.apache.cocoon.components.xpointer.parser.XPointerFrameworkParser#parse
XPointerFrameworkParser.parse}.
+ * [EMAIL PROTECTED]
org.apache.cocoon.components.xpointer.parser.XPointerFrameworkParser#parse(String)}.
*/
public class XPointer {
private List pointerParts = new LinkedList();
1.3 +3 -3
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/AbstractFormHandler.java
Index: AbstractFormHandler.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/AbstractFormHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractFormHandler.java 11 Feb 2004 09:27:55 -0000 1.2
+++ AbstractFormHandler.java 19 Feb 2004 22:13:28 -0000 1.3
@@ -52,8 +52,8 @@
/**
* Abstract implementation of [EMAIL PROTECTED] FormHandler}, which checks
the type
- * of the WidgetEvent and calls the more specific [EMAIL PROTECTED]
#handleActionEvent}
- * or [EMAIL PROTECTED] #handleValueChangedEvent} methods.
+ * of the WidgetEvent and calls the more specific [EMAIL PROTECTED]
#handleActionEvent(ActionEvent)}
+ * or [EMAIL PROTECTED] #handleValueChangedEvent(ValueChangedEvent)} methods.
*
* @version CVS $Id$
*/
1.3 +3 -2
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/environment/portlet/RenderResponse.java
Index: RenderResponse.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/environment/portlet/RenderResponse.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RenderResponse.java 3 Dec 2003 13:20:29 -0000 1.2
+++ RenderResponse.java 19 Feb 2004 22:13:28 -0000 1.3
@@ -59,7 +59,8 @@
import java.util.Locale;
/**
- * Implements the [EMAIL PROTECTED] Response} interface for the JSR-168
(Portlet) environment.
+ * Implements the [EMAIL PROTECTED] org.apache.cocoon.environment.Response}
interface for
+ * the JSR-168 (Portlet) environment.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Alex Rudnev</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
1.3 +3 -2
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/environment/portlet/PortletEnvironment.java
Index: PortletEnvironment.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/environment/portlet/PortletEnvironment.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletEnvironment.java 3 Dec 2003 13:20:29 -0000 1.2
+++ PortletEnvironment.java 19 Feb 2004 22:13:28 -0000 1.3
@@ -64,7 +64,8 @@
import java.net.MalformedURLException;
/**
- * Implements [EMAIL PROTECTED] Environment} interface for the JSR-168
Portlet environment.
+ * Implements [EMAIL PROTECTED] org.apache.cocoon.environment.Environment}
interface for the JSR-168
+ * Portlet environment.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Alex Rudnev</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
1.3 +3 -2
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/environment/portlet/RenderRequest.java
Index: RenderRequest.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/environment/portlet/RenderRequest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RenderRequest.java 3 Dec 2003 13:20:29 -0000 1.2
+++ RenderRequest.java 19 Feb 2004 22:13:28 -0000 1.3
@@ -51,7 +51,8 @@
package org.apache.cocoon.environment.portlet;
/**
- * Implements the [EMAIL PROTECTED] Request} interface for the JSR-168
(Portlet) environment.
+ * Implements the [EMAIL PROTECTED] org.apache.cocoon.environment.Request}
interface for
+ * the JSR-168 (Portlet) environment.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Alex Rudnev</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
1.6 +0 -2
cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/RepositorySource.java
Index: RepositorySource.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/RepositorySource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RepositorySource.java 17 Feb 2004 17:19:26 -0000 1.5
+++ RepositorySource.java 19 Feb 2004 22:13:28 -0000 1.6
@@ -289,8 +289,6 @@
}
public Source getParent() throws SourceException {
- String eventName = null;
-
return new RepositorySource(
m_prefix,
(ModifiableTraversableSource) m_delegate.getParent(),
1.6 +8 -7
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/Datatype.java
Index: Datatype.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/Datatype.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Datatype.java 11 Feb 2004 09:53:43 -0000 1.5
+++ Datatype.java 19 Feb 2004 22:13:28 -0000 1.6
@@ -67,8 +67,8 @@
* </ul>
*
* <p>Each datatype can be marked as an "arraytype". Currently, this only
has an
- * influence on the [EMAIL PROTECTED] #validate} method, which should in
that case be passed
- * an array of objects. See also [EMAIL PROTECTED] #isArrayType}.
+ * influence on the [EMAIL PROTECTED] #validate(Object, ExpressionContext)}
method, which should in that case be passed
+ * an array of objects. See also [EMAIL PROTECTED] #isArrayType()}.
*
* @version $Id$
*/
@@ -76,14 +76,14 @@
/**
* Converts a string to an object of this datatype. Returns null if this
* fails. This method uses the same [EMAIL PROTECTED] Convertor} as
returned by the
- * [EMAIL PROTECTED] #getConvertor} method.
+ * [EMAIL PROTECTED] #getConvertor()} method.
*/
Object convertFromString(String value, Locale locale);
/**
* Converts an object of this datatype to a string representation.
* This method uses the same [EMAIL PROTECTED] Convertor} as returned by
the
- * [EMAIL PROTECTED] #getConvertor} method.
+ * [EMAIL PROTECTED] #getConvertor()} method.
*/
String convertToString(Object value, Locale locale);
@@ -91,8 +91,9 @@
* Returns null if validation is successful, otherwise returns a
* [EMAIL PROTECTED] ValidationError} instance.
*
- * @param value an Object of the correct type for this datatype (see
[EMAIL PROTECTED] #getTypeClass}, or
- * if [EMAIL PROTECTED] #isArrayType} returns true, an array of objects
of that type.
+ * @param value an Object of the correct type for this datatype (see
+ * [EMAIL PROTECTED] #getTypeClass()}, or if [EMAIL
PROTECTED] #isArrayType()}
+ * returns true, an array of objects of that type.
*/
ValidationError validate(Object value, ExpressionContext
expressionContext);
1.5 +2 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/validationruleimpl/ValueCountValidationRule.java
Index: ValueCountValidationRule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/validationruleimpl/ValueCountValidationRule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ValueCountValidationRule.java 11 Feb 2004 09:53:44 -0000 1.4
+++ ValueCountValidationRule.java 19 Feb 2004 22:13:28 -0000 1.5
@@ -61,7 +61,7 @@
/**
* Checks the number of values (i.e. the size of the array). This only works
for Datatypes
- * for which [EMAIL PROTECTED]
org.apache.cocoon.woody.datatype.Datatype#isArrayType isArrayType} returns
+ * for which [EMAIL PROTECTED]
org.apache.cocoon.woody.datatype.Datatype#isArrayType()} returns
* true.
*
* <p>This validation rule can perform 4 different checks:
1.5 +4 -3
cocoon-2.1/src/java/org/apache/cocoon/components/SitemapConfigurable.java
Index: SitemapConfigurable.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/SitemapConfigurable.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SitemapConfigurable.java 7 Jan 2004 15:08:42 -0000 1.4
+++ SitemapConfigurable.java 19 Feb 2004 22:13:28 -0000 1.5
@@ -55,8 +55,9 @@
/**
* Objects implementing this marker interface can get a configuration
* from the map:pipelines section of the sitemap when they are created.
- * Due to a problem in the component handling the [EMAIL PROTECTED]
#configure}
- * method is actually called each time the component is looked up!
+ * Due to a problem in the component handling the
+ * [EMAIL PROTECTED] #configure(SitemapConfigurationHolder)} method is
actually called
+ * each time the component is looked up!
*
* @since 2.1
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
1.4 +2 -2
cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/datasource/FilePartDataSource.java
Index: FilePartDataSource.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/datasource/FilePartDataSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FilePartDataSource.java 3 Jul 2003 08:27:47 -0000 1.3
+++ FilePartDataSource.java 19 Feb 2004 22:13:28 -0000 1.4
@@ -133,7 +133,7 @@
/** Returns the name for this <CODE>DataSource</CODE> object. This is
* what is returned by
- * [EMAIL PROTECTED] Part#getFileName}.
+ * [EMAIL PROTECTED] Part#getFileName()}.
* @return the name for this <CODE>DataSource</CODE> object.
*/
public String getName() {
1.2 +4 -4
cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/xslt/XSLTProcessor.java
Index: XSLTProcessor.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/xslt/XSLTProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSLTProcessor.java 9 Mar 2003 00:07:12 -0000 1.1
+++ XSLTProcessor.java 19 Feb 2004 22:13:28 -0000 1.2
@@ -107,8 +107,8 @@
* <p>Return a <code>TransformerHandler</code> for a given
* stylesheet <code>Source</code>. This can be used in a pipeline to
* handle the transformation of a stream of SAX events. See [EMAIL
PROTECTED]
- * org.apache.cocoon.transformation.TraxTransformer#setConsumer} for
- * an example of how to use this method.
+ *
org.apache.cocoon.transformation.TraxTransformer#setConsumer(org.apache.cocoon.xml.XMLConsumer)}
+ * for an example of how to use this method.
*
* <p>The additional <code>filter</code> argument, if it's not
* <code>null</code>, is inserted in the chain SAX events as an XML
@@ -134,7 +134,7 @@
* @param stylesheet a <code>Source</code> value
* @return a <code>TransformerHandler</code> value
* @exception ProcessingException if an error occurs
- * @see org.apache.cocoon.transformation.TraxTransformer#setConsumer
+ * @see
org.apache.cocoon.transformation.TraxTransformer#setConsumer(org.apache.cocoon.xml.XMLConsumer)
*/
TransformerHandler getTransformerHandler(Source stylesheet)
throws ProcessingException;
1.3 +3 -3
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/convertor/LocaleMap.java
Index: LocaleMap.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/convertor/LocaleMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocaleMap.java 31 Dec 2003 17:15:46 -0000 1.2
+++ LocaleMap.java 19 Feb 2004 22:13:28 -0000 1.3
@@ -57,8 +57,8 @@
/**
* Map using Locale objects as keys.
*
- * <p>This map should be filled once using calls to [EMAIL PROTECTED] #put},
before any calls
- * are made to [EMAIL PROTECTED] #get}.
+ * <p>This map should be filled once using calls to [EMAIL PROTECTED]
#put(Locale, Object)},
+ * before any calls are made to [EMAIL PROTECTED] #get(Locale)}.
*
* @version CVS $Id$
*/
1.12 +4 -4
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/util/DomHelper.java
Index: DomHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/util/DomHelper.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DomHelper.java 31 Dec 2003 10:27:18 -0000 1.11
+++ DomHelper.java 19 Feb 2004 22:13:28 -0000 1.12
@@ -81,7 +81,7 @@
* accurate model of an XML file (no mixed content, no namespaced
attributes, no namespace declarations, ...).
*
* <p>This class depends specifically on the Xerces DOM implementation to be
able to provide
- * information about the location of elements in their source XML file. See
the [EMAIL PROTECTED] #getLocation} method.
+ * information about the location of elements in their source XML file. See
the [EMAIL PROTECTED] #getLocation(Element)} method.
*
* @version CVS $Id$
*/
@@ -89,7 +89,7 @@
/**
* Retrieves the location of an element node in the source file from
which the Document was created.
- * This will only work for Document's created with the method [EMAIL
PROTECTED] #parse} of this class.
+ * This will only work for Document's created with the method [EMAIL
PROTECTED] #parse(InputSource)} of this class.
*/
public static String getLocation(Element element) {
String location = null;
@@ -292,7 +292,7 @@
/**
* Creates a W3C Document that remembers the location of each element in
the source file.
- * The location of element nodes can then be retrieved using the [EMAIL
PROTECTED] #getLocation} method.
+ * The location of element nodes can then be retrieved using the [EMAIL
PROTECTED] #getLocation(Element)} method.
*/
public static Document parse(InputSource inputSource) throws
SAXException, SAXNotSupportedException, IOException {
DOMParser domParser = new LocationTrackingDOMParser();
1.2 +2 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/validation/WidgetValidatorBuilder.java
Index: WidgetValidatorBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/validation/WidgetValidatorBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WidgetValidatorBuilder.java 4 Feb 2004 17:25:58 -0000 1.1
+++ WidgetValidatorBuilder.java 19 Feb 2004 22:13:29 -0000 1.2
@@ -69,7 +69,7 @@
* @param definition the widget definition the validator will have to
validate.
* This may be used to check applicability of the validator to
the widget.
* @return A [EMAIL PROTECTED] WidgetValidator}
- * @throws if some problem occurs
+ * @throws Exception if some problem occurs
*/
WidgetValidator build(Element validationRuleElement, WidgetDefinition
definition) throws Exception;
}