polishing

Author: jhoeller

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -112,7 +112,7 @@ private static boolean collectionCompare(Collection boundCollection, Object cand
 			}
 		}
 		catch (ClassCastException ex) {
-			// Probably from a  - ignore.
+			// Probably from a TreeSet - ignore.
 		}
 		return exhaustiveCollectionCompare(boundCollection, candidateValue, bindStatus);
 	}
@@ -181,7 +181,7 @@ else if (ObjectUtils.getDisplayString(boundValue).equals(candidateDisplayString)
 		else if (editor != null && candidate instanceof String) {
 			// Try PE-based comparison (PE should *not* be allowed to escape creating thread)
 			String candidateAsString = (String) candidate;
-			Object candidateAsValue = null;
+			Object candidateAsValue;
 			if (convertedValueCache != null && convertedValueCache.containsKey(editor)) {
 				candidateAsValue = convertedValueCache.get(editor);
 			}

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java

@@ -135,6 +135,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
 
 	private List<ViewResolver> viewResolvers;
 
+
 	public void setOrder(int order) {
 		this.order = order;
 	}
@@ -312,7 +313,8 @@ protected List<MediaType> getMediaTypes(HttpServletRequest request) {
 		}
 		if (this.defaultContentType != null) {
 			if (logger.isDebugEnabled()) {
-				logger.debug("Requested media types is " + defaultContentType + " (based on defaultContentType property)");
+				logger.debug("Requested media types is " + this.defaultContentType +
+						" (based on defaultContentType property)");
 			}
 			return Collections.singletonList(this.defaultContentType);
 		}
@@ -323,9 +325,9 @@ protected List<MediaType> getMediaTypes(HttpServletRequest request) {
 
 	/**
 	 * Determines the {@link MediaType} for the given filename.
-	 * <p>The default implementation will check the {@linkplain #setMediaTypes(Map) media types} property first for a
-	 * defined mapping. If not present, and if the Java Activation Framework can be found on the class path, it will call
-	 * {@link FileTypeMap#getContentType(String)}
+	 * <p>The default implementation will check the {@linkplain #setMediaTypes(Map) media types}
+	 * property first for a defined mapping. If not present, and if the Java Activation Framework
+	 * can be found on the classpath, it will call {@link FileTypeMap#getContentType(String)}
 	 * <p>This method can be overriden to provide a different algorithm.
 	 * @param filename the current request file name (i.e. {@code hotels.html})
 	 * @return the media type, if any
@@ -337,7 +339,7 @@ protected MediaType getMediaTypeFromFilename(String filename) {
 		}
 		extension = extension.toLowerCase(Locale.ENGLISH);
 		MediaType mediaType = this.mediaTypes.get(extension);
-		if (mediaType == null && useJaf && jafPresent) {
+		if (mediaType == null && this.useJaf && jafPresent) {
 			mediaType = ActivationMediaTypeFactory.getMediaType(filename);
 			if (mediaType != null) {
 				this.mediaTypes.putIfAbsent(extension, mediaType);
@@ -361,18 +363,14 @@ protected MediaType getMediaTypeFromParameter(String parameterValue) {
 	public View resolveViewName(String viewName, Locale locale) throws Exception {
 		RequestAttributes attrs = RequestContextHolder.getRequestAttributes();
 		Assert.isInstanceOf(ServletRequestAttributes.class, attrs);
-
 		List<MediaType> requestedMediaTypes = getMediaTypes(((ServletRequestAttributes) attrs).getRequest());
-
 		List<View> candidateViews = getCandidateViews(viewName, locale, requestedMediaTypes);
-
 		View bestView = getBestView(candidateViews, requestedMediaTypes);
-
 		if (bestView != null) {
 			return bestView;
 		}
 		else {
-			if (useNotAcceptableStatusCode) {
+			if (this.useNotAcceptableStatusCode) {
 				if (logger.isDebugEnabled()) {
 					logger.debug("No acceptable view found; returning 406 (Not Acceptable) status code");
 				}
@@ -389,8 +387,8 @@ public View resolveViewName(String viewName, Locale locale) throws Exception {
 
 	private List<View> getCandidateViews(String viewName, Locale locale, List<MediaType> requestedMediaTypes)
 			throws Exception {
-		List<View> candidateViews = new ArrayList<View>();
 
+		List<View> candidateViews = new ArrayList<View>();
 		for (ViewResolver viewResolver : this.viewResolvers) {
 			View view = viewResolver.resolveViewName(viewName, locale);
 			if (view != null) {
@@ -408,7 +406,6 @@ private List<View> getCandidateViews(String viewName, Locale locale, List<MediaT
 
 			}
 		}
-
 		if (!CollectionUtils.isEmpty(this.defaultViews)) {
 			candidateViews.addAll(this.defaultViews);
 		}
@@ -452,6 +449,7 @@ private View getBestView(List<View> candidateViews, List<MediaType> requestedMed
 
 	}
 
+
 	/**
 	 * Inner class to avoid hard-coded JAF dependency.
 	 */
@@ -501,6 +499,7 @@ public static MediaType getMediaType(String fileName) {
 		}
 	}
 
+
 	private static final View NOT_ACCEPTABLE_VIEW = new View() {
 
 		public String getContentType() {
@@ -512,4 +511,5 @@ public void render(Map<String, ?> model, HttpServletRequest request, HttpServlet
 			response.setStatus(HttpServletResponse.SC_NOT_ACCEPTABLE);
 		}
 	};
+
 }

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/RedirectView.java

@@ -261,7 +261,7 @@ protected void appendQueryProperties(StringBuilder targetUrl, Map<String, Object
 		boolean first = (getUrl().indexOf('?') < 0);
 		for (Map.Entry<String, Object> entry : queryProperties(model).entrySet()) {
 			Object rawValue = entry.getValue();
-			Iterator valueIter = null;
+			Iterator valueIter;
 			if (rawValue != null && rawValue.getClass().isArray()) {
 				valueIter = Arrays.asList(ObjectUtils.toObjectArray(rawValue)).iterator();
 			}
@@ -398,14 +398,18 @@ protected void sendRedirect(
 	/**
 	 * Determines the status code to use for HTTP 1.1 compatible requests.
 	 * <p>The default implemenetation returns the {@link #setStatusCode(HttpStatus) statusCode}
-	 * property if set, or the value of the {@link #RESPONSE_STATUS_ATTRIBUTE} attribute. If neither are
-	 * set, it defaults to {@link HttpStatus#SEE_OTHER} (303).
+	 * property if set, or the value of the {@link #RESPONSE_STATUS_ATTRIBUTE} attribute.
+	 * If neither are set, it defaults to {@link HttpStatus#SEE_OTHER} (303).
 	 * @param request the request to inspect
-	 * @return the response
+	 * @param response the servlet response
+	 * @param targetUrl the target URL
+	 * @return the response status
 	 */
-	protected HttpStatus getHttp11StatusCode(HttpServletRequest request, HttpServletResponse response, String targetUrl) {
-		if (statusCode != null) {
-			return statusCode;
+	protected HttpStatus getHttp11StatusCode(
+			HttpServletRequest request, HttpServletResponse response, String targetUrl) {
+
+		if (this.statusCode != null) {
+			return this.statusCode;
 		}
 		HttpStatus attributeStatusCode = (HttpStatus) request.getAttribute(View.RESPONSE_STATUS_ATTRIBUTE);
 		if (attributeStatusCode != null) {