root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

polishing

This commit is contained in:
Juergen Hoeller 2009-11-07 01:30:50 +00:00
parent 205b5a477b
commit 2a0b3cf3c9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
View File

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

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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); preparer = this.sharedPreparers.get(name);
if (preparer == null) { if (preparer == null) {
try { try {
Class beanClass = context.getClassLoader().loadClass(name); Class<?> beanClass = context.getClassLoader().loadClass(name);
if (!ViewPreparer.class.isAssignableFrom(beanClass)) { if (!ViewPreparer.class.isAssignableFrom(beanClass)) {
throw new PreparerException( throw new PreparerException(
"Invalid preparer class [" + name + "]: does not implement ViewPreparer interface"); "Invalid preparer class [" + name + "]: does not implement ViewPreparer interface");