polishing

org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java

@@ -215,10 +215,10 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 	 * <p>This method converts back to <code>&&</code> for the AspectJ pointcut parser.
 	 */
 	private String replaceBooleanOperators(String pcExpr) {
-		pcExpr = StringUtils.replace(pcExpr," and "," && ");
-		pcExpr = StringUtils.replace(pcExpr, " or ", " || ");
-		pcExpr = StringUtils.replace(pcExpr, " not ", " ! ");
-		return pcExpr;
+		String result = StringUtils.replace(pcExpr, " and ", " && ");
+		result = StringUtils.replace(result, " or ", " || ");
+		result = StringUtils.replace(result, " not ", " ! ");
+		return result;
 	}
 
 	/**

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -51,7 +51,7 @@ public class SimpleSpringPreparerFactory extends AbstractSpringPreparerFactory {
 				preparer = this.sharedPreparers.get(name);
 				if (preparer == null) {
 					try {
-						Class beanClass = context.getClassLoader().loadClass(name);
+						Class<?> beanClass = context.getClassLoader().loadClass(name);
 						if (!ViewPreparer.class.isAssignableFrom(beanClass)) {
 							throw new PreparerException(
 									"Invalid preparer class [" + name + "]: does not implement ViewPreparer interface");