Author: jochen
Date: Tue Mar 27 14:33:55 2007
New Revision: 523090
URL: http://svn.apache.org/viewvc?view=rev&rev=523090
Log:
Making checkstyle happy.
Modified:
jakarta/commons/proper/fileupload/trunk/pom.xml
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileItemHeadersSupport.java
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItemFactory.java
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/FileCleanerCleanup.java
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java
Modified: jakarta/commons/proper/fileupload/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/pom.xml?view=diff&rev=523090&r1=523089&r2=523090
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/pom.xml (original)
+++ jakarta/commons/proper/fileupload/trunk/pom.xml Tue Mar 27 14:33:55 2007
@@ -243,7 +243,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<configuration>
- <comparisonVersion>1.1</comparisonVersion>
+ <comparisonVersion>1.2</comparisonVersion>
<minSeverity>info</minSeverity>
</configuration>
</plugin>
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileItemHeadersSupport.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileItemHeadersSupport.java?view=diff&rev=523090&r1=523089&r2=523090
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileItemHeadersSupport.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileItemHeadersSupport.java
Tue Mar 27 14:33:55 2007
@@ -31,19 +31,17 @@
* Returns the collection of headers defined locally within this item.
*
* @return the [EMAIL PROTECTED] FileItemHeaders} present for this item.
- * @since 1.3
*/
FileItemHeaders getHeaders();
/**
- * Sets the headers read from within an item. Implementations of
- * [EMAIL PROTECTED] FileItem} or [EMAIL PROTECTED] FileItemStream}
should implement this
- * interface to be able to get the raw headers found within the item
- * header block.
- *
- * @param headers the instance that holds onto the headers
- * for this instance.
- * @since 1.3
- */
- void setHeaders(FileItemHeaders headers);
+ * Sets the headers read from within an item. Implementations of
+ * [EMAIL PROTECTED] FileItem} or [EMAIL PROTECTED] FileItemStream} should
implement this
+ * interface to be able to get the raw headers found within the item
+ * header block.
+ *
+ * @param headers the instance that holds onto the headers
+ * for this instance.
+ */
+ void setHeaders(FileItemHeaders headers);
}
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java?view=diff&rev=523090&r1=523089&r2=523090
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java
Tue Mar 27 14:33:55 2007
@@ -432,6 +432,11 @@
return getFileName(headers.getHeader(CONTENT_DISPOSITION));
}
+ /**
+ * Returns the given content-disposition headers file name.
+ * @param pContentDisposition The content-disposition headers value.
+ * @return The file name
+ */
private String getFileName(String pContentDisposition) {
String fileName = null;
if (pContentDisposition != null) {
@@ -470,9 +475,16 @@
return getFieldName(headers.getHeader(CONTENT_DISPOSITION));
}
+ /**
+ * Returns the field name, which is given by the content-disposition
+ * header.
+ * @param pContentDisposition The content-dispositions header value.
+ * @return The field jake
+ */
private String getFieldName(String pContentDisposition) {
String fieldName = null;
- if (pContentDisposition != null &&
pContentDisposition.toLowerCase().startsWith(FORM_DATA)) {
+ if (pContentDisposition != null
+ && pContentDisposition.toLowerCase().startsWith(FORM_DATA)) {
ParameterParser parser = new ParameterParser();
parser.setLowerCaseNames(true);
// Parameter parser can handle null input
@@ -574,7 +586,7 @@
protected FileItemHeadersImpl newFileItemHeaders() {
return new FileItemHeadersImpl();
}
-
+
/**
* <p> Parses the <code>header-part</code> and returns as key/value
* pairs.
@@ -780,10 +792,18 @@
stream.close();
}
+ /**
+ * Returns the file item headers.
+ * @return The items header object
+ */
public FileItemHeaders getHeaders() {
return headers;
}
+ /**
+ * Sets the file item headers.
+ * @param pHeaders The items header object
+ */
public void setHeaders(FileItemHeaders pHeaders) {
headers = pHeaders;
}
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java?view=diff&rev=523090&r1=523089&r2=523090
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java
Tue Mar 27 14:33:55 2007
@@ -201,7 +201,8 @@
* @param repository The data repository, which is the directory in
* which files will be created, should the item size
* exceed the threshold.
- * @deprecated Use [EMAIL PROTECTED] #DiskFileItem(FileCleaningTracker,
String, String, boolean, String, int, File)}.
+ * @deprecated Use [EMAIL PROTECTED] #DiskFileItem(FileCleaningTracker,
String, String,
+ * boolean, String, int, File)}.
*/
public DiskFileItem(String fieldName, String contentType,
boolean isFormField, String fileName, int sizeThreshold,
@@ -230,8 +231,9 @@
* which files will be created, should the item size
* exceed the threshold.
*/
- private DiskFileItem(FileCleaningTracker tracker, String fieldName, String
contentType,
- boolean isFormField, String fileName, int sizeThreshold, File
repository) {
+ private DiskFileItem(FileCleaningTracker tracker, String fieldName,
+ String contentType, boolean isFormField, String fileName,
+ int sizeThreshold, File repository) {
this.fileCleaningTracker = tracker;
this.fieldName = fieldName;
this.contentType = contentType;
@@ -253,8 +255,8 @@
* @param fileName The original filename in the user's filesystem, or
* <code>null</code> if not specified.
*/
- public DiskFileItem(DiskFileItemFactory factory, String fieldName, String
contentType,
- boolean isFormField, String fileName) {
+ public DiskFileItem(DiskFileItemFactory factory, String fieldName,
+ String contentType, boolean isFormField, String fileName) {
this(factory.getFileCleaningTracker(), fieldName, contentType,
isFormField, fileName, factory.getSizeThreshold(),
factory.getRepository());
@@ -771,6 +773,7 @@
/**
* Returns the file item headers.
+ * @return The file items headers.
*/
public FileItemHeaders getHeaders() {
return headers;
@@ -778,6 +781,7 @@
/**
* Sets the file item headers.
+ * @param pHeaders The file items headers.
*/
public void setHeaders(FileItemHeaders pHeaders) {
headers = pHeaders;
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItemFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItemFactory.java?view=diff&rev=523090&r1=523089&r2=523090
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItemFactory.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItemFactory.java
Tue Mar 27 14:33:55 2007
@@ -51,7 +51,7 @@
* terminating this thread, for example, when your web application
* ends. See the section on "Resource cleanup"
* in the users guide of commons-fileupload.</p>
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Martin Cooper</a>
*
* @since FileUpload 1.1
@@ -96,7 +96,8 @@
/**
* Constructs an unconfigured instance of this class. The resulting factory
* may be configured by calling the appropriate setter methods.
- * @deprecated Use [EMAIL PROTECTED]
#DiskFileItemFactory(FileCleaningTracker, int, File)}.
+ * @deprecated Use
+ * [EMAIL PROTECTED] #DiskFileItemFactory(FileCleaningTracker, int,
File)}.
*/
public DiskFileItemFactory() {
this(FileCleaner.getInstance(), DEFAULT_SIZE_THRESHOLD, null);
@@ -112,7 +113,8 @@
* @param repository The data repository, which is the directory in
* which files will be created, should the item size
* exceed the threshold.
- * @deprecated Use [EMAIL PROTECTED]
#DiskFileItemFactory(FileCleaningTracker, int, File)}.
+ * @deprecated Use
+ * [EMAIL PROTECTED] #DiskFileItemFactory(FileCleaningTracker, int,
File)}.
*/
public DiskFileItemFactory(int sizeThreshold, File repository) {
this(FileCleaner.getInstance(), sizeThreshold, repository);
@@ -127,9 +129,11 @@
* @param repository The data repository, which is the directory in
* which files will be created, should the item size
* exceed the threshold.
- * @param tracker The tracker, which is responsible to delete
temporary files.
+ * @param tracker The tracker, which is responsible to delete
+ * temporary files.
*/
- public DiskFileItemFactory(FileCleaningTracker tracker, int sizeThreshold,
File repository) {
+ public DiskFileItemFactory(FileCleaningTracker tracker, int sizeThreshold,
+ File repository) {
this.sizeThreshold = sizeThreshold;
this.repository = repository;
this.fileCleaningTracker = tracker;
@@ -231,11 +235,11 @@
/**
* Returns the tracker, which is responsible for deleting temporary
* files.
- * @param pFileCleaningTracker An instance of [EMAIL PROTECTED]
FileCleaningTracker},
+ * @param pTracker An instance of [EMAIL PROTECTED] FileCleaningTracker},
* which will from now on track the created files.
*/
- public void setFileCleaningTracker(FileCleaningTracker
pFileCleaningTracker) {
- fileCleaningTracker = pFileCleaningTracker;
+ public void setFileCleaningTracker(FileCleaningTracker pTracker) {
+ fileCleaningTracker = pTracker;
}
}
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/FileCleanerCleanup.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/FileCleanerCleanup.java?view=diff&rev=523090&r1=523089&r2=523090
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/FileCleanerCleanup.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/FileCleanerCleanup.java
Tue Mar 27 14:33:55 2007
@@ -25,7 +25,8 @@
/**
* A servlet context listener, which ensures that the
- * [EMAIL PROTECTED] org.apache.commons.io.FileCleaner FileCleaner's} reaper
thread is terminated,
+ * [EMAIL PROTECTED] org.apache.commons.io.FileCleaner FileCleaner's}
+ * reaper thread is terminated,
* when the web application is destroyed.
*/
public class FileCleanerCleanup implements ServletContextListener {
@@ -39,16 +40,23 @@
/**
* Returns the instance of [EMAIL PROTECTED] FileCleaningTracker}, which is
* associated with the given [EMAIL PROTECTED] ServletContext}.
+ * @param pServletContext The servlet context to query
+ * @return The contexts tracker
*/
- public static FileCleaningTracker getFileCleaningTracker(ServletContext
pServletContext) {
- return (FileCleaningTracker)
pServletContext.getAttribute(FILE_CLEANING_TRACKER_ATTRIBUTE);
+ public static FileCleaningTracker
+ getFileCleaningTracker(ServletContext pServletContext) {
+ return (FileCleaningTracker)
+ pServletContext.getAttribute(FILE_CLEANING_TRACKER_ATTRIBUTE);
}
/**
* Sets the instance of [EMAIL PROTECTED] FileCleaningTracker}, which is
* associated with the given [EMAIL PROTECTED] ServletContext}.
+ * @param pServletContext The servlet context to modify
+ * @param pTracker The tracker to set
*/
- public static void setFileCleaningTracker(ServletContext pServletContext,
FileCleaningTracker pTracker) {
+ public static void setFileCleaningTracker(ServletContext pServletContext,
+ FileCleaningTracker pTracker) {
pServletContext.setAttribute(FILE_CLEANING_TRACKER_ATTRIBUTE,
pTracker);
}
@@ -59,7 +67,8 @@
* [EMAIL PROTECTED] #setFileCleaningTracker(ServletContext,
FileCleaningTracker)}.
*/
public void contextInitialized(ServletContextEvent sce) {
- setFileCleaningTracker(sce.getServletContext(), new
FileCleaningTracker());
+ setFileCleaningTracker(sce.getServletContext(),
+ new FileCleaningTracker());
}
/**
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java?view=diff&rev=523090&r1=523089&r2=523090
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java
Tue Mar 27 14:33:55 2007
@@ -53,8 +53,7 @@
public String getHeader(String name) {
String nameLower = name.toLowerCase();
List headerValueList = (List) headerNameToValueListMap.get(nameLower);
- if (null == headerValueList)
- {
+ if (null == headerValueList) {
return null;
}
return (String) headerValueList.get(0);
@@ -73,8 +72,7 @@
public Iterator getHeaders(String name) {
String nameLower = name.toLowerCase();
List headerValueList = (List) headerNameToValueListMap.get(nameLower);
- if (null == headerValueList)
- {
+ if (null == headerValueList) {
return Collections.EMPTY_LIST.iterator();
}
return headerValueList.iterator();
@@ -89,8 +87,7 @@
public synchronized void addHeader(String name, String value) {
String nameLower = name.toLowerCase();
List headerValueList = (List) headerNameToValueListMap.get(nameLower);
- if (null == headerValueList)
- {
+ if (null == headerValueList) {
headerValueList = new ArrayList();
headerNameToValueListMap.put(nameLower, headerValueList);
headerNameList.add(nameLower);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
