Browse Source

remove java.awt as a default import in the StandardTypeLocator

conversation
Andy Clement 17 years ago
parent
commit
1917a50f6f
  1. 1
      org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/StandardTypeLocator.java
  2. 5
      org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java

1
org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/StandardTypeLocator.java

@ -33,7 +33,6 @@ public class StandardTypeLocator implements TypeLocator { @@ -33,7 +33,6 @@ public class StandardTypeLocator implements TypeLocator {
loader = Thread.currentThread().getContextClassLoader();
registerImport("java.lang");
registerImport("java.util");
registerImport("java.awt");
}
// OPTIMIZE I'm sure this *could* be more inefficient if I tried really hard...

5
org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java

@ -416,9 +416,8 @@ public class EvaluationTests extends ExpressionTestCase { @@ -416,9 +416,8 @@ public class EvaluationTests extends ExpressionTestCase {
evaluate("@(a/b/c:orange).name", "Orange", String.class, true);
}
// TODO 4 automatic/default imports for next line?
public void testReferences06() {
evaluate("@(apple).color.getRGB() == T(Color).green.getRGB()", "true", Boolean.class);
evaluate("@(apple).color.getRGB() == T(java.awt.Color).green.getRGB()", "true", Boolean.class);
}
public void testReferences06b() {
@ -435,7 +434,7 @@ public class EvaluationTests extends ExpressionTestCase { @@ -435,7 +434,7 @@ public class EvaluationTests extends ExpressionTestCase {
// }
public void testStaticRef02() {
evaluate("T(Color).green.getRGB()!=0", "true", Boolean.class);
evaluate("T(java.awt.Color).green.getRGB()!=0", "true", Boolean.class);
}
// variables and functions

Loading…
Cancel
Save