Polish formatting

Minor formatting polish across that codebase. Primarily fixing
whitespace issues.
This commit is contained in:
Phillip Webb 2013-02-01 10:14:01 -08:00
parent 0a6da1e42d
commit f464a45ba4
114 changed files with 124 additions and 127 deletions

View File

@ -63,7 +63,6 @@ public final class PrototypeTargetTests {
assertEquals(10, interceptor.invocationCount); assertEquals(10, interceptor.invocationCount);
} }
public static interface TestBean { public static interface TestBean {
public void doSomething(); public void doSomething();
} }

View File

@ -44,7 +44,7 @@ public final class ExposeInvocationInterceptorTests {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CONTEXT); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CONTEXT);
ITestBean tb = (ITestBean) bf.getBean("proxy"); ITestBean tb = (ITestBean) bf.getBean("proxy");
String name= "tony"; String name = "tony";
tb.setName(name); tb.setName(name);
// Fires context checks // Fires context checks
assertEquals(name, tb.getName()); assertEquals(name, tb.getName());

View File

@ -76,5 +76,4 @@ public class OC4JLoadTimeWeaver implements LoadTimeWeaver {
public ClassLoader getThrowawayClassLoader() { public ClassLoader getThrowawayClassLoader() {
return this.classLoader.getThrowawayClassLoader(); return this.classLoader.getThrowawayClassLoader();
} }
} }

View File

@ -36,6 +36,7 @@ public class CompoundExpression extends SpelNodeImpl {
} }
} }
@Override @Override
protected ValueRef getValueRef(ExpressionState state) throws EvaluationException { protected ValueRef getValueRef(ExpressionState state) throws EvaluationException {
if (getChildCount()==1) { if (getChildCount()==1) {

View File

@ -70,7 +70,7 @@ public class Projection extends SpelNodeImpl {
if (operand instanceof Map) { if (operand instanceof Map) {
Map<?, ?> mapData = (Map<?, ?>) operand; Map<?, ?> mapData = (Map<?, ?>) operand;
List<Object> result = new ArrayList<Object>(); List<Object> result = new ArrayList<Object>();
for (Map.Entry<?,?> entry : mapData.entrySet()) { for (Map.Entry<?, ?> entry : mapData.entrySet()) {
try { try {
state.pushActiveContextObject(new TypedValue(entry)); state.pushActiveContextObject(new TypedValue(entry));
result.add(this.children[0].getValueInternal(state).getValue()); result.add(this.children[0].getValueInternal(state).getValue());

View File

@ -73,9 +73,9 @@ public class Selection extends SpelNodeImpl {
if (operand instanceof Map) { if (operand instanceof Map) {
Map<?, ?> mapdata = (Map<?, ?>) operand; Map<?, ?> mapdata = (Map<?, ?>) operand;
// TODO don't lose generic info for the new map // TODO don't lose generic info for the new map
Map<Object,Object> result = new HashMap<Object,Object>(); Map<Object, Object> result = new HashMap<Object, Object>();
Object lastKey = null; Object lastKey = null;
for (Map.Entry<?,?> entry : mapdata.entrySet()) { for (Map.Entry<?, ?> entry : mapdata.entrySet()) {
try { try {
TypedValue kvpair = new TypedValue(entry); TypedValue kvpair = new TypedValue(entry);
state.pushActiveContextObject(kvpair); state.pushActiveContextObject(kvpair);
@ -101,7 +101,7 @@ public class Selection extends SpelNodeImpl {
return new ValueRef.TypedValueHolderValueRef(new TypedValue(null),this); return new ValueRef.TypedValueHolderValueRef(new TypedValue(null),this);
} }
if (variant == LAST) { if (variant == LAST) {
Map<Object,Object> resultMap = new HashMap<Object,Object>(); Map<Object, Object> resultMap = new HashMap<Object, Object>();
Object lastValue = result.get(lastKey); Object lastValue = result.get(lastKey);
resultMap.put(lastKey,lastValue); resultMap.put(lastKey,lastValue);
return new ValueRef.TypedValueHolderValueRef(new TypedValue(resultMap),this); return new ValueRef.TypedValueHolderValueRef(new TypedValue(resultMap),this);

View File

@ -149,5 +149,4 @@ public abstract class SpelNodeImpl implements SpelNode {
protected ValueRef getValueRef(ExpressionState state) throws EvaluationException { protected ValueRef getValueRef(ExpressionState state) throws EvaluationException {
throw new SpelEvaluationException(pos,SpelMessage.NOT_ASSIGNABLE,toStringAST()); throw new SpelEvaluationException(pos,SpelMessage.NOT_ASSIGNABLE,toStringAST());
} }
} }

View File

@ -43,5 +43,4 @@ public class RssChannelHttpMessageConverter extends AbstractWireFeedHttpMessageC
return Channel.class.isAssignableFrom(clazz); return Channel.class.isAssignableFrom(clazz);
} }
} }