Author: markt
Date: Tue Nov 17 22:03:22 2009
New Revision: 881562
URL: http://svn.apache.org/viewvc?rev=881562&view=rev
Log:
Generics
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java?rev=881562&r1=881561&r2=881562&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
Tue Nov 17 22:03:22 2009
@@ -54,7 +54,7 @@
private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
/** The list of buffers, which grows and never reduces. */
- private List buffers = new ArrayList();
+ private List<byte[]> buffers = new ArrayList<byte[]>();
/** The index of the current buffer. */
private int currentBufferIndex;
/** The total count of bytes in all the filled buffers. */
@@ -95,7 +95,7 @@
* @return the buffer
*/
private byte[] getBuffer(int index) {
- return (byte[]) buffers.get(index);
+ return buffers.get(index);
}
/**
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java?rev=881562&r1=881561&r2=881562&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java
Tue Nov 17 22:03:22 2009
@@ -252,8 +252,8 @@
ParameterParser parser = new ParameterParser();
parser.setLowerCaseNames(true);
// Parameter parser can handle null input
- Map params = parser.parse(getContentType(), ';');
- return (String) params.get("charset");
+ Map<String,String> params = parser.parse(getContentType(), ';');
+ return params.get("charset");
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java?rev=881562&r1=881561&r2=881562&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java
Tue Nov 17 22:03:22 2009
@@ -48,7 +48,7 @@
/**
* Collection of <code>Tracker</code> instances in existence.
*/
- final Collection /* Tracker */ trackers = new Vector(); // synchronized
+ final Collection<Tracker> trackers = new Vector<Tracker>(); //
synchronized
/**
* Whether to terminate the thread when the tracking is complete.
*/
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java?rev=881562&r1=881561&r2=881562&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java
Tue Nov 17 22:03:22 2009
@@ -57,7 +57,7 @@
* requested header. If the item does not have any headers of
* that name, return an empty <code>Enumeration</code>
*/
- Iterator getHeaders(String name);
+ Iterator<String> getHeaders(String name);
/**
* <p>
@@ -73,5 +73,5 @@
* requested header. If the item does not have any headers of
* that name return an empty <code>Enumeration</code>
*/
- Iterator getHeaderNames();
+ Iterator<String> getHeaderNames();
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java?rev=881562&r1=881561&r2=881562&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java
Tue Nov 17 22:03:22 2009
@@ -38,33 +38,34 @@
* Map of <code>String</code> keys to a <code>List</code> of
* <code>String</code> instances.
*/
- private final Map headerNameToValueListMap = new HashMap();
+ private final Map<String,List<String>> headerNameToValueListMap =
+ new HashMap<String,List<String>>();
/**
* List to preserve order of headers as added. This would not be
* needed if a <code>LinkedHashMap</code> could be used, but don't
* want to depend on 1.4.
*/
- private final List headerNameList = new ArrayList();
+ private final List<String> headerNameList = new ArrayList<String>();
public String getHeader(String name) {
String nameLower = name.toLowerCase();
- List headerValueList = (List) headerNameToValueListMap.get(nameLower);
+ List<String> headerValueList = headerNameToValueListMap.get(nameLower);
if (null == headerValueList) {
return null;
}
- return (String) headerValueList.get(0);
+ return headerValueList.get(0);
}
- public Iterator getHeaderNames() {
+ public Iterator<String> getHeaderNames() {
return headerNameList.iterator();
}
- public Iterator getHeaders(String name) {
+ public Iterator<String> getHeaders(String name) {
String nameLower = name.toLowerCase();
- List headerValueList = (List) headerNameToValueListMap.get(nameLower);
+ List<String> headerValueList = headerNameToValueListMap.get(nameLower);
if (null == headerValueList) {
- return Collections.EMPTY_LIST.iterator();
+ return Collections.<String>emptyList().iterator();
}
return headerValueList.iterator();
}
@@ -77,9 +78,9 @@
*/
public synchronized void addHeader(String name, String value) {
String nameLower = name.toLowerCase();
- List headerValueList = (List) headerNameToValueListMap.get(nameLower);
+ List<String> headerValueList = headerNameToValueListMap.get(nameLower);
if (null == headerValueList) {
- headerValueList = new ArrayList();
+ headerValueList = new ArrayList<String>();
headerNameToValueListMap.put(nameLower, headerValueList);
headerNameList.add(nameLower);
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java?rev=881562&r1=881561&r2=881562&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
Tue Nov 17 22:03:22 2009
@@ -290,11 +290,11 @@
* @throws FileUploadException if there are problems reading/parsing
* the request or storing files.
*/
- public List /* FileItem */ parseRequest(RequestContext ctx)
+ public List<FileItem> parseRequest(RequestContext ctx)
throws FileUploadException {
try {
FileItemIterator iter = getItemIterator(ctx);
- List items = new ArrayList();
+ List<FileItem> items = new ArrayList<FileItem>();
FileItemFactory fac = getFileItemFactory();
if (fac == null) {
throw new NullPointerException(
@@ -345,8 +345,9 @@
ParameterParser parser = new ParameterParser();
parser.setLowerCaseNames(true);
// Parameter parser can handle null input
- Map params = parser.parse(contentType, new char[] {';', ','});
- String boundaryStr = (String) params.get("boundary");
+ Map<String,String> params =
+ parser.parse(contentType, new char[] {';', ','});
+ String boundaryStr = params.get("boundary");
if (boundaryStr == null) {
return null;
@@ -386,9 +387,10 @@
ParameterParser parser = new ParameterParser();
parser.setLowerCaseNames(true);
// Parameter parser can handle null input
- Map params = parser.parse(pContentDisposition, ';');
+ Map<String,String> params =
+ parser.parse(pContentDisposition, ';');
if (params.containsKey("filename")) {
- fileName = (String) params.get("filename");
+ fileName = params.get("filename");
if (fileName != null) {
fileName = fileName.trim();
} else {
@@ -429,8 +431,9 @@
ParameterParser parser = new ParameterParser();
parser.setLowerCaseNames(true);
// Parameter parser can handle null input
- Map params = parser.parse(pContentDisposition, ';');
- fieldName = (String) params.get("name");
+ Map<String,String> params =
+ parser.parse(pContentDisposition, ';');
+ fieldName = params.get("name");
if (fieldName != null) {
fieldName = fieldName.trim();
}
@@ -1013,6 +1016,9 @@
* is exceeded.
*/
protected abstract static class SizeException extends FileUploadException {
+
+ private static final long serialVersionUID = 1L;
+
/**
* The actual size of the request.
*/
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java?rev=881562&r1=881561&r2=881562&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
Tue Nov 17 22:03:22 2009
@@ -680,7 +680,10 @@
* required syntax.
*/
public static class MalformedStreamException
- extends IOException {
+ extends IOException {
+
+ private static final long serialVersionUID = 1L;
+
/**
* Constructs a <code>MalformedStreamException</code> with no
* detail message.
@@ -706,6 +709,9 @@
*/
public static class IllegalBoundaryException
extends IOException {
+
+ private static final long serialVersionUID = 1L;
+
/**
* Constructs an <code>IllegalBoundaryException</code> with no
* detail message.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java?rev=881562&r1=881561&r2=881562&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
Tue Nov 17 22:03:22 2009
@@ -224,9 +224,9 @@
*
* @return a map of name/value pairs
*/
- public Map parse(final String str, char[] separators) {
+ public Map<String,String> parse(final String str, char[] separators) {
if (separators == null || separators.length == 0) {
- return new HashMap();
+ return new HashMap<String,String>();
}
char separator = separators[0];
if (str != null) {
@@ -253,9 +253,9 @@
*
* @return a map of name/value pairs
*/
- public Map parse(final String str, char separator) {
+ public Map<String,String> parse(final String str, char separator) {
if (str == null) {
- return new HashMap();
+ return new HashMap<String,String>();
}
return parse(str.toCharArray(), separator);
}
@@ -270,11 +270,11 @@
*
* @return a map of name/value pairs
*/
- public Map parse(final char[] chars, char separator) {
- if (chars == null) {
- return new HashMap();
+ public Map<String,String> parse(final char[] inputChars, char separator) {
+ if (inputChars == null) {
+ return new HashMap<String,String>();
}
- return parse(chars, 0, chars.length, separator);
+ return parse(inputChars, 0, inputChars.length, separator);
}
/**
@@ -289,17 +289,17 @@
*
* @return a map of name/value pairs
*/
- public Map parse(
- final char[] chars,
+ public Map<String,String> parse(
+ final char[] inputChars,
int offset,
int length,
char separator) {
if (chars == null) {
- return new HashMap();
+ return new HashMap<String,String>();
}
- HashMap params = new HashMap();
- this.chars = chars;
+ HashMap<String,String> params = new HashMap<String,String>();
+ this.chars = inputChars;
this.pos = offset;
this.len = length;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java?rev=881562&r1=881561&r2=881562&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java
Tue Nov 17 22:03:22 2009
@@ -117,7 +117,7 @@
* @throws FileUploadException if there are problems reading/parsing
* the request or storing files.
*/
- public List /* FileItem */ parseRequest(HttpServletRequest request)
+ public List<FileItem> parseRequest(HttpServletRequest request)
throws FileUploadException {
return parseRequest(new ServletRequestContext(request));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
