Polishing (including removal of javadoc imports that show as package cycles in IntelliJ)

spring-context/src/main/java/org/springframework/scheduling/config/CronTask.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,7 +16,6 @@
 
 package org.springframework.scheduling.config;
 
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.support.CronTrigger;
 
 /**
@@ -26,13 +25,13 @@ import org.springframework.scheduling.support.CronTrigger;
  *
  * @author Chris Beams
  * @since 3.2
- * @see Scheduled#cron()
+ * @see org.springframework.scheduling.annotation.Scheduled#cron()
  * @see ScheduledTaskRegistrar#setCronTasksList(java.util.List)
  * @see org.springframework.scheduling.TaskScheduler
  */
 public class CronTask extends TriggerTask {
 
-	private String expression;
+	private final String expression;
 
 
 	/**
@@ -54,7 +53,9 @@ public class CronTask extends TriggerTask {
 		this.expression = cronTrigger.getExpression();
 	}
 
+
 	public String getExpression() {
-		return expression;
+		return this.expression;
 	}
+
 }

spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,11 +16,8 @@
 
 package org.springframework.test.util;
 
-import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
-
 import java.io.StringReader;
 import java.util.Map;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.Source;
@@ -29,11 +26,12 @@ import javax.xml.transform.dom.DOMSource;
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.hamcrest.Matcher;
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
 
+import static org.springframework.test.util.MatcherAssertionErrors.*;
+
 /**
  * A helper class for assertions on XML content.
  *
@@ -73,15 +71,12 @@ public class XmlExpectationsHelper {
 	 * Parse the expected and actual content strings as XML and assert that the
 	 * two are "similar" -- i.e. they contain the same elements and attributes
 	 * regardless of order.
-	 *
 	 * <p>Use of this method assumes the
 	 * <a href="http://xmlunit.sourceforge.net/">XMLUnit<a/> library is available.
-	 *
 	 * @param expected the expected XML content
 	 * @param actual the actual XML content
-	 *
-	 * @see MockMvcResultMatchers#xpath(String, Object...)
-	 * @see MockMvcResultMatchers#xpath(String, Map, Object...)
+	 * @see org.springframework.test.web.servlet.result.MockMvcResultMatchers#xpath(String, Object...)
+	 * @see org.springframework.test.web.servlet.result.MockMvcResultMatchers#xpath(String, Map, Object...)
 	 */
 	public void assertXmlEqual(String expected, String actual) throws Exception {
 

spring-tx/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,6 +16,10 @@
 
 package org.springframework.transaction.config;
 
+/**
+ * @author Chris Beams
+ * @since 3.1
+ */
 public abstract class TransactionManagementConfigUtils {
 
 	/**

spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -32,6 +32,9 @@ import org.springframework.util.ClassUtils;
  */
 public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConverter {
 
+	private static final boolean jaxb2Present =
+			ClassUtils.isPresent("javax.xml.bind.Binder", AllEncompassingFormHttpMessageConverter.class.getClassLoader());
+
 	private static final boolean jackson2Present =
 			ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", AllEncompassingFormHttpMessageConverter.class.getClassLoader()) &&
 					ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", AllEncompassingFormHttpMessageConverter.class.getClassLoader());
@@ -40,9 +43,6 @@ public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConv
 			ClassUtils.isPresent("org.codehaus.jackson.map.ObjectMapper", AllEncompassingFormHttpMessageConverter.class.getClassLoader()) &&
 					ClassUtils.isPresent("org.codehaus.jackson.JsonGenerator", AllEncompassingFormHttpMessageConverter.class.getClassLoader());
 
-	private static final boolean jaxb2Present =
-			ClassUtils.isPresent("javax.xml.bind.Binder", AllEncompassingFormHttpMessageConverter.class.getClassLoader());
-
 
 	@SuppressWarnings("deprecation")
 	public AllEncompassingFormHttpMessageConverter() {

spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -19,7 +19,6 @@ package org.springframework.http.converter.xml;
 import javax.xml.transform.Source;
 
 import org.springframework.http.converter.FormHttpMessageConverter;
-import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
 
 /**
  * Extension of {@link org.springframework.http.converter.FormHttpMessageConverter},
@@ -27,7 +26,8 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage
  *
  * @author Juergen Hoeller
  * @since 3.0.3
- * @deprecated in favor of {@link AllEncompassingFormHttpMessageConverter}
+ * @deprecated in favor of
+ * {@link org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter}
  */
 @Deprecated
 public class XmlAwareFormHttpMessageConverter extends FormHttpMessageConverter {

spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java

@@ -28,7 +28,6 @@ import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.HttpSessionRequiredException;
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.context.support.WebApplicationObjectSupport;
-import org.springframework.web.servlet.mvc.LastModified;
 
 /**
  * Convenient superclass for any kind of web content generator,
@@ -204,7 +203,7 @@ public abstract class WebContentGenerator extends WebApplicationObjectSupport {
 	 * programmatically do a lastModified calculation as described in
 	 * {@link WebRequest#checkNotModified(long)}. Default is "false",
 	 * effectively relying on whether the handler implements
-	 * {@link LastModified} or not.
+	 * {@link org.springframework.web.servlet.mvc.LastModified} or not.
 	 */
 	public void setAlwaysMustRevalidate(boolean mustRevalidate) {
 		this.alwaysMustRevalidate = mustRevalidate;

spring-webmvc/src/main/resources/META-INF/spring.handlers

@@ -1 +1 @@
-http\://www.springframework.org/schema/mvc=org.springframework.web.servlet.config.MvcNamespaceHandler
+http\://www.springframework.org/schema/mvc=org.springframework.web.servlet.config.MvcNamespaceHandler