cziegeler 02/05/21 05:24:57
Modified: src/java/org/apache/cocoon/components/flow
AbstractInterpreter.java
src/java/org/apache/cocoon/components/request/multipart
FilePart.java FilePartArray.java FilePartFile.java
MultipartRequestWrapper.java
src/java/org/apache/cocoon/components/source
WriteableSAXSource.java WriteableSource.java
src/java/org/apache/cocoon/components/treeprocessor
DefaultTreeBuilder.java ProcessingNodeBuilder.java
src/java/org/apache/cocoon/transformation
I18nTransformer.java
Log:
Fixed javadocs
Revision Changes Path
1.2 +1 -1
xml-cocoon2/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
Index: AbstractInterpreter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractInterpreter.java 19 May 2002 19:19:38 -0000 1.1
+++ AbstractInterpreter.java 21 May 2002 12:24:57 -0000 1.2
@@ -44,7 +44,7 @@
/**
* When was the last time we checked for script modifications. Used
- * only if {@link reloadScripts} is true.
+ * only if {@link #reloadScripts} is true.
*/
protected long lastTimeCheck = 0;
1.2 +1 -6
xml-cocoon2/src/java/org/apache/cocoon/components/request/multipart/FilePart.java
Index: FilePart.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/request/multipart/FilePart.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FilePart.java 27 Feb 2002 20:21:22 -0000 1.1
+++ FilePart.java 21 May 2002 12:24:57 -0000 1.2
@@ -59,7 +59,7 @@
* FilePartArray (which is a file in memory)
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jeroen ter Voorde</a>
- * @version CVS $Id: FilePart.java,v 1.1 2002/02/27 20:21:22 dims Exp $
+ * @version CVS $Id: FilePart.java,v 1.2 2002/05/21 12:24:57 cziegeler Exp $
*/
public abstract class FilePart {
@@ -69,7 +69,6 @@
/**
* Returns the part headers
*
- * @return
*/
public Map getHeaders() {
return headers;
@@ -78,14 +77,12 @@
/**
* Returns the filename
*
- * @return
*/
public abstract String getFileName();
/**
* Returns the filepath
*
- * @return
*/
public String getFilePath() {
return (String) headers.get("filename");
@@ -94,7 +91,6 @@
/**
* Returns the mime type (or null if unknown)
*
- * @return
*/
public String getMimeType() {
return (String) headers.get("content-type");
@@ -103,7 +99,6 @@
/**
* Returns an InputStream containing the file data
*
- * @return
*
* @throws Exception
*/
1.2 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/components/request/multipart/FilePartArray.java
Index: FilePartArray.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/request/multipart/FilePartArray.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FilePartArray.java 27 Feb 2002 20:21:22 -0000 1.1
+++ FilePartArray.java 21 May 2002 12:24:57 -0000 1.2
@@ -58,7 +58,7 @@
* This class represents a file part parsed from a http post stream.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jeroen ter Voorde</a>
- * @version CVS $Id: FilePartArray.java,v 1.1 2002/02/27 20:21:22 dims Exp $
+ * @version CVS $Id: FilePartArray.java,v 1.2 2002/05/21 12:24:57 cziegeler Exp $
*/
public class FilePartArray extends FilePart {
@@ -82,7 +82,6 @@
/**
* Returns the filename
*
- * @return
*/
public String getFileName() {
@@ -94,7 +93,6 @@
/**
* Returns a (ByteArray)InputStream containing the file data
*
- * @return
*
* @throws Exception
*/
1.2 +1 -4
xml-cocoon2/src/java/org/apache/cocoon/components/request/multipart/FilePartFile.java
Index: FilePartFile.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/request/multipart/FilePartFile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FilePartFile.java 27 Feb 2002 20:21:22 -0000 1.1
+++ FilePartFile.java 21 May 2002 12:24:57 -0000 1.2
@@ -59,7 +59,7 @@
* This class represents a file part parsed from a http post stream.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jeroen ter Voorde</a>
- * @version CVS $Id: FilePartFile.java,v 1.1 2002/02/27 20:21:22 dims Exp $
+ * @version CVS $Id: FilePartFile.java,v 1.2 2002/05/21 12:24:57 cziegeler Exp $
*/
public class FilePartFile extends FilePart {
@@ -83,7 +83,6 @@
/**
* Returns the filename
*
- * @return
*/
public String getFileName() {
return file.getName();
@@ -92,7 +91,6 @@
/**
* Returns the file
*
- * @return
*/
public File getFile() {
return file;
@@ -101,7 +99,6 @@
/**
* Returns a (ByteArray)InputStream containing the file data
*
- * @return
*
* @throws Exception
*/
1.3 +1 -50
xml-cocoon2/src/java/org/apache/cocoon/components/request/multipart/MultipartRequestWrapper.java
Index: MultipartRequestWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/request/multipart/MultipartRequestWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultipartRequestWrapper.java 5 Apr 2002 11:04:24 -0000 1.2
+++ MultipartRequestWrapper.java 21 May 2002 12:24:57 -0000 1.3
@@ -70,7 +70,7 @@
*
* @author Jeroen ter Voorde
* @author <a href="mailto:[EMAIL PROTECTED]";>Jeroen ter Voorde</a>
- * @version CVS $Id: MultipartRequestWrapper.java,v 1.2 2002/04/05 11:04:24
cziegeler Exp $
+ * @version CVS $Id: MultipartRequestWrapper.java,v 1.3 2002/05/21 12:24:57
cziegeler Exp $
*/
public class MultipartRequestWrapper
implements ServletRequest, HttpServletRequest {
@@ -118,7 +118,6 @@
*
* @param name
*
- * @return
*/
public Object get(String name) {
@@ -157,7 +156,6 @@
/**
* Method getParameterNames
*
- * @return
*/
public Enumeration getParameterNames() {
@@ -173,7 +171,6 @@
*
* @param name
*
- * @return
*/
public String getParameter(String name) {
@@ -196,7 +193,6 @@
*
* @param name
*
- * @return
*/
public String[] getParameterValues(String name) {
@@ -225,7 +221,6 @@
/**
* Method getRequest
*
- * @return
*/
public HttpServletRequest getRequest() {
return request;
@@ -236,7 +231,6 @@
*
* @param name
*
- * @return
*/
public Object getAttribute(String name) {
return request.getAttribute(name);
@@ -245,7 +239,6 @@
/**
* Method getAttributeNames
*
- * @return
*/
public Enumeration getAttributeNames() {
return request.getAttributeNames();
@@ -254,7 +247,6 @@
/**
* Method getCharacterEncoding
*
- * @return
*/
public String getCharacterEncoding() {
return request.getCharacterEncoding();
@@ -263,7 +255,6 @@
/**
* Method getContentLength
*
- * @return
*/
public int getContentLength() {
return request.getContentLength();
@@ -272,7 +263,6 @@
/**
* Method getContentType
*
- * @return
*/
public String getContentType() {
return request.getContentType();
@@ -281,7 +271,6 @@
/**
* Method getInputStream
*
- * @return
*
* @throws IOException
*/
@@ -292,7 +281,6 @@
/**
* Method getProtocol
*
- * @return
*/
public String getProtocol() {
return request.getProtocol();
@@ -301,7 +289,6 @@
/**
* Method getScheme
*
- * @return
*/
public String getScheme() {
return request.getScheme();
@@ -310,7 +297,6 @@
/**
* Method getServerName
*
- * @return
*/
public String getServerName() {
return request.getServerName();
@@ -319,7 +305,6 @@
/**
* Method getServerPort
*
- * @return
*/
public int getServerPort() {
return request.getServerPort();
@@ -328,7 +313,6 @@
/**
* Method getReader
*
- * @return
*
* @throws IOException
*/
@@ -339,7 +323,6 @@
/**
* Method getRemoteAddr
*
- * @return
*/
public String getRemoteAddr() {
return request.getRemoteAddr();
@@ -348,7 +331,6 @@
/**
* Method getRemoteHost
*
- * @return
*/
public String getRemoteHost() {
return request.getRemoteHost();
@@ -376,7 +358,6 @@
/**
* Method getLocale
*
- * @return
*/
public Locale getLocale() {
return request.getLocale();
@@ -385,7 +366,6 @@
/**
* Method getLocales
*
- * @return
*/
public Enumeration getLocales() {
return request.getLocales();
@@ -394,7 +374,6 @@
/**
* Method isSecure
*
- * @return
*/
public boolean isSecure() {
return request.isSecure();
@@ -405,7 +384,6 @@
*
* @param path
*
- * @return
*/
public RequestDispatcher getRequestDispatcher(String path) {
return request.getRequestDispatcher(path);
@@ -416,7 +394,6 @@
*
* @param path
*
- * @return
*/
public String getRealPath(String path) {
return request.getRealPath(path);
@@ -425,7 +402,6 @@
/**
* Method getAuthType
*
- * @return
*/
public String getAuthType() {
return request.getAuthType();
@@ -434,7 +410,6 @@
/**
* Method getCookies
*
- * @return
*/
public Cookie[] getCookies() {
return request.getCookies();
@@ -445,7 +420,6 @@
*
* @param name
*
- * @return
*/
public long getDateHeader(String name) {
return request.getDateHeader(name);
@@ -456,7 +430,6 @@
*
* @param name
*
- * @return
*/
public String getHeader(String name) {
return request.getHeader(name);
@@ -467,7 +440,6 @@
*
* @param name
*
- * @return
*/
public Enumeration getHeaders(String name) {
return request.getHeaders(name);
@@ -476,7 +448,6 @@
/**
* Method getHeaderNames
*
- * @return
*/
public Enumeration getHeaderNames() {
return request.getHeaderNames();
@@ -487,7 +458,6 @@
*
* @param name
*
- * @return
*/
public int getIntHeader(String name) {
return request.getIntHeader(name);
@@ -496,7 +466,6 @@
/**
* Method getMethod
*
- * @return
*/
public String getMethod() {
return request.getMethod();
@@ -505,7 +474,6 @@
/**
* Method getPathInfo
*
- * @return
*/
public String getPathInfo() {
return request.getPathInfo();
@@ -514,7 +482,6 @@
/**
* Method getPathTranslated
*
- * @return
*/
public String getPathTranslated() {
return request.getPathTranslated();
@@ -523,7 +490,6 @@
/**
* Method getContextPath
*
- * @return
*/
public String getContextPath() {
return request.getContextPath();
@@ -532,7 +498,6 @@
/**
* Method getQueryString
*
- * @return
*/
public String getQueryString() {
return request.getQueryString();
@@ -541,7 +506,6 @@
/**
* Method getRemoteUser
*
- * @return
*/
public String getRemoteUser() {
return request.getRemoteUser();
@@ -552,7 +516,6 @@
*
* @param role
*
- * @return
*/
public boolean isUserInRole(String role) {
return request.isUserInRole(role);
@@ -561,7 +524,6 @@
/**
* Method getUserPrincipal
*
- * @return
*/
public Principal getUserPrincipal() {
return request.getUserPrincipal();
@@ -570,7 +532,6 @@
/**
* Method getRequestedSessionId
*
- * @return
*/
public String getRequestedSessionId() {
return request.getRequestedSessionId();
@@ -579,7 +540,6 @@
/**
* Method getRequestURI
*
- * @return
*/
public String getRequestURI() {
return request.getRequestURI();
@@ -588,7 +548,6 @@
/**
* Method getServletPath
*
- * @return
*/
public String getServletPath() {
return request.getServletPath();
@@ -599,7 +558,6 @@
*
* @param create
*
- * @return
*/
public HttpSession getSession(boolean create) {
return request.getSession(create);
@@ -608,7 +566,6 @@
/**
* Method getSession
*
- * @return
*/
public HttpSession getSession() {
return request.getSession();
@@ -617,7 +574,6 @@
/**
* Method isRequestedSessionIdValid
*
- * @return
*/
public boolean isRequestedSessionIdValid() {
return request.isRequestedSessionIdValid();
@@ -626,7 +582,6 @@
/**
* Method isRequestedSessionIdFromCookie
*
- * @return
*/
public boolean isRequestedSessionIdFromCookie() {
return request.isRequestedSessionIdFromCookie();
@@ -635,7 +590,6 @@
/**
* Method isRequestedSessionIdFromURL
*
- * @return
*/
public boolean isRequestedSessionIdFromURL() {
return request.isRequestedSessionIdFromURL();
@@ -644,7 +598,6 @@
/**
* Method isRequestedSessionIdFromUrl
*
- * @return
*/
public boolean isRequestedSessionIdFromUrl() {
return request.isRequestedSessionIdFromURL();
@@ -653,7 +606,6 @@
/**
* Method getParameterMap
*
- * @return
*/
public Map getParameterMap() {
// FIXME:
@@ -672,7 +624,6 @@
/**
* Method getRequestURL
*
- * @return
*/
public StringBuffer getRequestURL() {
// FIXME:
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/source/WriteableSAXSource.java
Index: WriteableSAXSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/WriteableSAXSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WriteableSAXSource.java 7 May 2002 08:44:35 -0000 1.1
+++ WriteableSAXSource.java 21 May 2002 12:24:57 -0000 1.2
@@ -61,7 +61,7 @@
import org.xml.sax.SAXException;
/**
- * A {@link Source} that can be written to. It provides two methods that
+ * A {@link org.apache.excalibur.source.Source} that can be written to. It provides
two methods that
* allow for SAX-based and byte-based output.
* <p>
* Callers will use the most appropriate method for their use and
@@ -73,7 +73,7 @@
*
* @since @next-version@
* @author <a href="[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Id: WriteableSAXSource.java,v 1.1 2002/05/07 08:44:35 cziegeler
Exp $
+ * @version CVS $Id: WriteableSAXSource.java,v 1.2 2002/05/21 12:24:57 cziegeler
Exp $
*/
public interface WriteableSAXSource
extends WriteableSource {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/source/WriteableSource.java
Index: WriteableSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/WriteableSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WriteableSource.java 7 May 2002 08:44:35 -0000 1.1
+++ WriteableSource.java 21 May 2002 12:24:57 -0000 1.2
@@ -61,7 +61,7 @@
import java.io.OutputStream;
/**
- * A {@link Source} that can be written to. It provides methods that
+ * A {@link org.apache.excalibur.source.Source} that can be written to. It provides
methods that
* allow for byte-based output.
* <p>If a writable source can handle sax streams, it should implement
* the <code>WriteableSAXSource</code> interface instead.
@@ -75,7 +75,7 @@
*
* @since @next-version@
* @author <a href="[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Id: WriteableSource.java,v 1.1 2002/05/07 08:44:35 cziegeler Exp $
+ * @version CVS $Id: WriteableSource.java,v 1.2 2002/05/21 12:24:57 cziegeler Exp $
*/
public interface WriteableSource extends Source {
1.7 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
Index: DefaultTreeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultTreeBuilder.java 22 Apr 2002 15:43:36 -0000 1.6
+++ DefaultTreeBuilder.java 21 May 2002 12:24:57 -0000 1.7
@@ -93,7 +93,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: DefaultTreeBuilder.java,v 1.6 2002/04/22 15:43:36 cziegeler
Exp $
+ * @version CVS $Id: DefaultTreeBuilder.java,v 1.7 2002/05/21 12:24:57 cziegeler
Exp $
*/
public class DefaultTreeBuilder extends AbstractLoggable implements TreeBuilder,
@@ -125,7 +125,7 @@
// -------------------------------------
/**
- * Component manager created by {@link #createComponentManager()}.
+ * Component manager created by {@link #createComponentManager(Configuration)}.
*/
protected ComponentManager manager;
1.3 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/ProcessingNodeBuilder.java
Index: ProcessingNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/ProcessingNodeBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProcessingNodeBuilder.java 17 Mar 2002 21:55:22 -0000 1.2
+++ ProcessingNodeBuilder.java 21 May 2002 12:24:57 -0000 1.3
@@ -72,7 +72,7 @@
* used by only one <code>TreeBuilder</code> at a time.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: ProcessingNodeBuilder.java,v 1.2 2002/03/17 21:55:22 sylvain
Exp $
+ * @version CVS $Id: ProcessingNodeBuilder.java,v 1.3 2002/05/21 12:24:57 cziegeler
Exp $
*/
public interface ProcessingNodeBuilder extends Component {
@@ -84,7 +84,7 @@
/**
* Build the {@link ProcessingNode} and its children from the given
- * <code>Configuration</code>, and optionnaly register it in the {@link Builder}
+ * <code>Configuration</code>, and optionnaly register it in the tree builder
* for lookup by other <code>LinkedProcessingNodeBuilder</code>s.
*/
ProcessingNode buildNode(Configuration config) throws Exception;
1.18 +5 -5
xml-cocoon2/src/java/org/apache/cocoon/transformation/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/I18nTransformer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- I18nTransformer.java 5 May 2002 17:33:56 -0000 1.17
+++ I18nTransformer.java 21 May 2002 12:24:57 -0000 1.18
@@ -96,7 +96,7 @@
* <h3>i18n transformer</h3>
* <p>The <strong>i18n transformer</strong> works by obtaining the users locale
* based on request, session attributes or a cookie data. See
- * {@link org.apache.cocoon.acting.LocaleAction#getLocaleAttribute(Map) } for
details.
+ * {@link org.apache.cocoon.acting.LocaleAction#getLocaleAttribute(Map, String) }
for details.
* It then attempts to find a <strong>message catalogue</strong> that satisifies
* the particular locale, and use it for for text replacement within i18n markup.
* <p>Catalogues are maintained in separate files, with a naming convention
@@ -224,7 +224,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marcus Crafter</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Michael Enke</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Lassi Immonen</a>
- * @version CVS $Id: I18nTransformer.java,v 1.17 2002/05/05 17:33:56 froehlich Exp $
+ * @version CVS $Id: I18nTransformer.java,v 1.18 2002/05/21 12:24:57 cziegeler Exp $
*
* @todo Move all formatting/parsing routines to I18nUtils
*/
@@ -744,7 +744,7 @@
String localCatLocation = null;
String localCatName = null;
String localUntranslated = null;
- String lc = null;
+ String lc = null;
if (parameters != null) {
localCatLocation =
@@ -753,7 +753,7 @@
parameters.getParameter(I18N_CATALOGUE_NAME, null);
localUntranslated =
parameters.getParameter(I18N_UNTRANSLATED, null);
- lc = parameters.getParameter(I18N_LOCALE, null);
+ lc = parameters.getParameter(I18N_LOCALE, null);
}
// if untranslated-text has been overridden, save the original
@@ -1484,7 +1484,7 @@
to_fmt = (DecimalFormat)NumberFormat.getPercentInstance(loc);
} else {
throw new SAXException("<i18n:number>: unknown type: " + type);
- }
+ }
if(fractionDigits > -1) {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
