From 991b8e9a06d65229b91ab29c7d59183fdd07dd02 Mon Sep 17 00:00:00 2001 From: Stevo Slavic Date: Sun, 12 Feb 2012 20:45:55 +0100 Subject: [PATCH] Fix encoding issues in javadoc Before this change javadoc in two classes had non-UTF-8 encoded characters. This caused building Spring API to fail in Java 1.7. Commit fixes this by replacing wrongly encoded characters with their UTF-8 equivalents. Issue: SPR-9097 --- .../org/springframework/expression/spel/ast/OpMultiply.java | 2 +- .../test/context/support/DelegatingSmartContextLoader.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java index e4565e211a..a68e557d49 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java @@ -25,7 +25,7 @@ import org.springframework.expression.spel.ExpressionState; * Implements the multiply operator. Conversions and promotions: * http://java.sun.com/docs/books/jls/third_edition/html/conversions.html Section 5.6.2: * - *

If any of the operands is of a reference type, unboxing conversion (¤5.1.8) is performed. Then:
+ *

If any of the operands is of a reference type, unboxing conversion (§5.1.8) is performed. Then:
* If either operand is of type double, the other is converted to double.
* Otherwise, if either operand is of type float, the other is converted to float.
* Otherwise, if either operand is of type long, the other is converted to long.
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java index 0cdbb0aeec..fcdf2a30db 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java @@ -34,7 +34,7 @@ import org.springframework.util.ObjectUtils; * {@code DelegatingSmartContextLoader} is an implementation of the {@link SmartContextLoader} * SPI that delegates to a set of candidate SmartContextLoaders (i.e., * {@link GenericXmlContextLoader} and {@link AnnotationConfigContextLoader}) to - * determine which context loader is appropriate for a given test classÕs configuration. + * determine which context loader is appropriate for a given test class's configuration. * Each candidate is given a chance to {@link #processContextConfiguration process} the * {@link ContextConfigurationAttributes} for each class in the test class hierarchy that * is annotated with {@link ContextConfiguration @ContextConfiguration}, and the candidate