Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove trailing whitespace in Java source code

Browse Source
This commit is contained in:
Sam Brannen
2015-05-29 02:03:44 +02:00
parent a31d1bdf60
commit 7018747cec
24 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java
View File

@@ -222,7 +222,7 @@ public class CodeFlow implements Opcodes {
mv.visitTypeInsn(CHECKCAST, "java/lang/Number");
}
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "doubleValue", "()D", false);
break;
break;
case 'F':
if (stackDescriptor.equals("Ljava/lang/Object")) {
mv.visitTypeInsn(CHECKCAST, "java/lang/Number");

6
spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java
View File

@@ -56,7 +56,7 @@ public class ExpressionState {
// When entering a new scope there is a new base object which should be used
// for '#this' references (or to act as a target for unqualified references).
// This stack captures those objects at each nested scope level.
// For example:
// For example:
// #list1.?[#list2.contains(#this)]
// On entering the selection we enter a new scope, and #this is now the
// element from list1
@@ -180,11 +180,11 @@ public class ExpressionState {
this.variableScopes.push(new VariableScope(argMap));
this.scopeRootObjects.push(getActiveContextObject());
}
public void enterScope() {
ensureVariableScopesInitialized();
this.variableScopes.push(new VariableScope(Collections.<String,Object>emptyMap()));
this.scopeRootObjects.push(getActiveContextObject());
this.scopeRootObjects.push(getActiveContextObject());
}
public void enterScope(String name, Object value) {

2
spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java
View File

@@ -644,7 +644,7 @@ class InternalSpelExpressionParser extends TemplateAwareExpressionParser {
while (peekToken(TokenKind.COMMA,true));
closingCurly = eatToken(TokenKind.RCURLY);
expr = new InlineList(toPos(t.startPos,closingCurly.endPos),listElements.toArray(new SpelNodeImpl[listElements.size()]));
}
else if (peekToken(TokenKind.COLON, true)) { // map!
List<SpelNodeImpl> mapElements = new ArrayList<SpelNodeImpl>();

2
spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
View File

@@ -81,7 +81,7 @@ public class ReflectiveMethodExecutor implements MethodExecutor {
clazz.getDeclaredMethod(method.getName(), method.getParameterTypes());
return clazz;
} catch (NoSuchMethodException nsme) {
}
}
Class<?>[] intfaces = clazz.getInterfaces();

4
spring-expression/src/test/java/org/springframework/expression/spel/MapTests.java
View File

@@ -166,7 +166,7 @@ public class MapTests extends AbstractExpressionTests {
expression = (SpelExpression) parser.parseExpression("foo['abc.def']");
o = expression.getValue(new MapHolder());
assertEquals("value", o);
expression = (SpelExpression)parser.parseExpression("foo[foo[NEW]]");
o = expression.getValue(new MapHolder());
assertEquals("37",o);
@@ -174,7 +174,7 @@ public class MapTests extends AbstractExpressionTests {
expression = (SpelExpression)parser.parseExpression("foo[foo[new]]");
o = expression.getValue(new MapHolder());
assertEquals("38",o);
expression = (SpelExpression)parser.parseExpression("foo[foo[foo[T]]]");
o = expression.getValue(new MapHolder());
assertEquals("value",o);

14
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
View File

@@ -2999,7 +2999,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
context.setVariable("it", person);
expression.setEvaluationContext(context);
assertTrue(expression.getValue(Boolean.class));
assertTrue(expression.getValue(Boolean.class));
assertTrue(expression.getValue(Boolean.class));
assertCanCompile(expression);
assertTrue(expression.getValue(Boolean.class));
}
@@ -3899,7 +3899,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
float[] fs = new float[]{6.0f,7.0f,8.0f};
byte[] bs = new byte[]{(byte)2,(byte)3,(byte)4};
char[] cs = new char[]{'a','b','c'};
// Access String (reference type) array
expression = parser.parseExpression("[0]");
assertEquals("a",expression.getValue(sss));
@@ -5022,7 +5022,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
for (String[] varg: vargs) {
s+="{";
for (String v: varg) {
s+=v;
s+=v;
}
s+="}";
}
@@ -5038,7 +5038,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
for (int[] varg: vargs) {
s+="{";
for (int v: varg) {
s+=Integer.toString(v);
s+=Integer.toString(v);
}
s+="}";
}
@@ -5150,7 +5150,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
}
output = b.toString();
}
public Obj3(String s, Float f, int... ints) {
StringBuilder b = new StringBuilder();
b.append(s);
@@ -5163,9 +5163,9 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
output = b.toString();
}
}
public static class Obj4 {
public final String output;
public Obj4(int[] params) {

4
spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
View File

@@ -1917,7 +1917,7 @@ public class SpelReproTests extends AbstractExpressionTests {
sec.setVariable("no", "1.0");
assertTrue(expression.getValue(sec).toString().startsWith("Object"));
}
@Test
@SuppressWarnings("rawtypes")
public void SPR13055() throws Exception {
@@ -1962,7 +1962,7 @@ public class SpelReproTests extends AbstractExpressionTests {
assertTrue(expression2.getValue(new BeanClass(new ListOf(1.1), new ListOf(-2.2)),
Boolean.class));
}
static class CCC {
public boolean method(Object o) {
System.out.println(o);