Merge branch 'SPR-10127' into cleanup-3.2.x

* SPR-10127:
  Replace space indentation with tabs
  Remove trailing whitespace in source files

spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java

@@ -78,8 +78,10 @@ public class ThreadLocalTargetSource extends AbstractPrototypeBasedTargetSource
 		Object target = this.targetInThread.get();
 		if (target == null) {
 			if (logger.isDebugEnabled()) {
-				logger.debug("No target for prototype '" + getTargetBeanName() + "' bound to thread: " +
+				logger.debug("No target for prototype '" + getTargetBeanName() +
-				    "creating one and binding it to thread '" + Thread.currentThread().getName() + "'");
+						"' bound to thread: " +
+						"creating one and binding it to thread '" +
+						Thread.currentThread().getName() + "'");
 			}
 			// Associate target with ThreadLocal.
 			target = newPrototypeInstance();

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java

@@ -411,6 +411,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 				CannotBeUnlocked.class);
 		assertFalse("Type pattern must have excluded mixin", proxy instanceof Lockable);
 	}
+
 	/* prereq AspectJ 1.6.7
 	@Test
 	public void testIntroductionBasedOnAnnotationMatch_Spr5307() {
@@ -427,7 +428,9 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		lockable.locked();
 	}
 	*/
+
 	// TODO: Why does this test fail? It hasn't been run before, so it maybe never actually passed...
+
 	public void XtestIntroductionWithArgumentBinding() {
 		TestBean target = new TestBean();
 
@@ -765,7 +768,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 
 		@Around(value="setAge(age)",argNames="age")
 		// @ArgNames({"age"})	// AMC needs more work here? ignoring pjp arg... ok??
-		//                     // argNames should be suported in Around as it is in Pointcut
+								// argNames should be suported in Around as it is in Pointcut
 		public void changeReturnType(ProceedingJoinPoint pjp, int age) throws Throwable {
 			pjp.proceed(new Object[] {age*2});
 		}

spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java

@@ -85,8 +85,8 @@ public class CustomNumberEditor extends PropertyEditorSupport {
 	 * @see java.text.NumberFormat#parse
 	 * @see java.text.NumberFormat#format
 	 */
-	public CustomNumberEditor(Class<? extends Number> numberClass, NumberFormat numberFormat, boolean allowEmpty)
+	public CustomNumberEditor(Class<? extends Number> numberClass,
-	    throws IllegalArgumentException {
+			NumberFormat numberFormat, boolean allowEmpty) throws IllegalArgumentException {
 
 		if (numberClass == null || !Number.class.isAssignableFrom(numberClass)) {
 			throw new IllegalArgumentException("Property class must be a subclass of Number");

spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java

@@ -159,7 +159,8 @@ public class MutableSortDefinition implements SortDefinition, Serializable {
 		}
 		SortDefinition otherSd = (SortDefinition) other;
 		return (getProperty().equals(otherSd.getProperty()) &&
-		    isAscending() == otherSd.isAscending() && isIgnoreCase() == otherSd.isIgnoreCase());
+				isAscending() == otherSd.isAscending() &&
+				isIgnoreCase() == otherSd.isIgnoreCase());
 	}
 
 	@Override

spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java

@@ -319,8 +319,7 @@ public final class ClassPathXmlApplicationContextTests {
 
 	@Test
 	public void testResourceAndInputStream() throws IOException {
-		ClassPathXmlApplicationContext ctx =
+		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(RESOURCE_CONTEXT) {
-		    new ClassPathXmlApplicationContext(RESOURCE_CONTEXT) {
 			public Resource getResource(String location) {
 				if (TEST_PROPERTIES.equals(location)) {
 					return new ClassPathResource(TEST_PROPERTIES, ClassPathXmlApplicationContextTests.class);

spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java

@@ -82,11 +82,11 @@ public class ExceptionDepthComparatorTests {
 		assertEquals(LowestDepthException.class, foundClass);
 	}
 
-  private Class<? extends Throwable> findClosestMatch(Class<? extends Throwable>... classes) {
+	private Class<? extends Throwable> findClosestMatch(
+			Class<? extends Throwable>... classes) {
 		return ExceptionDepthComparator.findClosestMatch(Arrays.asList(classes), new TargetException());
 	}
 
-
 	public class HighestDepthException extends Throwable {
 	}
 

spring-expression/src/main/java/org/springframework/expression/BeanResolver.java

@@ -35,4 +35,3 @@ public interface BeanResolver {
 	Object resolve(EvaluationContext context, String beanName) throws AccessException;
 
 }
-	

spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java

@@ -435,8 +435,8 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
 
-		context.registerFunction("reverseString", 
+		context.registerFunction("reverseString", StringUtils.class.getDeclaredMethod(
-		                         StringUtils.class.getDeclaredMethod("reverseString", new Class[] { String.class }));
+				"reverseString", new Class[] { String.class }));
 
 		String helloWorldReversed = parser.parseExpression("#reverseString('hello world')").getValue(context, String.class);
 		Assert.assertEquals("dlrow olleh",helloWorldReversed);
@@ -456,8 +456,8 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		parser.parseExpression("Name").setValue(societyContext, "IEEE");
 		societyContext.setVariable("queryName", "Nikola Tesla");
 
-		String expression = "isMember(#queryName)? #queryName + ' is a member of the ' " + 
+		String expression = "isMember(#queryName)? #queryName + ' is a member of the ' "
-		             "+ Name + ' Society' : #queryName + ' is not a member of the ' + Name + ' Society'";
+				+ "+ Name + ' Society' : #queryName + ' is not a member of the ' + Name + ' Society'";
 
 		String queryResultString = parser.parseExpression(expression).getValue(societyContext, String.class);
 		Assert.assertEquals("Nikola Tesla is a member of the IEEE Society",queryResultString);

spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java

@@ -60,4 +60,3 @@ public interface RowMapper<T> {
 	T mapRow(ResultSet rs, int rowNum) throws SQLException;
 
 }
- 

spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java

@@ -35,4 +35,3 @@ public class ConfigurableJasperReportsViewWithStreamTests extends AbstractConfig
 		return "application/pdf";
 	}
 }
-