lxy/enjoy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enjoy 3.4 release ^_^

Browse Source
This commit is contained in:
James
2018-04-25 22:09:05 +08:00
parent a1e88a4a4c
commit 0c3e7790b7
116 changed files with 129 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/jfinal/template/expr/ast/Arith.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/Array.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/Assign.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/Compare.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/Const.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/Expr.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/ExprList.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

6
src/main/java/com/jfinal/template/expr/ast/Field.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -113,9 +113,9 @@ public class Field extends Expr {
if (expr instanceof Id) {
String id = ((Id)expr).getId();
throw new TemplateException("Field not found: \"" + id + "." + fieldName + "\" and getter method not found: \"" + id + "." + getterName + "()\"", location);
throw new TemplateException("public field not found: \"" + id + "." + fieldName + "\" and public getter method not found: \"" + id + "." + getterName + "()\"", location);
}
throw new TemplateException("Field not found: \"" + fieldName + "\" and getter method not found: \"" + getterName + "()\"", location);
throw new TemplateException("public field not found: \"" + fieldName + "\" and public getter method not found: \"" + getterName + "()\"", location);
}
private Long buildFieldKey(Class<?> targetClass) {

2
src/main/java/com/jfinal/template/expr/ast/FieldKit.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/ForCtrl.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/Id.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/IncDec.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/Index.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/Logic.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/Map.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

4
src/main/java/com/jfinal/template/expr/ast/Method.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -75,7 +75,7 @@ public class Method extends Expr {
if (scope.getCtrl().isNullSafe()) {
return null;
}
throw new TemplateException(buildMethodNotFoundSignature("Method not found: " + target.getClass().getName() + ".", methodName, argValues), location);
throw new TemplateException(buildMethodNotFoundSignature("public method not found: " + target.getClass().getName() + ".", methodName, argValues), location);
}
try {

2
src/main/java/com/jfinal/template/expr/ast/MethodInfo.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/MethodInfoExt.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

7
src/main/java/com/jfinal/template/expr/ast/MethodKeyBuilder.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -87,6 +87,9 @@ public abstract class MethodKeyBuilder {
if (type != null) {
hash ^= type.getName().hashCode();
hash *= HashKit.FNV_PRIME_64;
} else {
hash ^= "null".hashCode();
hash *= HashKit.FNV_PRIME_64;
}
}
}
@@ -110,6 +113,8 @@ public abstract class MethodKeyBuilder {
Class<?> type = argTypes[i];
if (type != null) {
hash = fnv1a64(hash, type.getName());
} else {
hash = fnv1a64(hash, "null");
}
}
}

2
src/main/java/com/jfinal/template/expr/ast/MethodKit.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/NullExpr.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/NullSafe.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/RangeArray.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/SharedMethod.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

5
src/main/java/com/jfinal/template/expr/ast/SharedMethodKit.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -156,6 +156,9 @@ public class SharedMethodKit {
if (type != null) {
hash ^= type.getName().hashCode();
hash *= HashKit.FNV_PRIME_64;
} else {
hash ^= "null".hashCode();
hash *= HashKit.FNV_PRIME_64;
}
}
}

2
src/main/java/com/jfinal/template/expr/ast/StaticField.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/StaticMethod.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/Ternary.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/java/com/jfinal/template/expr/ast/Unary.java
View File

@@ -1,5 +1,5 @@
/**
* Copyright (c) 2011-2017, James Zhan 詹波 (jfinal@126.com).
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.