Merge commit 'refs/pull/9/head' of https://github.com/apache/incubator-freemarker into 2.3-gae
Summary: Added TemplateNodeModelEx to support getting the previous and next sibling node. Added ?previous_sibling and ?next_sibling. Added @@previous_significant and @@next_significant to XML element nodes. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/ddc6a5ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/ddc6a5ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/ddc6a5ca Branch: refs/heads/2.3-gae Commit: ddc6a5cadc797e49f27ac4403cda47b6f1dc868a Parents: 6750d92 8e5e8a2 Author: ddekany <[email protected]> Authored: Sun Jan 8 10:43:48 2017 +0100 Committer: ddekany <[email protected]> Committed: Sun Jan 8 21:58:12 2017 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/core/BuiltIn.java | 9 +- .../java/freemarker/core/BuiltInForNodeEx.java | 36 ++++++ .../java/freemarker/core/BuiltInsForNodes.java | 22 ++-- .../java/freemarker/core/BuiltinVariable.java | 2 + .../java/freemarker/ext/dom/ElementModel.java | 38 +++++- src/main/java/freemarker/ext/dom/NodeModel.java | 23 +++- .../template/TemplateNodeModelEx.java | 33 +++++ src/test/java/freemarker/core/SiblingTest.java | 126 +++++++++++++++++++ .../freemarker/core/siblingDataModel.xml | 13 ++ 9 files changed, 290 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
