From 4be7f7dc87b423872b6f2d0dfb2bbd942d368013 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Sat, 16 Aug 2008 18:21:03 +0000 Subject: [PATCH] remove java.awt as a default import in the StandardTypeLocator git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@65 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../expression/spel/standard/StandardTypeLocator.java | 1 - .../org/springframework/expression/spel/EvaluationTests.java | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/StandardTypeLocator.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/StandardTypeLocator.java index 9ac0ab9d4c1..2290552d321 100644 --- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/StandardTypeLocator.java +++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/StandardTypeLocator.java @@ -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... diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java b/org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java index 38456b38b42..6b0466b13b2 100644 --- a/org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java +++ b/org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java @@ -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 { // } 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