From 0c3e7790b77292834389bcdee45d3307fc0114b7 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 25 Apr 2018 22:09:05 +0800 Subject: [PATCH] enjoy 3.4 release ^_^ --- src/main/java/com/jfinal/kit/ElKit.java | 2 +- src/main/java/com/jfinal/kit/HashKit.java | 2 +- src/main/java/com/jfinal/kit/JavaKeyword.java | 2 +- src/main/java/com/jfinal/kit/Kv.java | 2 +- src/main/java/com/jfinal/kit/ReflectKit.java | 2 +- src/main/java/com/jfinal/kit/StrKit.java | 2 +- src/main/java/com/jfinal/template/Directive.java | 2 +- src/main/java/com/jfinal/template/Engine.java | 2 +- src/main/java/com/jfinal/template/EngineConfig.java | 2 +- src/main/java/com/jfinal/template/Env.java | 2 +- .../java/com/jfinal/template/IOutputDirectiveFactory.java | 2 +- .../java/com/jfinal/template/OutputDirectiveFactory.java | 2 +- src/main/java/com/jfinal/template/Template.java | 2 +- src/main/java/com/jfinal/template/TemplateException.java | 2 +- src/main/java/com/jfinal/template/expr/ExprLexer.java | 2 +- src/main/java/com/jfinal/template/expr/ExprParser.java | 2 +- src/main/java/com/jfinal/template/expr/NumTok.java | 2 +- src/main/java/com/jfinal/template/expr/Sym.java | 2 +- src/main/java/com/jfinal/template/expr/Tok.java | 2 +- src/main/java/com/jfinal/template/expr/ast/Arith.java | 2 +- src/main/java/com/jfinal/template/expr/ast/Array.java | 2 +- src/main/java/com/jfinal/template/expr/ast/Assign.java | 2 +- src/main/java/com/jfinal/template/expr/ast/Compare.java | 2 +- src/main/java/com/jfinal/template/expr/ast/Const.java | 2 +- src/main/java/com/jfinal/template/expr/ast/Expr.java | 2 +- src/main/java/com/jfinal/template/expr/ast/ExprList.java | 2 +- src/main/java/com/jfinal/template/expr/ast/Field.java | 6 +++--- src/main/java/com/jfinal/template/expr/ast/FieldKit.java | 2 +- src/main/java/com/jfinal/template/expr/ast/ForCtrl.java | 2 +- src/main/java/com/jfinal/template/expr/ast/Id.java | 2 +- src/main/java/com/jfinal/template/expr/ast/IncDec.java | 2 +- src/main/java/com/jfinal/template/expr/ast/Index.java | 2 +- src/main/java/com/jfinal/template/expr/ast/Logic.java | 2 +- src/main/java/com/jfinal/template/expr/ast/Map.java | 2 +- src/main/java/com/jfinal/template/expr/ast/Method.java | 4 ++-- src/main/java/com/jfinal/template/expr/ast/MethodInfo.java | 2 +- .../java/com/jfinal/template/expr/ast/MethodInfoExt.java | 2 +- .../com/jfinal/template/expr/ast/MethodKeyBuilder.java | 7 ++++++- src/main/java/com/jfinal/template/expr/ast/MethodKit.java | 2 +- src/main/java/com/jfinal/template/expr/ast/NullExpr.java | 2 +- src/main/java/com/jfinal/template/expr/ast/NullSafe.java | 2 +- src/main/java/com/jfinal/template/expr/ast/RangeArray.java | 2 +- .../java/com/jfinal/template/expr/ast/SharedMethod.java | 2 +- .../java/com/jfinal/template/expr/ast/SharedMethodKit.java | 5 ++++- .../java/com/jfinal/template/expr/ast/StaticField.java | 2 +- .../java/com/jfinal/template/expr/ast/StaticMethod.java | 2 +- src/main/java/com/jfinal/template/expr/ast/Ternary.java | 2 +- src/main/java/com/jfinal/template/expr/ast/Unary.java | 2 +- .../com/jfinal/template/ext/directive/DateDirective.java | 2 +- .../com/jfinal/template/ext/directive/EscapeDirective.java | 2 +- .../com/jfinal/template/ext/directive/NowDirective.java | 2 +- .../com/jfinal/template/ext/directive/NumberDirective.java | 2 +- .../com/jfinal/template/ext/directive/RandomDirective.java | 2 +- .../com/jfinal/template/ext/directive/RenderDirective.java | 4 ++-- .../com/jfinal/template/ext/directive/StringDirective.java | 2 +- .../com/jfinal/template/ext/extensionmethod/ByteExt.java | 2 +- .../com/jfinal/template/ext/extensionmethod/DoubleExt.java | 2 +- .../com/jfinal/template/ext/extensionmethod/FloatExt.java | 2 +- .../jfinal/template/ext/extensionmethod/IntegerExt.java | 2 +- .../com/jfinal/template/ext/extensionmethod/LongExt.java | 2 +- .../com/jfinal/template/ext/extensionmethod/ShortExt.java | 2 +- .../com/jfinal/template/ext/extensionmethod/StringExt.java | 2 +- .../jfinal/template/ext/sharedmethod/SharedMethodLib.java | 2 +- .../java/com/jfinal/template/ext/spring/JFinalView.java | 2 +- .../com/jfinal/template/ext/spring/JFinalViewResolver.java | 2 +- src/main/java/com/jfinal/template/io/ByteWriter.java | 2 +- src/main/java/com/jfinal/template/io/CharWriter.java | 2 +- src/main/java/com/jfinal/template/io/DateFormats.java | 2 +- src/main/java/com/jfinal/template/io/Encoder.java | 2 +- src/main/java/com/jfinal/template/io/EncoderFactory.java | 2 +- src/main/java/com/jfinal/template/io/FastStringWriter.java | 2 +- src/main/java/com/jfinal/template/io/FloatingWriter.java | 2 +- src/main/java/com/jfinal/template/io/IWritable.java | 2 +- src/main/java/com/jfinal/template/io/JdkEncoder.java | 2 +- src/main/java/com/jfinal/template/io/Utf8Encoder.java | 2 +- src/main/java/com/jfinal/template/io/Writer.java | 2 +- src/main/java/com/jfinal/template/io/WriterBuffer.java | 2 +- .../java/com/jfinal/template/source/ClassPathSource.java | 2 +- .../com/jfinal/template/source/ClassPathSourceFactory.java | 2 +- src/main/java/com/jfinal/template/source/FileSource.java | 2 +- .../java/com/jfinal/template/source/FileSourceFactory.java | 2 +- src/main/java/com/jfinal/template/source/ISource.java | 2 +- .../java/com/jfinal/template/source/ISourceFactory.java | 2 +- src/main/java/com/jfinal/template/source/StringSource.java | 2 +- src/main/java/com/jfinal/template/stat/CharTable.java | 2 +- src/main/java/com/jfinal/template/stat/Ctrl.java | 2 +- src/main/java/com/jfinal/template/stat/Lexer.java | 2 +- src/main/java/com/jfinal/template/stat/Location.java | 2 +- src/main/java/com/jfinal/template/stat/ParaToken.java | 2 +- src/main/java/com/jfinal/template/stat/ParseException.java | 2 +- src/main/java/com/jfinal/template/stat/Parser.java | 2 +- src/main/java/com/jfinal/template/stat/Scope.java | 2 +- src/main/java/com/jfinal/template/stat/Symbol.java | 2 +- src/main/java/com/jfinal/template/stat/TextToken.java | 2 +- src/main/java/com/jfinal/template/stat/Token.java | 2 +- src/main/java/com/jfinal/template/stat/ast/Break.java | 2 +- src/main/java/com/jfinal/template/stat/ast/Call.java | 2 +- src/main/java/com/jfinal/template/stat/ast/Continue.java | 2 +- src/main/java/com/jfinal/template/stat/ast/Define.java | 2 +- src/main/java/com/jfinal/template/stat/ast/Else.java | 2 +- src/main/java/com/jfinal/template/stat/ast/ElseIf.java | 2 +- src/main/java/com/jfinal/template/stat/ast/For.java | 2 +- src/main/java/com/jfinal/template/stat/ast/ForEntry.java | 2 +- .../com/jfinal/template/stat/ast/ForIteratorStatus.java | 2 +- .../java/com/jfinal/template/stat/ast/ForLoopStatus.java | 2 +- src/main/java/com/jfinal/template/stat/ast/If.java | 2 +- src/main/java/com/jfinal/template/stat/ast/Include.java | 4 ++-- src/main/java/com/jfinal/template/stat/ast/NullStat.java | 2 +- src/main/java/com/jfinal/template/stat/ast/Output.java | 2 +- src/main/java/com/jfinal/template/stat/ast/Return.java | 2 +- src/main/java/com/jfinal/template/stat/ast/Set.java | 2 +- src/main/java/com/jfinal/template/stat/ast/SetGlobal.java | 2 +- src/main/java/com/jfinal/template/stat/ast/SetLocal.java | 2 +- src/main/java/com/jfinal/template/stat/ast/Stat.java | 2 +- src/main/java/com/jfinal/template/stat/ast/StatList.java | 2 +- src/main/java/com/jfinal/template/stat/ast/Text.java | 2 +- 116 files changed, 129 insertions(+), 121 deletions(-) diff --git a/src/main/java/com/jfinal/kit/ElKit.java b/src/main/java/com/jfinal/kit/ElKit.java index 0240239..19ed22a 100644 --- a/src/main/java/com/jfinal/kit/ElKit.java +++ b/src/main/java/com/jfinal/kit/ElKit.java @@ -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. diff --git a/src/main/java/com/jfinal/kit/HashKit.java b/src/main/java/com/jfinal/kit/HashKit.java index 10a3b04..0436f16 100644 --- a/src/main/java/com/jfinal/kit/HashKit.java +++ b/src/main/java/com/jfinal/kit/HashKit.java @@ -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. diff --git a/src/main/java/com/jfinal/kit/JavaKeyword.java b/src/main/java/com/jfinal/kit/JavaKeyword.java index e00bed4..28950ba 100644 --- a/src/main/java/com/jfinal/kit/JavaKeyword.java +++ b/src/main/java/com/jfinal/kit/JavaKeyword.java @@ -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. diff --git a/src/main/java/com/jfinal/kit/Kv.java b/src/main/java/com/jfinal/kit/Kv.java index 6c7b2bd..b00a896 100644 --- a/src/main/java/com/jfinal/kit/Kv.java +++ b/src/main/java/com/jfinal/kit/Kv.java @@ -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. diff --git a/src/main/java/com/jfinal/kit/ReflectKit.java b/src/main/java/com/jfinal/kit/ReflectKit.java index 9b7d2a4..0f7347e 100644 --- a/src/main/java/com/jfinal/kit/ReflectKit.java +++ b/src/main/java/com/jfinal/kit/ReflectKit.java @@ -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. diff --git a/src/main/java/com/jfinal/kit/StrKit.java b/src/main/java/com/jfinal/kit/StrKit.java index 1f00ab5..77ac9f6 100644 --- a/src/main/java/com/jfinal/kit/StrKit.java +++ b/src/main/java/com/jfinal/kit/StrKit.java @@ -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. diff --git a/src/main/java/com/jfinal/template/Directive.java b/src/main/java/com/jfinal/template/Directive.java index 8701462..88e7ee3 100644 --- a/src/main/java/com/jfinal/template/Directive.java +++ b/src/main/java/com/jfinal/template/Directive.java @@ -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. diff --git a/src/main/java/com/jfinal/template/Engine.java b/src/main/java/com/jfinal/template/Engine.java index 4f975d9..6d71ec7 100644 --- a/src/main/java/com/jfinal/template/Engine.java +++ b/src/main/java/com/jfinal/template/Engine.java @@ -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. diff --git a/src/main/java/com/jfinal/template/EngineConfig.java b/src/main/java/com/jfinal/template/EngineConfig.java index 0979836..3469016 100644 --- a/src/main/java/com/jfinal/template/EngineConfig.java +++ b/src/main/java/com/jfinal/template/EngineConfig.java @@ -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. diff --git a/src/main/java/com/jfinal/template/Env.java b/src/main/java/com/jfinal/template/Env.java index a298db5..bfea4cf 100644 --- a/src/main/java/com/jfinal/template/Env.java +++ b/src/main/java/com/jfinal/template/Env.java @@ -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. diff --git a/src/main/java/com/jfinal/template/IOutputDirectiveFactory.java b/src/main/java/com/jfinal/template/IOutputDirectiveFactory.java index 9e9a153..0dae7bd 100644 --- a/src/main/java/com/jfinal/template/IOutputDirectiveFactory.java +++ b/src/main/java/com/jfinal/template/IOutputDirectiveFactory.java @@ -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. diff --git a/src/main/java/com/jfinal/template/OutputDirectiveFactory.java b/src/main/java/com/jfinal/template/OutputDirectiveFactory.java index 6be28a6..aeff017 100644 --- a/src/main/java/com/jfinal/template/OutputDirectiveFactory.java +++ b/src/main/java/com/jfinal/template/OutputDirectiveFactory.java @@ -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. diff --git a/src/main/java/com/jfinal/template/Template.java b/src/main/java/com/jfinal/template/Template.java index 7676711..48f902e 100644 --- a/src/main/java/com/jfinal/template/Template.java +++ b/src/main/java/com/jfinal/template/Template.java @@ -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. diff --git a/src/main/java/com/jfinal/template/TemplateException.java b/src/main/java/com/jfinal/template/TemplateException.java index 756124b..786c57a 100644 --- a/src/main/java/com/jfinal/template/TemplateException.java +++ b/src/main/java/com/jfinal/template/TemplateException.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ExprLexer.java b/src/main/java/com/jfinal/template/expr/ExprLexer.java index 6cff9fb..c477551 100644 --- a/src/main/java/com/jfinal/template/expr/ExprLexer.java +++ b/src/main/java/com/jfinal/template/expr/ExprLexer.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ExprParser.java b/src/main/java/com/jfinal/template/expr/ExprParser.java index 2ddd1f0..f724a49 100644 --- a/src/main/java/com/jfinal/template/expr/ExprParser.java +++ b/src/main/java/com/jfinal/template/expr/ExprParser.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/NumTok.java b/src/main/java/com/jfinal/template/expr/NumTok.java index c6eeae9..151ab65 100644 --- a/src/main/java/com/jfinal/template/expr/NumTok.java +++ b/src/main/java/com/jfinal/template/expr/NumTok.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/Sym.java b/src/main/java/com/jfinal/template/expr/Sym.java index 4e22c2e..e8e7b8f 100644 --- a/src/main/java/com/jfinal/template/expr/Sym.java +++ b/src/main/java/com/jfinal/template/expr/Sym.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/Tok.java b/src/main/java/com/jfinal/template/expr/Tok.java index dcc8b6d..100fcbb 100644 --- a/src/main/java/com/jfinal/template/expr/Tok.java +++ b/src/main/java/com/jfinal/template/expr/Tok.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/Arith.java b/src/main/java/com/jfinal/template/expr/ast/Arith.java index 5e07d18..762e692 100644 --- a/src/main/java/com/jfinal/template/expr/ast/Arith.java +++ b/src/main/java/com/jfinal/template/expr/ast/Arith.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/Array.java b/src/main/java/com/jfinal/template/expr/ast/Array.java index 3282327..6dd7d26 100644 --- a/src/main/java/com/jfinal/template/expr/ast/Array.java +++ b/src/main/java/com/jfinal/template/expr/ast/Array.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/Assign.java b/src/main/java/com/jfinal/template/expr/ast/Assign.java index aae10ce..30748ae 100644 --- a/src/main/java/com/jfinal/template/expr/ast/Assign.java +++ b/src/main/java/com/jfinal/template/expr/ast/Assign.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/Compare.java b/src/main/java/com/jfinal/template/expr/ast/Compare.java index 3e091e9..09203ab 100644 --- a/src/main/java/com/jfinal/template/expr/ast/Compare.java +++ b/src/main/java/com/jfinal/template/expr/ast/Compare.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/Const.java b/src/main/java/com/jfinal/template/expr/ast/Const.java index 41f2df6..2e3eee7 100644 --- a/src/main/java/com/jfinal/template/expr/ast/Const.java +++ b/src/main/java/com/jfinal/template/expr/ast/Const.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/Expr.java b/src/main/java/com/jfinal/template/expr/ast/Expr.java index ee3ed22..907d6c8 100644 --- a/src/main/java/com/jfinal/template/expr/ast/Expr.java +++ b/src/main/java/com/jfinal/template/expr/ast/Expr.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/ExprList.java b/src/main/java/com/jfinal/template/expr/ast/ExprList.java index 8decdcf..80c290d 100644 --- a/src/main/java/com/jfinal/template/expr/ast/ExprList.java +++ b/src/main/java/com/jfinal/template/expr/ast/ExprList.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/Field.java b/src/main/java/com/jfinal/template/expr/ast/Field.java index b21553e..09a15a1 100644 --- a/src/main/java/com/jfinal/template/expr/ast/Field.java +++ b/src/main/java/com/jfinal/template/expr/ast/Field.java @@ -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) { diff --git a/src/main/java/com/jfinal/template/expr/ast/FieldKit.java b/src/main/java/com/jfinal/template/expr/ast/FieldKit.java index 4b4e651..de2b8e1 100644 --- a/src/main/java/com/jfinal/template/expr/ast/FieldKit.java +++ b/src/main/java/com/jfinal/template/expr/ast/FieldKit.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/ForCtrl.java b/src/main/java/com/jfinal/template/expr/ast/ForCtrl.java index 95aa6bd..d93a11f 100644 --- a/src/main/java/com/jfinal/template/expr/ast/ForCtrl.java +++ b/src/main/java/com/jfinal/template/expr/ast/ForCtrl.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/Id.java b/src/main/java/com/jfinal/template/expr/ast/Id.java index 9ce0ed8..bcfdd76 100644 --- a/src/main/java/com/jfinal/template/expr/ast/Id.java +++ b/src/main/java/com/jfinal/template/expr/ast/Id.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/IncDec.java b/src/main/java/com/jfinal/template/expr/ast/IncDec.java index cd4e99b..e534263 100644 --- a/src/main/java/com/jfinal/template/expr/ast/IncDec.java +++ b/src/main/java/com/jfinal/template/expr/ast/IncDec.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/Index.java b/src/main/java/com/jfinal/template/expr/ast/Index.java index 16749b2..b41656a 100644 --- a/src/main/java/com/jfinal/template/expr/ast/Index.java +++ b/src/main/java/com/jfinal/template/expr/ast/Index.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/Logic.java b/src/main/java/com/jfinal/template/expr/ast/Logic.java index 4406267..7c59337 100644 --- a/src/main/java/com/jfinal/template/expr/ast/Logic.java +++ b/src/main/java/com/jfinal/template/expr/ast/Logic.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/Map.java b/src/main/java/com/jfinal/template/expr/ast/Map.java index 00ab527..2e80b82 100644 --- a/src/main/java/com/jfinal/template/expr/ast/Map.java +++ b/src/main/java/com/jfinal/template/expr/ast/Map.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/Method.java b/src/main/java/com/jfinal/template/expr/ast/Method.java index 6a8005a..e145975 100644 --- a/src/main/java/com/jfinal/template/expr/ast/Method.java +++ b/src/main/java/com/jfinal/template/expr/ast/Method.java @@ -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 { diff --git a/src/main/java/com/jfinal/template/expr/ast/MethodInfo.java b/src/main/java/com/jfinal/template/expr/ast/MethodInfo.java index c81fc03..1f0f346 100644 --- a/src/main/java/com/jfinal/template/expr/ast/MethodInfo.java +++ b/src/main/java/com/jfinal/template/expr/ast/MethodInfo.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/MethodInfoExt.java b/src/main/java/com/jfinal/template/expr/ast/MethodInfoExt.java index 559d2fa..2eae3cd 100644 --- a/src/main/java/com/jfinal/template/expr/ast/MethodInfoExt.java +++ b/src/main/java/com/jfinal/template/expr/ast/MethodInfoExt.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/MethodKeyBuilder.java b/src/main/java/com/jfinal/template/expr/ast/MethodKeyBuilder.java index 7ce8395..51ee170 100644 --- a/src/main/java/com/jfinal/template/expr/ast/MethodKeyBuilder.java +++ b/src/main/java/com/jfinal/template/expr/ast/MethodKeyBuilder.java @@ -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"); } } } diff --git a/src/main/java/com/jfinal/template/expr/ast/MethodKit.java b/src/main/java/com/jfinal/template/expr/ast/MethodKit.java index e82da06..c5dfd21 100644 --- a/src/main/java/com/jfinal/template/expr/ast/MethodKit.java +++ b/src/main/java/com/jfinal/template/expr/ast/MethodKit.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/NullExpr.java b/src/main/java/com/jfinal/template/expr/ast/NullExpr.java index e8361b1..eaecab2 100644 --- a/src/main/java/com/jfinal/template/expr/ast/NullExpr.java +++ b/src/main/java/com/jfinal/template/expr/ast/NullExpr.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/NullSafe.java b/src/main/java/com/jfinal/template/expr/ast/NullSafe.java index 81d38bd..8e3e8da 100644 --- a/src/main/java/com/jfinal/template/expr/ast/NullSafe.java +++ b/src/main/java/com/jfinal/template/expr/ast/NullSafe.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/RangeArray.java b/src/main/java/com/jfinal/template/expr/ast/RangeArray.java index 3f77b84..03f6431 100644 --- a/src/main/java/com/jfinal/template/expr/ast/RangeArray.java +++ b/src/main/java/com/jfinal/template/expr/ast/RangeArray.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/SharedMethod.java b/src/main/java/com/jfinal/template/expr/ast/SharedMethod.java index 2b04b5a..0bba784 100644 --- a/src/main/java/com/jfinal/template/expr/ast/SharedMethod.java +++ b/src/main/java/com/jfinal/template/expr/ast/SharedMethod.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/SharedMethodKit.java b/src/main/java/com/jfinal/template/expr/ast/SharedMethodKit.java index b77316c..8fccaea 100644 --- a/src/main/java/com/jfinal/template/expr/ast/SharedMethodKit.java +++ b/src/main/java/com/jfinal/template/expr/ast/SharedMethodKit.java @@ -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; } } } diff --git a/src/main/java/com/jfinal/template/expr/ast/StaticField.java b/src/main/java/com/jfinal/template/expr/ast/StaticField.java index 4968e78..2039a85 100644 --- a/src/main/java/com/jfinal/template/expr/ast/StaticField.java +++ b/src/main/java/com/jfinal/template/expr/ast/StaticField.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/StaticMethod.java b/src/main/java/com/jfinal/template/expr/ast/StaticMethod.java index 9938b02..2f0920d 100644 --- a/src/main/java/com/jfinal/template/expr/ast/StaticMethod.java +++ b/src/main/java/com/jfinal/template/expr/ast/StaticMethod.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/Ternary.java b/src/main/java/com/jfinal/template/expr/ast/Ternary.java index f17afba..ee7e43f 100644 --- a/src/main/java/com/jfinal/template/expr/ast/Ternary.java +++ b/src/main/java/com/jfinal/template/expr/ast/Ternary.java @@ -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. diff --git a/src/main/java/com/jfinal/template/expr/ast/Unary.java b/src/main/java/com/jfinal/template/expr/ast/Unary.java index 1311d70..bc250cd 100644 --- a/src/main/java/com/jfinal/template/expr/ast/Unary.java +++ b/src/main/java/com/jfinal/template/expr/ast/Unary.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/directive/DateDirective.java b/src/main/java/com/jfinal/template/ext/directive/DateDirective.java index 1cfc512..b578730 100644 --- a/src/main/java/com/jfinal/template/ext/directive/DateDirective.java +++ b/src/main/java/com/jfinal/template/ext/directive/DateDirective.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/directive/EscapeDirective.java b/src/main/java/com/jfinal/template/ext/directive/EscapeDirective.java index 7f20aba..f57344b 100644 --- a/src/main/java/com/jfinal/template/ext/directive/EscapeDirective.java +++ b/src/main/java/com/jfinal/template/ext/directive/EscapeDirective.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/directive/NowDirective.java b/src/main/java/com/jfinal/template/ext/directive/NowDirective.java index f6bf1f4..bf8f89c 100644 --- a/src/main/java/com/jfinal/template/ext/directive/NowDirective.java +++ b/src/main/java/com/jfinal/template/ext/directive/NowDirective.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/directive/NumberDirective.java b/src/main/java/com/jfinal/template/ext/directive/NumberDirective.java index a670603..1df7cdc 100644 --- a/src/main/java/com/jfinal/template/ext/directive/NumberDirective.java +++ b/src/main/java/com/jfinal/template/ext/directive/NumberDirective.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/directive/RandomDirective.java b/src/main/java/com/jfinal/template/ext/directive/RandomDirective.java index 21f857f..baed611 100644 --- a/src/main/java/com/jfinal/template/ext/directive/RandomDirective.java +++ b/src/main/java/com/jfinal/template/ext/directive/RandomDirective.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/directive/RenderDirective.java b/src/main/java/com/jfinal/template/ext/directive/RenderDirective.java index 64fbf7f..dfe2e16 100644 --- a/src/main/java/com/jfinal/template/ext/directive/RenderDirective.java +++ b/src/main/java/com/jfinal/template/ext/directive/RenderDirective.java @@ -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. @@ -70,7 +70,7 @@ public class RenderDirective extends Directive { if (len > 1) { for (int i = 1; i < len; i++) { if (!(exprList.getExpr(i) instanceof Assign)) { - throw new ParseException("The " + i + "th parameter of #render directive must be an assignment expression", location); + throw new ParseException("The " + (i + 1) + "th parameter of #render directive must be an assignment expression", location); } } } diff --git a/src/main/java/com/jfinal/template/ext/directive/StringDirective.java b/src/main/java/com/jfinal/template/ext/directive/StringDirective.java index 34e6192..2463ac5 100644 --- a/src/main/java/com/jfinal/template/ext/directive/StringDirective.java +++ b/src/main/java/com/jfinal/template/ext/directive/StringDirective.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/extensionmethod/ByteExt.java b/src/main/java/com/jfinal/template/ext/extensionmethod/ByteExt.java index cce6bda..3130eff 100644 --- a/src/main/java/com/jfinal/template/ext/extensionmethod/ByteExt.java +++ b/src/main/java/com/jfinal/template/ext/extensionmethod/ByteExt.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/extensionmethod/DoubleExt.java b/src/main/java/com/jfinal/template/ext/extensionmethod/DoubleExt.java index cb085ef..9f71421 100644 --- a/src/main/java/com/jfinal/template/ext/extensionmethod/DoubleExt.java +++ b/src/main/java/com/jfinal/template/ext/extensionmethod/DoubleExt.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/extensionmethod/FloatExt.java b/src/main/java/com/jfinal/template/ext/extensionmethod/FloatExt.java index f844d53..615ef94 100644 --- a/src/main/java/com/jfinal/template/ext/extensionmethod/FloatExt.java +++ b/src/main/java/com/jfinal/template/ext/extensionmethod/FloatExt.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/extensionmethod/IntegerExt.java b/src/main/java/com/jfinal/template/ext/extensionmethod/IntegerExt.java index f7a4b35..728b6f2 100644 --- a/src/main/java/com/jfinal/template/ext/extensionmethod/IntegerExt.java +++ b/src/main/java/com/jfinal/template/ext/extensionmethod/IntegerExt.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/extensionmethod/LongExt.java b/src/main/java/com/jfinal/template/ext/extensionmethod/LongExt.java index e65bc2f..4a64db9 100644 --- a/src/main/java/com/jfinal/template/ext/extensionmethod/LongExt.java +++ b/src/main/java/com/jfinal/template/ext/extensionmethod/LongExt.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/extensionmethod/ShortExt.java b/src/main/java/com/jfinal/template/ext/extensionmethod/ShortExt.java index 2251e4a..54538ce 100644 --- a/src/main/java/com/jfinal/template/ext/extensionmethod/ShortExt.java +++ b/src/main/java/com/jfinal/template/ext/extensionmethod/ShortExt.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/extensionmethod/StringExt.java b/src/main/java/com/jfinal/template/ext/extensionmethod/StringExt.java index 1e8fd3f..e556595 100644 --- a/src/main/java/com/jfinal/template/ext/extensionmethod/StringExt.java +++ b/src/main/java/com/jfinal/template/ext/extensionmethod/StringExt.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/sharedmethod/SharedMethodLib.java b/src/main/java/com/jfinal/template/ext/sharedmethod/SharedMethodLib.java index 63bcb7a..8668e1f 100644 --- a/src/main/java/com/jfinal/template/ext/sharedmethod/SharedMethodLib.java +++ b/src/main/java/com/jfinal/template/ext/sharedmethod/SharedMethodLib.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/spring/JFinalView.java b/src/main/java/com/jfinal/template/ext/spring/JFinalView.java index a128897..9162fab 100644 --- a/src/main/java/com/jfinal/template/ext/spring/JFinalView.java +++ b/src/main/java/com/jfinal/template/ext/spring/JFinalView.java @@ -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. diff --git a/src/main/java/com/jfinal/template/ext/spring/JFinalViewResolver.java b/src/main/java/com/jfinal/template/ext/spring/JFinalViewResolver.java index 96c391c..9e7e401 100644 --- a/src/main/java/com/jfinal/template/ext/spring/JFinalViewResolver.java +++ b/src/main/java/com/jfinal/template/ext/spring/JFinalViewResolver.java @@ -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. diff --git a/src/main/java/com/jfinal/template/io/ByteWriter.java b/src/main/java/com/jfinal/template/io/ByteWriter.java index 4b2b249..c2aa442 100644 --- a/src/main/java/com/jfinal/template/io/ByteWriter.java +++ b/src/main/java/com/jfinal/template/io/ByteWriter.java @@ -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. diff --git a/src/main/java/com/jfinal/template/io/CharWriter.java b/src/main/java/com/jfinal/template/io/CharWriter.java index e0a73c0..6e19a28 100644 --- a/src/main/java/com/jfinal/template/io/CharWriter.java +++ b/src/main/java/com/jfinal/template/io/CharWriter.java @@ -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. diff --git a/src/main/java/com/jfinal/template/io/DateFormats.java b/src/main/java/com/jfinal/template/io/DateFormats.java index 4fdc4a6..36a4876 100644 --- a/src/main/java/com/jfinal/template/io/DateFormats.java +++ b/src/main/java/com/jfinal/template/io/DateFormats.java @@ -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. diff --git a/src/main/java/com/jfinal/template/io/Encoder.java b/src/main/java/com/jfinal/template/io/Encoder.java index 2cf23f2..30ec5ea 100644 --- a/src/main/java/com/jfinal/template/io/Encoder.java +++ b/src/main/java/com/jfinal/template/io/Encoder.java @@ -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. diff --git a/src/main/java/com/jfinal/template/io/EncoderFactory.java b/src/main/java/com/jfinal/template/io/EncoderFactory.java index 2150546..b98050e 100644 --- a/src/main/java/com/jfinal/template/io/EncoderFactory.java +++ b/src/main/java/com/jfinal/template/io/EncoderFactory.java @@ -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. diff --git a/src/main/java/com/jfinal/template/io/FastStringWriter.java b/src/main/java/com/jfinal/template/io/FastStringWriter.java index 4dc783f..00e4758 100644 --- a/src/main/java/com/jfinal/template/io/FastStringWriter.java +++ b/src/main/java/com/jfinal/template/io/FastStringWriter.java @@ -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. diff --git a/src/main/java/com/jfinal/template/io/FloatingWriter.java b/src/main/java/com/jfinal/template/io/FloatingWriter.java index 254a6b2..486686f 100644 --- a/src/main/java/com/jfinal/template/io/FloatingWriter.java +++ b/src/main/java/com/jfinal/template/io/FloatingWriter.java @@ -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. diff --git a/src/main/java/com/jfinal/template/io/IWritable.java b/src/main/java/com/jfinal/template/io/IWritable.java index 61017f6..d3b5911 100644 --- a/src/main/java/com/jfinal/template/io/IWritable.java +++ b/src/main/java/com/jfinal/template/io/IWritable.java @@ -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. diff --git a/src/main/java/com/jfinal/template/io/JdkEncoder.java b/src/main/java/com/jfinal/template/io/JdkEncoder.java index cf4371d..41259e0 100644 --- a/src/main/java/com/jfinal/template/io/JdkEncoder.java +++ b/src/main/java/com/jfinal/template/io/JdkEncoder.java @@ -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. diff --git a/src/main/java/com/jfinal/template/io/Utf8Encoder.java b/src/main/java/com/jfinal/template/io/Utf8Encoder.java index f7a1e14..da4225a 100644 --- a/src/main/java/com/jfinal/template/io/Utf8Encoder.java +++ b/src/main/java/com/jfinal/template/io/Utf8Encoder.java @@ -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. diff --git a/src/main/java/com/jfinal/template/io/Writer.java b/src/main/java/com/jfinal/template/io/Writer.java index 86fb10c..a5639fb 100644 --- a/src/main/java/com/jfinal/template/io/Writer.java +++ b/src/main/java/com/jfinal/template/io/Writer.java @@ -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. diff --git a/src/main/java/com/jfinal/template/io/WriterBuffer.java b/src/main/java/com/jfinal/template/io/WriterBuffer.java index ba13e4d..8bc4b2b 100644 --- a/src/main/java/com/jfinal/template/io/WriterBuffer.java +++ b/src/main/java/com/jfinal/template/io/WriterBuffer.java @@ -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. diff --git a/src/main/java/com/jfinal/template/source/ClassPathSource.java b/src/main/java/com/jfinal/template/source/ClassPathSource.java index d8baf00..dd981fd 100644 --- a/src/main/java/com/jfinal/template/source/ClassPathSource.java +++ b/src/main/java/com/jfinal/template/source/ClassPathSource.java @@ -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. diff --git a/src/main/java/com/jfinal/template/source/ClassPathSourceFactory.java b/src/main/java/com/jfinal/template/source/ClassPathSourceFactory.java index d72eaa6..19ea298 100644 --- a/src/main/java/com/jfinal/template/source/ClassPathSourceFactory.java +++ b/src/main/java/com/jfinal/template/source/ClassPathSourceFactory.java @@ -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. diff --git a/src/main/java/com/jfinal/template/source/FileSource.java b/src/main/java/com/jfinal/template/source/FileSource.java index 1554536..1c6037b 100644 --- a/src/main/java/com/jfinal/template/source/FileSource.java +++ b/src/main/java/com/jfinal/template/source/FileSource.java @@ -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. diff --git a/src/main/java/com/jfinal/template/source/FileSourceFactory.java b/src/main/java/com/jfinal/template/source/FileSourceFactory.java index a2806c3..5595702 100644 --- a/src/main/java/com/jfinal/template/source/FileSourceFactory.java +++ b/src/main/java/com/jfinal/template/source/FileSourceFactory.java @@ -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. diff --git a/src/main/java/com/jfinal/template/source/ISource.java b/src/main/java/com/jfinal/template/source/ISource.java index ea38139..c453a2e 100644 --- a/src/main/java/com/jfinal/template/source/ISource.java +++ b/src/main/java/com/jfinal/template/source/ISource.java @@ -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. diff --git a/src/main/java/com/jfinal/template/source/ISourceFactory.java b/src/main/java/com/jfinal/template/source/ISourceFactory.java index 1bd868e..ee9bccf 100644 --- a/src/main/java/com/jfinal/template/source/ISourceFactory.java +++ b/src/main/java/com/jfinal/template/source/ISourceFactory.java @@ -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. diff --git a/src/main/java/com/jfinal/template/source/StringSource.java b/src/main/java/com/jfinal/template/source/StringSource.java index c5af315..e8748a9 100644 --- a/src/main/java/com/jfinal/template/source/StringSource.java +++ b/src/main/java/com/jfinal/template/source/StringSource.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/CharTable.java b/src/main/java/com/jfinal/template/stat/CharTable.java index 624c308..63e9d95 100644 --- a/src/main/java/com/jfinal/template/stat/CharTable.java +++ b/src/main/java/com/jfinal/template/stat/CharTable.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/Ctrl.java b/src/main/java/com/jfinal/template/stat/Ctrl.java index 0c1d2ea..7835b2b 100644 --- a/src/main/java/com/jfinal/template/stat/Ctrl.java +++ b/src/main/java/com/jfinal/template/stat/Ctrl.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/Lexer.java b/src/main/java/com/jfinal/template/stat/Lexer.java index 3a83cff..0dbcba0 100644 --- a/src/main/java/com/jfinal/template/stat/Lexer.java +++ b/src/main/java/com/jfinal/template/stat/Lexer.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/Location.java b/src/main/java/com/jfinal/template/stat/Location.java index 8aca401..6a3a233 100644 --- a/src/main/java/com/jfinal/template/stat/Location.java +++ b/src/main/java/com/jfinal/template/stat/Location.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ParaToken.java b/src/main/java/com/jfinal/template/stat/ParaToken.java index 9fcdff1..6e393de 100644 --- a/src/main/java/com/jfinal/template/stat/ParaToken.java +++ b/src/main/java/com/jfinal/template/stat/ParaToken.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ParseException.java b/src/main/java/com/jfinal/template/stat/ParseException.java index 29409f9..cbef22a 100644 --- a/src/main/java/com/jfinal/template/stat/ParseException.java +++ b/src/main/java/com/jfinal/template/stat/ParseException.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/Parser.java b/src/main/java/com/jfinal/template/stat/Parser.java index 4bb009e..5fe605d 100644 --- a/src/main/java/com/jfinal/template/stat/Parser.java +++ b/src/main/java/com/jfinal/template/stat/Parser.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/Scope.java b/src/main/java/com/jfinal/template/stat/Scope.java index 619aba6..5ced6cd 100644 --- a/src/main/java/com/jfinal/template/stat/Scope.java +++ b/src/main/java/com/jfinal/template/stat/Scope.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/Symbol.java b/src/main/java/com/jfinal/template/stat/Symbol.java index 972b460..a3b0ce2 100644 --- a/src/main/java/com/jfinal/template/stat/Symbol.java +++ b/src/main/java/com/jfinal/template/stat/Symbol.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/TextToken.java b/src/main/java/com/jfinal/template/stat/TextToken.java index bd07503..19d397c 100644 --- a/src/main/java/com/jfinal/template/stat/TextToken.java +++ b/src/main/java/com/jfinal/template/stat/TextToken.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/Token.java b/src/main/java/com/jfinal/template/stat/Token.java index da17a23..7262c25 100644 --- a/src/main/java/com/jfinal/template/stat/Token.java +++ b/src/main/java/com/jfinal/template/stat/Token.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/Break.java b/src/main/java/com/jfinal/template/stat/ast/Break.java index 319ddd0..b32a8db 100644 --- a/src/main/java/com/jfinal/template/stat/ast/Break.java +++ b/src/main/java/com/jfinal/template/stat/ast/Break.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/Call.java b/src/main/java/com/jfinal/template/stat/ast/Call.java index 9dfcf2b..a558726 100644 --- a/src/main/java/com/jfinal/template/stat/ast/Call.java +++ b/src/main/java/com/jfinal/template/stat/ast/Call.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/Continue.java b/src/main/java/com/jfinal/template/stat/ast/Continue.java index 56be097..302b967 100644 --- a/src/main/java/com/jfinal/template/stat/ast/Continue.java +++ b/src/main/java/com/jfinal/template/stat/ast/Continue.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/Define.java b/src/main/java/com/jfinal/template/stat/ast/Define.java index f83dda4..4e9e0d3 100644 --- a/src/main/java/com/jfinal/template/stat/ast/Define.java +++ b/src/main/java/com/jfinal/template/stat/ast/Define.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/Else.java b/src/main/java/com/jfinal/template/stat/ast/Else.java index b717c5a..b46cec3 100644 --- a/src/main/java/com/jfinal/template/stat/ast/Else.java +++ b/src/main/java/com/jfinal/template/stat/ast/Else.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/ElseIf.java b/src/main/java/com/jfinal/template/stat/ast/ElseIf.java index 7d0ba85..8c04ac5 100644 --- a/src/main/java/com/jfinal/template/stat/ast/ElseIf.java +++ b/src/main/java/com/jfinal/template/stat/ast/ElseIf.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/For.java b/src/main/java/com/jfinal/template/stat/ast/For.java index 1502ef1..ead3cd0 100644 --- a/src/main/java/com/jfinal/template/stat/ast/For.java +++ b/src/main/java/com/jfinal/template/stat/ast/For.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/ForEntry.java b/src/main/java/com/jfinal/template/stat/ast/ForEntry.java index fc16d7e..35d23e0 100644 --- a/src/main/java/com/jfinal/template/stat/ast/ForEntry.java +++ b/src/main/java/com/jfinal/template/stat/ast/ForEntry.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/ForIteratorStatus.java b/src/main/java/com/jfinal/template/stat/ast/ForIteratorStatus.java index 3b08b86..59c74ca 100644 --- a/src/main/java/com/jfinal/template/stat/ast/ForIteratorStatus.java +++ b/src/main/java/com/jfinal/template/stat/ast/ForIteratorStatus.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/ForLoopStatus.java b/src/main/java/com/jfinal/template/stat/ast/ForLoopStatus.java index 9f20c64..edda243 100644 --- a/src/main/java/com/jfinal/template/stat/ast/ForLoopStatus.java +++ b/src/main/java/com/jfinal/template/stat/ast/ForLoopStatus.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/If.java b/src/main/java/com/jfinal/template/stat/ast/If.java index 473804f..975fb49 100644 --- a/src/main/java/com/jfinal/template/stat/ast/If.java +++ b/src/main/java/com/jfinal/template/stat/ast/If.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/Include.java b/src/main/java/com/jfinal/template/stat/ast/Include.java index f89dec9..f322e86 100644 --- a/src/main/java/com/jfinal/template/stat/ast/Include.java +++ b/src/main/java/com/jfinal/template/stat/ast/Include.java @@ -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 Include extends Stat { if (len > 1) { for (int i = 1; i < len; i++) { if (!(exprList.getExpr(i) instanceof Assign)) { - throw new ParseException("The " + i + "th parameter of #include directive must be an assignment expression", location); + throw new ParseException("The " + (i + 1) + "th parameter of #include directive must be an assignment expression", location); } } } diff --git a/src/main/java/com/jfinal/template/stat/ast/NullStat.java b/src/main/java/com/jfinal/template/stat/ast/NullStat.java index 5c62fb8..ac89722 100644 --- a/src/main/java/com/jfinal/template/stat/ast/NullStat.java +++ b/src/main/java/com/jfinal/template/stat/ast/NullStat.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/Output.java b/src/main/java/com/jfinal/template/stat/ast/Output.java index edfee36..e42d27d 100644 --- a/src/main/java/com/jfinal/template/stat/ast/Output.java +++ b/src/main/java/com/jfinal/template/stat/ast/Output.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/Return.java b/src/main/java/com/jfinal/template/stat/ast/Return.java index f7d099c..fa46306 100644 --- a/src/main/java/com/jfinal/template/stat/ast/Return.java +++ b/src/main/java/com/jfinal/template/stat/ast/Return.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/Set.java b/src/main/java/com/jfinal/template/stat/ast/Set.java index eb7502c..38472d7 100644 --- a/src/main/java/com/jfinal/template/stat/ast/Set.java +++ b/src/main/java/com/jfinal/template/stat/ast/Set.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/SetGlobal.java b/src/main/java/com/jfinal/template/stat/ast/SetGlobal.java index 4810679..f2d7257 100644 --- a/src/main/java/com/jfinal/template/stat/ast/SetGlobal.java +++ b/src/main/java/com/jfinal/template/stat/ast/SetGlobal.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/SetLocal.java b/src/main/java/com/jfinal/template/stat/ast/SetLocal.java index 4cf1c36..23804b2 100644 --- a/src/main/java/com/jfinal/template/stat/ast/SetLocal.java +++ b/src/main/java/com/jfinal/template/stat/ast/SetLocal.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/Stat.java b/src/main/java/com/jfinal/template/stat/ast/Stat.java index 52ce0da..63550e5 100644 --- a/src/main/java/com/jfinal/template/stat/ast/Stat.java +++ b/src/main/java/com/jfinal/template/stat/ast/Stat.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/StatList.java b/src/main/java/com/jfinal/template/stat/ast/StatList.java index 0658ed2..1236aa9 100644 --- a/src/main/java/com/jfinal/template/stat/ast/StatList.java +++ b/src/main/java/com/jfinal/template/stat/ast/StatList.java @@ -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. diff --git a/src/main/java/com/jfinal/template/stat/ast/Text.java b/src/main/java/com/jfinal/template/stat/ast/Text.java index 7c81c7a..d6ff3a8 100644 --- a/src/main/java/com/jfinal/template/stat/ast/Text.java +++ b/src/main/java/com/jfinal/template/stat/ast/Text.java @@ -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.