You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2007/10/15 22:18:41 UTC
svn commit: r584893 [10/10] - in
/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket: ./ ajax/
ajax/form/ ajax/markup/html/navigation/paging/ application/ behavior/
feedback/ markup/ markup/html/ markup/html/body/ markup/html/border/
markup/ht...
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileItem.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileItem.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileItem.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileItem.java Mon Oct 15 13:18:27 2007
@@ -29,7 +29,7 @@
* <p>
* This class represents a file or form item that was received within a
* <code>multipart/form-data</code> POST request.
- *
+ *
* <p>
* After retrieving an instance of this class from a {@link
* org.apache.wicket.util.upload.FileUpload FileUpload} instance, you may either request
@@ -37,14 +37,14 @@
* {@link java.io.InputStream InputStream} with {@link #getInputStream()} and
* process the file without attempting to load it into memory, which may come
* handy with large files.
- *
+ *
* <p>
* While this interface does not extend <code>javax.activation.DataSource</code>
* per se (to avoid a seldom used dependency), several of the defined methods
* are specifically defined with the same signatures as methods in that
* interface. This allows an implementation of this interface to also implement
* <code>javax.activation.DataSource</code> with minimal additional work.
- *
+ *
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:sean@informage.net">Sean Legassick</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
@@ -60,10 +60,10 @@
/**
* Returns an {@link java.io.InputStream InputStream} that can be used to
* retrieve the contents of the file.
- *
+ *
* @return An {@link java.io.InputStream InputStream} that can be used to
* retrieve the contents of the file.
- *
+ *
* @exception IOException
* if an error occurs.
*/
@@ -73,7 +73,7 @@
/**
* Returns the content type passed by the browser or <code>null</code> if
* not defined.
- *
+ *
* @return The content type passed by the browser or <code>null</code> if
* not defined.
*/
@@ -85,7 +85,7 @@
* the browser (or other client software). In most cases, this will be the
* base file name, without path information. However, some clients, such as
* the Opera browser, do include path information.
- *
+ *
* @return The original filename in the client's filesystem.
*/
String getName();
@@ -97,7 +97,7 @@
/**
* Provides a hint as to whether or not the file contents will be read from
* memory.
- *
+ *
* @return <code>true</code> if the file contents will be read from
* memory; <code>false</code> otherwise.
*/
@@ -106,7 +106,7 @@
/**
* Returns the size of the file item.
- *
+ *
* @return The size of the file item, in bytes.
*/
long getSize();
@@ -114,7 +114,7 @@
/**
* Returns the contents of the file item as an array of bytes.
- *
+ *
* @return The contents of the file item as an array of bytes.
*/
byte[] get();
@@ -124,12 +124,12 @@
* Returns the contents of the file item as a String, using the specified
* encoding. This method uses {@link #get()} to retrieve the contents of the
* item.
- *
+ *
* @param encoding
* The character encoding to use.
- *
+ *
* @return The contents of the item, as a string.
- *
+ *
* @exception UnsupportedEncodingException
* if the requested character encoding is not available.
*/
@@ -140,7 +140,7 @@
* Returns the contents of the file item as a String, using the default
* character encoding. This method uses {@link #get()} to retrieve the
* contents of the item.
- *
+ *
* @return The contents of the item, as a string.
*/
String getString();
@@ -156,11 +156,11 @@
* same item. This allows a particular implementation to use, for example,
* file renaming, where possible, rather than copying all of the underlying
* data, thus gaining a significant performance benefit.
- *
+ *
* @param file
* The <code>File</code> into which the uploaded item should be
* stored.
- *
+ *
* @exception Exception
* if an error occurs.
*/
@@ -180,7 +180,7 @@
/**
* Returns the name of the field in the multipart form corresponding to this
* file item.
- *
+ *
* @return The name of the form field.
*/
String getFieldName();
@@ -188,7 +188,7 @@
/**
* Sets the field name used to reference this file item.
- *
+ *
* @param name
* The name of the form field.
*/
@@ -198,7 +198,7 @@
/**
* Determines whether or not a <code>FileItem</code> instance represents a
* simple form field.
- *
+ *
* @return <code>true</code> if the instance represents a simple form
* field; <code>false</code> if it represents an uploaded file.
*/
@@ -208,7 +208,7 @@
/**
* Specifies whether or not a <code>FileItem</code> instance represents a
* simple form field.
- *
+ *
* @param state
* <code>true</code> if the instance represents a simple form
* field; <code>false</code> if it represents an uploaded file.
@@ -219,10 +219,10 @@
/**
* Returns an {@link java.io.OutputStream OutputStream} that can be used for
* storing the contents of the file.
- *
+ *
* @return An {@link java.io.OutputStream OutputStream} that can be used for
- * storing the contensts of the file.
- *
+ * storing the contents of the file.
+ *
* @exception IOException
* if an error occurs.
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileUpload.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileUpload.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileUpload.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileUpload.java Mon Oct 15 13:18:27 2007
@@ -21,18 +21,18 @@
* <p>
* High level API for processing file uploads.
* </p>
- *
+ *
* <p>
* This class handles multiple files per single HTML widget, sent using
* <code>multipart/mixed</code> encoding type, as specified by <a
* href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>.
* </p>
- *
+ *
* <p>
* How the data for individual parts is stored is determined by the factory used
* to create them; a given part may be in memory, on disk, or somewhere else.
* </p>
- *
+ *
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
@@ -49,10 +49,10 @@
private FileItemFactory fileItemFactory;
/**
- * Constructs an uninitialised instance of this class. A factory must be
+ * Constructs an uninitialized instance of this class. A factory must be
* configured, using <code>setFileItemFactory()</code>, before attempting
* to parse requests.
- *
+ *
* @see #FileUpload(FileItemFactory)
*/
public FileUpload()
@@ -64,9 +64,9 @@
/**
* Constructs an instance of this class which uses the supplied factory to
* create <code>FileItem</code> instances.
- *
+ *
* @param fileItemFactory
- *
+ *
* @see #FileUpload()
*/
public FileUpload(FileItemFactory fileItemFactory)
@@ -77,7 +77,7 @@
/**
* Returns the factory class used when creating file items.
- *
+ *
* @return The factory class for new file items.
*/
public FileItemFactory getFileItemFactory()
@@ -88,12 +88,12 @@
/**
* Sets the factory class to use when creating file items.
- *
+ *
* @param factory
* The factory class for new file items.
*/
public void setFileItemFactory(FileItemFactory factory)
{
- this.fileItemFactory = factory;
+ fileItemFactory = factory;
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java Mon Oct 15 13:18:27 2007
@@ -30,17 +30,17 @@
* <p>
* High level API for processing file uploads.
* </p>
- *
+ *
* <p>
* This class handles multiple files per single HTML widget, sent using
* <code>multipart/mixed</code> encoding type, as specified by <a
* href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>.
- *
+ *
* <p>
* How the data for individual parts is stored is determined by the factory used
* to create them; a given part may be in memory, on disk, or somewhere else.
* </p>
- *
+ *
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
@@ -59,17 +59,17 @@
* Utility method that determines whether the request contains multipart
* content.
* </p>
- *
+ *
* <p>
* <strong>NOTE:</strong>This method will be moved to the
* <code>ServletFileUpload</code> class after the FileUpload 1.1 release.
* Unfortunately, since this method is static, it is not possible to provide
* its replacement until this method is removed.
* </p>
- *
+ *
* @param ctx
* The request context to be evaluated. Must be non-null.
- *
+ *
* @return <code>true</code> if the request is multipart;
* <code>false</code> otherwise.
*/
@@ -160,7 +160,7 @@
/**
* Returns the factory class used when creating file items.
- *
+ *
* @return The factory class for new file items.
*/
public abstract FileItemFactory getFileItemFactory();
@@ -168,7 +168,7 @@
/**
* Sets the factory class to use when creating file items.
- *
+ *
* @param factory
* The factory class for new file items.
*/
@@ -177,11 +177,11 @@
/**
* Returns the maximum allowed upload size.
- *
+ *
* @return The maximum allowed size, in bytes.
- *
+ *
* @see #setSizeMax(long)
- *
+ *
*/
public long getSizeMax()
{
@@ -191,12 +191,12 @@
/**
* Sets the maximum allowed upload size. If negative, there is no maximum.
- *
+ *
* @param sizeMax
* The maximum allowed size, in bytes, or -1 for no maximum.
- *
+ *
* @see #getSizeMax()
- *
+ *
*/
public void setSizeMax(long sizeMax)
{
@@ -208,7 +208,7 @@
* Retrieves the character encoding used when reading the headers of an
* individual part. When not specified, or <code>null</code>, the
* platform default encoding is used.
- *
+ *
* @return The encoding used to read part headers.
*/
public String getHeaderEncoding()
@@ -221,7 +221,7 @@
* Specifies the character encoding to be used when reading the headers of
* individual parts. When not specified, or <code>null</code>, the
* platform default encoding is used.
- *
+ *
* @param encoding
* The encoding used to read part headers.
*/
@@ -236,13 +236,13 @@
/**
* Processes an <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>
* compliant <code>multipart/form-data</code> stream.
- *
+ *
* @param ctx
* The context for the request to be parsed.
- *
+ *
* @return A list of <code>FileItem</code> instances parsed from the
* request, in the order that they were transmitted.
- *
+ *
* @exception FileUploadException
* if there are problems reading/parsing the request or
* storing files.
@@ -374,11 +374,11 @@
/**
* Retrieves the boundary from the <code>Content-type</code> header.
- *
+ *
* @param contentType
* The value of the content type header from which to extract the
* boundary value.
- *
+ *
* @return The boundary, as a byte array.
*/
protected byte[] getBoundary(String contentType)
@@ -409,10 +409,10 @@
/**
* Retrieves the file name from the <code>Content-disposition</code>
* header.
- *
+ *
* @param headers
* A <code>Map</code> containing the HTTP request headers.
- *
+ *
* @return The file name for the current <code>encapsulation</code>.
*/
protected String getFileName(Map /* String, String */headers)
@@ -456,10 +456,10 @@
/**
* Retrieves the field name from the <code>Content-disposition</code>
* header.
- *
+ *
* @param headers
* A <code>Map</code> containing the HTTP request headers.
- *
+ *
* @return The field name for the current <code>encapsulation</code>.
*/
protected String getFieldName(Map /* String, String */headers)
@@ -485,13 +485,13 @@
/**
* Creates a new {@link FileItem} instance.
- *
+ *
* @param headers
* A <code>Map</code> containing the HTTP request headers.
* @param isFormField
* Whether or not this item is a form field, as opposed to a
* file.
- *
+ *
* @return A newly created <code>FileItem</code> instance.
*/
protected FileItem createItem(Map /* String, String */headers, boolean isFormField)
@@ -504,15 +504,15 @@
/**
* <p>
* Parses the <code>header-part</code> and returns as key/value pairs.
- *
+ *
* <p>
* If there are multiple headers of the same names, the name will map to a
* comma-separated list containing the values.
- *
+ *
* @param headerPart
* The <code>header-part</code> of the current
* <code>encapsulation</code>.
- *
+ *
* @return A <code>Map</code> containing the parsed HTTP request headers.
*/
protected Map /* String, String */parseHeaders(String headerPart)
@@ -550,7 +550,7 @@
headerValue = header.substring(header.indexOf(':') + 1).trim();
if (getHeader(headers, headerName) != null)
{
- // More that one heder of that name exists,
+ // More that one header of that name exists,
// append to the list.
headers.put(headerName, getHeader(headers, headerName) + ',' + headerValue);
}
@@ -573,12 +573,12 @@
/**
* Returns the header with the specified name from the supplied map. The
* header lookup is case-insensitive.
- *
+ *
* @param headers
* A <code>Map</code> containing the HTTP request headers.
* @param name
* The name of the header to return.
- *
+ *
* @return The value of specified header, or a comma-separated list if there
* were multiple headers of that name.
*/
@@ -608,7 +608,7 @@
/**
* Constructs an <code>InvalidContentTypeException</code> with the
* specified detail message.
- *
+ *
* @param message
* The detail message.
*/
@@ -639,7 +639,7 @@
/**
* Constructs an <code>UnknownSizeException</code> with the specified
* detail message.
- *
+ *
* @param message
* The detail message.
*/
@@ -670,7 +670,7 @@
/**
* Constructs an <code>SizeExceededException</code> with the specified
* detail message.
- *
+ *
* @param message
* The detail message.
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java Mon Oct 15 13:18:27 2007
@@ -25,21 +25,21 @@
/**
* <p>
* Low level API for processing file uploads.
- *
+ *
* <p>
* This class can be used to process data streams conforming to MIME 'multipart'
* format as defined in <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>.
* Arbitrarily large amounts of data in the stream can be processed under
* constant memory usage.
- *
+ *
* <p>
* The format of the stream is defined in the following way:<br>
- *
+ *
* <code>
* multipart-body := preamble 1*encapsulation close-delimiter epilogue<br>
* encapsulation := delimiter body CRLF<br>
* delimiter := "--" boundary CRLF<br>
- * close-delimiter := "--" boudary "--"<br>
+ * close-delimiter := "--" boundary "--"<br>
* preamble := <ignore><br>
* epilogue := <ignore><br>
* body := header-part CRLF body-part<br>
@@ -49,16 +49,16 @@
* header-value := <any ascii characters except CR & LF><br>
* body-data := <arbitrary data><br>
* </code>
- *
+ *
* <p>
- * Note that body-data can contain another mulipart entity. There is limited
+ * Note that body-data can contain another multipart entity. There is limited
* support for single pass processing of such nested streams. The nested stream
* is <strong>required</strong> to have a boundary token of the same length as
* the parent stream (see {@link #setBoundary(byte[])}).
- *
+ *
* <p>
- * Here is an exaple of usage of this class.<br>
- *
+ * Here is an example of usage of this class.<br>
+ *
* <pre>
* try {
* MultipartStream multipartStream = new MultipartStream(input,
@@ -77,13 +77,13 @@
* } catch(IOException) {
* // a read or write error occurred
* }
- *
+ *
* </pre>
- *
+ *
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:martinc@apache.org">Martin Cooper</a>
* @author Sean C. Sullivan
- *
+ *
* @version $Id: MultipartFormInputStream.java,v 1.2 2006/02/05 18:41:32
* jonathanlocke Exp $
*/
@@ -192,7 +192,7 @@
/**
- * The index of last valid characer in the buffer + 1. <br>
+ * The index of last valid character in the buffer + 1. <br>
* 0 <= tail <= bufSize
*/
private int tail;
@@ -209,10 +209,10 @@
/**
* Default constructor.
- *
+ *
* @see #MultipartFormInputStream(InputStream, byte[], int)
* @see #MultipartFormInputStream(InputStream, byte[])
- *
+ *
*/
public MultipartFormInputStream()
{
@@ -222,12 +222,12 @@
/**
* <p>
* Constructs a <code>MultipartStream</code> with a custom size buffer.
- *
+ *
* <p>
* Note that the buffer must be at least big enough to contain the boundary
* string, plus 4 characters for CR/LF and double dash, plus at least one
* byte of data. Too small a buffer size setting will degrade performance.
- *
+ *
* @param input
* The <code>InputStream</code> to serve as a data source.
* @param boundary
@@ -235,23 +235,23 @@
* <code>encapsulations</code>.
* @param bufSize
* The size of the buffer to be used, in bytes.
- *
- *
+ *
+ *
* @see #MultipartFormInputStream()
* @see #MultipartFormInputStream(InputStream, byte[])
- *
+ *
*/
public MultipartFormInputStream(InputStream input, byte[] boundary, int bufSize)
{
this.input = input;
this.bufSize = bufSize;
- this.buffer = new byte[bufSize];
+ buffer = new byte[bufSize];
- // We prepend CR/LF to the boundary to chop trailng CR/LF from
+ // We prepend CR/LF to the boundary to chop trailing CR/LF from
// body-data tokens.
this.boundary = new byte[boundary.length + 4];
- this.boundaryLength = boundary.length + 4;
- this.keepRegion = boundary.length + 3;
+ boundaryLength = boundary.length + 4;
+ keepRegion = boundary.length + 3;
this.boundary[0] = CR;
this.boundary[1] = LF;
this.boundary[2] = DASH;
@@ -266,16 +266,16 @@
/**
* <p>
* Constructs a <code>MultipartStream</code> with a default size buffer.
- *
+ *
* @param input
* The <code>InputStream</code> to serve as a data source.
* @param boundary
* The token used for dividing the stream into
* <code>encapsulations</code>.
- *
+ *
* @see #MultipartFormInputStream()
* @see #MultipartFormInputStream(InputStream, byte[], int)
- *
+ *
*/
public MultipartFormInputStream(InputStream input, byte[] boundary)
{
@@ -290,8 +290,8 @@
* Retrieves the character encoding used when reading the headers of an
* individual part. When not specified, or <code>null</code>, the
* platform default encoding is used.
- *
- *
+ *
+ *
* @return The encoding used to read part headers.
*/
public String getHeaderEncoding()
@@ -304,7 +304,7 @@
* Specifies the character encoding to be used when reading the headers of
* individual parts. When not specified, or <code>null</code>, the
* platform default encoding is used.
- *
+ *
* @param encoding
* The encoding used to read part headers.
*/
@@ -317,9 +317,9 @@
/**
* Reads a byte from the <code>buffer</code>, and refills it as
* necessary.
- *
+ *
* @return The next byte from the input stream.
- *
+ *
* @exception IOException
* if there is no more data available.
*/
@@ -344,12 +344,12 @@
/**
* Skips a <code>boundary</code> token, and checks whether more
* <code>encapsulations</code> are contained in the stream.
- *
+ *
* @return <code>true</code> if there are more encapsulations in this
* stream; <code>false</code> otherwise.
- *
+ *
* @exception MalformedStreamException
- * if the stream ends unexpecetedly or fails to follow
+ * if the stream ends unexpectedly or fails to follow
* required syntax.
*/
public boolean readBoundary() throws MalformedStreamException
@@ -397,21 +397,21 @@
/**
* <p>
* Changes the boundary token used for partitioning the stream.
- *
+ *
* <p>
* This method allows single pass processing of nested multipart streams.
- *
+ *
* <p>
* The boundary token of the nested stream is <code>required</code> to be
* of the same length as the boundary token in parent stream.
- *
+ *
* <p>
* Restoring the parent stream boundary token after processing of a nested
* stream is left to the application.
- *
+ *
* @param boundary
* The boundary to be used for parsing of the nested stream.
- *
+ *
* @exception IllegalBoundaryException
* if the <code>boundary</code> has a different length than
* the one being currently parsed.
@@ -432,14 +432,14 @@
* <p>
* Headers are returned verbatim to the input stream, including the trailing
* <code>CRLF</code> marker. Parsing is left to the application.
- *
+ *
* @param maxSize
* The maximum amount to read before giving up
- *
+ *
* @return The <code>header-part</code> of the current encapsulation.
- *
+ *
* @exception MalformedStreamException
- * if the stream ends unexpecetedly.
+ * if the stream ends unexpectedly.
*/
public String readHeaders(final int maxSize) throws MalformedStreamException
{
@@ -506,17 +506,17 @@
* Reads <code>body-data</code> from the current
* <code>encapsulation</code> and writes its contents into the output
* <code>Stream</code>.
- *
+ *
* <p>
* Arbitrary large amounts of data can be processed by this method using a
* constant size buffer. (see {@link
* #MultipartFormInputStream(InputStream,byte[],int) constructor}).
- *
+ *
* @param output
* The <code>Stream</code> to write data into.
- *
+ *
* @return the amount of data written.
- *
+ *
* @exception MalformedStreamException
* if the stream ends unexpectedly.
* @exception IOException
@@ -531,7 +531,7 @@
int total = 0;
while (!done)
{
- // Is boundary token present somewere in the buffer?
+ // Is boundary token present somewhere in the buffer?
pos = findSeparator();
if (pos != -1)
{
@@ -590,13 +590,13 @@
* <p>
* Reads <code>body-data</code> from the current
* <code>encapsulation</code> and discards it.
- *
+ *
* <p>
* Use this method to skip encapsulations you don't need or don't
* understand.
- *
+ *
* @return The amount of data discarded.
- *
+ *
* @exception MalformedStreamException
* if the stream ends unexpectedly.
* @exception IOException
@@ -611,7 +611,7 @@
int total = 0;
while (!done)
{
- // Is boundary token present somewere in the buffer?
+ // Is boundary token present somewhere in the buffer?
pos = findSeparator();
if (pos != -1)
{
@@ -662,10 +662,10 @@
/**
* Finds the beginning of the first <code>encapsulation</code>.
- *
+ *
* @return <code>true</code> if an <code>encapsulation</code> was found
* in the stream.
- *
+ *
* @exception IOException
* if an i/o error occurs.
*/
@@ -679,7 +679,7 @@
// Discard all data up to the delimiter.
discardBodyData();
- // Read boundary - if succeded, the stream contains an
+ // Read boundary - if succeeded, the stream contains an
// encapsulation.
return readBoundary();
}
@@ -701,14 +701,14 @@
/**
* Compares <code>count</code> first bytes in the arrays <code>a</code>
* and <code>b</code>.
- *
+ *
* @param a
* The first array to compare.
* @param b
* The second array to compare.
* @param count
* How many bytes should be compared.
- *
+ *
* @return <code>true</code> if <code>count</code> first bytes in arrays
* <code>a</code> and <code>b</code> are equal.
*/
@@ -728,12 +728,12 @@
/**
* Searches for a byte of specified value in the <code>buffer</code>,
* starting at the specified <code>position</code>.
- *
+ *
* @param value
* The value to find.
* @param pos
* The starting position for searching.
- *
+ *
* @return The position of byte found, counting from beginning of the
* <code>buffer</code>, or <code>-1</code> if not found.
*/
@@ -754,7 +754,7 @@
/**
* Searches for the <code>boundary</code> in the <code>buffer</code>
* region delimited by <code>head</code> and <code>tail</code>.
- *
+ *
* @return The position of the boundary found, counting from the beginning
* of the <code>buffer</code>, or <code>-1</code> if not found.
*/
@@ -787,7 +787,7 @@
/**
* Returns a string representation of this object.
- *
+ *
* @return The string representation of this object.
*/
public String toString()
@@ -821,7 +821,7 @@
/**
* Constructs an <code>MalformedStreamException</code> with the
* specified detail message.
- *
+ *
* @param message
* The detail message.
*/
@@ -852,7 +852,7 @@
/**
* Constructs an <code>IllegalBoundaryException</code> with the
* specified detail message.
- *
+ *
* @param message
* The detail message.
*/
@@ -881,15 +881,15 @@
* File("boundary.dat"); int boundarySize = (int)boundaryFile.length();
* byte[] boundary = new byte[boundarySize]; FileInputStream input = new
* FileInputStream(boundaryFile); input.read(boundary,0,boundarySize);
- *
+ *
* input = new FileInputStream("multipart.dat"); MultipartStream chunks =
* new MultipartStream(input, boundary);
- *
+ *
* int i = 0; String header; OutputStream output; boolean nextChunk =
* chunks.skipPreamble(); while (nextChunk) { header = chunks.readHeaders();
* System.out.println("!"+header+"!"); System.out.println("wrote
* part"+i+".dat"); output = new FileOutputStream("part"+(i++)+".dat");
* chunks.readBodyData(output); nextChunk = chunks.readBoundary(); } }
- *
+ *
*/
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/ParameterParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/ParameterParser.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/ParameterParser.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/ParameterParser.java Mon Oct 15 13:18:27 2007
@@ -21,14 +21,14 @@
/**
* A simple parser intended to parse sequences of name/value pairs. Parameter
- * values are exptected to be enclosed in quotes if they contain unsafe
+ * values are expected to be enclosed in quotes if they contain unsafe
* characters, such as '=' characters or separators. Parameter values are
* optional and can be omitted.
- *
+ *
* <p>
* <code>param1 = value; param2 = "anything goes; really"; param3</code>
* </p>
- *
+ *
* @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
*/
@@ -74,19 +74,19 @@
/**
* Are there any characters left to parse?
- *
+ *
* @return <tt>true</tt> if there are unparsed characters, <tt>false</tt>
* otherwise.
*/
private boolean hasChar()
{
- return this.pos < this.len;
+ return pos < len;
}
/**
* A helper method to process the parsed token. This method removes leading
* and trailing blanks as well as enclosing quotation marks, when necessary.
- *
+ *
* @param quoted
* <tt>true</tt> if quotation marks are expected,
* <tt>false</tt> otherwise.
@@ -123,12 +123,12 @@
/**
* Tests if the given character is present in the array of characters.
- *
+ *
* @param ch
- * the character to test for presense in the array of characters
+ * the character to test for presence in the array of characters
* @param charray
* the array of characters to test against
- *
+ *
* @return <tt>true</tt> if the character is present in the array of
* characters, <tt>false</tt> otherwise.
*/
@@ -148,11 +148,11 @@
/**
* Parses out a token until any of the given terminators is encountered.
- *
+ *
* @param terminators
* the array of terminating characters. Any of these characters
* when encountered signify the end of the token
- *
+ *
* @return the token
*/
private String parseToken(final char[] terminators)
@@ -176,12 +176,12 @@
/**
* Parses out a token until any of the given terminators is encountered
* outside the quotation marks.
- *
+ *
* @param terminators
* the array of terminating characters. Any of these characters
* when encountered outside the quotation marks signify the end
* of the token
- *
+ *
* @return the token
*/
private String parseQuotedToken(final char[] terminators)
@@ -213,20 +213,20 @@
/**
* Returns <tt>true</tt> if parameter names are to be converted to lower
* case when name/value pairs are parsed.
- *
+ *
* @return <tt>true</tt> if parameter names are to be converted to lower
* case when name/value pairs are parsed. Otherwise returns
* <tt>false</tt>
*/
public boolean isLowerCaseNames()
{
- return this.lowerCaseNames;
+ return lowerCaseNames;
}
/**
* Sets the flag if parameter names are to be converted to lower case when
* name/value pairs are parsed.
- *
+ *
* @param b
* <tt>true</tt> if parameter names are to be converted to
* lower case when name/value pairs are parsed. <tt>false</tt>
@@ -234,18 +234,18 @@
*/
public void setLowerCaseNames(boolean b)
{
- this.lowerCaseNames = b;
+ lowerCaseNames = b;
}
/**
* Extracts a map of name/value pairs from the given string. Names are
* expected to be unique.
- *
+ *
* @param str
* the string that contains a sequence of name/value pairs
* @param separator
* the name/value pairs separator
- *
+ *
* @return a map of name/value pairs
*/
public Map parse(final String str, char separator)
@@ -260,13 +260,13 @@
/**
* Extracts a map of name/value pairs from the given array of characters.
* Names are expected to be unique.
- *
+ *
* @param chars
* the array of characters that contains a sequence of name/value
* pairs
* @param separator
* the name/value pairs separator
- *
+ *
* @return a map of name/value pairs
*/
public Map parse(final char[] chars, char separator)
@@ -281,7 +281,7 @@
/**
* Extracts a map of name/value pairs from the given array of characters.
* Names are expected to be unique.
- *
+ *
* @param chars
* the array of characters that contains a sequence of name/value
* pairs
@@ -291,7 +291,7 @@
* the length.
* @param separator
* the name/value pairs separator
- *
+ *
* @return a map of name/value pairs
*/
public Map parse(final char[] chars, int offset, int length, char separator)
@@ -303,8 +303,8 @@
}
HashMap params = new HashMap();
this.chars = chars;
- this.pos = offset;
- this.len = length;
+ pos = offset;
+ len = length;
String paramName = null;
String paramValue = null;
@@ -323,7 +323,7 @@
}
if ((paramName != null) && (paramName.length() > 0))
{
- if (this.lowerCaseNames)
+ if (lowerCaseNames)
{
paramName = paramName.toLowerCase();
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/RequestContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/RequestContext.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/RequestContext.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/RequestContext.java Mon Oct 15 13:18:27 2007
@@ -22,10 +22,10 @@
/**
* <p>
* Abstracts access to the request information needed for file uploads. This
- * interfsace should be implemented for each type of request that may be handled
+ * interface should be implemented for each type of request that may be handled
* by FileUpload, such as servlets and portlets.
* </p>
- *
+ *
* @author <a href="mailto:martinc@apache.org">Martin Cooper</a>
*/
public interface RequestContext
@@ -33,23 +33,23 @@
/**
* Retrieve the content type of the request.
- *
+ *
* @return The content type of the request.
*/
String getContentType();
/**
* Retrieve the content length of the request.
- *
+ *
* @return The content length of the request.
*/
int getContentLength();
/**
* Retrieve the input stream for the request.
- *
+ *
* @return The input stream for the request.
- *
+ *
* @throws IOException
* if a problem occurs.
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/ServletFileUpload.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/ServletFileUpload.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/ServletFileUpload.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/upload/ServletFileUpload.java Mon Oct 15 13:18:27 2007
@@ -25,7 +25,7 @@
* <p>
* High level API for processing file uploads.
* </p>
- *
+ *
* <p>
* This class handles multiple files per single HTML widget, sent using
* <code>multipart/mixed</code> encoding type, as specified by <a
@@ -33,12 +33,12 @@
* #parseRequest(HttpServletRequest)} to acquire a list of {@link
* org.apache.wicket.util.upload.FileItem}s associated with a given HTML widget.
* </p>
- *
+ *
* <p>
* How the data for individual parts is stored is determined by the factory used
* to create them; a given part may be in memory, on disk, or somewhere else.
* </p>
- *
+ *
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
@@ -55,10 +55,10 @@
/**
* Utility method that determines whether the request contains multipart
* content.
- *
+ *
* @param request
* The servlet request to be evaluated. Must be non-null.
- *
+ *
* @return <code>true</code> if the request is multipart;
* <code>false</code> otherwise.
*/
@@ -76,7 +76,7 @@
/**
- * Constructs an uninitialised instance of this class. A factory must be
+ * Constructs an uninitialized instance of this class. A factory must be
* configured, using <code>setFileItemFactory()</code>, before attempting
* to parse requests.
*/
@@ -89,7 +89,7 @@
/**
* Constructs an instance of this class which uses the supplied factory to
* create <code>FileItem</code> instances.
- *
+ *
* @param fileItemFactory
*/
public ServletFileUpload(FileItemFactory fileItemFactory)
@@ -104,13 +104,13 @@
/**
* Processes an <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>
* compliant <code>multipart/form-data</code> stream.
- *
+ *
* @param request
* The servlet request to be parsed.
- *
+ *
* @return A list of <code>FileItem</code> instances parsed from the
* request, in the order that they were transmitted.
- *
+ *
* @exception FileUploadException
* if there are problems reading/parsing the request or
* storing files.
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/value/IntValue.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/value/IntValue.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/value/IntValue.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/value/IntValue.java Mon Oct 15 13:18:27 2007
@@ -25,20 +25,20 @@
* A base class based on the Java <code>int</code> primitive for value classes
* that want to implement standard operations on that value without the pain of
* aggregating an <code>Integer</code> object.
- *
+ *
* @author Jonathan Locke
* @since 1.2.6
*/
public class IntValue implements Comparable, Serializable
{
private static final long serialVersionUID = 1L;
-
+
/** the <code>int</code> value */
protected final int value;
/**
* Constructor.
- *
+ *
* @param value
* the <code>int</code> value
*/
@@ -56,12 +56,12 @@
{
final IntValue that = (IntValue)object;
- if (this.value < that.value)
+ if (value < that.value)
{
return -1;
}
- if (this.value > that.value)
+ if (value > that.value)
{
return 1;
}
@@ -71,7 +71,7 @@
/**
* Compares this <code>Object</code> to a given <code>Object</code>.
- *
+ *
* @param object
* the <code>Object</code> to compare with
* @return 0 if equal, -1 if less than the given <code>Object</code>'s
@@ -81,7 +81,7 @@
{
if (that instanceof IntValue)
{
- return this.value == ((IntValue)that).value;
+ return value == ((IntValue)that).value;
}
return false;
@@ -90,7 +90,7 @@
/**
* Compares this <code>IntValue</code> with a primitive <code>int</code>
* value.
- *
+ *
* @param value
* the <code>int</code> value to compare with
* @return <code>true</code> if this <code>IntValue</code> is greater
@@ -103,7 +103,7 @@
/**
* Compares this <code>IntValue</code> with another <code>IntValue</code>.
- *
+ *
* @param that
* the <code>IntValue</code> to compare with
* @return <code>true</code> if this <code>IntValue</code> is greater
@@ -111,12 +111,12 @@
*/
public final boolean greaterThan(final IntValue that)
{
- return this.value > that.value;
+ return value > that.value;
}
/**
* Returns the hash code for this <code>Object</code>.
- *
+ *
* @return hash code for this <code>Object</code>
*/
public final int hashCode()
@@ -127,20 +127,20 @@
/**
* Compares this <code>IntValue</code> with a primitive <code>int</code>
* value.
- *
- * @param value
+ *
+ * @param that
* the <code>int</code> value to compare with
* @return <code>true</code> if this <code>IntValue</code> is less
* than the given <code>int</code> value
*/
public final boolean lessThan(final int that)
{
- return this.value < that;
+ return value < that;
}
/**
* Compares this <code>IntValue</code> with another <code>IntValue</code>.
- *
+ *
* @param that
* the <code>IntValue</code> to compare with
* @return <code>true</code> if this <code>IntValue</code> is less
@@ -148,12 +148,12 @@
*/
public final boolean lessThan(final IntValue that)
{
- return this.value < that.value;
+ return value < that.value;
}
/**
* Converts this <code>LongValue</code> to a <code>String</code>.
- *
+ *
* @return a <code>String</code> representation of this
* <code>LongValue</code>
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java Mon Oct 15 13:18:27 2007
@@ -27,7 +27,7 @@
/**
* A <code>ChangeList</code> is a sequence of changes that can be undone.
- *
+ *
* @author Jonathan Locke
* @since 1.2.6
*/
@@ -43,7 +43,7 @@
/**
* A <code>Component</code> was added.
- *
+ *
* @param component
* the <code>Component</code> that was added
*/
@@ -54,7 +54,7 @@
/**
* An <code>IModel</code> is about to change.
- *
+ *
* @param component
* the <code>Component</code> for which the <code>IModel</code>
* changed
@@ -66,7 +66,7 @@
/**
* The state of a <code>Component</code> is about to change.
- *
+ *
* @param change
* the <code>Change</code> object
*/
@@ -82,7 +82,7 @@
/**
* A <code>Component</code> was removed from its parent.
- *
+ *
* @param component
* the <code>Component</code> that was removed
*/
@@ -93,8 +93,8 @@
/**
* Adds the given <code>ChangeList</code> to this <code>ChangeList</code>.
- *
- * @param component
+ *
+ * @param list
* the <code>ChangeList</code> to add
*/
void add(ChangeList list)
@@ -113,7 +113,7 @@
((Change)changes.get(i)).undo();
}
}
-
+
/**
* @see java.lang.Object#toString()
*/
@@ -121,5 +121,5 @@
{
return changes.toString();
}
-
+
}