Merge pull request spring-projects#53 from aclement/SPR-9203

* SPR-9203:
  Eliminate trailing whitespace in SpEL classes
  Support [] array ref syntax in SpEL T() construct

Author: cbeams

spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeReference.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -16,19 +16,28 @@
 
 package org.springframework.expression.spel.ast;
 
+import java.lang.reflect.Array;
+
 import org.springframework.expression.EvaluationException;
 import org.springframework.expression.TypedValue;
 import org.springframework.expression.spel.ExpressionState;
 
 /**
  * Represents a reference to a type, for example "T(String)" or "T(com.somewhere.Foo)"
- * 
+ *
  * @author Andy Clement
  */
 public class TypeReference extends SpelNodeImpl {
 
+	private int dimensions;
+
 	public TypeReference(int pos,SpelNodeImpl qualifiedId) {
+		this(pos,qualifiedId,0);
+	}
+
+	public TypeReference(int pos,SpelNodeImpl qualifiedId,int dims) {
 		super(pos,qualifiedId);
+		this.dimensions = dims;
 	}
 
 	@Override
@@ -39,19 +48,36 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 			TypeCode tc = TypeCode.valueOf(typename.toUpperCase());
 			if (tc != TypeCode.OBJECT) {
 				// it is a primitive type
-				return new TypedValue(tc.getType());
+				Class<?> clazz = tc.getType();
+				clazz = makeArrayIfNecessary(clazz);
+				return new TypedValue(clazz);
 			}
 		}
-		return new TypedValue(state.findType(typename));
+		Class<?> clazz = state.findType(typename);
+		clazz = makeArrayIfNecessary(clazz);
+		return new TypedValue(clazz);
+	}
+
+	private Class makeArrayIfNecessary(Class clazz) {
+		if (dimensions!=0) {
+			for (int i=0;i<dimensions;i++) {
+				Object o = Array.newInstance(clazz, 0);
+				clazz = o.getClass();
+			}
+		}
+		return clazz;
 	}
 
 	@Override
 	public String toStringAST() {
 		StringBuilder sb = new StringBuilder();
 		sb.append("T(");
 		sb.append(getChild(0).toStringAST());
+		for (int d=0;d<dimensions;d++) {
+			sb.append("[]");
+		}
 		sb.append(")");
 		return sb.toString();
 	}
-	
+
 }