You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/03/01 14:20:59 UTC
[01/50] [abbrv] incubator-freemarker git commit: (JavaDoc typo fix)
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3 402d66744 -> 617ad6fc0
(JavaDoc typo fix)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/81613498
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/81613498
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/81613498
Branch: refs/heads/2.3
Commit: 816134989482e95cbb1f14c7e119b275e02ab610
Parents: 43ae3de
Author: ddekany <dd...@apache.org>
Authored: Tue Jan 24 23:50:17 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Tue Jan 24 23:50:17 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/core/Environment.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/81613498/src/main/java/freemarker/core/Environment.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Environment.java b/src/main/java/freemarker/core/Environment.java
index 3e454d6..876fbba 100644
--- a/src/main/java/freemarker/core/Environment.java
+++ b/src/main/java/freemarker/core/Environment.java
@@ -2672,7 +2672,7 @@ public final class Environment extends Configurable {
* {@link TemplateNameFormat#DEFAULT_2_4_0}, the rules are as follows. If you want to specify a base
* directory here, it must end with {@code "/"}. If it doesn't end with {@code "/"}, it's parent
* directory will be used as the base path. Might starts with a scheme part (like {@code "foo://"}, or
- * with {@link TemplateNameFormat#DEFAULT_2_4_0} even just {@code "foo:"}).
+ * with {@link TemplateNameFormat#DEFAULT_2_4_0} even just with {@code "foo:"}).
* @param targetName
* The name of the template, which is either a relative or absolute name. Assuming
* {@link TemplateNameFormat#DEFAULT_2_3_0} or {@link TemplateNameFormat#DEFAULT_2_4_0}, the rules are as
[04/50] [abbrv] incubator-freemarker git commit: Allowed
template_loader=null when loading configuration settings from string-string
pairs.
Posted by dd...@apache.org.
Allowed template_loader=null when loading configuration settings from string-string pairs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/61054200
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/61054200
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/61054200
Branch: refs/heads/2.3
Commit: 610542009ed5c0dd864d66399b55274fcdbc7b23
Parents: 1ca0b01
Author: ddekany <dd...@apache.org>
Authored: Sun Feb 5 19:13:37 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Feb 5 19:13:37 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/core/Configurable.java | 2 +-
src/main/java/freemarker/template/Configuration.java | 4 ++--
src/manual/en_US/book.xml | 9 +++++++++
3 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/61054200/src/main/java/freemarker/core/Configurable.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Configurable.java b/src/main/java/freemarker/core/Configurable.java
index 8dc4762..60372b9 100644
--- a/src/main/java/freemarker/core/Configurable.java
+++ b/src/main/java/freemarker/core/Configurable.java
@@ -2270,7 +2270,7 @@ public class Configurable {
* <li><p>{@code "template_loader"}:
* See: {@link Configuration#setTemplateLoader(TemplateLoader)}.
* <br>String value: {@code "default"} (case insensitive) for the default, or else interpreted as an
- * <a href="#fm_obe">object builder expression</a>.
+ * <a href="#fm_obe">object builder expression</a>. {@code "null"} is also allowed since 2.3.26.
*
* <li><p>{@code "template_lookup_strategy"}:
* See: {@link Configuration#setTemplateLookupStrategy(freemarker.cache.TemplateLookupStrategy)}.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/61054200/src/main/java/freemarker/template/Configuration.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/Configuration.java b/src/main/java/freemarker/template/Configuration.java
index 2b88bde..e6bbf3d 100644
--- a/src/main/java/freemarker/template/Configuration.java
+++ b/src/main/java/freemarker/template/Configuration.java
@@ -1142,7 +1142,7 @@ public class Configuration extends Configurable implements Cloneable, ParserConf
/**
* Sets a {@link TemplateLoader} that is used to look up and load templates;
- * as a side effect the template cache will be emptied.
+ * as a side effect the template cache will be emptied (unless the new and the old values are the same).
* By providing your own {@link TemplateLoader} implementation, you can load templates from whatever kind of
* storages, like from relational databases, NoSQL-storages, etc.
*
@@ -2968,7 +2968,7 @@ public class Configuration extends Configurable implements Cloneable, ParserConf
unsetTemplateLoader();
} else {
setTemplateLoader((TemplateLoader) _ObjectBuilderSettingEvaluator.eval(
- value, TemplateLoader.class, false, _SettingEvaluationEnvironment.getCurrent()));
+ value, TemplateLoader.class, true, _SettingEvaluationEnvironment.getCurrent()));
}
} else if (TEMPLATE_LOOKUP_STRATEGY_KEY_SNAKE_CASE.equals(name)
|| TEMPLATE_LOOKUP_STRATEGY_KEY_CAMEL_CASE.equals(name)) {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/61054200/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index af466b3..3f9ccef 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26864,6 +26864,15 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
method encapsulates the call to the platform XML parser, we
thought it's better to point this risk out.</para>
</listitem>
+
+ <listitem>
+ <para><literal>Configuration.setSetting(String,
+ String)</literal> and <literal>setSettings</literal> now allows
+ <literal>null</literal> value for
+ <literal>template_loader</literal> (because
+ <literal>Configuration.setTemplateLoader(null)</literal> is also
+ allowed for a while.).</para>
+ </listitem>
</itemizedlist>
</section>
[42/50] [abbrv] incubator-freemarker git commit: Changing copyright
header format to be identical to IntelliJ generated copyright headers
Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/LocAndTZSensitiveTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/LocAndTZSensitiveTemplateDateFormatFactory.java b/src/test/java/freemarker/core/LocAndTZSensitiveTemplateDateFormatFactory.java
index 0b32bd7..ea2b6f7 100644
--- a/src/test/java/freemarker/core/LocAndTZSensitiveTemplateDateFormatFactory.java
+++ b/src/test/java/freemarker/core/LocAndTZSensitiveTemplateDateFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/LocaleSensitiveTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/LocaleSensitiveTemplateNumberFormatFactory.java b/src/test/java/freemarker/core/LocaleSensitiveTemplateNumberFormatFactory.java
index 0c349cb..3ab6380 100644
--- a/src/test/java/freemarker/core/LocaleSensitiveTemplateNumberFormatFactory.java
+++ b/src/test/java/freemarker/core/LocaleSensitiveTemplateNumberFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/MiscErrorMessagesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/MiscErrorMessagesTest.java b/src/test/java/freemarker/core/MiscErrorMessagesTest.java
index 341032f..79ccb2c 100644
--- a/src/test/java/freemarker/core/MiscErrorMessagesTest.java
+++ b/src/test/java/freemarker/core/MiscErrorMessagesTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/NumberFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/NumberFormatTest.java b/src/test/java/freemarker/core/NumberFormatTest.java
index dee402f..29920c4 100644
--- a/src/test/java/freemarker/core/NumberFormatTest.java
+++ b/src/test/java/freemarker/core/NumberFormatTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/ObjectBuilderSettingsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/ObjectBuilderSettingsTest.java b/src/test/java/freemarker/core/ObjectBuilderSettingsTest.java
index 57648ec..3be85d1 100644
--- a/src/test/java/freemarker/core/ObjectBuilderSettingsTest.java
+++ b/src/test/java/freemarker/core/ObjectBuilderSettingsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/OptInTemplateClassResolverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/OptInTemplateClassResolverTest.java b/src/test/java/freemarker/core/OptInTemplateClassResolverTest.java
index 7a27b08..b0a9d29 100644
--- a/src/test/java/freemarker/core/OptInTemplateClassResolverTest.java
+++ b/src/test/java/freemarker/core/OptInTemplateClassResolverTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/OutputFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/OutputFormatTest.java b/src/test/java/freemarker/core/OutputFormatTest.java
index bab9619..0c72faa 100644
--- a/src/test/java/freemarker/core/OutputFormatTest.java
+++ b/src/test/java/freemarker/core/OutputFormatTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/ParseTimeParameterBIErrorMessagesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/ParseTimeParameterBIErrorMessagesTest.java b/src/test/java/freemarker/core/ParseTimeParameterBIErrorMessagesTest.java
index 417eabd..f50c686 100644
--- a/src/test/java/freemarker/core/ParseTimeParameterBIErrorMessagesTest.java
+++ b/src/test/java/freemarker/core/ParseTimeParameterBIErrorMessagesTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/ParsingErrorMessagesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/ParsingErrorMessagesTest.java b/src/test/java/freemarker/core/ParsingErrorMessagesTest.java
index f34ddf2..53194a8 100644
--- a/src/test/java/freemarker/core/ParsingErrorMessagesTest.java
+++ b/src/test/java/freemarker/core/ParsingErrorMessagesTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/PrintfGTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/PrintfGTemplateNumberFormatFactory.java b/src/test/java/freemarker/core/PrintfGTemplateNumberFormatFactory.java
index ccaca18..1fd0ed7 100644
--- a/src/test/java/freemarker/core/PrintfGTemplateNumberFormatFactory.java
+++ b/src/test/java/freemarker/core/PrintfGTemplateNumberFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/RTFOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/RTFOutputFormatTest.java b/src/test/java/freemarker/core/RTFOutputFormatTest.java
index 96d01d0..26ff333 100644
--- a/src/test/java/freemarker/core/RTFOutputFormatTest.java
+++ b/src/test/java/freemarker/core/RTFOutputFormatTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/SQLTimeZoneTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/SQLTimeZoneTest.java b/src/test/java/freemarker/core/SQLTimeZoneTest.java
index 08a2504..3ef114c 100644
--- a/src/test/java/freemarker/core/SQLTimeZoneTest.java
+++ b/src/test/java/freemarker/core/SQLTimeZoneTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/SeldomEscapedOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/SeldomEscapedOutputFormat.java b/src/test/java/freemarker/core/SeldomEscapedOutputFormat.java
index 54d1c5a..9cc0eed 100644
--- a/src/test/java/freemarker/core/SeldomEscapedOutputFormat.java
+++ b/src/test/java/freemarker/core/SeldomEscapedOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/SettingDirectiveTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/SettingDirectiveTest.java b/src/test/java/freemarker/core/SettingDirectiveTest.java
index 2842890..08e76e4 100644
--- a/src/test/java/freemarker/core/SettingDirectiveTest.java
+++ b/src/test/java/freemarker/core/SettingDirectiveTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/SpecialVariableTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/SpecialVariableTest.java b/src/test/java/freemarker/core/SpecialVariableTest.java
index b0453e3..81da56a 100644
--- a/src/test/java/freemarker/core/SpecialVariableTest.java
+++ b/src/test/java/freemarker/core/SpecialVariableTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/StringLiteralInterpolationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/StringLiteralInterpolationTest.java b/src/test/java/freemarker/core/StringLiteralInterpolationTest.java
index fc66013..b0d0581 100644
--- a/src/test/java/freemarker/core/StringLiteralInterpolationTest.java
+++ b/src/test/java/freemarker/core/StringLiteralInterpolationTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/TabSizeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/TabSizeTest.java b/src/test/java/freemarker/core/TabSizeTest.java
index 1f59a3a..b9d4702 100644
--- a/src/test/java/freemarker/core/TabSizeTest.java
+++ b/src/test/java/freemarker/core/TabSizeTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/TagSyntaxVariationsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/TagSyntaxVariationsTest.java b/src/test/java/freemarker/core/TagSyntaxVariationsTest.java
index effeec5..08030d2 100644
--- a/src/test/java/freemarker/core/TagSyntaxVariationsTest.java
+++ b/src/test/java/freemarker/core/TagSyntaxVariationsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/TemplatGetEncodingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/TemplatGetEncodingTest.java b/src/test/java/freemarker/core/TemplatGetEncodingTest.java
index a8ca84d..acfb284 100644
--- a/src/test/java/freemarker/core/TemplatGetEncodingTest.java
+++ b/src/test/java/freemarker/core/TemplatGetEncodingTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/TemplateConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/TemplateConfigurationTest.java b/src/test/java/freemarker/core/TemplateConfigurationTest.java
index 3f69abc..837f6b6 100644
--- a/src/test/java/freemarker/core/TemplateConfigurationTest.java
+++ b/src/test/java/freemarker/core/TemplateConfigurationTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/TemplateConfigurationWithTemplateCacheTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/TemplateConfigurationWithTemplateCacheTest.java b/src/test/java/freemarker/core/TemplateConfigurationWithTemplateCacheTest.java
index 611c2e3..f0ae94a 100644
--- a/src/test/java/freemarker/core/TemplateConfigurationWithTemplateCacheTest.java
+++ b/src/test/java/freemarker/core/TemplateConfigurationWithTemplateCacheTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/TemplateDummyOutputModel.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/TemplateDummyOutputModel.java b/src/test/java/freemarker/core/TemplateDummyOutputModel.java
index a44dced..b134eda 100644
--- a/src/test/java/freemarker/core/TemplateDummyOutputModel.java
+++ b/src/test/java/freemarker/core/TemplateDummyOutputModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/TemplateLevelSettings.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/TemplateLevelSettings.java b/src/test/java/freemarker/core/TemplateLevelSettings.java
index ddde6b5..262ca76 100644
--- a/src/test/java/freemarker/core/TemplateLevelSettings.java
+++ b/src/test/java/freemarker/core/TemplateLevelSettings.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/TemplateNameSpecialVariablesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/TemplateNameSpecialVariablesTest.java b/src/test/java/freemarker/core/TemplateNameSpecialVariablesTest.java
index b7d3d14..32f3702 100644
--- a/src/test/java/freemarker/core/TemplateNameSpecialVariablesTest.java
+++ b/src/test/java/freemarker/core/TemplateNameSpecialVariablesTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/TemplateSeldomEscapedOutputModel.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/TemplateSeldomEscapedOutputModel.java b/src/test/java/freemarker/core/TemplateSeldomEscapedOutputModel.java
index 1a04108..bb04c36 100644
--- a/src/test/java/freemarker/core/TemplateSeldomEscapedOutputModel.java
+++ b/src/test/java/freemarker/core/TemplateSeldomEscapedOutputModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/TheadInterruptingSupportTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/TheadInterruptingSupportTest.java b/src/test/java/freemarker/core/TheadInterruptingSupportTest.java
index 9147d12..cbba0c3 100644
--- a/src/test/java/freemarker/core/TheadInterruptingSupportTest.java
+++ b/src/test/java/freemarker/core/TheadInterruptingSupportTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/TypeErrorMessagesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/TypeErrorMessagesTest.java b/src/test/java/freemarker/core/TypeErrorMessagesTest.java
index 853a10c..a45c2a5 100644
--- a/src/test/java/freemarker/core/TypeErrorMessagesTest.java
+++ b/src/test/java/freemarker/core/TypeErrorMessagesTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/UnclosedCommentTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/UnclosedCommentTest.java b/src/test/java/freemarker/core/UnclosedCommentTest.java
index 5f56f80..cb34556 100644
--- a/src/test/java/freemarker/core/UnclosedCommentTest.java
+++ b/src/test/java/freemarker/core/UnclosedCommentTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/WhitespaceStrippingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/WhitespaceStrippingTest.java b/src/test/java/freemarker/core/WhitespaceStrippingTest.java
index cb0ba7c..0363723 100644
--- a/src/test/java/freemarker/core/WhitespaceStrippingTest.java
+++ b/src/test/java/freemarker/core/WhitespaceStrippingTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/XHTMLOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/XHTMLOutputFormatTest.java b/src/test/java/freemarker/core/XHTMLOutputFormatTest.java
index 81466ef..a9a27ef 100644
--- a/src/test/java/freemarker/core/XHTMLOutputFormatTest.java
+++ b/src/test/java/freemarker/core/XHTMLOutputFormatTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/XMLOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/XMLOutputFormatTest.java b/src/test/java/freemarker/core/XMLOutputFormatTest.java
index f9377d5..5fc2dfc 100644
--- a/src/test/java/freemarker/core/XMLOutputFormatTest.java
+++ b/src/test/java/freemarker/core/XMLOutputFormatTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/subpkg/PackageVisibleAll.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/subpkg/PackageVisibleAll.java b/src/test/java/freemarker/core/subpkg/PackageVisibleAll.java
index 4126921..8f47d5d 100644
--- a/src/test/java/freemarker/core/subpkg/PackageVisibleAll.java
+++ b/src/test/java/freemarker/core/subpkg/PackageVisibleAll.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/subpkg/PackageVisibleAllWithBuilder.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/subpkg/PackageVisibleAllWithBuilder.java b/src/test/java/freemarker/core/subpkg/PackageVisibleAllWithBuilder.java
index eee28d6..9cc482e 100644
--- a/src/test/java/freemarker/core/subpkg/PackageVisibleAllWithBuilder.java
+++ b/src/test/java/freemarker/core/subpkg/PackageVisibleAllWithBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/subpkg/PackageVisibleAllWithBuilderBuilder.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/subpkg/PackageVisibleAllWithBuilderBuilder.java b/src/test/java/freemarker/core/subpkg/PackageVisibleAllWithBuilderBuilder.java
index 1978333..06e1651 100644
--- a/src/test/java/freemarker/core/subpkg/PackageVisibleAllWithBuilderBuilder.java
+++ b/src/test/java/freemarker/core/subpkg/PackageVisibleAllWithBuilderBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/subpkg/PackageVisibleWithPublicConstructor.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/subpkg/PackageVisibleWithPublicConstructor.java b/src/test/java/freemarker/core/subpkg/PackageVisibleWithPublicConstructor.java
index e0ac231..06ee9b1 100644
--- a/src/test/java/freemarker/core/subpkg/PackageVisibleWithPublicConstructor.java
+++ b/src/test/java/freemarker/core/subpkg/PackageVisibleWithPublicConstructor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/subpkg/PublicAll.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/subpkg/PublicAll.java b/src/test/java/freemarker/core/subpkg/PublicAll.java
index 94bff6a..faa31b1 100644
--- a/src/test/java/freemarker/core/subpkg/PublicAll.java
+++ b/src/test/java/freemarker/core/subpkg/PublicAll.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/subpkg/PublicWithMixedConstructors.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/subpkg/PublicWithMixedConstructors.java b/src/test/java/freemarker/core/subpkg/PublicWithMixedConstructors.java
index 45afbc4..7c0b162 100644
--- a/src/test/java/freemarker/core/subpkg/PublicWithMixedConstructors.java
+++ b/src/test/java/freemarker/core/subpkg/PublicWithMixedConstructors.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/subpkg/PublicWithPackageVisibleConstructor.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/subpkg/PublicWithPackageVisibleConstructor.java b/src/test/java/freemarker/core/subpkg/PublicWithPackageVisibleConstructor.java
index 9bffd46..3991388 100644
--- a/src/test/java/freemarker/core/subpkg/PublicWithPackageVisibleConstructor.java
+++ b/src/test/java/freemarker/core/subpkg/PublicWithPackageVisibleConstructor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/AbstractParallelIntrospectionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/AbstractParallelIntrospectionTest.java b/src/test/java/freemarker/ext/beans/AbstractParallelIntrospectionTest.java
index 6bfb19b..5d221e0 100644
--- a/src/test/java/freemarker/ext/beans/AbstractParallelIntrospectionTest.java
+++ b/src/test/java/freemarker/ext/beans/AbstractParallelIntrospectionTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/AlphabeticalMethodSorter.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/AlphabeticalMethodSorter.java b/src/test/java/freemarker/ext/beans/AlphabeticalMethodSorter.java
index fa28abc..3adbaa8 100644
--- a/src/test/java/freemarker/ext/beans/AlphabeticalMethodSorter.java
+++ b/src/test/java/freemarker/ext/beans/AlphabeticalMethodSorter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/BeansAPINewInstanceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansAPINewInstanceTest.java b/src/test/java/freemarker/ext/beans/BeansAPINewInstanceTest.java
index 39a1a5a..fac6e45 100644
--- a/src/test/java/freemarker/ext/beans/BeansAPINewInstanceTest.java
+++ b/src/test/java/freemarker/ext/beans/BeansAPINewInstanceTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/BeansWrapperBasics.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansWrapperBasics.java b/src/test/java/freemarker/ext/beans/BeansWrapperBasics.java
index f12a592..9d0eb71 100644
--- a/src/test/java/freemarker/ext/beans/BeansWrapperBasics.java
+++ b/src/test/java/freemarker/ext/beans/BeansWrapperBasics.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/BeansWrapperCachesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansWrapperCachesTest.java b/src/test/java/freemarker/ext/beans/BeansWrapperCachesTest.java
index 87f424a..f89c96f 100644
--- a/src/test/java/freemarker/ext/beans/BeansWrapperCachesTest.java
+++ b/src/test/java/freemarker/ext/beans/BeansWrapperCachesTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/BeansWrapperDesc2003020.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansWrapperDesc2003020.java b/src/test/java/freemarker/ext/beans/BeansWrapperDesc2003020.java
index 57b56e8..42ed213 100644
--- a/src/test/java/freemarker/ext/beans/BeansWrapperDesc2003020.java
+++ b/src/test/java/freemarker/ext/beans/BeansWrapperDesc2003020.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/BeansWrapperDesc2003021.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansWrapperDesc2003021.java b/src/test/java/freemarker/ext/beans/BeansWrapperDesc2003021.java
index a53c840..8e17bb1 100644
--- a/src/test/java/freemarker/ext/beans/BeansWrapperDesc2003021.java
+++ b/src/test/java/freemarker/ext/beans/BeansWrapperDesc2003021.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/BeansWrapperInc2003020.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansWrapperInc2003020.java b/src/test/java/freemarker/ext/beans/BeansWrapperInc2003020.java
index eb5a6c7..a3b8c06 100644
--- a/src/test/java/freemarker/ext/beans/BeansWrapperInc2003020.java
+++ b/src/test/java/freemarker/ext/beans/BeansWrapperInc2003020.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/BeansWrapperInc2003021.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansWrapperInc2003021.java b/src/test/java/freemarker/ext/beans/BeansWrapperInc2003021.java
index 7b409b8..723e5f7 100644
--- a/src/test/java/freemarker/ext/beans/BeansWrapperInc2003021.java
+++ b/src/test/java/freemarker/ext/beans/BeansWrapperInc2003021.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/BeansWrapperMiscTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansWrapperMiscTest.java b/src/test/java/freemarker/ext/beans/BeansWrapperMiscTest.java
index aa86a80..697a98c 100644
--- a/src/test/java/freemarker/ext/beans/BeansWrapperMiscTest.java
+++ b/src/test/java/freemarker/ext/beans/BeansWrapperMiscTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/BeansWrapperReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansWrapperReadOnlyTest.java b/src/test/java/freemarker/ext/beans/BeansWrapperReadOnlyTest.java
index b70f7ee..5cbcd6e 100644
--- a/src/test/java/freemarker/ext/beans/BeansWrapperReadOnlyTest.java
+++ b/src/test/java/freemarker/ext/beans/BeansWrapperReadOnlyTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/BeansWrapperSingletonsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansWrapperSingletonsTest.java b/src/test/java/freemarker/ext/beans/BeansWrapperSingletonsTest.java
index 9eedd53..60d5c0a 100644
--- a/src/test/java/freemarker/ext/beans/BeansWrapperSingletonsTest.java
+++ b/src/test/java/freemarker/ext/beans/BeansWrapperSingletonsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/BeansWrapperWithShortedMethods.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansWrapperWithShortedMethods.java b/src/test/java/freemarker/ext/beans/BeansWrapperWithShortedMethods.java
index 5c864a5..7b33c87 100644
--- a/src/test/java/freemarker/ext/beans/BeansWrapperWithShortedMethods.java
+++ b/src/test/java/freemarker/ext/beans/BeansWrapperWithShortedMethods.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/CommonSupertypeForUnwrappingHintTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/CommonSupertypeForUnwrappingHintTest.java b/src/test/java/freemarker/ext/beans/CommonSupertypeForUnwrappingHintTest.java
index 5b8cc2a..68db7e2 100644
--- a/src/test/java/freemarker/ext/beans/CommonSupertypeForUnwrappingHintTest.java
+++ b/src/test/java/freemarker/ext/beans/CommonSupertypeForUnwrappingHintTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003020.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003020.java b/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003020.java
index 570716b..562e741 100644
--- a/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003020.java
+++ b/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003020.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003021.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003021.java b/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003021.java
index eeb2ac2..f58bbc5 100644
--- a/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003021.java
+++ b/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003021.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003022.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003022.java b/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003022.java
index 2245c03..3939cca 100644
--- a/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003022.java
+++ b/src/test/java/freemarker/ext/beans/DefaultObjectWrapperDesc2003022.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003020.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003020.java b/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003020.java
index 524cd7e..7c7541e 100644
--- a/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003020.java
+++ b/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003020.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003021.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003021.java b/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003021.java
index 6c853f9..2a05048 100644
--- a/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003021.java
+++ b/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003021.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003022.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003022.java b/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003022.java
index b8e217a..0f23cf2 100644
--- a/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003022.java
+++ b/src/test/java/freemarker/ext/beans/DefaultObjectWrapperInc2003022.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/DefaultObjectWrapperWithSortedMethods.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/DefaultObjectWrapperWithSortedMethods.java b/src/test/java/freemarker/ext/beans/DefaultObjectWrapperWithSortedMethods.java
index cb0a8b5..212adce 100644
--- a/src/test/java/freemarker/ext/beans/DefaultObjectWrapperWithSortedMethods.java
+++ b/src/test/java/freemarker/ext/beans/DefaultObjectWrapperWithSortedMethods.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/EnumModelsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/EnumModelsTest.java b/src/test/java/freemarker/ext/beans/EnumModelsTest.java
index a50e029..57d2076 100644
--- a/src/test/java/freemarker/ext/beans/EnumModelsTest.java
+++ b/src/test/java/freemarker/ext/beans/EnumModelsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/ErrorMessagesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/ErrorMessagesTest.java b/src/test/java/freemarker/ext/beans/ErrorMessagesTest.java
index e169a67..9849b8e 100644
--- a/src/test/java/freemarker/ext/beans/ErrorMessagesTest.java
+++ b/src/test/java/freemarker/ext/beans/ErrorMessagesTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/FineTuneMethodAppearanceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/FineTuneMethodAppearanceTest.java b/src/test/java/freemarker/ext/beans/FineTuneMethodAppearanceTest.java
index 523705b..fa663a4 100644
--- a/src/test/java/freemarker/ext/beans/FineTuneMethodAppearanceTest.java
+++ b/src/test/java/freemarker/ext/beans/FineTuneMethodAppearanceTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/GetlessMethodsAsPropertyGettersRule.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/GetlessMethodsAsPropertyGettersRule.java b/src/test/java/freemarker/ext/beans/GetlessMethodsAsPropertyGettersRule.java
index c12c205..b14898f 100644
--- a/src/test/java/freemarker/ext/beans/GetlessMethodsAsPropertyGettersRule.java
+++ b/src/test/java/freemarker/ext/beans/GetlessMethodsAsPropertyGettersRule.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/IsApplicableTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/IsApplicableTest.java b/src/test/java/freemarker/ext/beans/IsApplicableTest.java
index 772b103..df5a221 100644
--- a/src/test/java/freemarker/ext/beans/IsApplicableTest.java
+++ b/src/test/java/freemarker/ext/beans/IsApplicableTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/IsMoreSpecificParameterTypeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/IsMoreSpecificParameterTypeTest.java b/src/test/java/freemarker/ext/beans/IsMoreSpecificParameterTypeTest.java
index 9c6887c..4d456de 100644
--- a/src/test/java/freemarker/ext/beans/IsMoreSpecificParameterTypeTest.java
+++ b/src/test/java/freemarker/ext/beans/IsMoreSpecificParameterTypeTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/Java7MembersOnlyBeansWrapper.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/Java7MembersOnlyBeansWrapper.java b/src/test/java/freemarker/ext/beans/Java7MembersOnlyBeansWrapper.java
index 9376541..9f4e4e5 100644
--- a/src/test/java/freemarker/ext/beans/Java7MembersOnlyBeansWrapper.java
+++ b/src/test/java/freemarker/ext/beans/Java7MembersOnlyBeansWrapper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/ManyObjectsOfDifferentClasses.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/ManyObjectsOfDifferentClasses.java b/src/test/java/freemarker/ext/beans/ManyObjectsOfDifferentClasses.java
index 04c9f9f..57aab43 100644
--- a/src/test/java/freemarker/ext/beans/ManyObjectsOfDifferentClasses.java
+++ b/src/test/java/freemarker/ext/beans/ManyObjectsOfDifferentClasses.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/ManyStaticsOfDifferentClasses.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/ManyStaticsOfDifferentClasses.java b/src/test/java/freemarker/ext/beans/ManyStaticsOfDifferentClasses.java
index 6be5c10..b2db5dc 100644
--- a/src/test/java/freemarker/ext/beans/ManyStaticsOfDifferentClasses.java
+++ b/src/test/java/freemarker/ext/beans/ManyStaticsOfDifferentClasses.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/MiscNumericalOperationsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/MiscNumericalOperationsTest.java b/src/test/java/freemarker/ext/beans/MiscNumericalOperationsTest.java
index 6313bb0..508bbcb 100644
--- a/src/test/java/freemarker/ext/beans/MiscNumericalOperationsTest.java
+++ b/src/test/java/freemarker/ext/beans/MiscNumericalOperationsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/ModelCacheTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/ModelCacheTest.java b/src/test/java/freemarker/ext/beans/ModelCacheTest.java
index 6aa4d59..cc89558 100644
--- a/src/test/java/freemarker/ext/beans/ModelCacheTest.java
+++ b/src/test/java/freemarker/ext/beans/ModelCacheTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/OverloadedNumberUtilTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/OverloadedNumberUtilTest.java b/src/test/java/freemarker/ext/beans/OverloadedNumberUtilTest.java
index fb267c9..68a83fd 100644
--- a/src/test/java/freemarker/ext/beans/OverloadedNumberUtilTest.java
+++ b/src/test/java/freemarker/ext/beans/OverloadedNumberUtilTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/ParameterListPreferabilityTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/ParameterListPreferabilityTest.java b/src/test/java/freemarker/ext/beans/ParameterListPreferabilityTest.java
index 5096110..66038c7 100644
--- a/src/test/java/freemarker/ext/beans/ParameterListPreferabilityTest.java
+++ b/src/test/java/freemarker/ext/beans/ParameterListPreferabilityTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/PrallelObjectIntrospectionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/PrallelObjectIntrospectionTest.java b/src/test/java/freemarker/ext/beans/PrallelObjectIntrospectionTest.java
index 7493b48..a798d20 100644
--- a/src/test/java/freemarker/ext/beans/PrallelObjectIntrospectionTest.java
+++ b/src/test/java/freemarker/ext/beans/PrallelObjectIntrospectionTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/PrallelStaticIntrospectionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/PrallelStaticIntrospectionTest.java b/src/test/java/freemarker/ext/beans/PrallelStaticIntrospectionTest.java
index 2e43829..c287272 100644
--- a/src/test/java/freemarker/ext/beans/PrallelStaticIntrospectionTest.java
+++ b/src/test/java/freemarker/ext/beans/PrallelStaticIntrospectionTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/RationalNumber.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/RationalNumber.java b/src/test/java/freemarker/ext/beans/RationalNumber.java
index 84cb786..97859a7 100644
--- a/src/test/java/freemarker/ext/beans/RationalNumber.java
+++ b/src/test/java/freemarker/ext/beans/RationalNumber.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/StaticModelsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/StaticModelsTest.java b/src/test/java/freemarker/ext/beans/StaticModelsTest.java
index 9af6606..8b72ffa 100644
--- a/src/test/java/freemarker/ext/beans/StaticModelsTest.java
+++ b/src/test/java/freemarker/ext/beans/StaticModelsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/beans/TypeFlagsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/TypeFlagsTest.java b/src/test/java/freemarker/ext/beans/TypeFlagsTest.java
index 5701f72..d1584c5 100644
--- a/src/test/java/freemarker/ext/beans/TypeFlagsTest.java
+++ b/src/test/java/freemarker/ext/beans/TypeFlagsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/dom/DOMConvenienceStaticsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/dom/DOMConvenienceStaticsTest.java b/src/test/java/freemarker/ext/dom/DOMConvenienceStaticsTest.java
index d93a58c..4a3c836 100644
--- a/src/test/java/freemarker/ext/dom/DOMConvenienceStaticsTest.java
+++ b/src/test/java/freemarker/ext/dom/DOMConvenienceStaticsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/dom/DOMSiblingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/dom/DOMSiblingTest.java b/src/test/java/freemarker/ext/dom/DOMSiblingTest.java
index 70dace9..e03ed04 100644
--- a/src/test/java/freemarker/ext/dom/DOMSiblingTest.java
+++ b/src/test/java/freemarker/ext/dom/DOMSiblingTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/dom/DOMTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/dom/DOMTest.java b/src/test/java/freemarker/ext/dom/DOMTest.java
index 91fef3b..c446758 100644
--- a/src/test/java/freemarker/ext/dom/DOMTest.java
+++ b/src/test/java/freemarker/ext/dom/DOMTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/JspTestFreemarkerServlet.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/JspTestFreemarkerServlet.java b/src/test/java/freemarker/ext/jsp/JspTestFreemarkerServlet.java
index 3933a66..4e05e10 100644
--- a/src/test/java/freemarker/ext/jsp/JspTestFreemarkerServlet.java
+++ b/src/test/java/freemarker/ext/jsp/JspTestFreemarkerServlet.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/JspTestFreemarkerServletWithDefaultOverride.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/JspTestFreemarkerServletWithDefaultOverride.java b/src/test/java/freemarker/ext/jsp/JspTestFreemarkerServletWithDefaultOverride.java
index 3c439d5..dfe8755 100644
--- a/src/test/java/freemarker/ext/jsp/JspTestFreemarkerServletWithDefaultOverride.java
+++ b/src/test/java/freemarker/ext/jsp/JspTestFreemarkerServletWithDefaultOverride.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/RealServletContainertTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/RealServletContainertTest.java b/src/test/java/freemarker/ext/jsp/RealServletContainertTest.java
index f3ef4cf..2685297 100644
--- a/src/test/java/freemarker/ext/jsp/RealServletContainertTest.java
+++ b/src/test/java/freemarker/ext/jsp/RealServletContainertTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/TLDParsingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/TLDParsingTest.java b/src/test/java/freemarker/ext/jsp/TLDParsingTest.java
index 2724510..ab45f07 100644
--- a/src/test/java/freemarker/ext/jsp/TLDParsingTest.java
+++ b/src/test/java/freemarker/ext/jsp/TLDParsingTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/TaglibMethodUtilTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/TaglibMethodUtilTest.java b/src/test/java/freemarker/ext/jsp/TaglibMethodUtilTest.java
index ddade2e..8f4ab07 100644
--- a/src/test/java/freemarker/ext/jsp/TaglibMethodUtilTest.java
+++ b/src/test/java/freemarker/ext/jsp/TaglibMethodUtilTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/taglibmembers/AttributeAccessorTag.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/taglibmembers/AttributeAccessorTag.java b/src/test/java/freemarker/ext/jsp/taglibmembers/AttributeAccessorTag.java
index f60eb61..40b713e 100644
--- a/src/test/java/freemarker/ext/jsp/taglibmembers/AttributeAccessorTag.java
+++ b/src/test/java/freemarker/ext/jsp/taglibmembers/AttributeAccessorTag.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/taglibmembers/AttributeInfoTag.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/taglibmembers/AttributeInfoTag.java b/src/test/java/freemarker/ext/jsp/taglibmembers/AttributeInfoTag.java
index f7a453e..705e076 100644
--- a/src/test/java/freemarker/ext/jsp/taglibmembers/AttributeInfoTag.java
+++ b/src/test/java/freemarker/ext/jsp/taglibmembers/AttributeInfoTag.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/taglibmembers/EnclosingClass.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/taglibmembers/EnclosingClass.java b/src/test/java/freemarker/ext/jsp/taglibmembers/EnclosingClass.java
index d2cbd6d..b6f759a 100644
--- a/src/test/java/freemarker/ext/jsp/taglibmembers/EnclosingClass.java
+++ b/src/test/java/freemarker/ext/jsp/taglibmembers/EnclosingClass.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/taglibmembers/GetAndSetTag.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/taglibmembers/GetAndSetTag.java b/src/test/java/freemarker/ext/jsp/taglibmembers/GetAndSetTag.java
index 8a7f43e..d0a89ec 100644
--- a/src/test/java/freemarker/ext/jsp/taglibmembers/GetAndSetTag.java
+++ b/src/test/java/freemarker/ext/jsp/taglibmembers/GetAndSetTag.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/taglibmembers/TestFunctions.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/taglibmembers/TestFunctions.java b/src/test/java/freemarker/ext/jsp/taglibmembers/TestFunctions.java
index 91ab502..b6fe1a3 100644
--- a/src/test/java/freemarker/ext/jsp/taglibmembers/TestFunctions.java
+++ b/src/test/java/freemarker/ext/jsp/taglibmembers/TestFunctions.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag.java b/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag.java
index 118a7db..bc1a3e6 100644
--- a/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag.java
+++ b/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag2.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag2.java b/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag2.java
index 84424ec..ca49dbf 100644
--- a/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag2.java
+++ b/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag2.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[38/50] [abbrv] incubator-freemarker git commit: Changing copyright
header format to be identical to IntelliJ generated copyright headers
Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/new-safer.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/new-safer.txt b/src/test/resources/freemarker/test/templatesuite/expected/new-safer.txt
index d23943f..dc39393 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/new-safer.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/new-safer.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/new-unrestricted.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/new-unrestricted.txt b/src/test/resources/freemarker/test/templatesuite/expected/new-unrestricted.txt
index 5d50e10..2ea00fa 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/new-unrestricted.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/new-unrestricted.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/newlines1.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/newlines1.txt b/src/test/resources/freemarker/test/templatesuite/expected/newlines1.txt
index e0afb67..bc58731 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/newlines1.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/newlines1.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/newlines2.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/newlines2.txt b/src/test/resources/freemarker/test/templatesuite/expected/newlines2.txt
index 347f513..c131421 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/newlines2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/newlines2.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/non-strict-syntax.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/non-strict-syntax.txt b/src/test/resources/freemarker/test/templatesuite/expected/non-strict-syntax.txt
index 75e0b45..61b88bc 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/non-strict-syntax.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/non-strict-syntax.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/noparse.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/noparse.txt b/src/test/resources/freemarker/test/templatesuite/expected/noparse.txt
index d6272ac..546a6f2 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/noparse.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/noparse.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/number-format.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/number-format.txt b/src/test/resources/freemarker/test/templatesuite/expected/number-format.txt
index a29e0d9..a6f8475 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/number-format.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/number-format.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/number-literal.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/number-literal.txt b/src/test/resources/freemarker/test/templatesuite/expected/number-literal.txt
index aee5b3d..b80bc85 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/number-literal.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/number-literal.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/number-to-date.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/number-to-date.txt b/src/test/resources/freemarker/test/templatesuite/expected/number-to-date.txt
index 7f1b7fe..bc8a10e 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/number-to-date.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/number-to-date.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/numerical-cast.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/numerical-cast.txt b/src/test/resources/freemarker/test/templatesuite/expected/numerical-cast.txt
index 70317bd..3bf6cd0 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/numerical-cast.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/numerical-cast.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/output-encoding1.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding1.txt b/src/test/resources/freemarker/test/templatesuite/expected/output-encoding1.txt
index 63cb8d9..3b5215a 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding1.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/output-encoding1.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/output-encoding2.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding2.txt b/src/test/resources/freemarker/test/templatesuite/expected/output-encoding2.txt
index 2d9ee55..6956b6c 100644
Binary files a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding2.txt and b/src/test/resources/freemarker/test/templatesuite/expected/output-encoding2.txt differ
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/output-encoding3.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding3.txt b/src/test/resources/freemarker/test/templatesuite/expected/output-encoding3.txt
index 53843c1..c0369f6 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/output-encoding3.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/output-encoding3.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/precedence.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/precedence.txt b/src/test/resources/freemarker/test/templatesuite/expected/precedence.txt
index b977e5d..b19cb31 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/precedence.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/precedence.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/recover.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/recover.txt b/src/test/resources/freemarker/test/templatesuite/expected/recover.txt
index fa5f7fc..880cea3 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/recover.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/recover.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/root.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/root.txt b/src/test/resources/freemarker/test/templatesuite/expected/root.txt
index a73a959..041222c 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/root.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/root.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/sequence-builtins.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/sequence-builtins.txt b/src/test/resources/freemarker/test/templatesuite/expected/sequence-builtins.txt
index 1201da9..4f7796a 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/sequence-builtins.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/sequence-builtins.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/specialvars.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/specialvars.txt b/src/test/resources/freemarker/test/templatesuite/expected/specialvars.txt
index c94f981..e2fa13e 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/specialvars.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/specialvars.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/strictinheader.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/strictinheader.txt b/src/test/resources/freemarker/test/templatesuite/expected/strictinheader.txt
index 893cb63..38e13eb 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/strictinheader.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/strictinheader.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps-matches.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps-matches.txt b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps-matches.txt
index 59c8dbb..ba14e7f 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps-matches.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps-matches.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps.txt b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps.txt
index 0b709f9..c54dc96 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins-regexps.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/string-builtins1.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins1.txt b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins1.txt
index 1952722..6e689ac 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins1.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins1.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/string-builtins2.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins2.txt b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins2.txt
index 59b8b76..f5eebd9 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/string-builtins2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/string-builtins2.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/stringbimethods.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/stringbimethods.txt b/src/test/resources/freemarker/test/templatesuite/expected/stringbimethods.txt
index 039aa4f..8ef415d 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/stringbimethods.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/stringbimethods.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/stringliteral.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/stringliteral.txt b/src/test/resources/freemarker/test/templatesuite/expected/stringliteral.txt
index e0f0964..3d9d4c9 100644
Binary files a/src/test/resources/freemarker/test/templatesuite/expected/stringliteral.txt and b/src/test/resources/freemarker/test/templatesuite/expected/stringliteral.txt differ
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/switch.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/switch.txt b/src/test/resources/freemarker/test/templatesuite/expected/switch.txt
index a0e6b30..5d42785 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/switch.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/switch.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt b/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
index 916a32c..62dc203 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
index 0554864..5f0423d 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
index 924bbe8..637d520 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/type-builtins.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins.txt b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins.txt
index d3ac7fa..56aa8d2 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/var-layers.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/var-layers.txt b/src/test/resources/freemarker/test/templatesuite/expected/var-layers.txt
index af85ff5..5fd6e2e 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/var-layers.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/var-layers.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/varargs.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/varargs.txt b/src/test/resources/freemarker/test/templatesuite/expected/varargs.txt
index 2d5155b..a310855 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/varargs.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/varargs.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/variables.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/variables.txt b/src/test/resources/freemarker/test/templatesuite/expected/variables.txt
index 59c73ef..5365b07 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/variables.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/variables.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/whitespace-trim.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/whitespace-trim.txt b/src/test/resources/freemarker/test/templatesuite/expected/whitespace-trim.txt
index bec61ee..e74163a 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/whitespace-trim.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/whitespace-trim.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/wstrip-in-header.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/wstrip-in-header.txt b/src/test/resources/freemarker/test/templatesuite/expected/wstrip-in-header.txt
index ac7724a..2cb2913 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/wstrip-in-header.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/wstrip-in-header.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/wstripping.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/wstripping.txt b/src/test/resources/freemarker/test/templatesuite/expected/wstripping.txt
index 21feb6c..2aae297 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/wstripping.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/wstripping.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/xml-fragment.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/xml-fragment.txt b/src/test/resources/freemarker/test/templatesuite/expected/xml-fragment.txt
index 6236d7c..cb0da5f 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/xml-fragment.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/xml-fragment.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/xml-ns_prefix-scope.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/xml-ns_prefix-scope.txt b/src/test/resources/freemarker/test/templatesuite/expected/xml-ns_prefix-scope.txt
index c0315ec..bf8e6bd 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/xml-ns_prefix-scope.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/xml-ns_prefix-scope.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/xml.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/xml.txt b/src/test/resources/freemarker/test/templatesuite/expected/xml.txt
index 6c5397e..718bba1 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/xml.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/xml.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/xmlns1.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/xmlns1.txt b/src/test/resources/freemarker/test/templatesuite/expected/xmlns1.txt
index 85cc8ee..69af553 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/xmlns1.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/xmlns1.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/xmlns3.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/xmlns3.txt b/src/test/resources/freemarker/test/templatesuite/expected/xmlns3.txt
index d4627f5..f028f0a 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/xmlns3.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/xmlns3.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/xmlns4.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/xmlns4.txt b/src/test/resources/freemarker/test/templatesuite/expected/xmlns4.txt
index d4627f5..f028f0a 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/xmlns4.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/xmlns4.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/xmlns5.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/xmlns5.txt b/src/test/resources/freemarker/test/templatesuite/expected/xmlns5.txt
index ad925c7..6e42b09 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/xmlns5.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/xmlns5.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties b/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties
index 24b1e65..609e20b 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties
+++ b/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/models/defaultxmlns1.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/defaultxmlns1.xml b/src/test/resources/freemarker/test/templatesuite/models/defaultxmlns1.xml
index f555e3e..ed289bb 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/defaultxmlns1.xml
+++ b/src/test/resources/freemarker/test/templatesuite/models/defaultxmlns1.xml
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/models/xml-ns_prefix-scope.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/xml-ns_prefix-scope.xml b/src/test/resources/freemarker/test/templatesuite/models/xml-ns_prefix-scope.xml
index 13cf78c..934acac 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/xml-ns_prefix-scope.xml
+++ b/src/test/resources/freemarker/test/templatesuite/models/xml-ns_prefix-scope.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/models/xml.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/xml.xml b/src/test/resources/freemarker/test/templatesuite/models/xml.xml
index 25a2893..abf7e96 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/xml.xml
+++ b/src/test/resources/freemarker/test/templatesuite/models/xml.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/models/xmlfragment.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/xmlfragment.xml b/src/test/resources/freemarker/test/templatesuite/models/xmlfragment.xml
index 9a8e476..b5578b6 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/xmlfragment.xml
+++ b/src/test/resources/freemarker/test/templatesuite/models/xmlfragment.xml
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/models/xmlns.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/xmlns.xml b/src/test/resources/freemarker/test/templatesuite/models/xmlns.xml
index ca07080..6f6453e 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/xmlns.xml
+++ b/src/test/resources/freemarker/test/templatesuite/models/xmlns.xml
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/models/xmlns2.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/xmlns2.xml b/src/test/resources/freemarker/test/templatesuite/models/xmlns2.xml
index 6e177b4..c8bfc9f 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/xmlns2.xml
+++ b/src/test/resources/freemarker/test/templatesuite/models/xmlns2.xml
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/models/xmlns3.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/xmlns3.xml b/src/test/resources/freemarker/test/templatesuite/models/xmlns3.xml
index 1aaa8ca..8502ead 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/xmlns3.xml
+++ b/src/test/resources/freemarker/test/templatesuite/models/xmlns3.xml
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/api-builtins.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/api-builtins.ftl b/src/test/resources/freemarker/test/templatesuite/templates/api-builtins.ftl
index ce5fc9f..a403b9d 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/api-builtins.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/api-builtins.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/arithmetic.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/arithmetic.ftl b/src/test/resources/freemarker/test/templatesuite/templates/arithmetic.ftl
index 19b8228..afd4c28 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/arithmetic.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/arithmetic.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/assignments.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/assignments.ftl b/src/test/resources/freemarker/test/templatesuite/templates/assignments.ftl
index 8fbb725..f9f546d 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/assignments.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/assignments.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/bean-maps.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/bean-maps.ftl b/src/test/resources/freemarker/test/templatesuite/templates/bean-maps.ftl
index e8651b8..f332941 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/bean-maps.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/bean-maps.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/beans.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/beans.ftl b/src/test/resources/freemarker/test/templatesuite/templates/beans.ftl
index 54087f9..c2be2e9 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/beans.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/beans.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/boolean-formatting.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/boolean-formatting.ftl b/src/test/resources/freemarker/test/templatesuite/templates/boolean-formatting.ftl
index 6ccc6ca..9d6c742 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/boolean-formatting.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/boolean-formatting.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/boolean.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/boolean.ftl b/src/test/resources/freemarker/test/templatesuite/templates/boolean.ftl
index f0c9edc..ab11c64 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/boolean.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/boolean.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header.ftl b/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header.ftl
index 3be3755..638f4b9 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header_inc1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header_inc1.ftl b/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header_inc1.ftl
index 6c625d5..b8dc608 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header_inc1.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header_inc1.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header_inc2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header_inc2.ftl b/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header_inc2.ftl
index 68427b1..0b3427a 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header_inc2.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/charset-in-header_inc2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/classic-compatible-mode2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/classic-compatible-mode2.ftl b/src/test/resources/freemarker/test/templatesuite/templates/classic-compatible-mode2.ftl
index 6a27bb1..b10b185 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/classic-compatible-mode2.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/classic-compatible-mode2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/classic-compatible.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/classic-compatible.ftl b/src/test/resources/freemarker/test/templatesuite/templates/classic-compatible.ftl
index c3a3ffb..7cc1acc 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/classic-compatible.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/classic-compatible.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/comment.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/comment.ftl b/src/test/resources/freemarker/test/templatesuite/templates/comment.ftl
index 7bf18b9..f94122f 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/comment.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/comment.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/comparisons.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/comparisons.ftl b/src/test/resources/freemarker/test/templatesuite/templates/comparisons.ftl
index 60c7ac4..3889765 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/comparisons.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/comparisons.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/compress.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/compress.ftl b/src/test/resources/freemarker/test/templatesuite/templates/compress.ftl
index ebc40f4..5e3edb6 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/compress.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/compress.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/date-type-builtins.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/date-type-builtins.ftl b/src/test/resources/freemarker/test/templatesuite/templates/date-type-builtins.ftl
index 7773220..f05654b 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/date-type-builtins.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/date-type-builtins.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi-common.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi-common.ftl b/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi-common.ftl
index d70a854..31cf390 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi-common.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi-common.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi-ici-2.3.21.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi-ici-2.3.21.ftl b/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi-ici-2.3.21.ftl
index 03ffd00..0a9aa94 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi-ici-2.3.21.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi-ici-2.3.21.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi.ftl b/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi.ftl
index c2d7ad4..2a525a7 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-bi.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-like.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-like.ftl b/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-like.ftl
index 36f172c..a5accaf 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-like.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/dateformat-iso-like.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/dateformat-java.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/dateformat-java.ftl b/src/test/resources/freemarker/test/templatesuite/templates/dateformat-java.ftl
index df38992..82001db 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/dateformat-java.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/dateformat-java.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/dateparsing.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/dateparsing.ftl b/src/test/resources/freemarker/test/templatesuite/templates/dateparsing.ftl
index 4ea56a0..d830f95 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/dateparsing.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/dateparsing.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/default-xmlns.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/default-xmlns.ftl b/src/test/resources/freemarker/test/templatesuite/templates/default-xmlns.ftl
index 4180a4c..4f01835 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/default-xmlns.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/default-xmlns.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/default.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/default.ftl b/src/test/resources/freemarker/test/templatesuite/templates/default.ftl
index e099a1c..6ecf8b3 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/default.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/default.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/encoding-builtins.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/encoding-builtins.ftl b/src/test/resources/freemarker/test/templatesuite/templates/encoding-builtins.ftl
index f7694ed..6ee2a26 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/encoding-builtins.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/encoding-builtins.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/escapes.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/escapes.ftl b/src/test/resources/freemarker/test/templatesuite/templates/escapes.ftl
index 38dec30..20efc67 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/escapes.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/escapes.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/exception.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/exception.ftl b/src/test/resources/freemarker/test/templatesuite/templates/exception.ftl
index 99ff116..83ae356 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/exception.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/exception.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/exception2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/exception2.ftl b/src/test/resources/freemarker/test/templatesuite/templates/exception2.ftl
index 99ff116..83ae356 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/exception2.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/exception2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/exception3.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/exception3.ftl b/src/test/resources/freemarker/test/templatesuite/templates/exception3.ftl
index 2b90f7c..f386fec 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/exception3.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/exception3.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/existence-operators.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/existence-operators.ftl b/src/test/resources/freemarker/test/templatesuite/templates/existence-operators.ftl
index f55623b..2f9bdce 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/existence-operators.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/existence-operators.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/exthash.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/exthash.ftl b/src/test/resources/freemarker/test/templatesuite/templates/exthash.ftl
index b0b334f..24ba759 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/exthash.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/exthash.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/hashconcat.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/hashconcat.ftl b/src/test/resources/freemarker/test/templatesuite/templates/hashconcat.ftl
index 6831379..127d828 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/hashconcat.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/hashconcat.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/hashliteral.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/hashliteral.ftl b/src/test/resources/freemarker/test/templatesuite/templates/hashliteral.ftl
index 8374a5e..60a823f 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/hashliteral.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/hashliteral.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/helloworld.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/helloworld.ftl b/src/test/resources/freemarker/test/templatesuite/templates/helloworld.ftl
index c026d1c..91816f6 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/helloworld.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/helloworld.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/identifier-escaping.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/identifier-escaping.ftl b/src/test/resources/freemarker/test/templatesuite/templates/identifier-escaping.ftl
index 1c62c43..9b39235 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/identifier-escaping.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/identifier-escaping.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/identifier-non-ascii.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/identifier-non-ascii.ftl b/src/test/resources/freemarker/test/templatesuite/templates/identifier-non-ascii.ftl
index d0193ad..59a4b0e 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/identifier-non-ascii.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/identifier-non-ascii.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/if.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/if.ftl b/src/test/resources/freemarker/test/templatesuite/templates/if.ftl
index c17b979..97c3f4b 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/if.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/if.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[40/50] [abbrv] incubator-freemarker git commit: Changing copyright
header format to be identical to IntelliJ generated copyright headers
Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/AssertationFailedInTemplateException.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/AssertationFailedInTemplateException.java b/src/test/java/freemarker/test/utility/AssertationFailedInTemplateException.java
index a1f51fd..e715a6f 100644
--- a/src/test/java/freemarker/test/utility/AssertationFailedInTemplateException.java
+++ b/src/test/java/freemarker/test/utility/AssertationFailedInTemplateException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/BadParameterTypeException.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/BadParameterTypeException.java b/src/test/java/freemarker/test/utility/BadParameterTypeException.java
index 4f78e90..c67221b 100644
--- a/src/test/java/freemarker/test/utility/BadParameterTypeException.java
+++ b/src/test/java/freemarker/test/utility/BadParameterTypeException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/FileTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/FileTestCase.java b/src/test/java/freemarker/test/utility/FileTestCase.java
index c85496c..c8ad159 100644
--- a/src/test/java/freemarker/test/utility/FileTestCase.java
+++ b/src/test/java/freemarker/test/utility/FileTestCase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/MissingRequiredParameterException.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/MissingRequiredParameterException.java b/src/test/java/freemarker/test/utility/MissingRequiredParameterException.java
index f8fa167..28e5f3a 100644
--- a/src/test/java/freemarker/test/utility/MissingRequiredParameterException.java
+++ b/src/test/java/freemarker/test/utility/MissingRequiredParameterException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/NoOutputDirective.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/NoOutputDirective.java b/src/test/java/freemarker/test/utility/NoOutputDirective.java
index 029bcf7..c16a034 100644
--- a/src/test/java/freemarker/test/utility/NoOutputDirective.java
+++ b/src/test/java/freemarker/test/utility/NoOutputDirective.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/ParameterException.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/ParameterException.java b/src/test/java/freemarker/test/utility/ParameterException.java
index 909a16c..cd79078 100644
--- a/src/test/java/freemarker/test/utility/ParameterException.java
+++ b/src/test/java/freemarker/test/utility/ParameterException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/TestUtil.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/TestUtil.java b/src/test/java/freemarker/test/utility/TestUtil.java
index e12a9fa..3714163 100644
--- a/src/test/java/freemarker/test/utility/TestUtil.java
+++ b/src/test/java/freemarker/test/utility/TestUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/UnsupportedParameterException.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/UnsupportedParameterException.java b/src/test/java/freemarker/test/utility/UnsupportedParameterException.java
index a16bdf0..1825a85 100644
--- a/src/test/java/freemarker/test/utility/UnsupportedParameterException.java
+++ b/src/test/java/freemarker/test/utility/UnsupportedParameterException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/META-INF/malformed.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/META-INF/malformed.tld b/src/test/resources/META-INF/malformed.tld
index f30dac5..3ac9758 100644
--- a/src/test/resources/META-INF/malformed.tld
+++ b/src/test/resources/META-INF/malformed.tld
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld b/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld
index 86c1682..c1dc603 100644
--- a/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld
+++ b/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/cache/test.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/cache/test.ftl b/src/test/resources/freemarker/cache/test.ftl
index 3a1f6b5..fb3f45d 100644
--- a/src/test/resources/freemarker/cache/test.ftl
+++ b/src/test/resources/freemarker/cache/test.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-1.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-1.ast b/src/test/resources/freemarker/core/ast-1.ast
index 2956157..853feb5 100644
--- a/src/test/resources/freemarker/core/ast-1.ast
+++ b/src/test/resources/freemarker/core/ast-1.ast
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-1.ftl b/src/test/resources/freemarker/core/ast-1.ftl
index 3f45dda..8c8953a 100644
--- a/src/test/resources/freemarker/core/ast-1.ftl
+++ b/src/test/resources/freemarker/core/ast-1.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-assignments.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-assignments.ast b/src/test/resources/freemarker/core/ast-assignments.ast
index 2191544..bbc0659 100644
--- a/src/test/resources/freemarker/core/ast-assignments.ast
+++ b/src/test/resources/freemarker/core/ast-assignments.ast
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-assignments.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-assignments.ftl b/src/test/resources/freemarker/core/ast-assignments.ftl
index fc5aaa5..c070635 100644
--- a/src/test/resources/freemarker/core/ast-assignments.ftl
+++ b/src/test/resources/freemarker/core/ast-assignments.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-builtins.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-builtins.ast b/src/test/resources/freemarker/core/ast-builtins.ast
index 53ce0ec..27be467 100644
--- a/src/test/resources/freemarker/core/ast-builtins.ast
+++ b/src/test/resources/freemarker/core/ast-builtins.ast
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-builtins.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-builtins.ftl b/src/test/resources/freemarker/core/ast-builtins.ftl
index 06f65ad..74aee52 100644
--- a/src/test/resources/freemarker/core/ast-builtins.ftl
+++ b/src/test/resources/freemarker/core/ast-builtins.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-locations.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-locations.ast b/src/test/resources/freemarker/core/ast-locations.ast
index f3d240e..a7feb3b 100644
--- a/src/test/resources/freemarker/core/ast-locations.ast
+++ b/src/test/resources/freemarker/core/ast-locations.ast
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-locations.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-locations.ftl b/src/test/resources/freemarker/core/ast-locations.ftl
index a8fdcd7..99fa244 100644
--- a/src/test/resources/freemarker/core/ast-locations.ftl
+++ b/src/test/resources/freemarker/core/ast-locations.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast b/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast
index 32a3f17..9d0cc38 100644
--- a/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast
+++ b/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ftl b/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ftl
index a11ffe7..53716e4 100644
--- a/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ftl
+++ b/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-multipleignoredchildren.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-multipleignoredchildren.ast b/src/test/resources/freemarker/core/ast-multipleignoredchildren.ast
index 979a93a..3e3cd1e 100644
--- a/src/test/resources/freemarker/core/ast-multipleignoredchildren.ast
+++ b/src/test/resources/freemarker/core/ast-multipleignoredchildren.ast
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-multipleignoredchildren.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-multipleignoredchildren.ftl b/src/test/resources/freemarker/core/ast-multipleignoredchildren.ftl
index 009962a..501802a 100644
--- a/src/test/resources/freemarker/core/ast-multipleignoredchildren.ftl
+++ b/src/test/resources/freemarker/core/ast-multipleignoredchildren.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-nestedignoredchildren.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-nestedignoredchildren.ast b/src/test/resources/freemarker/core/ast-nestedignoredchildren.ast
index cbc6970..4cc514f 100644
--- a/src/test/resources/freemarker/core/ast-nestedignoredchildren.ast
+++ b/src/test/resources/freemarker/core/ast-nestedignoredchildren.ast
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-nestedignoredchildren.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-nestedignoredchildren.ftl b/src/test/resources/freemarker/core/ast-nestedignoredchildren.ftl
index 9d2ed7a..fbdb342 100644
--- a/src/test/resources/freemarker/core/ast-nestedignoredchildren.ftl
+++ b/src/test/resources/freemarker/core/ast-nestedignoredchildren.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-range.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-range.ast b/src/test/resources/freemarker/core/ast-range.ast
index 9c553e1..58af73c 100644
--- a/src/test/resources/freemarker/core/ast-range.ast
+++ b/src/test/resources/freemarker/core/ast-range.ast
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-range.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-range.ftl b/src/test/resources/freemarker/core/ast-range.ftl
index f6c837b..cb55c8a 100644
--- a/src/test/resources/freemarker/core/ast-range.ftl
+++ b/src/test/resources/freemarker/core/ast-range.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-strlitinterpolation.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-strlitinterpolation.ast b/src/test/resources/freemarker/core/ast-strlitinterpolation.ast
index cb74d74..7d14e80 100644
--- a/src/test/resources/freemarker/core/ast-strlitinterpolation.ast
+++ b/src/test/resources/freemarker/core/ast-strlitinterpolation.ast
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-strlitinterpolation.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-strlitinterpolation.ftl b/src/test/resources/freemarker/core/ast-strlitinterpolation.ftl
index 641f39c..cd86f2f 100644
--- a/src/test/resources/freemarker/core/ast-strlitinterpolation.ftl
+++ b/src/test/resources/freemarker/core/ast-strlitinterpolation.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-whitespacestripping.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-whitespacestripping.ast b/src/test/resources/freemarker/core/ast-whitespacestripping.ast
index 4e4689e..23f06eb 100644
--- a/src/test/resources/freemarker/core/ast-whitespacestripping.ast
+++ b/src/test/resources/freemarker/core/ast-whitespacestripping.ast
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-whitespacestripping.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-whitespacestripping.ftl b/src/test/resources/freemarker/core/ast-whitespacestripping.ftl
index af801fa..cba7289 100644
--- a/src/test/resources/freemarker/core/ast-whitespacestripping.ftl
+++ b/src/test/resources/freemarker/core/ast-whitespacestripping.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-assignments.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-assignments.ftl b/src/test/resources/freemarker/core/cano-assignments.ftl
index 1719dd5..24c8984 100644
--- a/src/test/resources/freemarker/core/cano-assignments.ftl
+++ b/src/test/resources/freemarker/core/cano-assignments.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-assignments.ftl.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-assignments.ftl.out b/src/test/resources/freemarker/core/cano-assignments.ftl.out
index 5990288..3dd2307 100644
--- a/src/test/resources/freemarker/core/cano-assignments.ftl.out
+++ b/src/test/resources/freemarker/core/cano-assignments.ftl.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-builtins.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-builtins.ftl b/src/test/resources/freemarker/core/cano-builtins.ftl
index 06f65ad..74aee52 100644
--- a/src/test/resources/freemarker/core/cano-builtins.ftl
+++ b/src/test/resources/freemarker/core/cano-builtins.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-builtins.ftl.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-builtins.ftl.out b/src/test/resources/freemarker/core/cano-builtins.ftl.out
index 231d6d2..3c62974 100644
--- a/src/test/resources/freemarker/core/cano-builtins.ftl.out
+++ b/src/test/resources/freemarker/core/cano-builtins.ftl.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-identifier-escaping.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-identifier-escaping.ftl b/src/test/resources/freemarker/core/cano-identifier-escaping.ftl
index 01f1d3c..75d52f1 100644
--- a/src/test/resources/freemarker/core/cano-identifier-escaping.ftl
+++ b/src/test/resources/freemarker/core/cano-identifier-escaping.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-identifier-escaping.ftl.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-identifier-escaping.ftl.out b/src/test/resources/freemarker/core/cano-identifier-escaping.ftl.out
index 3f875be..17e2b4e 100644
--- a/src/test/resources/freemarker/core/cano-identifier-escaping.ftl.out
+++ b/src/test/resources/freemarker/core/cano-identifier-escaping.ftl.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-macros.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-macros.ftl b/src/test/resources/freemarker/core/cano-macros.ftl
index bd6a780..9288e63 100644
--- a/src/test/resources/freemarker/core/cano-macros.ftl
+++ b/src/test/resources/freemarker/core/cano-macros.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-macros.ftl.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-macros.ftl.out b/src/test/resources/freemarker/core/cano-macros.ftl.out
index ea846cd..ad49cae 100644
--- a/src/test/resources/freemarker/core/cano-macros.ftl.out
+++ b/src/test/resources/freemarker/core/cano-macros.ftl.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl b/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl
index 718aeec..85189a4 100644
--- a/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl
+++ b/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl.out b/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl.out
index ecd31be..754c225 100644
--- a/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl.out
+++ b/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/encodingOverride-ISO-8859-1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/encodingOverride-ISO-8859-1.ftl b/src/test/resources/freemarker/core/encodingOverride-ISO-8859-1.ftl
index 99f336b..e0382c7 100644
--- a/src/test/resources/freemarker/core/encodingOverride-ISO-8859-1.ftl
+++ b/src/test/resources/freemarker/core/encodingOverride-ISO-8859-1.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/encodingOverride-UTF-8.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/encodingOverride-UTF-8.ftl b/src/test/resources/freemarker/core/encodingOverride-UTF-8.ftl
index 0c5401e..5948e30 100644
--- a/src/test/resources/freemarker/core/encodingOverride-UTF-8.ftl
+++ b/src/test/resources/freemarker/core/encodingOverride-UTF-8.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/dom/DOMSiblingTest.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/dom/DOMSiblingTest.xml b/src/test/resources/freemarker/ext/dom/DOMSiblingTest.xml
index bdb3e45..d1fe3dc 100644
--- a/src/test/resources/freemarker/ext/dom/DOMSiblingTest.xml
+++ b/src/test/resources/freemarker/ext/dom/DOMSiblingTest.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/TLDParsingTest.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/TLDParsingTest.tld b/src/test/resources/freemarker/ext/jsp/TLDParsingTest.tld
index 34bbde2..1f7e049 100644
--- a/src/test/resources/freemarker/ext/jsp/TLDParsingTest.tld
+++ b/src/test/resources/freemarker/ext/jsp/TLDParsingTest.tld
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/templates/classpath-test.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/templates/classpath-test.ftl b/src/test/resources/freemarker/ext/jsp/templates/classpath-test.ftl
index 0180281..e05c1b3 100644
--- a/src/test/resources/freemarker/ext/jsp/templates/classpath-test.ftl
+++ b/src/test/resources/freemarker/ext/jsp/templates/classpath-test.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld b/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld
index 4b30fd6..6854189 100644
--- a/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld
+++ b/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld b/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld
index 553d924..5079298 100644
--- a/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld
+++ b/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/CONTENTS.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/CONTENTS.txt b/src/test/resources/freemarker/ext/jsp/webapps/basic/CONTENTS.txt
index 19127ec..fa1f3ff 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/CONTENTS.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/CONTENTS.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-function-tag-name-clash.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-function-tag-name-clash.tld b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-function-tag-name-clash.tld
index c0eb104..81d9ed4 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-function-tag-name-clash.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-function-tag-name-clash.tld
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld
index 5fc4ec2..a8c2702 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.0.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.0.txt b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.0.txt
index fd77dd6..d1f664c 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.0.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.0.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.22-future.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.22-future.txt b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.22-future.txt
index ef5d921..6e3ccee 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.22-future.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.22-future.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes.txt b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes.txt
index b6a06d8..2d0738c 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/customTags1.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/customTags1.txt b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/customTags1.txt
index 6c859a4..54e6650 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/customTags1.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/customTags1.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld
index 034ccdc..01e20f2 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml
index 40a63ce..1d8451a 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/attributes.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/attributes.ftl b/src/test/resources/freemarker/ext/jsp/webapps/basic/attributes.ftl
index dd05b27..8d2f8af 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/attributes.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/attributes.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.ftl b/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.ftl
index 6e071a3..7e44c32 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp b/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp
index 59c9cee..1148782 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/customTags1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/customTags1.ftl b/src/test/resources/freemarker/ext/jsp/webapps/basic/customTags1.ftl
index 62ae7c7..9334853 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/customTags1.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/customTags1.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.ftl b/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.ftl
index dbac123..8968f26 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.jsp
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.jsp b/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.jsp
index d6abe6f..412d08f 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.jsp
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.jsp
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial-jstl-@Ignore.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial-jstl-@Ignore.ftl b/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial-jstl-@Ignore.ftl
index b81f7c4..c37e72a 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial-jstl-@Ignore.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial-jstl-@Ignore.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.ftl b/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.ftl
index ec2710d..b86e023 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp b/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp
index 1f2a237..d8b4a3c 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/config/CONTENTS.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/CONTENTS.txt b/src/test/resources/freemarker/ext/jsp/webapps/config/CONTENTS.txt
index 3157059..7eca473 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/CONTENTS.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/CONTENTS.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/sub/test.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/sub/test.ftl b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/sub/test.ftl
index ae05634..96a022a 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/sub/test.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/sub/test.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/test.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/test.ftl b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/test.ftl
index 57186a2..c0a0444 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/test.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/test.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar/sub/test2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar/sub/test2.ftl b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar/sub/test2.ftl
index 71b1d86..67feac0 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar/sub/test2.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar/sub/test2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/templates/test.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/templates/test.ftl b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/templates/test.ftl
index 0f06309..a46f12a 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/templates/test.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/templates/test.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml
index 8818368..5148907 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/config/test.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/test.ftl b/src/test/resources/freemarker/ext/jsp/webapps/config/test.ftl
index 49a80f2..1852b69 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/test.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/test.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/errors/CONTENTS.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/CONTENTS.txt b/src/test/resources/freemarker/ext/jsp/webapps/errors/CONTENTS.txt
index 62d711e..fe48ca4 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/CONTENTS.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/CONTENTS.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml b/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml
index 38f72ca..eb31ac7 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp
index f0d8a76..af1e261 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.ftl b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.ftl
index 04bc8aa..a65d9be 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp
index 52ed45b..6899bd3 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/errors/not-failing.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/not-failing.ftl b/src/test/resources/freemarker/ext/jsp/webapps/errors/not-failing.ftl
index be33775..06ebbcc 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/not-failing.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/not-failing.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/CONTENTS.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/CONTENTS.txt b/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/CONTENTS.txt
index 5453db8..27016ef 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/CONTENTS.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/CONTENTS.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/templates/test.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/templates/test.ftl b/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/templates/test.ftl
index 5eb7864..3dda3db 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/templates/test.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/templates/test.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml b/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml
index 006e13e..0781c2b 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/CONTENTS.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/CONTENTS.txt b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/CONTENTS.txt
index d38119e..13f1923 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/CONTENTS.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/CONTENTS.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/subdir/test-rel.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/subdir/test-rel.txt b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/subdir/test-rel.txt
index db19a3c..23414b5 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/subdir/test-rel.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/subdir/test-rel.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test-noClasspath.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test-noClasspath.txt b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test-noClasspath.txt
index d18ab0a..131a716 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test-noClasspath.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test-noClasspath.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test1.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test1.txt b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test1.txt
index 06d516f..21cd7c9 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test1.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test1.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld
index 62d5504..111a4e0 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld
index 62d5504..111a4e0 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar/META-INF/foo bar.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar/META-INF/foo bar.tld b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar/META-INF/foo bar.tld
index 3f2e096..4254437 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar/META-INF/foo bar.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar/META-INF/foo bar.tld
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld
index a108fa5..487923e 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[07/50] [abbrv] incubator-freemarker git commit: Un-deprecated
Template constructors with get an "encoding" argument. After all,
they make sense, as it's what <#ftl encoding=...> is checked against.
Posted by dd...@apache.org.
Un-deprecated Template constructors with get an "encoding" argument. After all, they make sense, as it's what <#ftl encoding=...> is checked against.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/e6ec6c46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e6ec6c46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e6ec6c46
Branch: refs/heads/2.3
Commit: e6ec6c46e926f8c89647d4475773a7ce49290dfe
Parents: 23852f0
Author: ddekany <dd...@apache.org>
Authored: Sun Feb 5 19:15:54 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Feb 5 19:15:54 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/template/Template.java | 25 +++++++-------------
1 file changed, 9 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e6ec6c46/src/main/java/freemarker/template/Template.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/Template.java b/src/main/java/freemarker/template/Template.java
index 51095e5..5b19a33 100644
--- a/src/main/java/freemarker/template/Template.java
+++ b/src/main/java/freemarker/template/Template.java
@@ -136,11 +136,7 @@ public class Template extends Configurable {
/**
* Convenience constructor for {@link #Template(String, String, Reader, Configuration, String) Template(name, null,
* reader, cfg, encoding)}.
- *
- * @deprecated In most applications, use {@link #Template(String, Reader, Configuration)} instead, which doesn't
- * specify the encoding.
*/
- @Deprecated
public Template(String name, Reader reader, Configuration cfg, String encoding) throws IOException {
this(name, null, reader, cfg, encoding);
}
@@ -186,20 +182,17 @@ public class Template extends Configurable {
* recommended).
*
* @param encoding
- * This is the encoding that we are supposed to be using. But it's not really necessary because we have a
- * {@link Reader} which is already decoded, but it's kept as meta-info. It also has an impact when
- * {@code #include}-ing/{@code #import}-ing another template from this template, as its default encoding
- * will be this. But this behavior of said directives is considered to be harmful, and will be probably
- * phased out. Until that, it's better to leave this on {@code null}, so that the encoding will come from
- * the {@link Configuration}. Note that if this is non-{@code null} and there's an {@code #ftl} header
- * with encoding, they must match, or else a {@link WrongEncodingException} is thrown.
- *
- * @deprecated In most applications, use {@link #Template(String, String, Reader, Configuration)} instead, which
- * doesn't specify the encoding.
- *
+ * This is the encoding that we are supposed to be using. At the first glance it's unnecessary because we
+ * already have a {@link Reader} (so decoding with the charset has already happened), however, if this is
+ * non-{@code null} and there's an {@code #ftl} header with {@code encoding} parameter, they must match,
+ * or else a {@link WrongEncodingException} is thrown. Thus, it should be set if to decode the template,
+ * we were using an encoding (a charset), otherwise it should be {@code null}. It's also kept as
+ * meta-info (returned by {@link #getEncoding()}). It also has an impact when {@code #include}-ing or
+ * {@code #import}-ing another template from this template, as its default encoding will be this. But
+ * this behavior of said directives is considered to be harmful, and will be probably phased out.
+ *
* @since 2.3.22
*/
- @Deprecated
public Template(
String name, String sourceName, Reader reader, Configuration cfg, String encoding) throws IOException {
this(name, sourceName, reader, cfg, null, encoding);
[08/50] [abbrv] incubator-freemarker git commit:
TemplateConfiguration.getXxx has thrown NPE instead of the more helpful
IllegalStateException when the parent Configuration wasn't yet set.
Posted by dd...@apache.org.
TemplateConfiguration.getXxx has thrown NPE instead of the more helpful IllegalStateException when the parent Configuration wasn't yet set.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d661acc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d661acc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d661acc3
Branch: refs/heads/2.3
Commit: d661acc3797f9e4b70f9de194bcdbff71d89f0e9
Parents: e6ec6c4
Author: ddekany <dd...@apache.org>
Authored: Sun Feb 5 19:17:21 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Feb 5 19:17:21 2017 +0100
----------------------------------------------------------------------
.../freemarker/core/TemplateConfiguration.java | 32 +++++++++++---------
1 file changed, 18 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d661acc3/src/main/java/freemarker/core/TemplateConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateConfiguration.java b/src/main/java/freemarker/core/TemplateConfiguration.java
index fe1062a..804446b 100644
--- a/src/main/java/freemarker/core/TemplateConfiguration.java
+++ b/src/main/java/freemarker/core/TemplateConfiguration.java
@@ -49,7 +49,7 @@ import freemarker.template.utility.NullArgumentException;
* <p>
* Note that the result value of the reader methods (getter and "is" methods) is usually not useful unless the value of
* that setting was already set on this object. Otherwise you will get the value from the parent {@link Configuration},
- * which is {@link Configuration#getDefaultConfiguration()} before this object is associated to a {@link Configuration}.
+ * or an {@link IllegalStateException} before this object is associated to a {@link Configuration}.
*
* <p>
* If you are using this class for your own template loading and caching solution, rather than with the standard one,
@@ -147,6 +147,11 @@ public final class TemplateConfiguration extends Configurable implements ParserC
public Configuration getParentConfiguration() {
return parentConfigurationSet ? (Configuration) getParent() : null;
}
+
+ private Configuration getNonNullParentConfiguration() {
+ checkParentConfigurationSet();
+ return (Configuration) getParent();
+ }
/**
* Set all settings in this {@link TemplateConfiguration} that were set in the parameter
@@ -278,8 +283,7 @@ public final class TemplateConfiguration extends Configurable implements ParserC
* If the parent configuration wasn't yet set.
*/
public void apply(Template template) {
- checkParentConfigurationSet();
- Configuration cfg = getParentConfiguration();
+ Configuration cfg = getNonNullParentConfiguration();
if (template.getConfiguration() != cfg) {
// This is actually not a problem right now, but for future BC we enforce this.
throw new IllegalArgumentException(
@@ -386,7 +390,7 @@ public final class TemplateConfiguration extends Configurable implements ParserC
* The getter pair of {@link #setTagSyntax(int)}.
*/
public int getTagSyntax() {
- return tagSyntax != null ? tagSyntax.intValue() : getParentConfiguration().getTagSyntax();
+ return tagSyntax != null ? tagSyntax.intValue() : getNonNullParentConfiguration().getTagSyntax();
}
/**
@@ -408,7 +412,8 @@ public final class TemplateConfiguration extends Configurable implements ParserC
* The getter pair of {@link #setNamingConvention(int)}.
*/
public int getNamingConvention() {
- return namingConvention != null ? namingConvention.intValue() : getParentConfiguration().getNamingConvention();
+ return namingConvention != null ? namingConvention.intValue()
+ : getNonNullParentConfiguration().getNamingConvention();
}
/**
@@ -430,7 +435,7 @@ public final class TemplateConfiguration extends Configurable implements ParserC
*/
public boolean getWhitespaceStripping() {
return whitespaceStripping != null ? whitespaceStripping.booleanValue()
- : getParentConfiguration().getWhitespaceStripping();
+ : getNonNullParentConfiguration().getWhitespaceStripping();
}
/**
@@ -453,7 +458,7 @@ public final class TemplateConfiguration extends Configurable implements ParserC
*/
public int getAutoEscapingPolicy() {
return autoEscapingPolicy != null ? autoEscapingPolicy.intValue()
- : getParentConfiguration().getAutoEscapingPolicy();
+ : getNonNullParentConfiguration().getAutoEscapingPolicy();
}
/**
@@ -475,7 +480,7 @@ public final class TemplateConfiguration extends Configurable implements ParserC
* The getter pair of {@link #setOutputFormat(OutputFormat)}.
*/
public OutputFormat getOutputFormat() {
- return outputFormat != null ? outputFormat : getParentConfiguration().getOutputFormat();
+ return outputFormat != null ? outputFormat : getNonNullParentConfiguration().getOutputFormat();
}
/**
@@ -497,7 +502,7 @@ public final class TemplateConfiguration extends Configurable implements ParserC
*/
public boolean getRecognizeStandardFileExtensions() {
return recognizeStandardFileExtensions != null ? recognizeStandardFileExtensions.booleanValue()
- : getParentConfiguration().getRecognizeStandardFileExtensions();
+ : getNonNullParentConfiguration().getRecognizeStandardFileExtensions();
}
/**
@@ -519,7 +524,7 @@ public final class TemplateConfiguration extends Configurable implements ParserC
*/
public boolean getStrictSyntaxMode() {
return strictSyntaxMode != null ? strictSyntaxMode.booleanValue()
- : getParentConfiguration().getStrictSyntaxMode();
+ : getNonNullParentConfiguration().getStrictSyntaxMode();
}
/**
@@ -536,7 +541,7 @@ public final class TemplateConfiguration extends Configurable implements ParserC
}
public String getEncoding() {
- return encoding != null ? encoding : getParentConfiguration().getDefaultEncoding();
+ return encoding != null ? encoding : getNonNullParentConfiguration().getDefaultEncoding();
}
/**
@@ -577,7 +582,7 @@ public final class TemplateConfiguration extends Configurable implements ParserC
*/
public int getTabSize() {
return tabSize != null ? tabSize.intValue()
- : getParentConfiguration().getTabSize();
+ : getNonNullParentConfiguration().getTabSize();
}
/**
@@ -597,8 +602,7 @@ public final class TemplateConfiguration extends Configurable implements ParserC
* If the parent configuration wasn't yet set.
*/
public Version getIncompatibleImprovements() {
- checkParentConfigurationSet();
- return getParentConfiguration().getIncompatibleImprovements();
+ return getNonNullParentConfiguration().getIncompatibleImprovements();
}
private void checkParentConfigurationSet() {
[35/50] [abbrv] incubator-freemarker git commit: (Manual typo)
Posted by dd...@apache.org.
(Manual typo)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/2a396462
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/2a396462
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/2a396462
Branch: refs/heads/2.3
Commit: 2a396462574548452dd7376cad07573a8064812b
Parents: 973ea4c
Author: ddekany <dd...@apache.org>
Authored: Wed Mar 1 14:51:27 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Mar 1 14:51:27 2017 +0100
----------------------------------------------------------------------
src/manual/en_US/book.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2a396462/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 2e9015b..59282bb 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26834,8 +26834,8 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
</listitem>
<listitem>
- <para><literal>MultiTemplateLoader</literal>, when it's in
- sticky mode (the default), and the
+ <para>Bug fixed: <literal>MultiTemplateLoader</literal>, when
+ it's in sticky mode (the default), and the
<literal>TemplateLoader</literal> that was successfully used for
a given name last time doesn't find the template now (let's call
it the sticked <literal>TemplateLoader</literal>), and thus
[46/50] [abbrv] incubator-freemarker git commit: Changing copyright
header format to be identical to IntelliJ generated copyright headers
Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateElementsToVisit.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateElementsToVisit.java b/src/main/java/freemarker/core/TemplateElementsToVisit.java
index 0b96988..8f449e6 100644
--- a/src/main/java/freemarker/core/TemplateElementsToVisit.java
+++ b/src/main/java/freemarker/core/TemplateElementsToVisit.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateFormatUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateFormatUtil.java b/src/main/java/freemarker/core/TemplateFormatUtil.java
index 034d5cb..d36fa3b 100644
--- a/src/main/java/freemarker/core/TemplateFormatUtil.java
+++ b/src/main/java/freemarker/core/TemplateFormatUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateHTMLOutputModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateHTMLOutputModel.java b/src/main/java/freemarker/core/TemplateHTMLOutputModel.java
index a43a379..2915b05 100644
--- a/src/main/java/freemarker/core/TemplateHTMLOutputModel.java
+++ b/src/main/java/freemarker/core/TemplateHTMLOutputModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateMarkupOutputModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateMarkupOutputModel.java b/src/main/java/freemarker/core/TemplateMarkupOutputModel.java
index 3beead0..7043fba 100644
--- a/src/main/java/freemarker/core/TemplateMarkupOutputModel.java
+++ b/src/main/java/freemarker/core/TemplateMarkupOutputModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateNumberFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateNumberFormat.java b/src/main/java/freemarker/core/TemplateNumberFormat.java
index 759d969..2332575 100644
--- a/src/main/java/freemarker/core/TemplateNumberFormat.java
+++ b/src/main/java/freemarker/core/TemplateNumberFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateNumberFormatFactory.java b/src/main/java/freemarker/core/TemplateNumberFormatFactory.java
index e0d0bc6..cee3478 100644
--- a/src/main/java/freemarker/core/TemplateNumberFormatFactory.java
+++ b/src/main/java/freemarker/core/TemplateNumberFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateObject.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateObject.java b/src/main/java/freemarker/core/TemplateObject.java
index f3f9e05..87ee274 100644
--- a/src/main/java/freemarker/core/TemplateObject.java
+++ b/src/main/java/freemarker/core/TemplateObject.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplatePostProcessor.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplatePostProcessor.java b/src/main/java/freemarker/core/TemplatePostProcessor.java
index cadb90b..0b1297e 100644
--- a/src/main/java/freemarker/core/TemplatePostProcessor.java
+++ b/src/main/java/freemarker/core/TemplatePostProcessor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplatePostProcessorException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplatePostProcessorException.java b/src/main/java/freemarker/core/TemplatePostProcessorException.java
index 7ac9da4..caadfa9 100644
--- a/src/main/java/freemarker/core/TemplatePostProcessorException.java
+++ b/src/main/java/freemarker/core/TemplatePostProcessorException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateRTFOutputModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateRTFOutputModel.java b/src/main/java/freemarker/core/TemplateRTFOutputModel.java
index f2a105d..26d8d5d 100644
--- a/src/main/java/freemarker/core/TemplateRTFOutputModel.java
+++ b/src/main/java/freemarker/core/TemplateRTFOutputModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateValueFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateValueFormat.java b/src/main/java/freemarker/core/TemplateValueFormat.java
index 433f652..f7bcc0e 100644
--- a/src/main/java/freemarker/core/TemplateValueFormat.java
+++ b/src/main/java/freemarker/core/TemplateValueFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateValueFormatException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateValueFormatException.java b/src/main/java/freemarker/core/TemplateValueFormatException.java
index 2e26ee0..9d10d7e 100644
--- a/src/main/java/freemarker/core/TemplateValueFormatException.java
+++ b/src/main/java/freemarker/core/TemplateValueFormatException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateValueFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateValueFormatFactory.java b/src/main/java/freemarker/core/TemplateValueFormatFactory.java
index f57ea26..78a2ae7 100644
--- a/src/main/java/freemarker/core/TemplateValueFormatFactory.java
+++ b/src/main/java/freemarker/core/TemplateValueFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateXHTMLOutputModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateXHTMLOutputModel.java b/src/main/java/freemarker/core/TemplateXHTMLOutputModel.java
index b7564e2..0d36887 100644
--- a/src/main/java/freemarker/core/TemplateXHTMLOutputModel.java
+++ b/src/main/java/freemarker/core/TemplateXHTMLOutputModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateXMLOutputModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateXMLOutputModel.java b/src/main/java/freemarker/core/TemplateXMLOutputModel.java
index be81309..c9bd329 100644
--- a/src/main/java/freemarker/core/TemplateXMLOutputModel.java
+++ b/src/main/java/freemarker/core/TemplateXMLOutputModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TextBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TextBlock.java b/src/main/java/freemarker/core/TextBlock.java
index dce4958..fb343fa 100644
--- a/src/main/java/freemarker/core/TextBlock.java
+++ b/src/main/java/freemarker/core/TextBlock.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java b/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java
index fb9bb6f..84807cc 100644
--- a/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java
+++ b/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TokenMgrError.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TokenMgrError.java b/src/main/java/freemarker/core/TokenMgrError.java
index ae37ae6..a2d8378 100644
--- a/src/main/java/freemarker/core/TokenMgrError.java
+++ b/src/main/java/freemarker/core/TokenMgrError.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TransformBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TransformBlock.java b/src/main/java/freemarker/core/TransformBlock.java
index 5cfddc4..6b78fa8 100644
--- a/src/main/java/freemarker/core/TransformBlock.java
+++ b/src/main/java/freemarker/core/TransformBlock.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TrimInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TrimInstruction.java b/src/main/java/freemarker/core/TrimInstruction.java
index 3e5d536..1279b99 100644
--- a/src/main/java/freemarker/core/TrimInstruction.java
+++ b/src/main/java/freemarker/core/TrimInstruction.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/UnaryPlusMinusExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/UnaryPlusMinusExpression.java b/src/main/java/freemarker/core/UnaryPlusMinusExpression.java
index 8633d7f..dc57c81 100644
--- a/src/main/java/freemarker/core/UnaryPlusMinusExpression.java
+++ b/src/main/java/freemarker/core/UnaryPlusMinusExpression.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/UndefinedCustomFormatException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/UndefinedCustomFormatException.java b/src/main/java/freemarker/core/UndefinedCustomFormatException.java
index 160ae46..04297a8 100644
--- a/src/main/java/freemarker/core/UndefinedCustomFormatException.java
+++ b/src/main/java/freemarker/core/UndefinedCustomFormatException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/UndefinedOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/UndefinedOutputFormat.java b/src/main/java/freemarker/core/UndefinedOutputFormat.java
index 4dce258..47a5c2c 100644
--- a/src/main/java/freemarker/core/UndefinedOutputFormat.java
+++ b/src/main/java/freemarker/core/UndefinedOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/UnexpectedTypeException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/UnexpectedTypeException.java b/src/main/java/freemarker/core/UnexpectedTypeException.java
index 6939b7c..73420e3 100644
--- a/src/main/java/freemarker/core/UnexpectedTypeException.java
+++ b/src/main/java/freemarker/core/UnexpectedTypeException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/UnformattableValueException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/UnformattableValueException.java b/src/main/java/freemarker/core/UnformattableValueException.java
index d769680..bd28960 100644
--- a/src/main/java/freemarker/core/UnformattableValueException.java
+++ b/src/main/java/freemarker/core/UnformattableValueException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/UnifiedCall.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/UnifiedCall.java b/src/main/java/freemarker/core/UnifiedCall.java
index 6608b0a..ee0334d 100644
--- a/src/main/java/freemarker/core/UnifiedCall.java
+++ b/src/main/java/freemarker/core/UnifiedCall.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/UnknownDateTypeFormattingUnsupportedException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/UnknownDateTypeFormattingUnsupportedException.java b/src/main/java/freemarker/core/UnknownDateTypeFormattingUnsupportedException.java
index 84275bd..01a0871 100644
--- a/src/main/java/freemarker/core/UnknownDateTypeFormattingUnsupportedException.java
+++ b/src/main/java/freemarker/core/UnknownDateTypeFormattingUnsupportedException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/UnknownDateTypeParsingUnsupportedException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/UnknownDateTypeParsingUnsupportedException.java b/src/main/java/freemarker/core/UnknownDateTypeParsingUnsupportedException.java
index a8deaf6..e9edf95 100644
--- a/src/main/java/freemarker/core/UnknownDateTypeParsingUnsupportedException.java
+++ b/src/main/java/freemarker/core/UnknownDateTypeParsingUnsupportedException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/UnparsableValueException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/UnparsableValueException.java b/src/main/java/freemarker/core/UnparsableValueException.java
index dab0397..d762967 100644
--- a/src/main/java/freemarker/core/UnparsableValueException.java
+++ b/src/main/java/freemarker/core/UnparsableValueException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/UnregisteredOutputFormatException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/UnregisteredOutputFormatException.java b/src/main/java/freemarker/core/UnregisteredOutputFormatException.java
index e1d5279..3babc53 100644
--- a/src/main/java/freemarker/core/UnregisteredOutputFormatException.java
+++ b/src/main/java/freemarker/core/UnregisteredOutputFormatException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/VisitNode.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/VisitNode.java b/src/main/java/freemarker/core/VisitNode.java
index e116c4a..be80fe2 100644
--- a/src/main/java/freemarker/core/VisitNode.java
+++ b/src/main/java/freemarker/core/VisitNode.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/XHTMLOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/XHTMLOutputFormat.java b/src/main/java/freemarker/core/XHTMLOutputFormat.java
index 432a5ff..d351b57 100644
--- a/src/main/java/freemarker/core/XHTMLOutputFormat.java
+++ b/src/main/java/freemarker/core/XHTMLOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/XMLOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/XMLOutputFormat.java b/src/main/java/freemarker/core/XMLOutputFormat.java
index 90fed02..49ea797 100644
--- a/src/main/java/freemarker/core/XMLOutputFormat.java
+++ b/src/main/java/freemarker/core/XMLOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/XSTemplateDateFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/XSTemplateDateFormat.java b/src/main/java/freemarker/core/XSTemplateDateFormat.java
index 6c1f1d1..d8374d4 100644
--- a/src/main/java/freemarker/core/XSTemplateDateFormat.java
+++ b/src/main/java/freemarker/core/XSTemplateDateFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/XSTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/XSTemplateDateFormatFactory.java b/src/main/java/freemarker/core/XSTemplateDateFormatFactory.java
index b273a4d..9c4e583 100644
--- a/src/main/java/freemarker/core/XSTemplateDateFormatFactory.java
+++ b/src/main/java/freemarker/core/XSTemplateDateFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_ArrayEnumeration.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_ArrayEnumeration.java b/src/main/java/freemarker/core/_ArrayEnumeration.java
index d8558be..6bb57ba 100644
--- a/src/main/java/freemarker/core/_ArrayEnumeration.java
+++ b/src/main/java/freemarker/core/_ArrayEnumeration.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_ArrayIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_ArrayIterator.java b/src/main/java/freemarker/core/_ArrayIterator.java
index 93b2c50..4e5a4f6 100644
--- a/src/main/java/freemarker/core/_ArrayIterator.java
+++ b/src/main/java/freemarker/core/_ArrayIterator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_CoreAPI.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_CoreAPI.java b/src/main/java/freemarker/core/_CoreAPI.java
index a363c23..66442da 100644
--- a/src/main/java/freemarker/core/_CoreAPI.java
+++ b/src/main/java/freemarker/core/_CoreAPI.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_CoreLocaleUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_CoreLocaleUtils.java b/src/main/java/freemarker/core/_CoreLocaleUtils.java
index 6ddbe9c..1113af9 100644
--- a/src/main/java/freemarker/core/_CoreLocaleUtils.java
+++ b/src/main/java/freemarker/core/_CoreLocaleUtils.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_CoreStringUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_CoreStringUtils.java b/src/main/java/freemarker/core/_CoreStringUtils.java
index 5e49504..e545d7c 100644
--- a/src/main/java/freemarker/core/_CoreStringUtils.java
+++ b/src/main/java/freemarker/core/_CoreStringUtils.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_DelayedAOrAn.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_DelayedAOrAn.java b/src/main/java/freemarker/core/_DelayedAOrAn.java
index 63e6c59..21bc896 100644
--- a/src/main/java/freemarker/core/_DelayedAOrAn.java
+++ b/src/main/java/freemarker/core/_DelayedAOrAn.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_DelayedConversionToString.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_DelayedConversionToString.java b/src/main/java/freemarker/core/_DelayedConversionToString.java
index 054de9b..a705c01 100644
--- a/src/main/java/freemarker/core/_DelayedConversionToString.java
+++ b/src/main/java/freemarker/core/_DelayedConversionToString.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_DelayedFTLTypeDescription.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_DelayedFTLTypeDescription.java b/src/main/java/freemarker/core/_DelayedFTLTypeDescription.java
index e2a877c..93d8713 100644
--- a/src/main/java/freemarker/core/_DelayedFTLTypeDescription.java
+++ b/src/main/java/freemarker/core/_DelayedFTLTypeDescription.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_DelayedGetCanonicalForm.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_DelayedGetCanonicalForm.java b/src/main/java/freemarker/core/_DelayedGetCanonicalForm.java
index 45cd258..2f070f5 100644
--- a/src/main/java/freemarker/core/_DelayedGetCanonicalForm.java
+++ b/src/main/java/freemarker/core/_DelayedGetCanonicalForm.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_DelayedGetMessage.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_DelayedGetMessage.java b/src/main/java/freemarker/core/_DelayedGetMessage.java
index 41d0797..ed2fe56 100644
--- a/src/main/java/freemarker/core/_DelayedGetMessage.java
+++ b/src/main/java/freemarker/core/_DelayedGetMessage.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_DelayedGetMessageWithoutStackTop.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_DelayedGetMessageWithoutStackTop.java b/src/main/java/freemarker/core/_DelayedGetMessageWithoutStackTop.java
index 6f42348..56111d0 100644
--- a/src/main/java/freemarker/core/_DelayedGetMessageWithoutStackTop.java
+++ b/src/main/java/freemarker/core/_DelayedGetMessageWithoutStackTop.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_DelayedJQuote.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_DelayedJQuote.java b/src/main/java/freemarker/core/_DelayedJQuote.java
index 61597f2..7dfef58 100644
--- a/src/main/java/freemarker/core/_DelayedJQuote.java
+++ b/src/main/java/freemarker/core/_DelayedJQuote.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_DelayedJoinWithComma.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_DelayedJoinWithComma.java b/src/main/java/freemarker/core/_DelayedJoinWithComma.java
index bb82978..68ce8b9 100644
--- a/src/main/java/freemarker/core/_DelayedJoinWithComma.java
+++ b/src/main/java/freemarker/core/_DelayedJoinWithComma.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_DelayedOrdinal.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_DelayedOrdinal.java b/src/main/java/freemarker/core/_DelayedOrdinal.java
index f973960..7847b15 100644
--- a/src/main/java/freemarker/core/_DelayedOrdinal.java
+++ b/src/main/java/freemarker/core/_DelayedOrdinal.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_DelayedShortClassName.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_DelayedShortClassName.java b/src/main/java/freemarker/core/_DelayedShortClassName.java
index d58c9f5..6df50dc 100644
--- a/src/main/java/freemarker/core/_DelayedShortClassName.java
+++ b/src/main/java/freemarker/core/_DelayedShortClassName.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_DelayedToString.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_DelayedToString.java b/src/main/java/freemarker/core/_DelayedToString.java
index 8d573e6..1d18fc7 100644
--- a/src/main/java/freemarker/core/_DelayedToString.java
+++ b/src/main/java/freemarker/core/_DelayedToString.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_ErrorDescriptionBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_ErrorDescriptionBuilder.java b/src/main/java/freemarker/core/_ErrorDescriptionBuilder.java
index 9249f20..8c7563d 100644
--- a/src/main/java/freemarker/core/_ErrorDescriptionBuilder.java
+++ b/src/main/java/freemarker/core/_ErrorDescriptionBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_Java6.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_Java6.java b/src/main/java/freemarker/core/_Java6.java
index 8a49389..cd03fb2 100644
--- a/src/main/java/freemarker/core/_Java6.java
+++ b/src/main/java/freemarker/core/_Java6.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_Java6Impl.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_Java6Impl.java b/src/main/java/freemarker/core/_Java6Impl.java
index ba2b21c..05c1258 100644
--- a/src/main/java/freemarker/core/_Java6Impl.java
+++ b/src/main/java/freemarker/core/_Java6Impl.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_JavaVersions.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_JavaVersions.java b/src/main/java/freemarker/core/_JavaVersions.java
index 244862d..1101752 100644
--- a/src/main/java/freemarker/core/_JavaVersions.java
+++ b/src/main/java/freemarker/core/_JavaVersions.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_MiscTemplateException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_MiscTemplateException.java b/src/main/java/freemarker/core/_MiscTemplateException.java
index 24d7a86..a9550d7 100644
--- a/src/main/java/freemarker/core/_MiscTemplateException.java
+++ b/src/main/java/freemarker/core/_MiscTemplateException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluationException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluationException.java b/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluationException.java
index 64891d0..e262721 100644
--- a/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluationException.java
+++ b/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluationException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java b/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java
index afbb436..ed0849d 100644
--- a/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java
+++ b/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_ParserConfigurationWithInheritedFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_ParserConfigurationWithInheritedFormat.java b/src/main/java/freemarker/core/_ParserConfigurationWithInheritedFormat.java
index 8248b5c..8524d62 100644
--- a/src/main/java/freemarker/core/_ParserConfigurationWithInheritedFormat.java
+++ b/src/main/java/freemarker/core/_ParserConfigurationWithInheritedFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_SettingEvaluationEnvironment.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_SettingEvaluationEnvironment.java b/src/main/java/freemarker/core/_SettingEvaluationEnvironment.java
index ff4184b..88a4abf 100644
--- a/src/main/java/freemarker/core/_SettingEvaluationEnvironment.java
+++ b/src/main/java/freemarker/core/_SettingEvaluationEnvironment.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_SortedArraySet.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_SortedArraySet.java b/src/main/java/freemarker/core/_SortedArraySet.java
index b0a85f0..4016eb8 100644
--- a/src/main/java/freemarker/core/_SortedArraySet.java
+++ b/src/main/java/freemarker/core/_SortedArraySet.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_TemplateModelException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_TemplateModelException.java b/src/main/java/freemarker/core/_TemplateModelException.java
index d4e70e5..b6c969e 100644
--- a/src/main/java/freemarker/core/_TemplateModelException.java
+++ b/src/main/java/freemarker/core/_TemplateModelException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_TimeZoneBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_TimeZoneBuilder.java b/src/main/java/freemarker/core/_TimeZoneBuilder.java
index 329ab85..4c77612 100644
--- a/src/main/java/freemarker/core/_TimeZoneBuilder.java
+++ b/src/main/java/freemarker/core/_TimeZoneBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_UnexpectedTypeErrorExplainerTemplateModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_UnexpectedTypeErrorExplainerTemplateModel.java b/src/main/java/freemarker/core/_UnexpectedTypeErrorExplainerTemplateModel.java
index 7888e00..18e8f07 100644
--- a/src/main/java/freemarker/core/_UnexpectedTypeErrorExplainerTemplateModel.java
+++ b/src/main/java/freemarker/core/_UnexpectedTypeErrorExplainerTemplateModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_UnmodifiableCompositeSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_UnmodifiableCompositeSet.java b/src/main/java/freemarker/core/_UnmodifiableCompositeSet.java
index 017e41a..da98830 100644
--- a/src/main/java/freemarker/core/_UnmodifiableCompositeSet.java
+++ b/src/main/java/freemarker/core/_UnmodifiableCompositeSet.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/_UnmodifiableSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_UnmodifiableSet.java b/src/main/java/freemarker/core/_UnmodifiableSet.java
index 901e5d0..8c98482 100644
--- a/src/main/java/freemarker/core/_UnmodifiableSet.java
+++ b/src/main/java/freemarker/core/_UnmodifiableSet.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/package.html b/src/main/java/freemarker/core/package.html
index 15c389f..a7e85b8 100644
--- a/src/main/java/freemarker/core/package.html
+++ b/src/main/java/freemarker/core/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/Breakpoint.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/Breakpoint.java b/src/main/java/freemarker/debug/Breakpoint.java
index 499efd1..8766500 100644
--- a/src/main/java/freemarker/debug/Breakpoint.java
+++ b/src/main/java/freemarker/debug/Breakpoint.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/DebugModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/DebugModel.java b/src/main/java/freemarker/debug/DebugModel.java
index fb168d4..e906fdf 100644
--- a/src/main/java/freemarker/debug/DebugModel.java
+++ b/src/main/java/freemarker/debug/DebugModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/DebuggedEnvironment.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/DebuggedEnvironment.java b/src/main/java/freemarker/debug/DebuggedEnvironment.java
index 6d0ae8f..6000c8a 100644
--- a/src/main/java/freemarker/debug/DebuggedEnvironment.java
+++ b/src/main/java/freemarker/debug/DebuggedEnvironment.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/Debugger.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/Debugger.java b/src/main/java/freemarker/debug/Debugger.java
index 827d1c8..464d8e4 100644
--- a/src/main/java/freemarker/debug/Debugger.java
+++ b/src/main/java/freemarker/debug/Debugger.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/DebuggerClient.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/DebuggerClient.java b/src/main/java/freemarker/debug/DebuggerClient.java
index 8633ca4..1433881 100644
--- a/src/main/java/freemarker/debug/DebuggerClient.java
+++ b/src/main/java/freemarker/debug/DebuggerClient.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/DebuggerListener.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/DebuggerListener.java b/src/main/java/freemarker/debug/DebuggerListener.java
index 28b1e25..2a7e014 100644
--- a/src/main/java/freemarker/debug/DebuggerListener.java
+++ b/src/main/java/freemarker/debug/DebuggerListener.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/EnvironmentSuspendedEvent.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/EnvironmentSuspendedEvent.java b/src/main/java/freemarker/debug/EnvironmentSuspendedEvent.java
index 916e011..3b080ab 100644
--- a/src/main/java/freemarker/debug/EnvironmentSuspendedEvent.java
+++ b/src/main/java/freemarker/debug/EnvironmentSuspendedEvent.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/impl/DebuggerServer.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/impl/DebuggerServer.java b/src/main/java/freemarker/debug/impl/DebuggerServer.java
index fc6f777..c98715a 100644
--- a/src/main/java/freemarker/debug/impl/DebuggerServer.java
+++ b/src/main/java/freemarker/debug/impl/DebuggerServer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/impl/DebuggerService.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/impl/DebuggerService.java b/src/main/java/freemarker/debug/impl/DebuggerService.java
index d51d7b1..5ba0c40 100644
--- a/src/main/java/freemarker/debug/impl/DebuggerService.java
+++ b/src/main/java/freemarker/debug/impl/DebuggerService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/impl/RmiDebugModelImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/impl/RmiDebugModelImpl.java b/src/main/java/freemarker/debug/impl/RmiDebugModelImpl.java
index 6bc84d5..dd009b2 100644
--- a/src/main/java/freemarker/debug/impl/RmiDebugModelImpl.java
+++ b/src/main/java/freemarker/debug/impl/RmiDebugModelImpl.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/impl/RmiDebuggedEnvironmentImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/impl/RmiDebuggedEnvironmentImpl.java b/src/main/java/freemarker/debug/impl/RmiDebuggedEnvironmentImpl.java
index ec6e5a4..d80bedf 100644
--- a/src/main/java/freemarker/debug/impl/RmiDebuggedEnvironmentImpl.java
+++ b/src/main/java/freemarker/debug/impl/RmiDebuggedEnvironmentImpl.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/impl/RmiDebuggerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/impl/RmiDebuggerImpl.java b/src/main/java/freemarker/debug/impl/RmiDebuggerImpl.java
index 61a5e14..48d9848 100644
--- a/src/main/java/freemarker/debug/impl/RmiDebuggerImpl.java
+++ b/src/main/java/freemarker/debug/impl/RmiDebuggerImpl.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/impl/RmiDebuggerListenerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/impl/RmiDebuggerListenerImpl.java b/src/main/java/freemarker/debug/impl/RmiDebuggerListenerImpl.java
index dcb5cd1..eb3041e 100644
--- a/src/main/java/freemarker/debug/impl/RmiDebuggerListenerImpl.java
+++ b/src/main/java/freemarker/debug/impl/RmiDebuggerListenerImpl.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/impl/RmiDebuggerService.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/impl/RmiDebuggerService.java b/src/main/java/freemarker/debug/impl/RmiDebuggerService.java
index 25d1b2e..d889af5 100644
--- a/src/main/java/freemarker/debug/impl/RmiDebuggerService.java
+++ b/src/main/java/freemarker/debug/impl/RmiDebuggerService.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/debug/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/package.html b/src/main/java/freemarker/debug/package.html
index bc8bb81..677b842 100644
--- a/src/main/java/freemarker/debug/package.html
+++ b/src/main/java/freemarker/debug/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/ant/FreemarkerXmlTask.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/ant/FreemarkerXmlTask.java b/src/main/java/freemarker/ext/ant/FreemarkerXmlTask.java
index 96b755a..59fed7b 100644
--- a/src/main/java/freemarker/ext/ant/FreemarkerXmlTask.java
+++ b/src/main/java/freemarker/ext/ant/FreemarkerXmlTask.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/ant/JythonAntTask.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/ant/JythonAntTask.java b/src/main/java/freemarker/ext/ant/JythonAntTask.java
index 3308b71..662f6e6 100644
--- a/src/main/java/freemarker/ext/ant/JythonAntTask.java
+++ b/src/main/java/freemarker/ext/ant/JythonAntTask.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/ant/UnlinkedJythonOperations.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/ant/UnlinkedJythonOperations.java b/src/main/java/freemarker/ext/ant/UnlinkedJythonOperations.java
index 7113482..b506b7a 100644
--- a/src/main/java/freemarker/ext/ant/UnlinkedJythonOperations.java
+++ b/src/main/java/freemarker/ext/ant/UnlinkedJythonOperations.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/ant/UnlinkedJythonOperationsImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/ant/UnlinkedJythonOperationsImpl.java b/src/main/java/freemarker/ext/ant/UnlinkedJythonOperationsImpl.java
index b586716..71a9a48 100644
--- a/src/main/java/freemarker/ext/ant/UnlinkedJythonOperationsImpl.java
+++ b/src/main/java/freemarker/ext/ant/UnlinkedJythonOperationsImpl.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/ant/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/ant/package.html b/src/main/java/freemarker/ext/ant/package.html
index 16d3343..c310f65 100644
--- a/src/main/java/freemarker/ext/ant/package.html
+++ b/src/main/java/freemarker/ext/ant/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/APIModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/APIModel.java b/src/main/java/freemarker/ext/beans/APIModel.java
index 83c4121..4580ac8 100644
--- a/src/main/java/freemarker/ext/beans/APIModel.java
+++ b/src/main/java/freemarker/ext/beans/APIModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/ArgumentTypes.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/ArgumentTypes.java b/src/main/java/freemarker/ext/beans/ArgumentTypes.java
index e383259..506f4d0 100644
--- a/src/main/java/freemarker/ext/beans/ArgumentTypes.java
+++ b/src/main/java/freemarker/ext/beans/ArgumentTypes.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/ArrayModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/ArrayModel.java b/src/main/java/freemarker/ext/beans/ArrayModel.java
index 5884c9a..fc92e22 100644
--- a/src/main/java/freemarker/ext/beans/ArrayModel.java
+++ b/src/main/java/freemarker/ext/beans/ArrayModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/BeanModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/BeanModel.java b/src/main/java/freemarker/ext/beans/BeanModel.java
index 24f8590..f9b56c7 100644
--- a/src/main/java/freemarker/ext/beans/BeanModel.java
+++ b/src/main/java/freemarker/ext/beans/BeanModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/BeansModelCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/BeansModelCache.java b/src/main/java/freemarker/ext/beans/BeansModelCache.java
index 659fe1b..7cf18e9 100644
--- a/src/main/java/freemarker/ext/beans/BeansModelCache.java
+++ b/src/main/java/freemarker/ext/beans/BeansModelCache.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/BeansWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/BeansWrapper.java b/src/main/java/freemarker/ext/beans/BeansWrapper.java
index 372dc5a..a9a3cbe 100644
--- a/src/main/java/freemarker/ext/beans/BeansWrapper.java
+++ b/src/main/java/freemarker/ext/beans/BeansWrapper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/BeansWrapperBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/BeansWrapperBuilder.java b/src/main/java/freemarker/ext/beans/BeansWrapperBuilder.java
index f8cb545..047a9dd 100644
--- a/src/main/java/freemarker/ext/beans/BeansWrapperBuilder.java
+++ b/src/main/java/freemarker/ext/beans/BeansWrapperBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/BeansWrapperConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/BeansWrapperConfiguration.java b/src/main/java/freemarker/ext/beans/BeansWrapperConfiguration.java
index 1216fb6..d80a812 100644
--- a/src/main/java/freemarker/ext/beans/BeansWrapperConfiguration.java
+++ b/src/main/java/freemarker/ext/beans/BeansWrapperConfiguration.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[23/50] [abbrv] incubator-freemarker git commit: (Renamed some
internal classes and variables)
Posted by dd...@apache.org.
(Renamed some internal classes and variables)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/b5148ee3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b5148ee3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b5148ee3
Branch: refs/heads/2.3
Commit: b5148ee3af2b052407ae51f41f23ed893ab07c93
Parents: 1b94c28
Author: ddekany <dd...@apache.org>
Authored: Wed Feb 22 09:05:10 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Feb 23 12:45:22 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/core/BuiltIn.java | 8 +-
.../core/BuiltInsForExistenceHandling.java | 132 +++++++++++++++++++
.../java/freemarker/core/ExistenceBuiltins.java | 132 -------------------
.../java/freemarker/core/TemplateElement.java | 38 +++---
...nterruptionSupportTemplatePostProcessor.java | 4 +-
src/test/java/freemarker/core/ASTPrinter.java | 22 ++--
6 files changed, 168 insertions(+), 168 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b5148ee3/src/main/java/freemarker/core/BuiltIn.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltIn.java b/src/main/java/freemarker/core/BuiltIn.java
index fbe0842..99be0b8 100644
--- a/src/main/java/freemarker/core/BuiltIn.java
+++ b/src/main/java/freemarker/core/BuiltIn.java
@@ -105,14 +105,14 @@ abstract class BuiltIn extends Expression implements Cloneable {
putBI("date_if_unknown", "dateIfUnknown", new BuiltInsForDates.dateType_if_unknownBI(TemplateDateModel.DATE));
putBI("datetime", new BuiltInsForMultipleTypes.dateBI(TemplateDateModel.DATETIME));
putBI("datetime_if_unknown", "datetimeIfUnknown", new BuiltInsForDates.dateType_if_unknownBI(TemplateDateModel.DATETIME));
- putBI("default", new ExistenceBuiltins.defaultBI());
+ putBI("default", new BuiltInsForExistenceHandling.defaultBI());
putBI("double", new doubleBI());
putBI("ends_with", "endsWith", new BuiltInsForStringsBasic.ends_withBI());
putBI("ensure_ends_with", "ensureEndsWith", new BuiltInsForStringsBasic.ensure_ends_withBI());
putBI("ensure_starts_with", "ensureStartsWith", new BuiltInsForStringsBasic.ensure_starts_withBI());
putBI("esc", new escBI());
putBI("eval", new evalBI());
- putBI("exists", new ExistenceBuiltins.existsBI());
+ putBI("exists", new BuiltInsForExistenceHandling.existsBI());
putBI("first", new firstBI());
putBI("float", new floatBI());
putBI("floor", new floorBI());
@@ -120,10 +120,10 @@ abstract class BuiltIn extends Expression implements Cloneable {
putBI("counter", new BuiltInsForLoopVariables.counterBI());
putBI("item_cycle", "itemCycle", new BuiltInsForLoopVariables.item_cycleBI());
putBI("has_api", "hasApi", new BuiltInsForMultipleTypes.has_apiBI());
- putBI("has_content", "hasContent", new ExistenceBuiltins.has_contentBI());
+ putBI("has_content", "hasContent", new BuiltInsForExistenceHandling.has_contentBI());
putBI("has_next", "hasNext", new BuiltInsForLoopVariables.has_nextBI());
putBI("html", new BuiltInsForStringsEncoding.htmlBI());
- putBI("if_exists", "ifExists", new ExistenceBuiltins.if_existsBI());
+ putBI("if_exists", "ifExists", new BuiltInsForExistenceHandling.if_existsBI());
putBI("index", new BuiltInsForLoopVariables.indexBI());
putBI("index_of", "indexOf", new BuiltInsForStringsBasic.index_ofBI(false));
putBI("int", new intBI());
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b5148ee3/src/main/java/freemarker/core/BuiltInsForExistenceHandling.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForExistenceHandling.java b/src/main/java/freemarker/core/BuiltInsForExistenceHandling.java
new file mode 100644
index 0000000..7b1ba3e
--- /dev/null
+++ b/src/main/java/freemarker/core/BuiltInsForExistenceHandling.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package freemarker.core;
+
+import java.util.List;
+
+import freemarker.template.TemplateBooleanModel;
+import freemarker.template.TemplateException;
+import freemarker.template.TemplateMethodModelEx;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
+
+/**
+ * A holder for builtins that deal with null left-hand values.
+ */
+class BuiltInsForExistenceHandling {
+
+ // Can't be instantiated
+ private BuiltInsForExistenceHandling() { }
+
+ private static abstract class ExistenceBuiltIn extends BuiltIn {
+
+ protected TemplateModel evalMaybeNonexistentTarget(Environment env) throws TemplateException {
+ TemplateModel tm;
+ if (target instanceof ParentheticalExpression) {
+ boolean lastFIRE = env.setFastInvalidReferenceExceptions(true);
+ try {
+ tm = target.eval(env);
+ } catch (InvalidReferenceException ire) {
+ tm = null;
+ } finally {
+ env.setFastInvalidReferenceExceptions(lastFIRE);
+ }
+ } else {
+ tm = target.eval(env);
+ }
+ return tm;
+ }
+
+ }
+
+ static class defaultBI extends BuiltInsForExistenceHandling.ExistenceBuiltIn {
+
+ @Override
+ TemplateModel _eval(final Environment env) throws TemplateException {
+ TemplateModel model = evalMaybeNonexistentTarget(env);
+ return model == null ? FIRST_NON_NULL_METHOD : new ConstantMethod(model);
+ }
+
+ private static class ConstantMethod implements TemplateMethodModelEx {
+ private final TemplateModel constant;
+
+ ConstantMethod(TemplateModel constant) {
+ this.constant = constant;
+ }
+
+ public Object exec(List args) {
+ return constant;
+ }
+ }
+
+ /**
+ * A method that goes through the arguments one by one and returns
+ * the first one that is non-null. If all args are null, returns null.
+ */
+ private static final TemplateMethodModelEx FIRST_NON_NULL_METHOD =
+ new TemplateMethodModelEx() {
+ public Object exec(List args) throws TemplateModelException {
+ int argCnt = args.size();
+ if (argCnt == 0) throw MessageUtil.newArgCntError("?default", argCnt, 1, Integer.MAX_VALUE);
+ for (int i = 0; i < argCnt; i++ ) {
+ TemplateModel result = (TemplateModel) args.get(i);
+ if (result != null) return result;
+ }
+ return null;
+ }
+ };
+ }
+
+ static class existsBI extends BuiltInsForExistenceHandling.ExistenceBuiltIn {
+ @Override
+ TemplateModel _eval(Environment env) throws TemplateException {
+ return evalMaybeNonexistentTarget(env) == null ? TemplateBooleanModel.FALSE : TemplateBooleanModel.TRUE;
+ }
+
+ @Override
+ boolean evalToBoolean(Environment env) throws TemplateException {
+ return _eval(env) == TemplateBooleanModel.TRUE;
+ }
+ }
+
+ static class has_contentBI extends BuiltInsForExistenceHandling.ExistenceBuiltIn {
+ @Override
+ TemplateModel _eval(Environment env) throws TemplateException {
+ return Expression.isEmpty(evalMaybeNonexistentTarget(env))
+ ? TemplateBooleanModel.FALSE
+ : TemplateBooleanModel.TRUE;
+ }
+
+ @Override
+ boolean evalToBoolean(Environment env) throws TemplateException {
+ return _eval(env) == TemplateBooleanModel.TRUE;
+ }
+ }
+
+ static class if_existsBI extends BuiltInsForExistenceHandling.ExistenceBuiltIn {
+ @Override
+ TemplateModel _eval(Environment env)
+ throws TemplateException {
+ TemplateModel model = evalMaybeNonexistentTarget(env);
+ return model == null ? TemplateModel.NOTHING : model;
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b5148ee3/src/main/java/freemarker/core/ExistenceBuiltins.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ExistenceBuiltins.java b/src/main/java/freemarker/core/ExistenceBuiltins.java
deleted file mode 100644
index ecc85f7..0000000
--- a/src/main/java/freemarker/core/ExistenceBuiltins.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package freemarker.core;
-
-import java.util.List;
-
-import freemarker.template.TemplateBooleanModel;
-import freemarker.template.TemplateException;
-import freemarker.template.TemplateMethodModelEx;
-import freemarker.template.TemplateModel;
-import freemarker.template.TemplateModelException;
-
-/**
- * A holder for builtins that deal with null left-hand values.
- */
-class ExistenceBuiltins {
-
- // Can't be instantiated
- private ExistenceBuiltins() { }
-
- private static abstract class ExistenceBuiltIn extends BuiltIn {
-
- protected TemplateModel evalMaybeNonexistentTarget(Environment env) throws TemplateException {
- TemplateModel tm;
- if (target instanceof ParentheticalExpression) {
- boolean lastFIRE = env.setFastInvalidReferenceExceptions(true);
- try {
- tm = target.eval(env);
- } catch (InvalidReferenceException ire) {
- tm = null;
- } finally {
- env.setFastInvalidReferenceExceptions(lastFIRE);
- }
- } else {
- tm = target.eval(env);
- }
- return tm;
- }
-
- }
-
- static class defaultBI extends ExistenceBuiltins.ExistenceBuiltIn {
-
- @Override
- TemplateModel _eval(final Environment env) throws TemplateException {
- TemplateModel model = evalMaybeNonexistentTarget(env);
- return model == null ? FIRST_NON_NULL_METHOD : new ConstantMethod(model);
- }
-
- private static class ConstantMethod implements TemplateMethodModelEx {
- private final TemplateModel constant;
-
- ConstantMethod(TemplateModel constant) {
- this.constant = constant;
- }
-
- public Object exec(List args) {
- return constant;
- }
- }
-
- /**
- * A method that goes through the arguments one by one and returns
- * the first one that is non-null. If all args are null, returns null.
- */
- private static final TemplateMethodModelEx FIRST_NON_NULL_METHOD =
- new TemplateMethodModelEx() {
- public Object exec(List args) throws TemplateModelException {
- int argCnt = args.size();
- if (argCnt == 0) throw MessageUtil.newArgCntError("?default", argCnt, 1, Integer.MAX_VALUE);
- for (int i = 0; i < argCnt; i++ ) {
- TemplateModel result = (TemplateModel) args.get(i);
- if (result != null) return result;
- }
- return null;
- }
- };
- }
-
- static class existsBI extends ExistenceBuiltins.ExistenceBuiltIn {
- @Override
- TemplateModel _eval(Environment env) throws TemplateException {
- return evalMaybeNonexistentTarget(env) == null ? TemplateBooleanModel.FALSE : TemplateBooleanModel.TRUE;
- }
-
- @Override
- boolean evalToBoolean(Environment env) throws TemplateException {
- return _eval(env) == TemplateBooleanModel.TRUE;
- }
- }
-
- static class has_contentBI extends ExistenceBuiltins.ExistenceBuiltIn {
- @Override
- TemplateModel _eval(Environment env) throws TemplateException {
- return Expression.isEmpty(evalMaybeNonexistentTarget(env))
- ? TemplateBooleanModel.FALSE
- : TemplateBooleanModel.TRUE;
- }
-
- @Override
- boolean evalToBoolean(Environment env) throws TemplateException {
- return _eval(env) == TemplateBooleanModel.TRUE;
- }
- }
-
- static class if_existsBI extends ExistenceBuiltins.ExistenceBuiltIn {
- @Override
- TemplateModel _eval(Environment env)
- throws TemplateException {
- TemplateModel model = evalMaybeNonexistentTarget(env);
- return model == null ? TemplateModel.NOTHING : model;
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b5148ee3/src/main/java/freemarker/core/TemplateElement.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateElement.java b/src/main/java/freemarker/core/TemplateElement.java
index 916769e..5d12ff9 100644
--- a/src/main/java/freemarker/core/TemplateElement.java
+++ b/src/main/java/freemarker/core/TemplateElement.java
@@ -259,11 +259,11 @@ abstract public class TemplateElement extends TemplateObject {
final void setChildBufferCapacity(int capacity) {
int ln = childCount;
- TemplateElement[] newRegulatedChildBuffer = new TemplateElement[capacity];
+ TemplateElement[] newChildBuffer = new TemplateElement[capacity];
for (int i = 0; i < ln; i++) {
- newRegulatedChildBuffer[i] = childBuffer[i];
+ newChildBuffer[i] = childBuffer[i];
}
- childBuffer = newRegulatedChildBuffer;
+ childBuffer = newChildBuffer;
}
/**
@@ -277,27 +277,27 @@ abstract public class TemplateElement extends TemplateObject {
* Inserts a new nested element at the given index, which can also be one higher than the current highest index.
*/
final void addChild(int index, TemplateElement nestedElement) {
- final int lRegulatedChildCount = childCount;
-
- TemplateElement[] lRegulatedChildBuffer = childBuffer;
- if (lRegulatedChildBuffer == null) {
- lRegulatedChildBuffer = new TemplateElement[INITIAL_REGULATED_CHILD_BUFFER_CAPACITY];
- childBuffer = lRegulatedChildBuffer;
- } else if (lRegulatedChildCount == lRegulatedChildBuffer.length) {
- setChildBufferCapacity(lRegulatedChildCount != 0 ? lRegulatedChildCount * 2 : 1);
- lRegulatedChildBuffer = childBuffer;
+ final int childCount = this.childCount;
+
+ TemplateElement[] childBuffer = this.childBuffer;
+ if (childBuffer == null) {
+ childBuffer = new TemplateElement[INITIAL_REGULATED_CHILD_BUFFER_CAPACITY];
+ this.childBuffer = childBuffer;
+ } else if (childCount == childBuffer.length) {
+ setChildBufferCapacity(childCount != 0 ? childCount * 2 : 1);
+ childBuffer = this.childBuffer;
}
// At this point: nestedElements == this.nestedElements, and has sufficient capacity.
- for (int i = lRegulatedChildCount; i > index; i--) {
- TemplateElement movedElement = lRegulatedChildBuffer[i - 1];
+ for (int i = childCount; i > index; i--) {
+ TemplateElement movedElement = childBuffer[i - 1];
movedElement.index = i;
- lRegulatedChildBuffer[i] = movedElement;
+ childBuffer[i] = movedElement;
}
nestedElement.index = index;
nestedElement.parent = this;
- lRegulatedChildBuffer[index] = nestedElement;
- childCount = lRegulatedChildCount + 1;
+ childBuffer[index] = nestedElement;
+ this.childCount = childCount + 1;
}
final TemplateElement getChild(int index) {
@@ -451,8 +451,8 @@ abstract public class TemplateElement extends TemplateObject {
}
private TemplateElement getLastChild() {
- final int regulatedChildCount = this.childCount;
- return regulatedChildCount == 0 ? null : childBuffer[regulatedChildCount - 1];
+ final int childCount = this.childCount;
+ return childCount == 0 ? null : childBuffer[childCount - 1];
}
private TemplateElement getFirstLeaf() {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b5148ee3/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java b/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java
index 26d54aa..fb9bb6f 100644
--- a/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java
+++ b/src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java
@@ -58,8 +58,8 @@ class ThreadInterruptionSupportTemplatePostProcessor extends TemplatePostProcess
return;
}
- final int regulatedChildrenCount = te.getChildCount();
- for (int i = 0; i < regulatedChildrenCount; i++) {
+ final int childCount = te.getChildCount();
+ for (int i = 0; i < childCount; i++) {
addInterruptionChecks(te.getChild(i));
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b5148ee3/src/test/java/freemarker/core/ASTPrinter.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/ASTPrinter.java b/src/test/java/freemarker/core/ASTPrinter.java
index 68d6ba0..82d61a1 100644
--- a/src/test/java/freemarker/core/ASTPrinter.java
+++ b/src/test/java/freemarker/core/ASTPrinter.java
@@ -264,8 +264,8 @@ public class ASTPrinter {
for (int i = 0; i < childCount; i++) {
TemplateElement child = te.getChild(i);
TemplateElement parentElement = child.getParentElement();
- // As MixedContent.accept does nothing but return its regulatedChildren, it's optimized out in the final
- // AST tree. While it will be present as a child, the parent element also will have regularedChildren
+ // As MixedContent.accept does nothing but return its children, it's optimized out in the final
+ // AST tree. While it will be present as a child, the parent element also will have children
// that contains the children of the MixedContent directly.
if (parentElement instanceof MixedContent && parentElement.getParentElement() != null) {
parentElement = parentElement.getParentElement();
@@ -287,31 +287,31 @@ public class ASTPrinter {
throw new InvalidASTException("Mixed content with child count less than 2 should removed by optimizatoin, "
+ "but found one with " + te.getChildCount() + " child(ren).");
}
- TemplateElement[] regulatedChildren = te.getChildBuffer();
- if (regulatedChildren != null) {
+ TemplateElement[] children = te.getChildBuffer();
+ if (children != null) {
if (childCount == 0) {
throw new InvalidASTException(
- "regularChildren must be null when regularChild is 0."
+ "Children must be null when childCount is 0."
+ "\nNode: " + te.dump(false));
}
for (int i = 0; i < te.getChildCount(); i++) {
- if (regulatedChildren[i] == null) {
+ if (children[i] == null) {
throw new InvalidASTException(
- "regularChildren can't be null at index " + i
+ "Children can't be null at index " + i
+ "\nNode: " + te.dump(false));
}
}
- for (int i = te.getChildCount(); i < regulatedChildren.length; i++) {
- if (regulatedChildren[i] != null) {
+ for (int i = te.getChildCount(); i < children.length; i++) {
+ if (children[i] != null) {
throw new InvalidASTException(
- "regularChildren can't be non-null at index " + i
+ "Children can't be non-null at index " + i
+ "\nNode: " + te.dump(false));
}
}
} else {
if (childCount != 0) {
throw new InvalidASTException(
- "regularChildren mustn't be null when regularChild isn't 0."
+ "Children mustn't be null when childCount isn't 0."
+ "\nNode: " + te.dump(false));
}
}
[16/50] [abbrv] incubator-freemarker git commit: Removing the file
used for testing push right
Posted by dd...@apache.org.
Removing the file used for testing push right
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/dce7f38b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/dce7f38b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/dce7f38b
Branch: refs/heads/2.3
Commit: dce7f38bcff3b52cc55b4cd2ebc0cc427beb91b2
Parents: 143a8f0
Author: Woonsan Ko <wo...@apache.org>
Authored: Sat Feb 11 02:52:24 2017 -0500
Committer: Woonsan Ko <wo...@apache.org>
Committed: Sat Feb 11 02:52:24 2017 -0500
----------------------------------------------------------------------
src/dist/bin/README.md | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dce7f38b/src/dist/bin/README.md
----------------------------------------------------------------------
diff --git a/src/dist/bin/README.md b/src/dist/bin/README.md
deleted file mode 100644
index 25f8d45..0000000
--- a/src/dist/bin/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Documentation
[24/50] [abbrv] incubator-freemarker git commit: (Some code cleanup)
Posted by dd...@apache.org.
(Some code cleanup)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/870f0a75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/870f0a75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/870f0a75
Branch: refs/heads/2.3
Commit: 870f0a750df2068a073fea40186684071edba604
Parents: b5148ee
Author: ddekany <dd...@apache.org>
Authored: Thu Feb 23 22:12:53 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Feb 23 22:33:04 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/core/Configurable.java | 2 +-
src/main/java/freemarker/core/TrimInstruction.java | 8 ++++----
src/main/java/freemarker/core/UnaryPlusMinusExpression.java | 4 ++--
src/main/java/freemarker/core/_CoreAPI.java | 2 +-
src/main/java/freemarker/ext/beans/BeansWrapper.java | 2 +-
.../freemarker/ext/jsp/CustomTagAndELFunctionCombiner.java | 2 +-
src/main/java/freemarker/template/Template.java | 8 +-------
.../freemarker/ext/beans/ParameterListPreferabilityTest.java | 6 +++---
.../test/templatesuite/models/OverloadedMethods2.java | 2 +-
.../test/templatesuite/models/TransformMethodWrapper1.java | 2 +-
10 files changed, 16 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/870f0a75/src/main/java/freemarker/core/Configurable.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Configurable.java b/src/main/java/freemarker/core/Configurable.java
index ae14643..fd1f8f1 100644
--- a/src/main/java/freemarker/core/Configurable.java
+++ b/src/main/java/freemarker/core/Configurable.java
@@ -2768,7 +2768,7 @@ public class Configurable {
*/
void copyDirectCustomAttributes(Configurable target, boolean overwriteExisting) {
synchronized (customAttributes) {
- for (Entry<? extends Object, ? extends Object> custAttrEnt : customAttributes.entrySet()) {
+ for (Entry<?, ?> custAttrEnt : customAttributes.entrySet()) {
Object custAttrKey = custAttrEnt.getKey();
if (overwriteExisting || !target.isCustomAttributeSet(custAttrKey)) {
if (custAttrKey instanceof String) {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/870f0a75/src/main/java/freemarker/core/TrimInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TrimInstruction.java b/src/main/java/freemarker/core/TrimInstruction.java
index 7e48367..3e5d536 100644
--- a/src/main/java/freemarker/core/TrimInstruction.java
+++ b/src/main/java/freemarker/core/TrimInstruction.java
@@ -25,10 +25,10 @@ package freemarker.core;
*/
final class TrimInstruction extends TemplateElement {
- private final int TYPE_T = 0;
- private final int TYPE_LT = 1;
- private final int TYPE_RT = 2;
- private final int TYPE_NT = 3;
+ private static final int TYPE_T = 0;
+ private static final int TYPE_LT = 1;
+ private static final int TYPE_RT = 2;
+ private static final int TYPE_NT = 3;
final boolean left, right;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/870f0a75/src/main/java/freemarker/core/UnaryPlusMinusExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/UnaryPlusMinusExpression.java b/src/main/java/freemarker/core/UnaryPlusMinusExpression.java
index 9ca17b6..8633d7f 100644
--- a/src/main/java/freemarker/core/UnaryPlusMinusExpression.java
+++ b/src/main/java/freemarker/core/UnaryPlusMinusExpression.java
@@ -26,8 +26,8 @@ import freemarker.template.TemplateNumberModel;
final class UnaryPlusMinusExpression extends Expression {
- private final int TYPE_MINUS = 0;
- private final int TYPE_PLUS = 1;
+ private static final int TYPE_MINUS = 0;
+ private static final int TYPE_PLUS = 1;
private final Expression target;
private final boolean isMinus;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/870f0a75/src/main/java/freemarker/core/_CoreAPI.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_CoreAPI.java b/src/main/java/freemarker/core/_CoreAPI.java
index df95196..a363c23 100644
--- a/src/main/java/freemarker/core/_CoreAPI.java
+++ b/src/main/java/freemarker/core/_CoreAPI.java
@@ -182,7 +182,7 @@ public class _CoreAPI {
* if the type of the some of the values isn't as expected
*/
public static void checkSettingValueItemsType(String somethingsSentenceStart, Class<?> expectedClass,
- Collection<? extends Object> values) {
+ Collection<?> values) {
if (values == null) return;
for (Object value : values) {
if (!expectedClass.isInstance(value)) {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/870f0a75/src/main/java/freemarker/ext/beans/BeansWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/BeansWrapper.java b/src/main/java/freemarker/ext/beans/BeansWrapper.java
index 71c405f..9731975 100644
--- a/src/main/java/freemarker/ext/beans/BeansWrapper.java
+++ b/src/main/java/freemarker/ext/beans/BeansWrapper.java
@@ -1007,7 +1007,7 @@ public class BeansWrapper implements RichObjectWrapper, WriteProtectable {
}
/**
- * See {@try #tryUnwrap(TemplateModel, Class, int, boolean)}.
+ * See {@link #tryUnwrapTo(TemplateModel, Class, int)}.
*/
private Object tryUnwrapTo(final TemplateModel model, Class<?> targetClass, final int typeFlags,
final Map<Object, Object> recursionStops)
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/870f0a75/src/main/java/freemarker/ext/jsp/CustomTagAndELFunctionCombiner.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/CustomTagAndELFunctionCombiner.java b/src/main/java/freemarker/ext/jsp/CustomTagAndELFunctionCombiner.java
index ba771e3..cba6a16 100644
--- a/src/main/java/freemarker/ext/jsp/CustomTagAndELFunctionCombiner.java
+++ b/src/main/java/freemarker/ext/jsp/CustomTagAndELFunctionCombiner.java
@@ -42,7 +42,7 @@ import freemarker.template.utility.ClassUtil;
* the two. As FTL as no separate namespace for "tags" and functions, both aspect has to be implemented by the same
* value.
*
- * @sine 2.3.25
+ * @since 2.3.25
*/
@SuppressWarnings("rawtypes")
class CustomTagAndELFunctionCombiner {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/870f0a75/src/main/java/freemarker/template/Template.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/Template.java b/src/main/java/freemarker/template/Template.java
index ffef603..85f8c10 100644
--- a/src/main/java/freemarker/template/Template.java
+++ b/src/main/java/freemarker/template/Template.java
@@ -81,10 +81,6 @@ public class Template extends Configurable {
private static final int READER_BUFFER_SIZE = 4096;
- /** This is only non-null during parsing. It's used internally to make some information available through the
- * Template API-s earlier than the parsing was finished. */
- private transient FMParser parser;
-
private Map macros = new HashMap();
private List imports = new Vector();
private TemplateElement rootElement;
@@ -245,7 +241,7 @@ public class Template extends Configurable {
reader = ltbReader;
try {
- parser = new FMParser(this, reader, actualParserConfiguration);
+ FMParser parser = new FMParser(this, reader, actualParserConfiguration);
try {
this.rootElement = parser.Root();
} catch (IndexOutOfBoundsException exc) {
@@ -263,8 +259,6 @@ public class Template extends Configurable {
// TokenMgrError VS ParseException is not an interesting difference for the user, so we just convert it
// to ParseException
throw exc.toParseException(this);
- } finally {
- parser = null;
}
} catch (ParseException e) {
e.setTemplateName(getSourceName());
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/870f0a75/src/test/java/freemarker/ext/beans/ParameterListPreferabilityTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/ParameterListPreferabilityTest.java b/src/test/java/freemarker/ext/beans/ParameterListPreferabilityTest.java
index c577f93..5096110 100644
--- a/src/test/java/freemarker/ext/beans/ParameterListPreferabilityTest.java
+++ b/src/test/java/freemarker/ext/beans/ParameterListPreferabilityTest.java
@@ -27,8 +27,8 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.TreeMap;
-import junit.framework.TestCase;
import freemarker.template.utility.NumberUtil;
+import junit.framework.TestCase;
@SuppressWarnings("boxing")
public class ParameterListPreferabilityTest extends TestCase {
@@ -313,7 +313,7 @@ public class ParameterListPreferabilityTest extends TestCase {
},
new Object[] { "a", "b" });
- /** Subclassing is more important than primitive-VS-boxed: */
+ // Subclassing is more important than primitive-VS-boxed:
testAllCmpPermutationsInc(
new Class[][] {
new Class[] { boolean.class, boolean.class, boolean.class, String.class },
@@ -332,7 +332,7 @@ public class ParameterListPreferabilityTest extends TestCase {
},
new Object[] { true, false, true, "a" });
- /** Subclassing is more important than primitive-VS-boxed: */
+ // Subclassing is more important than primitive-VS-boxed:
testAllCmpPermutationsInc(
new Class[][] {
new Class[] { int.class, int.class, int.class, String.class },
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/870f0a75/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods2.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods2.java b/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods2.java
index 833e590..854c179 100644
--- a/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods2.java
+++ b/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods2.java
@@ -1004,7 +1004,7 @@ public class OverloadedMethods2 {
return new MyBooleanWrapperAsAnotherBooleanModel();
}
- public String bugReport363(Map<String, ? extends Object> fields, List<?> listField) {
+ public String bugReport363(Map<String, ?> fields, List<?> listField) {
return "Executed: testMethod(Map fields, List listField) on input: fields=" + fields
+ " and listField=" + listField;
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/870f0a75/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper1.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper1.java b/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper1.java
index bfb2a34..8c2db7a 100644
--- a/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper1.java
+++ b/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper1.java
@@ -28,7 +28,7 @@ import freemarker.template.utility.XmlEscape;
/**
* Simple test of the interaction between MethodModels and TransformModels.
*/
-public class TransformMethodWrapper1 extends Object implements TemplateMethodModel {
+public class TransformMethodWrapper1 implements TemplateMethodModel {
/**
* Executes a method call.
[44/50] [abbrv] incubator-freemarker git commit: Changing copyright
header format to be identical to IntelliJ generated copyright headers
Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jython/JythonVersionAdapterHolder.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jython/JythonVersionAdapterHolder.java b/src/main/java/freemarker/ext/jython/JythonVersionAdapterHolder.java
index 013b32c..9b6c29d 100644
--- a/src/main/java/freemarker/ext/jython/JythonVersionAdapterHolder.java
+++ b/src/main/java/freemarker/ext/jython/JythonVersionAdapterHolder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jython/JythonWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jython/JythonWrapper.java b/src/main/java/freemarker/ext/jython/JythonWrapper.java
index eb82818..c10d122 100644
--- a/src/main/java/freemarker/ext/jython/JythonWrapper.java
+++ b/src/main/java/freemarker/ext/jython/JythonWrapper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jython/_Jython20And21VersionAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jython/_Jython20And21VersionAdapter.java b/src/main/java/freemarker/ext/jython/_Jython20And21VersionAdapter.java
index fe905dd..ddda4f0 100644
--- a/src/main/java/freemarker/ext/jython/_Jython20And21VersionAdapter.java
+++ b/src/main/java/freemarker/ext/jython/_Jython20And21VersionAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jython/_Jython22VersionAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jython/_Jython22VersionAdapter.java b/src/main/java/freemarker/ext/jython/_Jython22VersionAdapter.java
index 30173df..26277da 100644
--- a/src/main/java/freemarker/ext/jython/_Jython22VersionAdapter.java
+++ b/src/main/java/freemarker/ext/jython/_Jython22VersionAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jython/_Jython25VersionAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jython/_Jython25VersionAdapter.java b/src/main/java/freemarker/ext/jython/_Jython25VersionAdapter.java
index 27d58a8..bdced37 100644
--- a/src/main/java/freemarker/ext/jython/_Jython25VersionAdapter.java
+++ b/src/main/java/freemarker/ext/jython/_Jython25VersionAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jython/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jython/package.html b/src/main/java/freemarker/ext/jython/package.html
index b979552..e662959 100644
--- a/src/main/java/freemarker/ext/jython/package.html
+++ b/src/main/java/freemarker/ext/jython/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/package.html b/src/main/java/freemarker/ext/package.html
index 0f45e3f..5070a10 100644
--- a/src/main/java/freemarker/ext/package.html
+++ b/src/main/java/freemarker/ext/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/rhino/RhinoFunctionModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/rhino/RhinoFunctionModel.java b/src/main/java/freemarker/ext/rhino/RhinoFunctionModel.java
index 61674a1..9827d1b 100644
--- a/src/main/java/freemarker/ext/rhino/RhinoFunctionModel.java
+++ b/src/main/java/freemarker/ext/rhino/RhinoFunctionModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/rhino/RhinoScriptableModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/rhino/RhinoScriptableModel.java b/src/main/java/freemarker/ext/rhino/RhinoScriptableModel.java
index a39ae70..76761d6 100644
--- a/src/main/java/freemarker/ext/rhino/RhinoScriptableModel.java
+++ b/src/main/java/freemarker/ext/rhino/RhinoScriptableModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/rhino/RhinoWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/rhino/RhinoWrapper.java b/src/main/java/freemarker/ext/rhino/RhinoWrapper.java
index 9b06bac..b5dd3c5 100644
--- a/src/main/java/freemarker/ext/rhino/RhinoWrapper.java
+++ b/src/main/java/freemarker/ext/rhino/RhinoWrapper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/rhino/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/rhino/package.html b/src/main/java/freemarker/ext/rhino/package.html
index ede49a8..ba93c68 100644
--- a/src/main/java/freemarker/ext/rhino/package.html
+++ b/src/main/java/freemarker/ext/rhino/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/servlet/AllHttpScopesHashModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/servlet/AllHttpScopesHashModel.java b/src/main/java/freemarker/ext/servlet/AllHttpScopesHashModel.java
index 8273521..6428dda 100644
--- a/src/main/java/freemarker/ext/servlet/AllHttpScopesHashModel.java
+++ b/src/main/java/freemarker/ext/servlet/AllHttpScopesHashModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java b/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
index 4bc7504..dbfd69a 100644
--- a/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
+++ b/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/servlet/HttpRequestHashModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/servlet/HttpRequestHashModel.java b/src/main/java/freemarker/ext/servlet/HttpRequestHashModel.java
index 6ed9e51..2c0d574 100644
--- a/src/main/java/freemarker/ext/servlet/HttpRequestHashModel.java
+++ b/src/main/java/freemarker/ext/servlet/HttpRequestHashModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/servlet/HttpRequestParametersHashModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/servlet/HttpRequestParametersHashModel.java b/src/main/java/freemarker/ext/servlet/HttpRequestParametersHashModel.java
index 4b710a1..4129aa6 100644
--- a/src/main/java/freemarker/ext/servlet/HttpRequestParametersHashModel.java
+++ b/src/main/java/freemarker/ext/servlet/HttpRequestParametersHashModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/servlet/HttpSessionHashModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/servlet/HttpSessionHashModel.java b/src/main/java/freemarker/ext/servlet/HttpSessionHashModel.java
index 6fd3a1e..0434537 100644
--- a/src/main/java/freemarker/ext/servlet/HttpSessionHashModel.java
+++ b/src/main/java/freemarker/ext/servlet/HttpSessionHashModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/servlet/IncludePage.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/servlet/IncludePage.java b/src/main/java/freemarker/ext/servlet/IncludePage.java
index 069fe74..774b71a 100644
--- a/src/main/java/freemarker/ext/servlet/IncludePage.java
+++ b/src/main/java/freemarker/ext/servlet/IncludePage.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/servlet/InitParamParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/servlet/InitParamParser.java b/src/main/java/freemarker/ext/servlet/InitParamParser.java
index 6b0665d..8791058 100644
--- a/src/main/java/freemarker/ext/servlet/InitParamParser.java
+++ b/src/main/java/freemarker/ext/servlet/InitParamParser.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/servlet/ServletContextHashModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/servlet/ServletContextHashModel.java b/src/main/java/freemarker/ext/servlet/ServletContextHashModel.java
index 2edb374..e917ccf 100644
--- a/src/main/java/freemarker/ext/servlet/ServletContextHashModel.java
+++ b/src/main/java/freemarker/ext/servlet/ServletContextHashModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/servlet/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/servlet/package.html b/src/main/java/freemarker/ext/servlet/package.html
index 08f5267..99f7e24 100644
--- a/src/main/java/freemarker/ext/servlet/package.html
+++ b/src/main/java/freemarker/ext/servlet/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/util/IdentityHashMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/util/IdentityHashMap.java b/src/main/java/freemarker/ext/util/IdentityHashMap.java
index 13e140f..68b14ba 100644
--- a/src/main/java/freemarker/ext/util/IdentityHashMap.java
+++ b/src/main/java/freemarker/ext/util/IdentityHashMap.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/util/ModelCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/util/ModelCache.java b/src/main/java/freemarker/ext/util/ModelCache.java
index db07691..8d6686c 100644
--- a/src/main/java/freemarker/ext/util/ModelCache.java
+++ b/src/main/java/freemarker/ext/util/ModelCache.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/util/ModelFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/util/ModelFactory.java b/src/main/java/freemarker/ext/util/ModelFactory.java
index 18356c6..045a8b2 100644
--- a/src/main/java/freemarker/ext/util/ModelFactory.java
+++ b/src/main/java/freemarker/ext/util/ModelFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/util/WrapperTemplateModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/util/WrapperTemplateModel.java b/src/main/java/freemarker/ext/util/WrapperTemplateModel.java
index 9265489..e546eb0 100644
--- a/src/main/java/freemarker/ext/util/WrapperTemplateModel.java
+++ b/src/main/java/freemarker/ext/util/WrapperTemplateModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/util/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/util/package.html b/src/main/java/freemarker/ext/util/package.html
index 31c6092..aa4c1b3 100644
--- a/src/main/java/freemarker/ext/util/package.html
+++ b/src/main/java/freemarker/ext/util/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/xml/Namespaces.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/xml/Namespaces.java b/src/main/java/freemarker/ext/xml/Namespaces.java
index 8c4ce75..730b79a 100644
--- a/src/main/java/freemarker/ext/xml/Namespaces.java
+++ b/src/main/java/freemarker/ext/xml/Namespaces.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/xml/Navigator.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/xml/Navigator.java b/src/main/java/freemarker/ext/xml/Navigator.java
index 2a2542f..1065868 100644
--- a/src/main/java/freemarker/ext/xml/Navigator.java
+++ b/src/main/java/freemarker/ext/xml/Navigator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/xml/NodeListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/xml/NodeListModel.java b/src/main/java/freemarker/ext/xml/NodeListModel.java
index d42643d..af4e055 100644
--- a/src/main/java/freemarker/ext/xml/NodeListModel.java
+++ b/src/main/java/freemarker/ext/xml/NodeListModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/xml/NodeOperator.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/xml/NodeOperator.java b/src/main/java/freemarker/ext/xml/NodeOperator.java
index 27b80b6..8d8614f 100644
--- a/src/main/java/freemarker/ext/xml/NodeOperator.java
+++ b/src/main/java/freemarker/ext/xml/NodeOperator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/xml/_Dom4jNavigator.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/xml/_Dom4jNavigator.java b/src/main/java/freemarker/ext/xml/_Dom4jNavigator.java
index 747953d..23b631d 100644
--- a/src/main/java/freemarker/ext/xml/_Dom4jNavigator.java
+++ b/src/main/java/freemarker/ext/xml/_Dom4jNavigator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/xml/_DomNavigator.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/xml/_DomNavigator.java b/src/main/java/freemarker/ext/xml/_DomNavigator.java
index cd52c10..a8fa538 100644
--- a/src/main/java/freemarker/ext/xml/_DomNavigator.java
+++ b/src/main/java/freemarker/ext/xml/_DomNavigator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/xml/_JaxenNamespaces.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/xml/_JaxenNamespaces.java b/src/main/java/freemarker/ext/xml/_JaxenNamespaces.java
index 71772a0..eb79fe5 100644
--- a/src/main/java/freemarker/ext/xml/_JaxenNamespaces.java
+++ b/src/main/java/freemarker/ext/xml/_JaxenNamespaces.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/xml/_JdomNavigator.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/xml/_JdomNavigator.java b/src/main/java/freemarker/ext/xml/_JdomNavigator.java
index e4f8427..6ff4440 100644
--- a/src/main/java/freemarker/ext/xml/_JdomNavigator.java
+++ b/src/main/java/freemarker/ext/xml/_JdomNavigator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/xml/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/xml/package.html b/src/main/java/freemarker/ext/xml/package.html
index 0fd228b..271dff7 100644
--- a/src/main/java/freemarker/ext/xml/package.html
+++ b/src/main/java/freemarker/ext/xml/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/log/CommonsLoggingLoggerFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/log/CommonsLoggingLoggerFactory.java b/src/main/java/freemarker/log/CommonsLoggingLoggerFactory.java
index e157d41..de64490 100644
--- a/src/main/java/freemarker/log/CommonsLoggingLoggerFactory.java
+++ b/src/main/java/freemarker/log/CommonsLoggingLoggerFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/log/Logger.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/log/Logger.java b/src/main/java/freemarker/log/Logger.java
index a084fb0..c60310e 100644
--- a/src/main/java/freemarker/log/Logger.java
+++ b/src/main/java/freemarker/log/Logger.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/log/LoggerFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/log/LoggerFactory.java b/src/main/java/freemarker/log/LoggerFactory.java
index 5c4acef..1549a78 100644
--- a/src/main/java/freemarker/log/LoggerFactory.java
+++ b/src/main/java/freemarker/log/LoggerFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/log/SLF4JLoggerFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/log/SLF4JLoggerFactory.java b/src/main/java/freemarker/log/SLF4JLoggerFactory.java
index d0efbf2..f98a1b5 100644
--- a/src/main/java/freemarker/log/SLF4JLoggerFactory.java
+++ b/src/main/java/freemarker/log/SLF4JLoggerFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/log/_AvalonLoggerFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/log/_AvalonLoggerFactory.java b/src/main/java/freemarker/log/_AvalonLoggerFactory.java
index 9e274b1..9b5e50c 100644
--- a/src/main/java/freemarker/log/_AvalonLoggerFactory.java
+++ b/src/main/java/freemarker/log/_AvalonLoggerFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/log/_CommonsLoggingLoggerFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/log/_CommonsLoggingLoggerFactory.java b/src/main/java/freemarker/log/_CommonsLoggingLoggerFactory.java
index 551aa52..9973c5d 100644
--- a/src/main/java/freemarker/log/_CommonsLoggingLoggerFactory.java
+++ b/src/main/java/freemarker/log/_CommonsLoggingLoggerFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/log/_JULLoggerFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/log/_JULLoggerFactory.java b/src/main/java/freemarker/log/_JULLoggerFactory.java
index 7eb11b3..475db7f 100644
--- a/src/main/java/freemarker/log/_JULLoggerFactory.java
+++ b/src/main/java/freemarker/log/_JULLoggerFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/log/_Log4jLoggerFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/log/_Log4jLoggerFactory.java b/src/main/java/freemarker/log/_Log4jLoggerFactory.java
index d78a164..9547bbd 100644
--- a/src/main/java/freemarker/log/_Log4jLoggerFactory.java
+++ b/src/main/java/freemarker/log/_Log4jLoggerFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/log/_Log4jOverSLF4JTester.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/log/_Log4jOverSLF4JTester.java b/src/main/java/freemarker/log/_Log4jOverSLF4JTester.java
index 5afcadf..854f2e3 100644
--- a/src/main/java/freemarker/log/_Log4jOverSLF4JTester.java
+++ b/src/main/java/freemarker/log/_Log4jOverSLF4JTester.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/log/_NullLoggerFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/log/_NullLoggerFactory.java b/src/main/java/freemarker/log/_NullLoggerFactory.java
index 7e161a5..85cff74 100644
--- a/src/main/java/freemarker/log/_NullLoggerFactory.java
+++ b/src/main/java/freemarker/log/_NullLoggerFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/log/_SLF4JLoggerFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/log/_SLF4JLoggerFactory.java b/src/main/java/freemarker/log/_SLF4JLoggerFactory.java
index 6332130..08641a6 100644
--- a/src/main/java/freemarker/log/_SLF4JLoggerFactory.java
+++ b/src/main/java/freemarker/log/_SLF4JLoggerFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/log/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/log/package.html b/src/main/java/freemarker/log/package.html
index afc773c..ada58aa 100644
--- a/src/main/java/freemarker/log/package.html
+++ b/src/main/java/freemarker/log/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/AdapterTemplateModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/AdapterTemplateModel.java b/src/main/java/freemarker/template/AdapterTemplateModel.java
index 2f32cae..77eec24 100644
--- a/src/main/java/freemarker/template/AdapterTemplateModel.java
+++ b/src/main/java/freemarker/template/AdapterTemplateModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/Configuration.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/Configuration.java b/src/main/java/freemarker/template/Configuration.java
index e6bbf3d..4405f70 100644
--- a/src/main/java/freemarker/template/Configuration.java
+++ b/src/main/java/freemarker/template/Configuration.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/DefaultArrayAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/DefaultArrayAdapter.java b/src/main/java/freemarker/template/DefaultArrayAdapter.java
index 578976c..645e7ea 100644
--- a/src/main/java/freemarker/template/DefaultArrayAdapter.java
+++ b/src/main/java/freemarker/template/DefaultArrayAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/DefaultIterableAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/DefaultIterableAdapter.java b/src/main/java/freemarker/template/DefaultIterableAdapter.java
index 3bca9c3..14aa6d1 100644
--- a/src/main/java/freemarker/template/DefaultIterableAdapter.java
+++ b/src/main/java/freemarker/template/DefaultIterableAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/DefaultIteratorAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/DefaultIteratorAdapter.java b/src/main/java/freemarker/template/DefaultIteratorAdapter.java
index 7ca7f31..4ac1212 100644
--- a/src/main/java/freemarker/template/DefaultIteratorAdapter.java
+++ b/src/main/java/freemarker/template/DefaultIteratorAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/DefaultListAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/DefaultListAdapter.java b/src/main/java/freemarker/template/DefaultListAdapter.java
index 39b107f..62e7f18 100644
--- a/src/main/java/freemarker/template/DefaultListAdapter.java
+++ b/src/main/java/freemarker/template/DefaultListAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/DefaultMapAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/DefaultMapAdapter.java b/src/main/java/freemarker/template/DefaultMapAdapter.java
index 68c1438..3039e4c 100644
--- a/src/main/java/freemarker/template/DefaultMapAdapter.java
+++ b/src/main/java/freemarker/template/DefaultMapAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java b/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java
index 3d0f57e..b6a157b 100644
--- a/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java
+++ b/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/DefaultObjectWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/DefaultObjectWrapper.java b/src/main/java/freemarker/template/DefaultObjectWrapper.java
index 323e1dd..1398be4 100644
--- a/src/main/java/freemarker/template/DefaultObjectWrapper.java
+++ b/src/main/java/freemarker/template/DefaultObjectWrapper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/DefaultObjectWrapperBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/DefaultObjectWrapperBuilder.java b/src/main/java/freemarker/template/DefaultObjectWrapperBuilder.java
index 7a6a027..e73fa8b 100644
--- a/src/main/java/freemarker/template/DefaultObjectWrapperBuilder.java
+++ b/src/main/java/freemarker/template/DefaultObjectWrapperBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/DefaultObjectWrapperConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/DefaultObjectWrapperConfiguration.java b/src/main/java/freemarker/template/DefaultObjectWrapperConfiguration.java
index cde1eca..81b4836 100644
--- a/src/main/java/freemarker/template/DefaultObjectWrapperConfiguration.java
+++ b/src/main/java/freemarker/template/DefaultObjectWrapperConfiguration.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/DefaultUnassignableIteratorAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/DefaultUnassignableIteratorAdapter.java b/src/main/java/freemarker/template/DefaultUnassignableIteratorAdapter.java
index 383c390..80c4bc5 100644
--- a/src/main/java/freemarker/template/DefaultUnassignableIteratorAdapter.java
+++ b/src/main/java/freemarker/template/DefaultUnassignableIteratorAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/EmptyMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/EmptyMap.java b/src/main/java/freemarker/template/EmptyMap.java
index 13c4448..763ac93 100644
--- a/src/main/java/freemarker/template/EmptyMap.java
+++ b/src/main/java/freemarker/template/EmptyMap.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/FalseTemplateBooleanModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/FalseTemplateBooleanModel.java b/src/main/java/freemarker/template/FalseTemplateBooleanModel.java
index 560ad02..02628c8 100644
--- a/src/main/java/freemarker/template/FalseTemplateBooleanModel.java
+++ b/src/main/java/freemarker/template/FalseTemplateBooleanModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/GeneralPurposeNothing.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/GeneralPurposeNothing.java b/src/main/java/freemarker/template/GeneralPurposeNothing.java
index e078980..7ba8602 100644
--- a/src/main/java/freemarker/template/GeneralPurposeNothing.java
+++ b/src/main/java/freemarker/template/GeneralPurposeNothing.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/LocalizedString.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/LocalizedString.java b/src/main/java/freemarker/template/LocalizedString.java
index 3cd4857..f65267c 100755
--- a/src/main/java/freemarker/template/LocalizedString.java
+++ b/src/main/java/freemarker/template/LocalizedString.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/MalformedTemplateNameException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/MalformedTemplateNameException.java b/src/main/java/freemarker/template/MalformedTemplateNameException.java
index fdc4cfd..b5de075 100644
--- a/src/main/java/freemarker/template/MalformedTemplateNameException.java
+++ b/src/main/java/freemarker/template/MalformedTemplateNameException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/MapKeyValuePairIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/MapKeyValuePairIterator.java b/src/main/java/freemarker/template/MapKeyValuePairIterator.java
index 4c5c1c0..05e1356 100644
--- a/src/main/java/freemarker/template/MapKeyValuePairIterator.java
+++ b/src/main/java/freemarker/template/MapKeyValuePairIterator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/ObjectWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/ObjectWrapper.java b/src/main/java/freemarker/template/ObjectWrapper.java
index 8ef3730..71eea17 100644
--- a/src/main/java/freemarker/template/ObjectWrapper.java
+++ b/src/main/java/freemarker/template/ObjectWrapper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/ObjectWrapperAndUnwrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/ObjectWrapperAndUnwrapper.java b/src/main/java/freemarker/template/ObjectWrapperAndUnwrapper.java
index 7ec4461..ea1abb9 100644
--- a/src/main/java/freemarker/template/ObjectWrapperAndUnwrapper.java
+++ b/src/main/java/freemarker/template/ObjectWrapperAndUnwrapper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/ResourceBundleLocalizedString.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/ResourceBundleLocalizedString.java b/src/main/java/freemarker/template/ResourceBundleLocalizedString.java
index bc9afda..46cb8e8 100755
--- a/src/main/java/freemarker/template/ResourceBundleLocalizedString.java
+++ b/src/main/java/freemarker/template/ResourceBundleLocalizedString.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/SerializableTemplateBooleanModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/SerializableTemplateBooleanModel.java b/src/main/java/freemarker/template/SerializableTemplateBooleanModel.java
index 13b4db9..31cec49 100644
--- a/src/main/java/freemarker/template/SerializableTemplateBooleanModel.java
+++ b/src/main/java/freemarker/template/SerializableTemplateBooleanModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/SimpleCollection.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/SimpleCollection.java b/src/main/java/freemarker/template/SimpleCollection.java
index 77f9755..ebcd679 100644
--- a/src/main/java/freemarker/template/SimpleCollection.java
+++ b/src/main/java/freemarker/template/SimpleCollection.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/SimpleDate.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/SimpleDate.java b/src/main/java/freemarker/template/SimpleDate.java
index 7086f4b..c8b9963 100644
--- a/src/main/java/freemarker/template/SimpleDate.java
+++ b/src/main/java/freemarker/template/SimpleDate.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/SimpleHash.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/SimpleHash.java b/src/main/java/freemarker/template/SimpleHash.java
index 4b1bf0f..e689dfb 100644
--- a/src/main/java/freemarker/template/SimpleHash.java
+++ b/src/main/java/freemarker/template/SimpleHash.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/SimpleList.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/SimpleList.java b/src/main/java/freemarker/template/SimpleList.java
index 11aee42..414fd11 100644
--- a/src/main/java/freemarker/template/SimpleList.java
+++ b/src/main/java/freemarker/template/SimpleList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/SimpleNumber.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/SimpleNumber.java b/src/main/java/freemarker/template/SimpleNumber.java
index bc6943f..860b68c 100644
--- a/src/main/java/freemarker/template/SimpleNumber.java
+++ b/src/main/java/freemarker/template/SimpleNumber.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/SimpleObjectWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/SimpleObjectWrapper.java b/src/main/java/freemarker/template/SimpleObjectWrapper.java
index 3bef7fa..39dcf08 100644
--- a/src/main/java/freemarker/template/SimpleObjectWrapper.java
+++ b/src/main/java/freemarker/template/SimpleObjectWrapper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/SimpleScalar.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/SimpleScalar.java b/src/main/java/freemarker/template/SimpleScalar.java
index 0890c18..ea44017 100644
--- a/src/main/java/freemarker/template/SimpleScalar.java
+++ b/src/main/java/freemarker/template/SimpleScalar.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/SimpleSequence.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/SimpleSequence.java b/src/main/java/freemarker/template/SimpleSequence.java
index e0ea945..e318a8d 100644
--- a/src/main/java/freemarker/template/SimpleSequence.java
+++ b/src/main/java/freemarker/template/SimpleSequence.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/Template.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/Template.java b/src/main/java/freemarker/template/Template.java
index 85f8c10..26aa071 100644
--- a/src/main/java/freemarker/template/Template.java
+++ b/src/main/java/freemarker/template/Template.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateBooleanModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateBooleanModel.java b/src/main/java/freemarker/template/TemplateBooleanModel.java
index f371d61..0c276b1 100644
--- a/src/main/java/freemarker/template/TemplateBooleanModel.java
+++ b/src/main/java/freemarker/template/TemplateBooleanModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateCollectionModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateCollectionModel.java b/src/main/java/freemarker/template/TemplateCollectionModel.java
index 03aa727..f6662af 100644
--- a/src/main/java/freemarker/template/TemplateCollectionModel.java
+++ b/src/main/java/freemarker/template/TemplateCollectionModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateCollectionModelEx.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateCollectionModelEx.java b/src/main/java/freemarker/template/TemplateCollectionModelEx.java
index 7f4dcf1..356644e 100644
--- a/src/main/java/freemarker/template/TemplateCollectionModelEx.java
+++ b/src/main/java/freemarker/template/TemplateCollectionModelEx.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateDateModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateDateModel.java b/src/main/java/freemarker/template/TemplateDateModel.java
index d729f5c..a00cbcf 100644
--- a/src/main/java/freemarker/template/TemplateDateModel.java
+++ b/src/main/java/freemarker/template/TemplateDateModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateDirectiveBody.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateDirectiveBody.java b/src/main/java/freemarker/template/TemplateDirectiveBody.java
index cdfd923..7f7e41e 100644
--- a/src/main/java/freemarker/template/TemplateDirectiveBody.java
+++ b/src/main/java/freemarker/template/TemplateDirectiveBody.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateDirectiveModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateDirectiveModel.java b/src/main/java/freemarker/template/TemplateDirectiveModel.java
index e320721..2e1eca0 100644
--- a/src/main/java/freemarker/template/TemplateDirectiveModel.java
+++ b/src/main/java/freemarker/template/TemplateDirectiveModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateException.java b/src/main/java/freemarker/template/TemplateException.java
index 7845bf8..30da1b8 100644
--- a/src/main/java/freemarker/template/TemplateException.java
+++ b/src/main/java/freemarker/template/TemplateException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateExceptionHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateExceptionHandler.java b/src/main/java/freemarker/template/TemplateExceptionHandler.java
index 6fb113e..7d3744e 100644
--- a/src/main/java/freemarker/template/TemplateExceptionHandler.java
+++ b/src/main/java/freemarker/template/TemplateExceptionHandler.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateHashModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateHashModel.java b/src/main/java/freemarker/template/TemplateHashModel.java
index 4a2997d..fb6b288 100644
--- a/src/main/java/freemarker/template/TemplateHashModel.java
+++ b/src/main/java/freemarker/template/TemplateHashModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateHashModelEx.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateHashModelEx.java b/src/main/java/freemarker/template/TemplateHashModelEx.java
index 91bde39..294b28f 100644
--- a/src/main/java/freemarker/template/TemplateHashModelEx.java
+++ b/src/main/java/freemarker/template/TemplateHashModelEx.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateHashModelEx2.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateHashModelEx2.java b/src/main/java/freemarker/template/TemplateHashModelEx2.java
index d5b83a7..401d8fc 100644
--- a/src/main/java/freemarker/template/TemplateHashModelEx2.java
+++ b/src/main/java/freemarker/template/TemplateHashModelEx2.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateMethodModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateMethodModel.java b/src/main/java/freemarker/template/TemplateMethodModel.java
index 951b7e9..5250304 100644
--- a/src/main/java/freemarker/template/TemplateMethodModel.java
+++ b/src/main/java/freemarker/template/TemplateMethodModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateMethodModelEx.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateMethodModelEx.java b/src/main/java/freemarker/template/TemplateMethodModelEx.java
index 54e2d45..689aa70 100644
--- a/src/main/java/freemarker/template/TemplateMethodModelEx.java
+++ b/src/main/java/freemarker/template/TemplateMethodModelEx.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateModel.java b/src/main/java/freemarker/template/TemplateModel.java
index 453d97e..56dd6de 100644
--- a/src/main/java/freemarker/template/TemplateModel.java
+++ b/src/main/java/freemarker/template/TemplateModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateModelAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateModelAdapter.java b/src/main/java/freemarker/template/TemplateModelAdapter.java
index 67adfeb..972f4ee 100644
--- a/src/main/java/freemarker/template/TemplateModelAdapter.java
+++ b/src/main/java/freemarker/template/TemplateModelAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateModelException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateModelException.java b/src/main/java/freemarker/template/TemplateModelException.java
index cac23be..cdf3825 100644
--- a/src/main/java/freemarker/template/TemplateModelException.java
+++ b/src/main/java/freemarker/template/TemplateModelException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateModelIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateModelIterator.java b/src/main/java/freemarker/template/TemplateModelIterator.java
index c5965a7..bc60253 100644
--- a/src/main/java/freemarker/template/TemplateModelIterator.java
+++ b/src/main/java/freemarker/template/TemplateModelIterator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateModelListSequence.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateModelListSequence.java b/src/main/java/freemarker/template/TemplateModelListSequence.java
index d3bb7ca..2077e42 100644
--- a/src/main/java/freemarker/template/TemplateModelListSequence.java
+++ b/src/main/java/freemarker/template/TemplateModelListSequence.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[02/50] [abbrv] incubator-freemarker git commit: Manual: Replaced
strange ``..." quotations with ...
. Fixed some minor typos
spotted during that.
Posted by dd...@apache.org.
Manual: Replaced strange ``..." quotations with <quote>...</quote>. Fixed some minor typos spotted during that.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/bc202885
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/bc202885
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/bc202885
Branch: refs/heads/2.3
Commit: bc2028855f6af1e9d723d944cb7f323003458ac1
Parents: 8161349
Author: ddekany <dd...@apache.org>
Authored: Wed Jan 25 18:17:31 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Jan 25 18:17:31 2017 +0100
----------------------------------------------------------------------
src/manual/en_US/book.xml | 501 +++++++++++++++++++++--------------------
1 file changed, 259 insertions(+), 242 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc202885/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 38da320..3449535 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -1937,9 +1937,9 @@ The average of the price of a python and an elephant is:
interpolations is
<literal>${<replaceable>expression</replaceable>}</literal> where
expression gives the value you want to insert into the output as
- text. So <literal>${(5 + 8)/2}</literal> prints ``6.5'' to the
- output (or possibly ``6,5'' if the language of your output is not
- US English).</para>
+ text. So <literal>${(5 + 8)/2}</literal> prints <quote>6.5</quote>
+ to the output (or possibly <quote>6,5</quote> if the language of
+ your output is not US English).</para>
</listitem>
<listitem>
@@ -3398,7 +3398,7 @@ ${12 % -5} <#-- Prints 2 -->
(or <literal>=</literal> as a <emphasis>deprecated</emphasis>
alternative) To test two values for inequality you use
<literal>!=</literal>. For example, assume that
- <literal>user</literal> is ``Big Joe'':</para>
+ <literal>user</literal> is <quote>Big Joe</quote>:</para>
<programlisting role="template"><#if <emphasis>user == "Big Joe"</emphasis>>
It is Big Joe
@@ -3409,8 +3409,8 @@ ${12 % -5} <#-- Prints 2 -->
<para>The <literal>user == "Big Joe"</literal> expression in the
<literal><#if ...></literal> will evaluate to the boolean
- <literal>true</literal>, so the above will say ``It is Big
- Joe''.</para>
+ <literal>true</literal>, so the above will say <quote>It is Big
+ Joe</quote>.</para>
<para>The expressions on both sides of the <literal>==</literal> or
<literal>!=</literal> must evaluate to a scalar (not a sequence or
@@ -3577,7 +3577,7 @@ ${testSequence?size}
${testSequence?join(", ")}</programlisting>
<para>Assuming that <literal>testString</literal> stores the string
- ``Tom & Jerry'', and testSequnce stores the strings
+ <quote>Tom & Jerry</quote>, and testSequnce stores the strings
<quote>foo</quote>, <quote>bar</quote> and <quote>baz</quote>, the
output will be:</para>
@@ -3994,7 +3994,7 @@ ${("green " + "mouse")?upper_case} <#-- GREEN MOUSE -->
precedence. Operators with higher precedence are evaluated before
operators with a relatively lower precedence. Operators on the same
line have equal precedence. When binary operators (operators with
- two ``parameters'', as <literal>+</literal> and
+ two <quote>parameters</quote>, as <literal>+</literal> and
<literal>-</literal>) of equal precedence appear next to each other,
they are evaluated in left-to-right order.</para>
@@ -4397,7 +4397,7 @@ ${("green " + "mouse")?upper_case} <#-- GREEN MOUSE -->
<para>A macro is a template fragment associated with a variable. You
can use that variable in your template as a user-defined directive,
so it helps in repetitive tasks. For example, this creates a macro
- variable that prints a big ``Hello Joe!'':</para>
+ variable that prints a big <quote>Hello Joe!</quote>:</para>
<programlisting role="template"><emphasis><#macro greet></emphasis>
<font size="+2">Hello Joe!</font>
@@ -4451,8 +4451,8 @@ ${("green " + "mouse")?upper_case} <#-- GREEN MOUSE -->
<title>Parameters</title>
<para>Let's improve the <literal>greet</literal> macro so it can use
- arbitrary name, not only ``Joe''. For this purpose you can use
- <emphasis role="term">parameters</emphasis>. You define the
+ arbitrary name, not only <quote>Joe</quote>. For this purpose you
+ can use <emphasis role="term">parameters</emphasis>. You define the
parameters after the name of the macro in the
<literal>macro</literal> directive. Here we define one parameter for
the <literal>greet</literal> macro,
@@ -11142,19 +11142,20 @@ TemplateHashModel roundingModeEnums =
<para>But, probably you want to use FreeMarker with some already
existing Web application framework. Many frameworks rely on the
- ``Model 2'' architecture, where JSP pages handle presentation. If you
- use such a framework (for example, <link
+ <quote>Model 2</quote> architecture, where JSP pages handle
+ presentation. If you use such a framework (for example, <link
xlink:href="http://jakarta.apache.org/struts">Apache Struts</link>),
then read on. For other frameworks please refer to the documentation
of the framework.</para>
<section xml:id="pgui_misc_servlet_model2">
- <title>Using FreeMarker for ``Model 2''</title>
+ <title>Using FreeMarker for <quote>Model 2</quote></title>
<para>Many frameworks follow the strategy that the HTTP request is
- dispatched to user-defined ``action'' classes that put data into
- <literal>ServletContext</literal>, <literal>HttpSession</literal>
- and <literal>HttpServletRequest</literal> objects as attributes, and
+ dispatched to user-defined <quote>action</quote> classes that put
+ data into <literal>ServletContext</literal>,
+ <literal>HttpSession</literal> and
+ <literal>HttpServletRequest</literal> objects as attributes, and
then the request is forwarded by the framework to a JSP page (the
view) that will generate the HTML page using the data sent with the
attributes. This is often referred as Model 2.</para>
@@ -11642,15 +11643,16 @@ ${bar?trim}</programlisting>
</note>
<para>Since JSP custom tags are written to operate in JSP
- environment, they assume that variables (often referred as ``beans''
- in JSP world) are stored in 4 scopes: page scope, request scope,
- session scope and application scope. FTL has no such notation (the 4
- scopes), but <literal>FreemarkerServlet</literal> provides emulated
- JSP environment for the custom JSP tags, which maintains
- correspondence between the ``beans'' of JSP scopes and FTL
- variables. For the custom JSP tags, the request, session and
- application scopes are exactly the same as with real JSP: the
- attributes of the <literal>javax.servlet.ServletContext</literal>,
+ environment, they assume that variables (often referred as
+ <quote>beans</quote> in JSP world) are stored in 4 scopes: page
+ scope, request scope, session scope and application scope. FTL has
+ no such notation (the 4 scopes), but
+ <literal>FreemarkerServlet</literal> provides emulated JSP
+ environment for the custom JSP tags, which maintains correspondence
+ between the <quote>beans</quote> of JSP scopes and FTL variables.
+ For the custom JSP tags, the request, session and application scopes
+ are exactly the same as with real JSP: the attributes of the
+ <literal>javax.servlet.ServletContext</literal>,
<literal>HttpSession</literal> and <literal>ServletRequest</literal>
objects. From the FTL side you see these 3 scopes together as the
data-model, as it was explained earlier. The page scope corresponds
@@ -11672,9 +11674,10 @@ ${bar?trim}</programlisting>
since custom tags are accessible in FTL templates as user-defined
FTL directives, you have to use the FTL syntax rules inside the
custom tags, not the JSP rules. So when you specify the value of an
- ``attribute'', then on the right side of the <literal>=</literal>
- there is an <link linkend="dgui_template_exp">FTL expression</link>.
- Thus, <emphasis>you must not quote boolean and numerical parameter
+ <quote>attribute</quote>, then on the right side of the
+ <literal>=</literal> there is an <link
+ linkend="dgui_template_exp">FTL expression</link>. Thus,
+ <emphasis>you must not quote boolean and numerical parameter
values</emphasis> (e.g. <literal><@tiles.insert
page="/layout.ftl" flush=true/></literal>), or they are
interpreted as string values, and this will cause a type mismatch
@@ -12157,7 +12160,7 @@ grant codeBase "file:/path/to/freemarker.jar"
<primary>ant task</primary>
</indexterm>
- <para>There are two ``FreeMarker Ant tasks'' that we know
+ <para>There are two <quote>FreeMarker Ant tasks</quote> that we know
about:</para>
<itemizedlist>
@@ -12905,7 +12908,7 @@ grant codeBase "file:/path/to/freemarker.jar"
</indexterm>
<para>The string with the very first word of the string capitalized.
- For the precise meaning of ``word'' see the <link
+ For the precise meaning of <quote>word</quote> see the <link
linkend="ref_builtin_word_list">word_list built-in</link>.
Example:</para>
@@ -12931,8 +12934,9 @@ GreEN mouse
</indexterm>
<para>The string with all words capitalized. For the precise meaning
- of ``word'' see the <link linkend="ref_builtin_word_list">word_list
- built-in</link>. Example:</para>
+ of <quote>word</quote> see the <link
+ linkend="ref_builtin_word_list">word_list built-in</link>.
+ Example:</para>
<programlisting role="template">${" green mouse"?capitalize}
${"GreEN mouse"?capitalize}</programlisting>
@@ -13775,8 +13779,8 @@ String BEAN_NAME = "${beanName?j_string}";</programlisting>
<primary>matches built-in</primary>
</indexterm>
- <para>This is a ``power user'' built-in. Ignore it if you don't know
- <link linkend="gloss.regularExpression">regular
+ <para>This is a <quote>power user</quote> built-in. Ignore it if you
+ don't know <link linkend="gloss.regularExpression">regular
expressions</link>.</para>
<para>This built-in determines if the string exactly matches the
@@ -14705,11 +14709,11 @@ ${x?url}</programlisting>
<title>Common flags</title>
<para>Many string built-ins accept an optional string parameter, the
- so called ``flags''. In this string, each letter influences a
- certain aspect of the behavior of the built-in. For example, letter
- <literal>i</literal> means that the built-in should not
- differentiate the lower and upper-case variation of the same letter.
- The order of the letters in the flags string is not
+ so called <quote>flags</quote>. In this string, each letter
+ influences a certain aspect of the behavior of the built-in. For
+ example, letter <literal>i</literal> means that the built-in should
+ not differentiate the lower and upper-case variation of the same
+ letter. The order of the letters in the flags string is not
significant.</para>
<para>This is the complete list of letters (flags):</para>
@@ -15020,8 +15024,8 @@ rif: foo XYr baar</programlisting>
<literal>${x}</literal>), or else the output will be possibly broken
depending on the current number formatting settings and locale (like
the decimal point is not dot, but comma in many countries) and the
- value of the number (like big numbers are possibly ``damaged'' by
- grouping separators).</para>
+ value of the number (like big numbers are possibly
+ <quote>damaged</quote> by grouping separators).</para>
<para>If the <literal>incompatible_imporvements</literal> FreeMarker
configuration setting is set to 2.3.24 or higher (also if it's set
@@ -16410,8 +16414,8 @@ N
<para>This built in is mostly for outputting sequnces in
tabular/columnar format. When used with HTML tables, the 2nd
parameter is often <literal>"\xA0"</literal> (that is the code of
- the no-break space character, also known as ``nbsp''), so the border
- of the empty TD-s will not be missing.</para>
+ the no-break space character, also known as <quote>nbsp</quote>), so
+ the border of the empty TD-s will not be missing.</para>
<para>The 1st parameter must be a number that is at least 1. If the
number is not integer, it will be silently rounded down to integer
@@ -16975,8 +16979,9 @@ Sorted by name.last:
</indexterm>
<para>Returns the string that is used to determine what user-defined
- directive to invoke to handle this node when it is ``visited''. See:
- the <link linkend="ref.directive.visit">visit</link> and <link
+ directive to invoke to handle this node when it is
+ <quote>visited</quote>. See: the <link
+ linkend="ref.directive.visit">visit</link> and <link
linkend="ref.directive.recurse">recurse</link> directives.</para>
<para>XML: If the node is an element or attribute, then the string
@@ -17134,12 +17139,12 @@ Sorted by name.last:
<para>XML: According to W3C, the root of an XML document is not the
topmost element node, but the document itself, which is the parent
of the topmost element. For example, if you want to get the topmost
- <emphasis>element</emphasis> of the XML (the so called ``document
- element''; do not mix it with the ``document''), which is called
- <literal>foo</literal>, then you have to write
- <literal>someNode?root.foo</literal>. If you write just
- <literal>someNode?root</literal>, then you get the document itself,
- and not the document element.</para>
+ <emphasis>element</emphasis> of the XML (the so called
+ <quote>document element</quote>; do not mix it with the
+ <quote>document</quote>), which is called <literal>foo</literal>,
+ then you have to write <literal>someNode?root.foo</literal>. If you
+ write just <literal>someNode?root</literal>, then you get the
+ document itself, and not the document element.</para>
</section>
</section>
@@ -18234,9 +18239,10 @@ Sorted by name.last:
<primary>namespace built-in</primary>
</indexterm>
- <para>This built-in returns the namespace (i.e. the ``gate'' hash to
- the namespace) associated with a macro or function variable. You can
- use it with macros and functions only.</para>
+ <para>This built-in returns the namespace (i.e. the
+ <quote>gate</quote> hash to the namespace) associated with a macro
+ or function variable. You can use it with macros and functions
+ only.</para>
</section>
<section xml:id="ref_builtin_new">
@@ -18801,12 +18807,12 @@ Primary content continued</programlisting>
or no output at all results from the execution of the
<literal><replaceable>attempt block</replaceable></literal> (when
there was an error). For example, above, the failure happens after
- ``Optional content: '' was printed, still it is not there in the
- output before the ``Ops!''. (<phrase role="forProgrammers">This is
- implemented with the aggressive buffering of the output inside the
- <literal><replaceable>attempt block</replaceable></literal>. Not
- even the <literal>flush</literal> directive will send the output to
- the client.</phrase>)</para>
+ <quote>Optional content: </quote> was printed, still it is not there
+ in the output before the <quote>Ops!</quote>. (<phrase
+ role="forProgrammers">This is implemented with the aggressive
+ buffering of the output inside the <literal><replaceable>attempt
+ block</replaceable></literal>. Not even the <literal>flush</literal>
+ directive will send the output to the client.</phrase>)</para>
<para>To prevent misunderstandings coming from the above example:
<literal>attempt</literal>/<literal>recover</literal> is not (only)
@@ -19368,11 +19374,11 @@ m2: &lt;test&gt;</programlisting>
an FTL namespace is created for the template that contains it,
otherwise the <literal>ns_prefixes</literal> parameter has no
effect. An FTL namespace is made for a template when: (a) the
- template is the ``main'' template, that is, it is not invoked as
- a result of an <literal><#include ...></literal>, but it
- is directly invoked (<phrase role="forProgrammers">with the
- <literal>process</literal> Java method of class
- <literal>Template</literal> or
+ template is the <quote>main</quote> template, that is, it is not
+ invoked as a result of an <literal><#include
+ ...></literal>, but it is directly invoked (<phrase
+ role="forProgrammers">with the <literal>process</literal> Java
+ method of class <literal>Template</literal> or
<literal>Environment</literal></phrase>); (b) the template is
invoked directly with <literal><#import
...></literal>.</para>
@@ -19401,18 +19407,15 @@ m2: &lt;test&gt;</programlisting>
<listitem>
<para><literal>strict_syntax</literal>: This turns on/off
- ``strict syntax''. Valid values are the boolean constants
+ <quote>strict syntax</quote>, which is the standard syntax after
+ FreeMarker 2.1. Valid values are the boolean constants
<literal>true</literal> and <literal>false</literal>. (And for
backward compatibility, strings <literal>"yes"</literal>,
<literal>"no"</literal>, <literal>"true"</literal>,
- <literal>"false"</literal>). The default value (i.e. when you
+ <literal>"false"</literal>). The default value (i.e., when you
don't use this parameter) depends on the FreeMarker
- configuration set by the programmers, but it should be
- <literal>true</literal> for new projects. <phrase
- role="forProgrammers">(Programmers: you must set explicitly this
- setting to <literal>true</literal> for this:
- <literal>config.setStrictSyntaxMode(true);</literal>)</phrase>
- For more information read: <xref
+ configuration set by the programmers, but it's most certainly
+ set to <literal>true</literal>. For more information read: <xref
linkend="ref_depr_oldsyntax"/></para>
</listitem>
@@ -22247,16 +22250,16 @@ or
<itemizedlist>
<listitem>
- <para>``leading white-space'' means all space and tab (and other
- character that are white-space according to <link
+ <para><quote>leading white-space</quote> means all space and tab
+ (and other character that are white-space according to <link
linkend="gloss.unicode">UNICODE</link>, except <link
linkend="gloss.lineBreak">line breaks</link>) before the first
non-white-space character of the line.</para>
</listitem>
<listitem>
- <para>``trailing white-space'' means all space and tab (and
- other character that are white-space according to <link
+ <para><quote>trailing white-space</quote> means all space and
+ tab (and other character that are white-space according to <link
linkend="gloss.unicode">UNICODE</link>, except line breaks)
after the last non-white-space character of the line,
<emphasis>and</emphasis> the line break at the end of the
@@ -23139,31 +23142,33 @@ There was no specific handler for node y
<itemizedlist spacing="compact">
<listitem>
- <para><literal>true</literal>: boolean value ``true''</para>
+ <para><literal>true</literal>: boolean value
+ <quote>true</quote></para>
</listitem>
<listitem>
- <para><literal>false</literal>: boolean value ``false''</para>
+ <para><literal>false</literal>: boolean value
+ <quote>false</quote></para>
</listitem>
<listitem>
- <para><literal>gt</literal>: comparison operator ``greater
- than''</para>
+ <para><literal>gt</literal>: comparison operator <quote>greater
+ than</quote></para>
</listitem>
<listitem>
- <para><literal>gte</literal>: comparison operator ``greater than or
- equivalent''</para>
+ <para><literal>gte</literal>: comparison operator <quote>greater
+ than or equivalent</quote></para>
</listitem>
<listitem>
- <para><literal>lt</literal>: comparison operator ``less
- than''</para>
+ <para><literal>lt</literal>: comparison operator <quote>less
+ than</quote></para>
</listitem>
<listitem>
- <para><literal>lte</literal>: comparison operator ``less than or
- equivalent''</para>
+ <para><literal>lte</literal>: comparison operator <quote>less than
+ or equivalent</quote></para>
</listitem>
<listitem>
@@ -23530,7 +23535,7 @@ or
<para>Some transforms may take parameters. The name and meaning of
parameters depends on the transform in question. For example here we
- give a parameter called ``var'':</para>
+ give a parameter called <quote>var</quote>:</para>
<programlisting role="template"><#-- This transform stores the output in the variable x,
rather than sending it to the output -->
@@ -23587,12 +23592,13 @@ some test
<para>While the <literal>#</literal>-less syntax was more natural for
HTML authors, it had too many drawbacks, so finally we have decided to
- deprecate it. With the newer syntax (a.k.a ``strict syntax''), the
- <literal>#</literal> is strictly required. That is, things like
- <literal><include "common_footer.html"></literal> will go to the
- output as is, since they are not considered as FTL tags. Note that
- user-defined directives use <literal>@</literal> <emphasis>instead
- of</emphasis> <literal>#</literal>.</para>
+ deprecate it. With the newer syntax (a.k.a <quote>strict
+ syntax</quote>), the <literal>#</literal> is strictly required. That
+ is, things like <literal><include
+ "common_footer.html"></literal> will go to the output as is, since
+ they are not considered as FTL tags. Note that user-defined directives
+ use <literal>@</literal> <emphasis>instead of</emphasis>
+ <literal>#</literal>.</para>
<para>However, to give users time to prepare for this change, in
FreeMarker 2.1 and 2.2 the usage of <literal>#</literal> is optional,
@@ -23606,8 +23612,8 @@ some test
linkend="ref.directive.ftl"><literal>ftl</literal>
directive</link>.</para>
- <para>The advantages of ``strict syntax'' over the legacy FTL syntax
- are:</para>
+ <para>The advantages of <quote>strict syntax</quote> over the legacy
+ FTL syntax are:</para>
<itemizedlist>
<listitem>
@@ -23770,11 +23776,11 @@ or
cases. Also its syntax is terribly verbose. However, XSLT's
"apply-templates" method can be very handy when you process XML
documents, thus FreeMarker supports something similar called the
- ``visitor pattern''. So in many applications, it is much easier to write
- FTL stylesheets than XSLT style-sheets. Another fundamental difference
- is that FTL "transforms" the node tree to text, while XSLT transforms
- the tree to another tree. So you cannot always use FreeMarker where you
- can use XSLT.</para>
+ <quote>visitor pattern</quote>. So in many applications, it is much
+ easier to write FTL stylesheets than XSLT style-sheets. Another
+ fundamental difference is that FTL "transforms" the node tree to text,
+ while XSLT transforms the tree to another tree. So you cannot always use
+ FreeMarker where you can use XSLT.</para>
</preface>
<chapter xml:id="xgui_expose">
@@ -23880,8 +23886,8 @@ or
<listitem>
<para>The topmost node of a tree is called the <emphasis
role="term">root</emphasis>. In the case of XML documents, it is
- always the ``document'' node, and not the top-most element
- (<literal>book</literal> in this example).</para>
+ always the <quote>document</quote> node, and not the top-most
+ element (<literal>book</literal> in this example).</para>
</listitem>
<listitem>
@@ -23941,7 +23947,7 @@ or
</note>
<para>It's easy to create a simple program to try the examples. Just
- replace the ``Create a data-model'' part of <link
+ replace the <quote>Create a data-model</quote> part of <link
linkend="pgui_quickstart_all">the example of Programmer's Guide
Quickstart</link> with this:</para>
@@ -23999,10 +24005,10 @@ root.put(
<para>Assume that the programmer has put the XML document into the
data-model as variable <literal>doc</literal>. This variable
corresponds to the root of the <link linkend="xgui_expose_dom">DOM
- tree</link>, the ``document''. The actual variable structure behind
- <literal>doc</literal> is wily enough, and only roughly resembles the
- DOM tree. So instead of getting lost in the details, let's see how to
- use it by example.</para>
+ tree</link>, the <quote>document</quote>. The actual variable
+ structure behind <literal>doc</literal> is wily enough, and only
+ roughly resembles the DOM tree. So instead of getting lost in the
+ details, let's see how to use it by example.</para>
<section>
<title>Accessing elements by name</title>
@@ -24124,9 +24130,9 @@ root.put(
</#list>
</#list></programlisting>
- <para>Finally, a ``generalized`` usage of the child selector
- mechanism: this template lists all <literal>para</literal>-s of the
- example XML document:</para>
+ <para>Finally, a generalized usage of the child selector mechanism:
+ this template lists all <literal>para</literal>-s of the example XML
+ document:</para>
<programlisting role="template"><#list doc.book.chapter.para as p>
<p>${p}
@@ -24362,7 +24368,7 @@ Test Book</programlisting>
sections) stands for XPath results as well. That is, if the
resulting sequence contains exactly 1 node, it also acts as the node
itself. For example, print the first paragraph of chapter
- ``Ch1'':</para>
+ <quote>Ch1</quote>:</para>
<programlisting role="template">${doc["book/chapter[title='Ch1']/para[1]"]}</programlisting>
@@ -24704,10 +24710,11 @@ Test Book</programlisting>
<literal>"<replaceable>prefix</replaceable>:<replaceable>elementName</replaceable>"</literal>:
Returns the sequence of child nodes that are elements of name
<literal><replaceable>elementName</replaceable></literal>. (Note
- that the term ``child'' means <emphasis>immediate</emphasis>
- descendant.) The selection is XML name-space aware, unless the XML
- document was persed with an XML parser that was not in namespace
- aware mode. In XML name-space aware mode, names without prefix
+ that the term <quote>child</quote> means
+ <emphasis>immediate</emphasis> descendant.) The selection is XML
+ name-space aware, unless the XML document was persed with an XML
+ parser that was not in namespace aware mode. In XML name-space
+ aware mode, names without prefix
(<replaceable>elementName</replaceable>) selects only elements
that doesn't belong to any XML name-space (unless you have
registered a default XML namespace), and names with prefix
@@ -24723,10 +24730,10 @@ Test Book</programlisting>
<listitem>
<para><literal>*</literal>: Returns the sequence of all child
(direct descendant) <emphasis>element</emphasis> nodes. The
- sequence will contain the elements in the ``document order'', that
- is, in the order in which the first character of the XML
- representation of each node occurs (after expansion of general
- entities).</para>
+ sequence will contain the elements in the <quote>document
+ order</quote>, that is, in the order in which the first character
+ of the XML representation of each node occurs (after expansion of
+ general entities).</para>
</listitem>
<listitem>
@@ -25009,14 +25016,14 @@ Test Book</programlisting>
is the <link
linkend="ref.directive.recurse"><literal>recurse</literal>
directive</link>. This directive gets a node variable as parameter,
- and ``visits'' all its children nodes, one after the other, starting
- with the first child. ``Visiting'' a node means that it calls a
- user-defined directive (like a macro) that has the same name as the
- name of the child node (<literal>?node_name</literal>). We say on
- this, that the user-defined directive <emphasis>handles</emphasis> the
- node. The node that the user-defined directive just handles is
- available as special variable <literal>.node</literal>. For example,
- this FTL:</para>
+ and <quote>visits</quote> all its children nodes, one after the other,
+ starting with the first child. <quote>Visiting</quote> a node means
+ that it calls a user-defined directive (like a macro) that has the
+ same name as the name of the child node
+ (<literal>?node_name</literal>). We say on this, that the user-defined
+ directive <emphasis>handles</emphasis> the node. The node that the
+ user-defined directive just handles is available as special variable
+ <literal>.node</literal>. For example, this FTL:</para>
<programlisting role="template"><#recurse doc>
@@ -25444,11 +25451,11 @@ End book</programlisting>
</listitem>
<listitem>
- <para>``Object wrapping''. This lets you show the objects to
- templates in a customized, presentation oriented way (e.g.
- <link linkend="xgui_imperative_learn">see here</link> how a
- W3C DOM nodes can be seen by templates using this
- technology.)</para>
+ <para><quote>Object wrapping</quote>. This lets you show the
+ objects to templates in a customized, presentation oriented
+ way (e.g. <link linkend="xgui_imperative_learn">see
+ here</link> how a W3C DOM nodes can be seen by templates using
+ this technology.)</para>
</listitem>
<listitem>
@@ -25468,11 +25475,12 @@ End book</programlisting>
<itemizedlist>
<listitem>
- <para>Not a ``standard''. There are fewer tools and IDE
- integrations, fewer developers knows it and there's much less
- industry support in general. (However, most JSP tag libraries
- can work in FreeMarker templates with the proper setup, unless
- they are base on <literal>.tag</literal> files.)</para>
+ <para>Not a <quote>standard</quote>. There are fewer tools and
+ IDE integrations, fewer developers knows it and there's much
+ less industry support in general. (However, most JSP tag
+ libraries can work in FreeMarker templates with the proper
+ setup, unless they are base on <literal>.tag</literal>
+ files.)</para>
</listitem>
<listitem>
@@ -25639,7 +25647,7 @@ End book</programlisting>
<programlisting role="template"><a href="/shop/productdetails?id=${<emphasis>product.id?c</emphasis>}">Details...</a></programlisting>
<para>For computer audience you need <literal>?c</literal> anyway,
- as the decimal separators can also warry depending on the
+ as the decimal separators can also wary depending on the
locale.</para>
</answer>
</qandaentry>
@@ -25662,10 +25670,10 @@ End book</programlisting>
// where cfg is a freemarker.template.Configuration object</programlisting>
<para>However, sometimes you want to output a number not for human
- audience, but for ``computer audience'' (like you want to print a
- size in CSS), in which case you must use dot as decimal separator,
- regardless of the locale (language) of the page. For that use the
- <link linkend="ref_builtin_c"><literal>c</literal>
+ audience, but for <quote>computer audience</quote> (like you want
+ to print a size in CSS), in which case you must use dot as decimal
+ separator, regardless of the locale (language) of the page. For
+ that use the <link linkend="ref_builtin_c"><literal>c</literal>
built-in</link>, for example:</para>
<programlisting role="template">font-size: ${<emphasis>fontSize?c</emphasis>}pt;</programlisting>
@@ -25733,7 +25741,7 @@ End book</programlisting>
</question>
<answer>
- <para>Firs of all, you should know that FreeMarker doesn't load
+ <para>First of all, you should know that FreeMarker doesn't load
templates from file system paths directly. Instead, it uses a
simple virtual file system that might reads non-filesystem
resources (templates from inside jar-s, from inside a database
@@ -25827,8 +25835,8 @@ End book</programlisting>
there is an older version of <literal>freemarker.jar</literal>
around, which shadows the never. To check this, try to print the
version number in a template with <literal>${.version}</literal>.
- (If it dies with ``Unknown built-in variable: version'' error
- message, then you use a very, very old release.).</para>
+ (If it dies with <quote>Unknown built-in variable: version</quote>
+ error message, then you use a very, very old release.).</para>
<para>If you suspect that the problem is that you have multiple
<literal>freemarker.jar</literal>-s, the typical culprit is that
@@ -26067,8 +26075,8 @@ End book</programlisting>
<itemizedlist>
<listitem>
<para>Directives and methods that are written for presentation
- purposes (like kind of ``tools'' for helping FreeMarker
- templates) should declare their arguments as
+ purposes (like kind of <quote>tools</quote> for helping
+ FreeMarker templates) should declare their arguments as
<literal>TemplateModel</literal>-s and the more specific sub
interfaces of that. After all, the object wrapping is about
transforming the data-model to something that serves the
@@ -26355,11 +26363,11 @@ End book</programlisting>
<literal>null</literal>, it treats it exactly as a missing
variable. For example, both if <literal>x</literal> is
<literal>null</literal> in the data-model and if it's not present
- at all, <literal>${x!'missing'}</literal> will print ``missing'',
- you can't tell the difference. Also, if for example you want to
- test if a Java method has returned <literal>null</literal>, just
- write something like <literal><#if
- foo.bar()??></literal>.</para>
+ at all, <literal>${x!'missing'}</literal> will print
+ <quote>missing</quote>, you can't tell the difference. Also, if
+ for example you want to test if a Java method has returned
+ <literal>null</literal>, just write something like
+ <literal><#if foo.bar()??></literal>.</para>
<para>You may interested in the rationale behind this. From the
viewpoint of the presentation layer a <literal>null</literal> and
@@ -26391,7 +26399,7 @@ End book</programlisting>
to the method instead. Like <literal>foo.bar(nullArg)</literal>
will call the <literal>bar</literal> method with
<literal>null</literal> as argument, assuming that there is no
- varaible exists with ``nullArg'' name.</para>
+ variable exists with <quote>nullArg</quote> name.</para>
</answer>
</qandaentry>
@@ -26413,8 +26421,8 @@ End book</programlisting>
<qandaentry xml:id="faq_questionmark">
<question>
- <para>Why do I have ``?''-s in the output instead of character
- <replaceable>X</replaceable>?</para>
+ <para>Why do I have <quote>?</quote>-s in the output instead of
+ character <replaceable>X</replaceable>?</para>
</question>
<answer>
@@ -32414,14 +32422,14 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
templates!</emphasis> Fixed the bugs of the <link
linkend="ref_builtin_c"><literal>c</literal> built-in</link>
(<literal>?c</literal>) that sometimes caused whole numbers to
- be formatted with ``.0'' at the end (like: 1.0), and caused
- numbers sometimes formatted to exponential form (like 4E-20).
- From now whole numbers will never use decimal dot (not even if
- the wrapped number is a <literal>double</literal>; remember, the
- template language knows only a single numerical type), and
- exponential form will never be used either. Also, the maximum
- number of digits after the decimal dot was limited to 16, so
- numbers smaller than 1E-16 will be shown as 0.</para>
+ be formatted with <quote>.0</quote> at the end (like: 1.0), and
+ caused numbers sometimes formatted to exponential form (like
+ 4E-20). From now whole numbers will never use decimal dot (not
+ even if the wrapped number is a <literal>double</literal>;
+ remember, the template language knows only a single numerical
+ type), and exponential form will never be used either. Also, the
+ maximum number of digits after the decimal dot was limited to
+ 16, so numbers smaller than 1E-16 will be shown as 0.</para>
</listitem>
</itemizedlist>
</section>
@@ -32869,12 +32877,12 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<literal><replaceable>myString</replaceable>[<replaceable>from</replaceable>..<<replaceable>toExclusive</replaceable>]</literal>.)
Sequence (list) slices still has to be get with the old syntax,
since <literal>substring</literal> only applies to strings.
- Please note that the ``to'' parameter is 1 greater with this new
- builtin, as it is an exclusive index. Further difference is that
- the <literal>substring</literal> built-in requires that the
- ``from'' index is less than or equal to the ``to'' index. So 0
- length substrings are possible now, but not reversed
- substrings.</para>
+ Please note that the <quote>to</quote> parameter is 1 greater
+ with this new builtin, as it is an exclusive index. Further
+ difference is that the <literal>substring</literal> built-in
+ requires that the <quote>from</quote> index is less than or
+ equal to the <quote>to</quote> index. So 0 length substrings are
+ possible now, but not reversed substrings.</para>
</listitem>
<listitem>
@@ -33209,8 +33217,8 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<itemizedlist>
<listitem>
- <para>New built-in for formatting numbers for ``computer
- audience'' as opposed to human audience: <link
+ <para>New built-in for formatting numbers for <quote>computer
+ audience</quote> as opposed to human audience: <link
linkend="ref_builtin_c"><literal>c</literal></link>. It should
be used for numbers that must use Java language formatting
regardless of the number format and locale settings, like for a
@@ -33381,7 +33389,8 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<listitem>
<para>Bugfix: The <literal>DefaultObjectWrapper</literal> has
ignored the value of the <literal>nullModel</literal> property.
- (Note that it's discouraged to use a ``null model''.)</para>
+ (Note that it's discouraged to use a <quote>null
+ model</quote>.)</para>
</listitem>
</itemizedlist>
</section>
@@ -33697,13 +33706,13 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
the 2.2.x series (see the list below), so you may choose to use it for
new projects only.</para>
- <para>Probably the most ``loudly promoted'' new feature is the totally
- redesigned XML wrapper. With the new XML wrapper FreeMarker targets a
- new application domain, which is similar to the application domain of
- XSLT: transforming complex XML to whatever textual output. Although
- this subproject is young, it is definitely usable in practice. See the
- <link linkend="xgui">XML Processing Guide</link> for more
- details.</para>
+ <para>Probably the most <quote>loudly promoted</quote> new feature is
+ the totally redesigned XML wrapper. With the new XML wrapper
+ FreeMarker targets a new application domain, which is similar to the
+ application domain of XSLT: transforming complex XML to whatever
+ textual output. Although this subproject is young, it is definitely
+ usable in practice. See the <link linkend="xgui">XML Processing
+ Guide</link> for more details.</para>
<section>
<title>Non backward-compatible changes!</title>
@@ -33923,8 +33932,8 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<listitem>
<para>A new header parameter, <literal>strip_text</literal>,
that removes all top-level text from a template. This is useful
- for ``include files'' to suppress newlines that separate the
- macro definitions. See <link
+ for <quote>include files</quote> to suppress newlines that
+ separate the macro definitions. See <link
linkend="ref.directive.ftl"><literal>ftl</literal>
directive</link></para>
</listitem>
@@ -34358,7 +34367,7 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<itemizedlist>
<listitem>
<para>Bugfix: Fixing a fatal bug in the template cache that
- was introduced with the latest cache ``bugfix''. The template
+ was introduced with the latest cache bugfix. The template
cache has always reloaded the unchanged template when the
update delay has been elapsed, until the template has been
actually changed, in which case it has never reloaded the
@@ -34528,10 +34537,10 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
</listitem>
<listitem>
- <para>From now, if no XPath engine is available, and the hash
- key in an ``XML query'' can't be interpreted without XPath, an
- error will tell this clearly, rather than silently returning
- undefined variable (null).</para>
+ <para>From now on, if no XPath engine is available, and the
+ hash key in an XML query can't be interpreted without XPath,
+ an error will tell this clearly, rather than silently
+ returning undefined variable (null).</para>
</listitem>
<listitem>
@@ -34730,9 +34739,9 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
reworked and is absolutely incompatible with pre 10. Don't
worry about this if none of your XML input documents use
you use <literal>xmlns</literal> attributes. Worry,
- though, if you have utilized the ``loose mode'', where
- only the local name of elements were compared, because
- that's now gone. Sorry...</para>
+ though, if you have utilized the <quote>loose
+ mode</quote>, where only the local name of elements were
+ compared, because that's now gone. Sorry...</para>
</listitem>
<listitem>
@@ -35233,10 +35242,11 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<itemizedlist>
<listitem>
<para>Bugfix: Fixing a fatal bug in the template cache that was
- introduced with the latest cache ``bugfix''. The template cache
- has always reloaded the unchanged template when the update delay
- has been elapsed, until the template has been actually changed,
- in which case it has never reloaded the template anymore.</para>
+ introduced with the latest cache <quote>bugfix</quote>. The
+ template cache has always reloaded the unchanged template when
+ the update delay has been elapsed, until the template has been
+ actually changed, in which case it has never reloaded the
+ template anymore.</para>
</listitem>
</itemizedlist>
</section>
@@ -35321,8 +35331,8 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<listitem>
<para>Fixes and improvements in the Manual and in the API
JavaDoc. The documentation now works with the Eclipse help
- plugin (accessible in the ``Editor/IDE plugins'' section of the
- FreeMarker Web page).</para>
+ plugin (accessible in the <quote>Editor/IDE plugins</quote>
+ section of the FreeMarker Web page).</para>
</listitem>
<listitem>
@@ -35669,11 +35679,11 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<literal><nested></literal>, then that will be
misinterpreted as a directive. To prevent this kind of problem
in the future, we recommend everybody to switch from the old
- syntax to the new syntax (``strict syntax''). The strict syntax
- will be the the default syntax starting from some of the later
- releases anyway. We plan to release a conversion tool for
- converting old templates. For more information please read:
- <xref linkend="ref_depr_oldsyntax"/></para>
+ syntax to the new syntax (<quote>strict syntax</quote>). The
+ strict syntax will be the the default syntax starting from some
+ of the later releases anyway. We plan to release a conversion
+ tool for converting old templates. For more information please
+ read: <xref linkend="ref_depr_oldsyntax"/></para>
</listitem>
<listitem>
@@ -35748,14 +35758,14 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<listitem>
<para>Namespaces: Names-spaces are invaluable if you want to
- assemble collections (``libraries'') of macros and transforms
- (and other variables), and then use them in any template without
- worrying about accidental name clashes with the application
- specific and temporary variables, or with the variables of other
- collections you want to use in the same template. This is
- extremely important if FreeMarker users want to share their
- macro/transform collections. For more information read: <xref
- linkend="dgui_misc_namespace"/></para>
+ assemble collections (<quote>libraries</quote>) of macros and
+ transforms (and other variables), and then use them in any
+ template without worrying about accidental name clashes with the
+ application specific and temporary variables, or with the
+ variables of other collections you want to use in the same
+ template. This is extremely important if FreeMarker users want
+ to share their macro/transform collections. For more information
+ read: <xref linkend="dgui_misc_namespace"/></para>
</listitem>
<listitem>
@@ -36809,11 +36819,12 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
</listitem>
<listitem>
- <para>Bugfix: operator ``or'' (<literal>||</literal>) worked
- wrongly when its left operand was a composite expression (e.g.
- the second <literal>||</literal> in <literal>false || true ||
- false</literal>; this was evaluated to <literal>false</literal>,
- but it should be <literal>true</literal>)</para>
+ <para>Bugfix: operator <quote>or</quote> (<literal>||</literal>)
+ worked wrongly when its left operand was a composite expression
+ (e.g., the second <literal>||</literal> in <literal>false ||
+ true || false</literal>; this was evaluated to
+ <literal>false</literal>, but it should be
+ <literal>true</literal>)</para>
</listitem>
<listitem>
@@ -36902,8 +36913,9 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<para>Note however that the programmer can configure
FreeMarker so that it ignores certain errors (say, undefined
variables), and continues template processing by skipping
- the problematic part. This ``loose'' policy should be used
- only for sites that don't show critical information.</para>
+ the problematic part. This <quote>loose</quote> policy
+ should be used only for sites that don't show critical
+ information.</para>
</listitem>
<listitem>
@@ -38256,8 +38268,9 @@ Apache Software Foundation.</programlisting>
<glossdef>
<para>A symbol that people use in writing. Examples of characters:
- Latin capital letter A (``A''), Latin small letter A (``a''), digit
- four (``4''), number sign (``#''), colon (``:'')</para>
+ Latin capital letter A (<quote>A</quote>), Latin small letter A
+ (<quote>a</quote>), digit four (<quote>4</quote>), number sign
+ (<quote>#</quote>), colon (<quote>:</quote>)</para>
</glossdef>
</glossentry>
@@ -38295,8 +38308,8 @@ Apache Software Foundation.</programlisting>
<glossdef>
<para>Means output <link linkend="gloss.charset">charset</link>. In
- the Java world the term ``encoding'' is commonly (mis)used as a
- synonym to ``charset''.</para>
+ the Java world the term <quote>encoding</quote> is commonly (mis)used
+ as a synonym to charset.</para>
</glossdef>
</glossentry>
@@ -38305,8 +38318,8 @@ Apache Software Foundation.</programlisting>
<glossdef>
<para>Means template <link linkend="gloss.charset">charset</link>. In
- the Java world the term ``encoding'' is commonly (mis)used as a
- synonym to ``charset''.</para>
+ the Java world the term <quote>encoding</quote> is commonly (mis)used
+ as a synonym to charset.</para>
</glossdef>
</glossentry>
@@ -38469,13 +38482,14 @@ Apache Software Foundation.</programlisting>
text (say, when you read the text with Windows notepad). Typically you
type this character by hitting ENTER or RETURN key. The line break is
represented with different characters on different platforms (to cause
- incompatibility and confusion...): ``line feed'' character on UNIX-es,
- ``carriage return'' character on Macintosh, ``carriage return''+``line
- feed'' (two characters!) on Windows and DOS. Note that line breaks in
- HTML do not have a visual effect when viewed in a browser; you must
- use markup such as <literal><BR></literal> for that. This manual
- never means <literal><BR></literal> when it says
- ``line-break''.</para>
+ incompatibility and confusion...): <quote>line feed</quote> character
+ on UNIX-es, <quote>carriage return</quote> character on Macintosh,
+ <quote>carriage return</quote> + <quote>line feed</quote> (two
+ characters!) on Windows and DOS. Note that line breaks in HTML do not
+ have a visual effect when viewed in a browser; you must use markup
+ such as <literal><BR></literal> for that. This manual never
+ means <literal><BR></literal> when it says
+ <quote>line-break</quote>.</para>
</glossdef>
</glossentry>
@@ -38629,11 +38643,12 @@ Apache Software Foundation.</programlisting>
<literal>"fo*"</literal> matches <literal>"f"</literal>,
<literal>"fo"</literal>, <literal>"foo"</literal>, etc. Regular
expressions are used in several languages and other tools. In
- FreeMarker, the usage of them is a ``power user'' option. So if you
- have never used them before, there is no need to worry about not being
- familiar with them. But if you are interested in regular expressions,
- you can find several Web pages and books about them. FreeMarker uses
- the variation of regular expressions described at: <link
+ FreeMarker, the usage of them is a <quote>power user</quote> option.
+ So if you have never used them before, there is no need to worry about
+ not being familiar with them. But if you are interested in regular
+ expressions, you can find several Web pages and books about them.
+ FreeMarker uses the variation of regular expressions described at:
+ <link
xlink:href="http://docs.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html">http://docs.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html</link></para>
</glossdef>
</glossentry>
@@ -38663,7 +38678,8 @@ Apache Software Foundation.</programlisting>
<glossdef>
<para>A sequence of <link linkend="gloss.character">characters</link>
- such as ``m'', ``o'', ``u'', ``s'', ``e''.</para>
+ such as <quote>m</quote>, <quote>o</quote>, <quote>u</quote>,
+ <quote>s</quote>, <quote>e</quote>.</para>
</glossdef>
</glossentry>
@@ -38761,12 +38777,13 @@ Apache Software Foundation.</programlisting>
<glossdef>
<para>This is international standard (ISO-10646) that defines a huge
set of <link linkend="gloss.character">characters</link> and assigns a
- unique number for each character (``!'' is 33, ..., ``A'' is 61, ``B''
- is 62, ..., Arabic letter hamza is 1569... etc.). This character set
- (not charset) contains almost all characters used today (Latin
- alphabet, Cyrillic alphabet, Chinese letters, etc.). The idea behind
- UCS is that we can specify any character with a unique number, not
- mater what the platform or the language is.</para>
+ unique number for each character (<quote>!</quote> is 33, ...,
+ <quote>A</quote> is 61, <quote>B</quote> is 62, ..., Arabic letter
+ hamza is 1569... etc.). This character set (not charset) contains
+ almost all characters used today (Latin alphabet, Cyrillic alphabet,
+ Chinese letters, etc.). The idea behind UCS is that we can specify any
+ character with a unique number, not mater what the platform or the
+ language is.</para>
<glossseealso otherterm="gloss.unicode"/>
</glossdef>
[09/50] [abbrv] incubator-freemarker git commit: Improved
TemplateLoader tests a bit.
Posted by dd...@apache.org.
Improved TemplateLoader tests a bit.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/2065c579
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/2065c579
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/2065c579
Branch: refs/heads/2.3
Commit: 2065c57993d083efb2fa3e9785e59cc3bc1a7a38
Parents: d661acc
Author: ddekany <dd...@apache.org>
Authored: Sun Feb 5 19:17:53 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Feb 5 19:17:53 2017 +0100
----------------------------------------------------------------------
.../freemarker/cache/TemplateCacheTest.java | 38 +++-
.../cache/TemplateNameFormatTest.java | 16 +-
.../freemarker/template/ConfigurationTest.java | 22 +-
.../template/TemplateLookupStrategyTest.java | 124 +++++-----
.../test/MonitoredTemplateLoader.java | 226 ++++++++++++++++++-
5 files changed, 338 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2065c579/src/test/java/freemarker/cache/TemplateCacheTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/cache/TemplateCacheTest.java b/src/test/java/freemarker/cache/TemplateCacheTest.java
index b1988b2..417921a 100644
--- a/src/test/java/freemarker/cache/TemplateCacheTest.java
+++ b/src/test/java/freemarker/cache/TemplateCacheTest.java
@@ -19,7 +19,11 @@
package freemarker.cache;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.io.Reader;
@@ -29,12 +33,19 @@ import java.util.Locale;
import org.hamcrest.Matchers;
import org.junit.Test;
+import com.google.common.collect.ImmutableList;
+
import freemarker.core.ParseException;
import freemarker.template.Configuration;
import freemarker.template.MalformedTemplateNameException;
import freemarker.template.Template;
import freemarker.template.TemplateNotFoundException;
import freemarker.template.Version;
+import freemarker.test.MonitoredTemplateLoader;
+import freemarker.test.MonitoredTemplateLoader.CloseTemplateSourceEvent;
+import freemarker.test.MonitoredTemplateLoader.FindTemplateSourceEvent;
+import freemarker.test.MonitoredTemplateLoader.GetLastModifiedEvent;
+import freemarker.test.MonitoredTemplateLoader.GetReaderEvent;
public class TemplateCacheTest {
@@ -269,7 +280,7 @@ public class TemplateCacheTest {
Configuration cfg = new Configuration(Configuration.VERSION_2_3_22);
cfg.setLocale(Locale.US);
- StringTemplateLoader tl = new StringTemplateLoader();
+ MonitoredTemplateLoader tl = new MonitoredTemplateLoader();
tl.putTemplate("utf-8_en.ftl", "<#ftl encoding='utf-8'>Foo");
tl.putTemplate("utf-8.ftl", "Bar");
cfg.setTemplateLoader(tl);
@@ -280,17 +291,38 @@ public class TemplateCacheTest {
assertEquals("utf-8_en.ftl", t.getSourceName());
assertEquals("Utf-8", t.getEncoding());
assertEquals("Foo", t.toString());
+
+ assertEquals(
+ ImmutableList.of(
+ new FindTemplateSourceEvent("utf-8_en_US.ftl", false),
+ new FindTemplateSourceEvent("utf-8_en.ftl", true),
+ new GetLastModifiedEvent("utf-8_en.ftl"),
+ new GetReaderEvent("utf-8_en.ftl"), // Attempt 1
+ new CloseTemplateSourceEvent("utf-8_en.ftl")),
+ tl.getEvents());
}
{
+ tl.clearEvents();
+
Template t = cfg.getTemplate("utf-8.ftl", "Utf-16");
assertEquals("utf-8.ftl", t.getName());
assertEquals("utf-8_en.ftl", t.getSourceName());
assertEquals("utf-8", t.getEncoding());
assertEquals("Foo", t.toString());
+
+ assertEquals(
+ ImmutableList.of(
+ new FindTemplateSourceEvent("utf-8_en_US.ftl", false),
+ new FindTemplateSourceEvent("utf-8_en.ftl", true),
+ new GetLastModifiedEvent("utf-8_en.ftl"),
+ new GetReaderEvent("utf-8_en.ftl"), // Attempt 1
+ new GetReaderEvent("utf-8_en.ftl"), // Attempt 2
+ new CloseTemplateSourceEvent("utf-8_en.ftl")),
+ tl.getEvents());
}
}
-
+
@Test
public void testEncodingSelection() throws IOException {
Locale hungary = new Locale("hu", "HU");
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2065c579/src/test/java/freemarker/cache/TemplateNameFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/cache/TemplateNameFormatTest.java b/src/test/java/freemarker/cache/TemplateNameFormatTest.java
index 499e751..d001965 100644
--- a/src/test/java/freemarker/cache/TemplateNameFormatTest.java
+++ b/src/test/java/freemarker/cache/TemplateNameFormatTest.java
@@ -19,9 +19,11 @@
package freemarker.cache;
-import static freemarker.test.hamcerst.Matchers.*;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static freemarker.test.hamcerst.Matchers.containsStringIgnoringCase;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.Locale;
@@ -241,8 +243,8 @@ public class TemplateNameFormatTest {
"foo\\bar_en_US.ftl",
"foo\\bar_en.ftl",
name),
- tl.getTemplatesTried());
- tl.clear();
+ tl.getNamesSearched());
+ tl.clearEvents();
}
try {
@@ -255,8 +257,8 @@ public class TemplateNameFormatTest {
"foo\\missing_en_US.ftl",
"foo\\missing_en.ftl",
"foo\\missing.ftl"),
- tl.getTemplatesTried());
- tl.clear();
+ tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2065c579/src/test/java/freemarker/template/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/ConfigurationTest.java b/src/test/java/freemarker/template/ConfigurationTest.java
index 585940a..2cba054 100644
--- a/src/test/java/freemarker/template/ConfigurationTest.java
+++ b/src/test/java/freemarker/template/ConfigurationTest.java
@@ -640,28 +640,28 @@ public class ConfigurationTest extends TestCase {
t.process(null, sw);
assertEquals(expectedContent, sw.toString());
}
-
+
public void testSetTemplateLoaderAndCache() throws Exception {
Configuration cfg = new Configuration();
- CacheStorageWithGetSize cache = (CacheStorageWithGetSize) cfg.getCacheStorage();
- assertEquals(0, cache.getSize());
+ CacheStorageWithGetSize cacheStorage = (CacheStorageWithGetSize) cfg.getCacheStorage();
+ assertEquals(0, cacheStorage.getSize());
cfg.setCacheStorage(new StrongCacheStorage());
- cache = (CacheStorageWithGetSize) cfg.getCacheStorage();
- assertEquals(0, cache.getSize());
+ cacheStorage = (CacheStorageWithGetSize) cfg.getCacheStorage();
+ assertEquals(0, cacheStorage.getSize());
cfg.setClassForTemplateLoading(ConfigurationTest.class, "");
- assertEquals(0, cache.getSize());
+ assertEquals(0, cacheStorage.getSize());
cfg.getTemplate("toCache1.ftl");
- assertEquals(1, cache.getSize());
+ assertEquals(1, cacheStorage.getSize());
cfg.getTemplate("toCache2.ftl");
- assertEquals(2, cache.getSize());
+ assertEquals(2, cacheStorage.getSize());
cfg.setClassForTemplateLoading(ConfigurationTest.class, "");
- assertEquals(0, cache.getSize());
+ assertEquals(0, cacheStorage.getSize());
cfg.getTemplate("toCache1.ftl");
- assertEquals(1, cache.getSize());
+ assertEquals(1, cacheStorage.getSize());
cfg.setTemplateLoader(cfg.getTemplateLoader());
- assertEquals(1, cache.getSize());
+ assertEquals(1, cacheStorage.getSize());
}
public void testChangingLocalizedLookupClearsCache() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2065c579/src/test/java/freemarker/template/TemplateLookupStrategyTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/TemplateLookupStrategyTest.java b/src/test/java/freemarker/template/TemplateLookupStrategyTest.java
index 2a40c62..7d2f922 100644
--- a/src/test/java/freemarker/template/TemplateLookupStrategyTest.java
+++ b/src/test/java/freemarker/template/TemplateLookupStrategyTest.java
@@ -19,7 +19,11 @@
package freemarker.template;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.io.StringWriter;
@@ -67,8 +71,8 @@ public class TemplateLookupStrategyTest {
fail();
} catch (TemplateNotFoundException e) {
assertEquals("missing.ftl", e.getTemplateName());
- assertEquals(ImmutableList.of("aa/missing.ftl", "missing.ftl"), tl.getTemplatesTried());
- tl.clear();
+ assertEquals(ImmutableList.of("aa/missing.ftl", "missing.ftl"), tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -78,8 +82,8 @@ public class TemplateLookupStrategyTest {
assertEquals("aa/test.ftl", t.getSourceName());
assertEquals(locale, t.getLocale());
assertNull(t.getCustomLookupCondition());
- assertEquals(ImmutableList.of("aa/test.ftl"), tl.getTemplatesTried());
- tl.clear();
+ assertEquals(ImmutableList.of("aa/test.ftl"), tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
}
@@ -108,8 +112,8 @@ public class TemplateLookupStrategyTest {
"missing_aa_BB.ftl",
"missing_aa.ftl",
"missing.ftl"),
- tl.getTemplatesTried());
- tl.clear();
+ tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -121,8 +125,8 @@ public class TemplateLookupStrategyTest {
assertEquals("missing.ftl", e.getTemplateName());
assertEquals(
ImmutableList.of("missing_xx.ftl", "missing.ftl"),
- tl.getTemplatesTried());
- tl.clear();
+ tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -134,8 +138,8 @@ public class TemplateLookupStrategyTest {
assertEquals("missing.ftl", e.getTemplateName());
assertEquals(
ImmutableList.of("missing.ftl"),
- tl.getTemplatesTried());
- tl.clear();
+ tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
cfg.setLocalizedLookup(true);
@@ -147,8 +151,8 @@ public class TemplateLookupStrategyTest {
assertEquals("_a_b_.ftl", e.getTemplateName());
assertEquals(
ImmutableList.of("_a_b__xx_YY.ftl", "_a_b__xx.ftl", "_a_b_.ftl"),
- tl.getTemplatesTried());
- tl.clear();
+ tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -160,9 +164,9 @@ public class TemplateLookupStrategyTest {
assertEquals("test_aa_BB_CC_DD.ftl", t.getSourceName());
assertEquals(locale, t.getLocale());
assertNull(t.getCustomLookupCondition());
- assertEquals(ImmutableList.of("test_aa_BB_CC_DD.ftl"), tl.getTemplatesTried());
+ assertEquals(ImmutableList.of("test_aa_BB_CC_DD.ftl"), tl.getNamesSearched());
assertNull(t.getCustomLookupCondition());
- tl.clear();
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -173,8 +177,8 @@ public class TemplateLookupStrategyTest {
assertEquals("test_aa_BB_CC.ftl", t.getSourceName());
assertEquals(locale, t.getLocale());
assertNull(t.getCustomLookupCondition());
- assertEquals(ImmutableList.of("test_aa_BB_CC_XX.ftl", "test_aa_BB_CC.ftl"), tl.getTemplatesTried());
- tl.clear();
+ assertEquals(ImmutableList.of("test_aa_BB_CC_XX.ftl", "test_aa_BB_CC.ftl"), tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -187,8 +191,8 @@ public class TemplateLookupStrategyTest {
assertNull(t.getCustomLookupCondition());
assertEquals(
ImmutableList.of("test_aa_BB_XX_XX.ftl", "test_aa_BB_XX.ftl", "test_aa_BB.ftl"),
- tl.getTemplatesTried());
- tl.clear();
+ tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -202,8 +206,8 @@ public class TemplateLookupStrategyTest {
assertNull(t.getCustomLookupCondition());
assertEquals(
ImmutableList.of("test.ftl"),
- tl.getTemplatesTried());
- tl.clear();
+ tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
cfg.setLocalizedLookup(true);
}
@@ -217,8 +221,8 @@ public class TemplateLookupStrategyTest {
assertNull(t.getCustomLookupCondition());
assertEquals(
ImmutableList.of("test_aa_XX_XX_XX.ftl", "test_aa_XX_XX.ftl", "test_aa_XX.ftl", "test_aa.ftl"),
- tl.getTemplatesTried());
- tl.clear();
+ tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -232,8 +236,8 @@ public class TemplateLookupStrategyTest {
assertEquals(
ImmutableList.of(
"test_xx_XX_XX_XX.ftl", "test_xx_XX_XX.ftl", "test_xx_XX.ftl", "test_xx.ftl", "test.ftl"),
- tl.getTemplatesTried());
- tl.clear();
+ tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -247,8 +251,8 @@ public class TemplateLookupStrategyTest {
assertEquals(
ImmutableList.of(
"test_xx_BB_CC_DD.ftl", "test_xx_BB_CC.ftl", "test_xx_BB.ftl", "test_xx.ftl", "test.ftl"),
- tl.getTemplatesTried());
- tl.clear();
+ tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
}
@@ -276,8 +280,8 @@ public class TemplateLookupStrategyTest {
ImmutableList.of(
"x/y/sub/i_xx.ftl", "x/sub/i_xx.ftl", "sub/i_xx.ftl",
"x/y/sub/i.ftl", "x/sub/i.ftl"),
- tl.getTemplatesTried());
- tl.clear();
+ tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -291,8 +295,8 @@ public class TemplateLookupStrategyTest {
ImmutableList.of(
"a/b/sub/i_xx.ftl", "a/sub/i_xx.ftl", "sub/i_xx.ftl",
"a/b/sub/i.ftl", "a/sub/i.ftl", "sub/i.ftl"),
- tl.getTemplatesTried());
- tl.clear();
+ tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
}
@@ -344,15 +348,15 @@ public class TemplateLookupStrategyTest {
assertEquals(tAtFooComContent, t.toString());
assertEquals(
ImmutableList.of("@foo.com/t_xx.ftl", "@foo.com/t.ftl"),
- tl.getTemplatesTried());
+ tl.getNamesSearched());
- tl.clear();
+ tl.clearEvents();
assertOutputEquals(tAtFooComWithoutIncludeContent + iAtFooComContent, t);
assertEquals(
ImmutableList.of("@foo.com/i_xx.ftl", "@foo.com/i.ftl"),
- tl.getTemplatesTried());
+ tl.getNamesSearched());
- tl.clear();
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -367,17 +371,17 @@ public class TemplateLookupStrategyTest {
assertEquals(tAtBarComContent, t.toString());
assertEquals(
ImmutableList.of("@bar.com/t_xx.ftl", "@bar.com/t.ftl"),
- tl.getTemplatesTried());
+ tl.getNamesSearched());
- tl.clear();
+ tl.clearEvents();
assertOutputEquals(tAtBarComWithoutIncludeContent + iXxAtDefaultContent, t);
assertEquals(
ImmutableList.of(
"@bar.com/i_xx.ftl", "@bar.com/i.ftl",
"@default/i_xx.ftl"),
- tl.getTemplatesTried());
+ tl.getNamesSearched());
- tl.clear();
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -394,15 +398,15 @@ public class TemplateLookupStrategyTest {
ImmutableList.of(
"@baaz.com/t_xx_YY.ftl", "@baaz.com/t_xx.ftl", "@baaz.com/t.ftl",
"@default/t_xx_YY.ftl", "@default/t_xx.ftl", "@default/t.ftl"),
- tl.getTemplatesTried());
+ tl.getNamesSearched());
- tl.clear();
+ tl.clearEvents();
assertOutputEquals(tAtDefaultWithoutIncludeContent + iAtBaazComContent, t);
assertEquals(
ImmutableList.of("@baaz.com/i_xx_YY.ftl", "@baaz.com/i_xx.ftl", "@baaz.com/i.ftl"),
- tl.getTemplatesTried());
+ tl.getNamesSearched());
- tl.clear();
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -419,9 +423,9 @@ public class TemplateLookupStrategyTest {
ImmutableList.of(
"@nosuch.com/i_xx_YY.ftl", "@nosuch.com/i_xx.ftl", "@nosuch.com/i.ftl",
"@default/i_xx_YY.ftl", "@default/i_xx.ftl"),
- tl.getTemplatesTried());
+ tl.getNamesSearched());
- tl.clear();
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -437,9 +441,9 @@ public class TemplateLookupStrategyTest {
assertEquals(iAtDefaultContent, t.toString());
assertEquals(
ImmutableList.of("@nosuch.com/i.ftl", "@default/i.ftl"),
- tl.getTemplatesTried());
+ tl.getNamesSearched());
- tl.clear();
+ tl.clearEvents();
cfg.setLocalizedLookup(true);
cfg.clearTemplateCache();
}
@@ -454,9 +458,9 @@ public class TemplateLookupStrategyTest {
"@foo.com/t2_xx.ftl", "@foo.com/t2.ftl",
"@foo.com/i2_xx.ftl", "@foo.com/i2.ftl", "@default/i2_xx.ftl", "@default/i2.ftl",
"@foo.com/i3_xx.ftl"),
- tl.getTemplatesTried());
+ tl.getNamesSearched());
- tl.clear();
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -470,9 +474,9 @@ public class TemplateLookupStrategyTest {
"@foo.com/t2_yy.ftl", "@foo.com/t2.ftl",
"@foo.com/i2_yy.ftl", "@foo.com/i2.ftl", "@default/i2_yy.ftl", "@default/i2.ftl",
"@foo.com/i3_yy.ftl", "@foo.com/i3.ftl"),
- tl.getTemplatesTried());
+ tl.getNamesSearched());
- tl.clear();
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -487,9 +491,9 @@ public class TemplateLookupStrategyTest {
"@foo.com/t2.ftl",
"@foo.com/i2.ftl", "@default/i2.ftl",
"@foo.com/i3.ftl"),
- tl.getTemplatesTried());
+ tl.getNamesSearched());
- tl.clear();
+ tl.clearEvents();
cfg.setLocalizedLookup(true);
cfg.clearTemplateCache();
}
@@ -500,9 +504,9 @@ public class TemplateLookupStrategyTest {
cfg.getTemplate("i3.ftl", locale, domain, "utf-8", true, false);
assertEquals(
ImmutableList.of("@foo.com/i3_xx.ftl"),
- tl.getTemplatesTried());
+ tl.getNamesSearched());
- tl.clear();
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -519,9 +523,9 @@ public class TemplateLookupStrategyTest {
ImmutableList.of(
"@bar.com/i3_xx.ftl", "@bar.com/i3.ftl",
"@default/i3_xx.ftl", "@default/i3.ftl"),
- tl.getTemplatesTried());
+ tl.getNamesSearched());
- tl.clear();
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -546,8 +550,8 @@ public class TemplateLookupStrategyTest {
"missing_aa_BB.txt",
"missing_aa.txt",
"missing.txt"),
- tl.getTemplatesTried());
- tl.clear();
+ tl.getNamesSearched());
+ tl.clearEvents();
cfg.clearTemplateCache();
}
@@ -559,7 +563,7 @@ public class TemplateLookupStrategyTest {
ImmutableList.of(
"test_aa_BB.txt",
"test_aa.txt"),
- tl.getTemplatesTried());
+ tl.getNamesSearched());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2065c579/src/test/java/freemarker/test/MonitoredTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/MonitoredTemplateLoader.java b/src/test/java/freemarker/test/MonitoredTemplateLoader.java
index e088ab3..f51b109 100644
--- a/src/test/java/freemarker/test/MonitoredTemplateLoader.java
+++ b/src/test/java/freemarker/test/MonitoredTemplateLoader.java
@@ -19,28 +19,240 @@
package freemarker.test;
+import java.io.Reader;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import freemarker.cache.StringTemplateLoader;
public class MonitoredTemplateLoader extends StringTemplateLoader {
- private final List<String> templatesTried = new ArrayList<String>();
+ List<AbstractTemplateLoaderEvent> events = Collections.synchronizedList(new ArrayList<AbstractTemplateLoaderEvent>());
@Override
public Object findTemplateSource(String name) {
- templatesTried.add(name);
- return super.findTemplateSource(name);
+ FindTemplateSourceEvent event = new FindTemplateSourceEvent(name, null);
+ events.add(event);
+ Object result = super.findTemplateSource(name);
+ event.setFound(result != null);
+ return result;
}
- public List<String> getTemplatesTried() {
- return templatesTried;
+ public void clearEvents() {
+ events.clear();
}
- public void clear() {
- templatesTried.clear();
+ @Override
+ public void closeTemplateSource(Object templateSource) {
+ events.add(new CloseTemplateSourceEvent(templateSource.toString()));
+ super.closeTemplateSource(templateSource);
+ }
+
+ @Override
+ public Reader getReader(Object templateSource, String encoding) {
+ events.add(new GetReaderEvent(templateSource.toString()));
+ return super.getReader(templateSource, encoding);
+ }
+
+ @Override
+ public long getLastModified(Object templateSource) {
+ events.add(new GetLastModifiedEvent(templateSource.toString()));
+ return super.getLastModified(templateSource);
+ }
+
+ public List<AbstractTemplateLoaderEvent> getEvents() {
+ return events;
+ }
+
+ public List<String> getNamesSearched() {
+ ArrayList<String> result = new ArrayList<String>();
+ for (AbstractTemplateLoaderEvent event : events) {
+ if (event instanceof FindTemplateSourceEvent) {
+ result.add(((FindTemplateSourceEvent) event).getName());
+ }
+ }
+ return result;
+ }
+
+ public static abstract class AbstractTemplateLoaderEvent {
+ // empty
+ }
+
+ public static class FindTemplateSourceEvent extends AbstractTemplateLoaderEvent {
+ private final String name;
+ private Boolean found;
+
+ public FindTemplateSourceEvent(String name, Boolean found) {
+ this.name = name;
+ this.found = found;
+ }
+
+ public void setFound(boolean found) {
+ this.found = found;
+ }
+
+ public Boolean getFound() {
+ return found;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((found == null) ? 0 : found.hashCode());
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ FindTemplateSourceEvent other = (FindTemplateSourceEvent) obj;
+ if (found == null) {
+ if (other.found != null)
+ return false;
+ } else if (!found.equals(other.found))
+ return false;
+ if (name == null) {
+ if (other.name != null)
+ return false;
+ } else if (!name.equals(other.name))
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return "FindTemplateSourceEvent [name=" + name + ", found=" + found + "]";
+ }
+
}
+
+ public static class GetLastModifiedEvent extends AbstractTemplateLoaderEvent {
+ private final String sourceName;
+
+ public GetLastModifiedEvent(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((sourceName == null) ? 0 : sourceName.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ GetLastModifiedEvent other = (GetLastModifiedEvent) obj;
+ if (sourceName == null) {
+ if (other.sourceName != null)
+ return false;
+ } else if (!sourceName.equals(other.sourceName))
+ return false;
+ return true;
+ }
+ @Override
+ public String toString() {
+ return "GetLastModifiedEvent [sourceName=" + sourceName + "]";
+ }
+
+ }
+
+ public static class GetReaderEvent extends AbstractTemplateLoaderEvent {
+ private final String sourceName;
+
+ public GetReaderEvent(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((sourceName == null) ? 0 : sourceName.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ GetReaderEvent other = (GetReaderEvent) obj;
+ if (sourceName == null) {
+ if (other.sourceName != null)
+ return false;
+ } else if (!sourceName.equals(other.sourceName))
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return "GetReaderEvent [sourceName=" + sourceName + "]";
+ }
+
+ }
+
+ public static class CloseTemplateSourceEvent extends AbstractTemplateLoaderEvent {
+ private final String sourceName;
+
+ public CloseTemplateSourceEvent(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((sourceName == null) ? 0 : sourceName.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ CloseTemplateSourceEvent other = (CloseTemplateSourceEvent) obj;
+ if (sourceName == null) {
+ if (other.sourceName != null)
+ return false;
+ } else if (!sourceName.equals(other.sourceName))
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return "CloseTemplateSourceEvent [sourceName=" + sourceName + "]";
+ }
+
+ }
}
\ No newline at end of file
[36/50] [abbrv] incubator-freemarker git commit: Changing copyright
header format to be identical to IntelliJ generated copyright headers
Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/varargs.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/varargs.ftl b/src/test/resources/freemarker/test/templatesuite/templates/varargs.ftl
index ae86134..5e79aa7 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/varargs.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/varargs.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/variables.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/variables.ftl b/src/test/resources/freemarker/test/templatesuite/templates/variables.ftl
index ebee898..b927381 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/variables.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/variables.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/varlayers_lib.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/varlayers_lib.ftl b/src/test/resources/freemarker/test/templatesuite/templates/varlayers_lib.ftl
index e8b5c96..9a1a471 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/varlayers_lib.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/varlayers_lib.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/whitespace-trim.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/whitespace-trim.ftl b/src/test/resources/freemarker/test/templatesuite/templates/whitespace-trim.ftl
index 460d080..9c10dd9 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/whitespace-trim.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/whitespace-trim.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/wsstripinheader_inc.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/wsstripinheader_inc.ftl b/src/test/resources/freemarker/test/templatesuite/templates/wsstripinheader_inc.ftl
index dce2f75..03cbfbe 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/wsstripinheader_inc.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/wsstripinheader_inc.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/wstrip-in-header.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/wstrip-in-header.ftl b/src/test/resources/freemarker/test/templatesuite/templates/wstrip-in-header.ftl
index b14e087..0dce83c 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/wstrip-in-header.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/wstrip-in-header.ftl
@@ -10,9 +10,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/xml-fragment.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/xml-fragment.ftl b/src/test/resources/freemarker/test/templatesuite/templates/xml-fragment.ftl
index c315c33..226215b 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/xml-fragment.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/xml-fragment.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/xml-ns_prefix-scope-lib.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/xml-ns_prefix-scope-lib.ftl b/src/test/resources/freemarker/test/templatesuite/templates/xml-ns_prefix-scope-lib.ftl
index fac3346..0f0bde2 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/xml-ns_prefix-scope-lib.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/xml-ns_prefix-scope-lib.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/xml-ns_prefix-scope-main.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/xml-ns_prefix-scope-main.ftl b/src/test/resources/freemarker/test/templatesuite/templates/xml-ns_prefix-scope-main.ftl
index 7af3550..5b7ce24 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/xml-ns_prefix-scope-main.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/xml-ns_prefix-scope-main.ftl
@@ -11,9 +11,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/xml.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/xml.ftl b/src/test/resources/freemarker/test/templatesuite/templates/xml.ftl
index aa1c841..bae3067 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/xml.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/xml.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/xmlns1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/xmlns1.ftl b/src/test/resources/freemarker/test/templatesuite/templates/xmlns1.ftl
index e88e7de..8aa893e 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/xmlns1.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/xmlns1.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/xmlns3.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/xmlns3.ftl b/src/test/resources/freemarker/test/templatesuite/templates/xmlns3.ftl
index 9ad541f..c84ec69 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/xmlns3.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/xmlns3.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/xmlns4.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/xmlns4.ftl b/src/test/resources/freemarker/test/templatesuite/templates/xmlns4.ftl
index 2a79936..e97bfc0 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/xmlns4.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/xmlns4.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/xmlns5.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/xmlns5.ftl b/src/test/resources/freemarker/test/templatesuite/templates/xmlns5.ftl
index 0f4eccf..edc3b4a 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/xmlns5.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/xmlns5.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/testcases.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/testcases.xml b/src/test/resources/freemarker/test/templatesuite/testcases.xml
index 25a54e7..d514a2d 100644
--- a/src/test/resources/freemarker/test/templatesuite/testcases.xml
+++ b/src/test/resources/freemarker/test/templatesuite/testcases.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 243c3de..e3876ec 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[37/50] [abbrv] incubator-freemarker git commit: Changing copyright
header format to be identical to IntelliJ generated copyright headers
Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/import.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/import.ftl b/src/test/resources/freemarker/test/templatesuite/templates/import.ftl
index 783b3b7..bddd857 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/import.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/import.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/import_lib.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/import_lib.ftl b/src/test/resources/freemarker/test/templatesuite/templates/import_lib.ftl
index a4c5f16..3329af9 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/import_lib.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/import_lib.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/include.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/include.ftl b/src/test/resources/freemarker/test/templatesuite/templates/include.ftl
index 400fcbb..08f4df7 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/include.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/include.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/include2-included-encoding.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/include2-included-encoding.ftl b/src/test/resources/freemarker/test/templatesuite/templates/include2-included-encoding.ftl
index 4d8de2e..8a1a56d 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/include2-included-encoding.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/include2-included-encoding.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/include2-included.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/include2-included.ftl b/src/test/resources/freemarker/test/templatesuite/templates/include2-included.ftl
index 5001f25..db9dfc1 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/include2-included.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/include2-included.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/include2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/include2.ftl b/src/test/resources/freemarker/test/templatesuite/templates/include2.ftl
index d51def1..4111910 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/include2.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/include2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/included.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/included.ftl b/src/test/resources/freemarker/test/templatesuite/templates/included.ftl
index 8b36ba2..f711a67 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/included.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/included.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/interpret.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/interpret.ftl b/src/test/resources/freemarker/test/templatesuite/templates/interpret.ftl
index 7d44c2e..c41b492 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/interpret.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/interpret.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/iterators.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/iterators.ftl b/src/test/resources/freemarker/test/templatesuite/templates/iterators.ftl
index 8c40441..0b0e64d 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/iterators.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/iterators.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/lastcharacter.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/lastcharacter.ftl b/src/test/resources/freemarker/test/templatesuite/templates/lastcharacter.ftl
index b5f2cd3..e762356 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/lastcharacter.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/lastcharacter.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/list-bis.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/list-bis.ftl b/src/test/resources/freemarker/test/templatesuite/templates/list-bis.ftl
index 8c4fde3..e52307f 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/list-bis.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/list-bis.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/list.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/list.ftl b/src/test/resources/freemarker/test/templatesuite/templates/list.ftl
index 23892cb..280491c 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/list.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/list.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/list2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/list2.ftl b/src/test/resources/freemarker/test/templatesuite/templates/list2.ftl
index 6c10ee2..db64a4b 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/list2.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/list2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/list3.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/list3.ftl b/src/test/resources/freemarker/test/templatesuite/templates/list3.ftl
index 3abf14d..d2fcf71 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/list3.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/list3.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/listhash.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/listhash.ftl b/src/test/resources/freemarker/test/templatesuite/templates/listhash.ftl
index 82b7b56..6f22b43 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/listhash.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/listhash.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/listhashliteral.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/listhashliteral.ftl b/src/test/resources/freemarker/test/templatesuite/templates/listhashliteral.ftl
index 918b629..06694c9 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/listhashliteral.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/listhashliteral.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/listliteral.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/listliteral.ftl b/src/test/resources/freemarker/test/templatesuite/templates/listliteral.ftl
index b7c738b..6503864 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/listliteral.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/listliteral.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/localization.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/localization.ftl b/src/test/resources/freemarker/test/templatesuite/templates/localization.ftl
index 9a822ea..cf46fbf 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/localization.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/localization.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/localization_en.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/localization_en.ftl b/src/test/resources/freemarker/test/templatesuite/templates/localization_en.ftl
index c29d258..f8292bc 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/localization_en.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/localization_en.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/localization_en_AU.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/localization_en_AU.ftl b/src/test/resources/freemarker/test/templatesuite/templates/localization_en_AU.ftl
index a8c7faf..938f681 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/localization_en_AU.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/localization_en_AU.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/logging.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/logging.ftl b/src/test/resources/freemarker/test/templatesuite/templates/logging.ftl
index ed7d3bc..c44d6b8 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/logging.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/logging.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/loopvariable.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/loopvariable.ftl b/src/test/resources/freemarker/test/templatesuite/templates/loopvariable.ftl
index c8a86cd..bc77b82 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/loopvariable.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/loopvariable.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/macros-return.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/macros-return.ftl b/src/test/resources/freemarker/test/templatesuite/templates/macros-return.ftl
index 78d43e7..220fa2a 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/macros-return.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/macros-return.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/macros.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/macros.ftl b/src/test/resources/freemarker/test/templatesuite/templates/macros.ftl
index e305985..5cfd9f3 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/macros.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/macros.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/macros2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/macros2.ftl b/src/test/resources/freemarker/test/templatesuite/templates/macros2.ftl
index 70a9340..55ceefd 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/macros2.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/macros2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/multimodels.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/multimodels.ftl b/src/test/resources/freemarker/test/templatesuite/templates/multimodels.ftl
index 20dc47f..6d26fa7 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/multimodels.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/multimodels.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/nested.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/nested.ftl b/src/test/resources/freemarker/test/templatesuite/templates/nested.ftl
index ecd28ba..5922177 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/nested.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/nested.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/nestedinclude.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/nestedinclude.ftl b/src/test/resources/freemarker/test/templatesuite/templates/nestedinclude.ftl
index 5bffb50..c6e7b11 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/nestedinclude.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/nestedinclude.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/new-allowsnothing.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/new-allowsnothing.ftl b/src/test/resources/freemarker/test/templatesuite/templates/new-allowsnothing.ftl
index 355d747..60527d7 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/new-allowsnothing.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/new-allowsnothing.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/new-defaultresolver.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/new-defaultresolver.ftl b/src/test/resources/freemarker/test/templatesuite/templates/new-defaultresolver.ftl
index 333db6b..7e5c6f6 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/new-defaultresolver.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/new-defaultresolver.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/new-optin.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/new-optin.ftl b/src/test/resources/freemarker/test/templatesuite/templates/new-optin.ftl
index a1d583c..a6c8dc9 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/new-optin.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/new-optin.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/new-safer.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/new-safer.ftl b/src/test/resources/freemarker/test/templatesuite/templates/new-safer.ftl
index 333db6b..7e5c6f6 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/new-safer.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/new-safer.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/new-unrestricted.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/new-unrestricted.ftl b/src/test/resources/freemarker/test/templatesuite/templates/new-unrestricted.ftl
index ed9fd08..d04c636 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/new-unrestricted.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/new-unrestricted.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/newlines1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/newlines1.ftl b/src/test/resources/freemarker/test/templatesuite/templates/newlines1.ftl
index f5eae6b..18f4b32 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/newlines1.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/newlines1.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/newlines2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/newlines2.ftl b/src/test/resources/freemarker/test/templatesuite/templates/newlines2.ftl
index 1d12d82..fcd97a4 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/newlines2.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/newlines2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/non-strict-syntax.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/non-strict-syntax.ftl b/src/test/resources/freemarker/test/templatesuite/templates/non-strict-syntax.ftl
index 0ff029b..7611241 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/non-strict-syntax.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/non-strict-syntax.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/noparse.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/noparse.ftl b/src/test/resources/freemarker/test/templatesuite/templates/noparse.ftl
index ea36801..ba15baa 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/noparse.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/noparse.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/number-format.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/number-format.ftl b/src/test/resources/freemarker/test/templatesuite/templates/number-format.ftl
index ffdf8fb..82a14ed 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/number-format.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/number-format.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/number-literal.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/number-literal.ftl b/src/test/resources/freemarker/test/templatesuite/templates/number-literal.ftl
index 29780e5..7ddcc2b 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/number-literal.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/number-literal.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/number-math-builtins.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/number-math-builtins.ftl b/src/test/resources/freemarker/test/templatesuite/templates/number-math-builtins.ftl
index cced870..6dab082 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/number-math-builtins.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/number-math-builtins.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/number-to-date.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/number-to-date.ftl b/src/test/resources/freemarker/test/templatesuite/templates/number-to-date.ftl
index c0bfd05..403e033 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/number-to-date.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/number-to-date.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/numerical-cast.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/numerical-cast.ftl b/src/test/resources/freemarker/test/templatesuite/templates/numerical-cast.ftl
index 0b90ddc..221b61b 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/numerical-cast.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/numerical-cast.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/output-encoding1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/output-encoding1.ftl b/src/test/resources/freemarker/test/templatesuite/templates/output-encoding1.ftl
index 030e3bd..da1128f 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/output-encoding1.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/output-encoding1.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/output-encoding2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/output-encoding2.ftl b/src/test/resources/freemarker/test/templatesuite/templates/output-encoding2.ftl
index a85e77b..3a4f24d 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/output-encoding2.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/output-encoding2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/output-encoding3.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/output-encoding3.ftl b/src/test/resources/freemarker/test/templatesuite/templates/output-encoding3.ftl
index a85e77b..3a4f24d 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/output-encoding3.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/output-encoding3.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-bwici-2.3.20.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-bwici-2.3.20.ftl b/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-bwici-2.3.20.ftl
index b65be17..9142bbb 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-bwici-2.3.20.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-bwici-2.3.20.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-bwici-2.3.21.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-bwici-2.3.21.ftl b/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-bwici-2.3.21.ftl
index 43684a8..2566126 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-bwici-2.3.21.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-bwici-2.3.21.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-common.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-common.ftl b/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-common.ftl
index 2ce13ef..92ab392 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-common.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-common.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-desc-bwici-2.3.20.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-desc-bwici-2.3.20.ftl b/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-desc-bwici-2.3.20.ftl
index 9582dfe..af633d3 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-desc-bwici-2.3.20.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-desc-bwici-2.3.20.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-inc-bwici-2.3.20.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-inc-bwici-2.3.20.ftl b/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-inc-bwici-2.3.20.ftl
index 6c1e6b9..61fb267 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-inc-bwici-2.3.20.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-2-inc-bwici-2.3.20.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-23bc.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-23bc.ftl b/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-23bc.ftl
index d6548d4..8c1c640 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-23bc.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/overloaded-methods-23bc.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/precedence.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/precedence.ftl b/src/test/resources/freemarker/test/templatesuite/templates/precedence.ftl
index e37a519..472b076 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/precedence.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/precedence.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/range-common.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/range-common.ftl b/src/test/resources/freemarker/test/templatesuite/templates/range-common.ftl
index 618e216..142435b 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/range-common.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/range-common.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/range-ici-2.3.20.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/range-ici-2.3.20.ftl b/src/test/resources/freemarker/test/templatesuite/templates/range-ici-2.3.20.ftl
index 1dbd5b7..5bf1e18 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/range-ici-2.3.20.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/range-ici-2.3.20.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/range-ici-2.3.21.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/range-ici-2.3.21.ftl b/src/test/resources/freemarker/test/templatesuite/templates/range-ici-2.3.21.ftl
index 33f7c7f..d2f5450 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/range-ici-2.3.21.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/range-ici-2.3.21.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/recover.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/recover.ftl b/src/test/resources/freemarker/test/templatesuite/templates/recover.ftl
index 9595ad5..f7dc437 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/recover.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/recover.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/root.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/root.ftl b/src/test/resources/freemarker/test/templatesuite/templates/root.ftl
index 8deb77c..d612a6f 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/root.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/root.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/sequence-builtins.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/sequence-builtins.ftl b/src/test/resources/freemarker/test/templatesuite/templates/sequence-builtins.ftl
index 1586ad9..e21bc2d 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/sequence-builtins.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/sequence-builtins.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/setting.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/setting.ftl b/src/test/resources/freemarker/test/templatesuite/templates/setting.ftl
index 1def44b..fcf9605 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/setting.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/setting.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/simplehash-char-key.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/simplehash-char-key.ftl b/src/test/resources/freemarker/test/templatesuite/templates/simplehash-char-key.ftl
index 8ecd0fe..07a3f1e 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/simplehash-char-key.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/simplehash-char-key.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/specialvars.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/specialvars.ftl b/src/test/resources/freemarker/test/templatesuite/templates/specialvars.ftl
index fe45a0c..50416c9 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/specialvars.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/specialvars.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/strictinheader.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/strictinheader.ftl b/src/test/resources/freemarker/test/templatesuite/templates/strictinheader.ftl
index bf4678a..504ee4c 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/strictinheader.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/strictinheader.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/strictinheader_inc1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/strictinheader_inc1.ftl b/src/test/resources/freemarker/test/templatesuite/templates/strictinheader_inc1.ftl
index 0c2111c..06f946a 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/strictinheader_inc1.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/strictinheader_inc1.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/strictinheader_inc2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/strictinheader_inc2.ftl b/src/test/resources/freemarker/test/templatesuite/templates/strictinheader_inc2.ftl
index 1720945..cdc1f58 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/strictinheader_inc2.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/strictinheader_inc2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/string-builtin-coercion.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/string-builtin-coercion.ftl b/src/test/resources/freemarker/test/templatesuite/templates/string-builtin-coercion.ftl
index de836c7..5d2e094 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/string-builtin-coercion.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/string-builtin-coercion.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-ici-2.3.19.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-ici-2.3.19.ftl b/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-ici-2.3.19.ftl
index 033920d..50a5f49 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-ici-2.3.19.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-ici-2.3.19.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-ici-2.3.20.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-ici-2.3.20.ftl b/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-ici-2.3.20.ftl
index 62cbb68..44392b4 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-ici-2.3.20.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-ici-2.3.20.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-regexps-matches.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-regexps-matches.ftl b/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-regexps-matches.ftl
index f5d346a..201f404 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-regexps-matches.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-regexps-matches.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-regexps.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-regexps.ftl b/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-regexps.ftl
index c545222..81c0b8f 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-regexps.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/string-builtins-regexps.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/string-builtins1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/string-builtins1.ftl b/src/test/resources/freemarker/test/templatesuite/templates/string-builtins1.ftl
index 0dd3f17..84c794f 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/string-builtins1.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/string-builtins1.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/string-builtins2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/string-builtins2.ftl b/src/test/resources/freemarker/test/templatesuite/templates/string-builtins2.ftl
index 7ac0339..c9294fa 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/string-builtins2.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/string-builtins2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/string-builtins3.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/string-builtins3.ftl b/src/test/resources/freemarker/test/templatesuite/templates/string-builtins3.ftl
index f617236..77389fa 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/string-builtins3.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/string-builtins3.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/stringbimethods.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/stringbimethods.ftl b/src/test/resources/freemarker/test/templatesuite/templates/stringbimethods.ftl
index f757129..1d31c44 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/stringbimethods.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/stringbimethods.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/stringliteral.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/stringliteral.ftl b/src/test/resources/freemarker/test/templatesuite/templates/stringliteral.ftl
index d4e7a39..436c632 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/stringliteral.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/stringliteral.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/subdir/include-subdir.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/subdir/include-subdir.ftl b/src/test/resources/freemarker/test/templatesuite/templates/subdir/include-subdir.ftl
index 1db5722..cd24873 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/subdir/include-subdir.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/subdir/include-subdir.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/subdir/include-subdir2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/subdir/include-subdir2.ftl b/src/test/resources/freemarker/test/templatesuite/templates/subdir/include-subdir2.ftl
index a4e7744..356fcb2 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/subdir/include-subdir2.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/subdir/include-subdir2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/subdir/new-optin-2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/subdir/new-optin-2.ftl b/src/test/resources/freemarker/test/templatesuite/templates/subdir/new-optin-2.ftl
index 68cdfd8..b149657 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/subdir/new-optin-2.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/subdir/new-optin-2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/subdir/new-optin.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/subdir/new-optin.ftl b/src/test/resources/freemarker/test/templatesuite/templates/subdir/new-optin.ftl
index 8818d09..0f8413f 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/subdir/new-optin.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/subdir/new-optin.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/subdir/subsub/new-optin.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/subdir/subsub/new-optin.ftl b/src/test/resources/freemarker/test/templatesuite/templates/subdir/subsub/new-optin.ftl
index 68cdfd8..b149657 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/subdir/subsub/new-optin.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/subdir/subsub/new-optin.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/switch-builtin.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/switch-builtin.ftl b/src/test/resources/freemarker/test/templatesuite/templates/switch-builtin.ftl
index ed7409d..7441733 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/switch-builtin.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/switch-builtin.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/switch.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/switch.ftl b/src/test/resources/freemarker/test/templatesuite/templates/switch.ftl
index 140dff3..4404307 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/switch.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/switch.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/then-builtin.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/then-builtin.ftl b/src/test/resources/freemarker/test/templatesuite/templates/then-builtin.ftl
index f2cdb65..de809e1 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/then-builtin.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/then-builtin.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/transforms.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/transforms.ftl b/src/test/resources/freemarker/test/templatesuite/templates/transforms.ftl
index b171938..9ef4539 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/transforms.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/transforms.ftl
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/type-builtins.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/type-builtins.ftl b/src/test/resources/freemarker/test/templatesuite/templates/type-builtins.ftl
index 911cfb7..a576e95 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/type-builtins.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/type-builtins.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/undefined.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/undefined.ftl b/src/test/resources/freemarker/test/templatesuite/templates/undefined.ftl
index 5862d6f..2ca96ac 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/undefined.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/undefined.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/url.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/url.ftl b/src/test/resources/freemarker/test/templatesuite/templates/url.ftl
index bf55a11..814de80 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/url.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/url.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/templates/var-layers.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/templates/var-layers.ftl b/src/test/resources/freemarker/test/templatesuite/templates/var-layers.ftl
index 1ec9b95..25333de 100644
--- a/src/test/resources/freemarker/test/templatesuite/templates/var-layers.ftl
+++ b/src/test/resources/freemarker/test/templatesuite/templates/var-layers.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[14/50] [abbrv] incubator-freemarker git commit: Some minor code
cleanup in the TemplateLoader implementations.
Posted by dd...@apache.org.
Some minor code cleanup in the TemplateLoader implementations.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/b1e28b0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b1e28b0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b1e28b0f
Branch: refs/heads/2.3
Commit: b1e28b0fee57d99206fb3ed363c634b92a162a0d
Parents: 6837e4c
Author: ddekany <dd...@apache.org>
Authored: Wed Feb 8 02:00:51 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Feb 8 02:00:51 2017 +0100
----------------------------------------------------------------------
.../cache/ByteArrayTemplateLoader.java | 20 +++---
.../freemarker/cache/ClassTemplateLoader.java | 12 ++--
.../freemarker/cache/MultiTemplateLoader.java | 67 +++++++++++---------
.../freemarker/cache/StringTemplateLoader.java | 22 +++----
.../freemarker/cache/URLTemplateSource.java | 3 +-
.../freemarker/cache/WebappTemplateLoader.java | 9 +--
6 files changed, 68 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b1e28b0f/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java b/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
index 84251fb..950b7c6 100644
--- a/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
+++ b/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
@@ -41,16 +41,16 @@ public class ByteArrayTemplateLoader implements TemplateLoader {
/**
* Adds a template to this template loader; see {@link StringTemplateLoader#putTemplate(String, String)} for more.
*/
- public void putTemplate(String name, byte[] templateSource) {
- putTemplate(name, templateSource, System.currentTimeMillis());
+ public void putTemplate(String name, byte[] templateContent) {
+ putTemplate(name, templateContent, System.currentTimeMillis());
}
/**
* Adds a template to this template loader; see {@link StringTemplateLoader#putTemplate(String, String, long)} for
* more.
*/
- public void putTemplate(String name, byte[] templateSource, long lastModified) {
- templates.put(name, new ByteArrayTemplateSource(name, templateSource, lastModified));
+ public void putTemplate(String name, byte[] templateContent, long lastModified) {
+ templates.put(name, new ByteArrayTemplateSource(name, templateContent, lastModified));
}
/**
@@ -76,27 +76,27 @@ public class ByteArrayTemplateLoader implements TemplateLoader {
public Reader getReader(Object templateSource, String encoding) throws UnsupportedEncodingException {
return new InputStreamReader(
- new ByteArrayInputStream(((ByteArrayTemplateSource) templateSource).source),
+ new ByteArrayInputStream(((ByteArrayTemplateSource) templateSource).templateContent),
encoding);
}
private static class ByteArrayTemplateSource {
private final String name;
- private final byte[] source;
+ private final byte[] templateContent;
private final long lastModified;
- ByteArrayTemplateSource(String name, byte[] source, long lastModified) {
+ ByteArrayTemplateSource(String name, byte[] templateContent, long lastModified) {
if (name == null) {
throw new IllegalArgumentException("name == null");
}
- if (source == null) {
- throw new IllegalArgumentException("source == null");
+ if (templateContent == null) {
+ throw new IllegalArgumentException("templateContent == null");
}
if (lastModified < -1L) {
throw new IllegalArgumentException("lastModified < -1L");
}
this.name = name;
- this.source = source;
+ this.templateContent = templateContent;
this.lastModified = lastModified;
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b1e28b0f/src/main/java/freemarker/cache/ClassTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/ClassTemplateLoader.java b/src/main/java/freemarker/cache/ClassTemplateLoader.java
index 1bfbec8..9860355 100644
--- a/src/main/java/freemarker/cache/ClassTemplateLoader.java
+++ b/src/main/java/freemarker/cache/ClassTemplateLoader.java
@@ -31,7 +31,7 @@ import freemarker.template.utility.StringUtil;
*/
public class ClassTemplateLoader extends URLTemplateLoader {
- private final Class resourceLoaderClass;
+ private final Class<?> resourceLoaderClass;
private final ClassLoader classLoader;
private final String basePackagePath;
@@ -66,7 +66,7 @@ public class ClassTemplateLoader extends URLTemplateLoader {
* instead.
*/
@Deprecated
- public ClassTemplateLoader(Class resourceLoaderClass) {
+ public ClassTemplateLoader(Class<?> resourceLoaderClass) {
this(resourceLoaderClass, "");
}
@@ -96,7 +96,7 @@ public class ClassTemplateLoader extends URLTemplateLoader {
*
* @see #ClassTemplateLoader(ClassLoader, String)
*/
- public ClassTemplateLoader(Class resourceLoaderClass, String basePackagePath) {
+ public ClassTemplateLoader(Class<?> resourceLoaderClass, String basePackagePath) {
this(resourceLoaderClass, false, null, basePackagePath);
}
@@ -112,9 +112,9 @@ public class ClassTemplateLoader extends URLTemplateLoader {
this(null, true, classLoader, basePackagePath);
}
- private ClassTemplateLoader(Class resourceLoaderClass, boolean allowNullBaseClass, ClassLoader classLoader,
- String basePackagePath) {
- if (!allowNullBaseClass) {
+ private ClassTemplateLoader(Class<?> resourceLoaderClass, boolean allowNullResourceLoaderClass,
+ ClassLoader classLoader, String basePackagePath) {
+ if (!allowNullResourceLoaderClass) {
NullArgumentException.check("resourceLoaderClass", resourceLoaderClass);
}
NullArgumentException.check("basePackagePath", basePackagePath);
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b1e28b0f/src/main/java/freemarker/cache/MultiTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/MultiTemplateLoader.java b/src/main/java/freemarker/cache/MultiTemplateLoader.java
index 5457a88..bb8322d 100644
--- a/src/main/java/freemarker/cache/MultiTemplateLoader.java
+++ b/src/main/java/freemarker/cache/MultiTemplateLoader.java
@@ -24,6 +24,8 @@ import java.io.Reader;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import freemarker.template.utility.NullArgumentException;
+
/**
* A {@link TemplateLoader} that uses a set of other loaders to load the templates. On every request, loaders are
* queried in the order of their appearance in the array of loaders provided to the constructor. However, by default, if
@@ -35,32 +37,35 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public class MultiTemplateLoader implements StatefulTemplateLoader {
- private final TemplateLoader[] loaders;
- private final Map<String, TemplateLoader> lastLoaderForName = new ConcurrentHashMap<String, TemplateLoader>();
+ private final TemplateLoader[] templateLoaders;
+ private final Map<String, TemplateLoader> lastTemplateLoaderForName
+ = new ConcurrentHashMap<String, TemplateLoader>();
private boolean sticky = true;
/**
- * Creates a new multi template Loader that will use the specified loaders.
+ * Creates a new instance that will use the specified template loaders.
*
- * @param loaders
- * the loaders that are used to load templates.
+ * @param templateLoaders
+ * the template loaders that are used to load templates, in the order as they will be searched
+ * (except where {@linkplain #setSticky(boolean) stickiness} says otherwise).
*/
- public MultiTemplateLoader(TemplateLoader[] loaders) {
- this.loaders = loaders.clone();
+ public MultiTemplateLoader(TemplateLoader[] templateLoaders) {
+ NullArgumentException.check("templateLoaders", templateLoaders);
+ this.templateLoaders = templateLoaders.clone();
}
public Object findTemplateSource(String name)
throws IOException {
- TemplateLoader lastLoader = null;
+ TemplateLoader lastTemplateLoader = null;
if (sticky) {
// Use soft affinity - give the loader that last found this
// resource a chance to find it again first.
- lastLoader = lastLoaderForName.get(name);
- if (lastLoader != null) {
- Object source = lastLoader.findTemplateSource(name);
+ lastTemplateLoader = lastTemplateLoaderForName.get(name);
+ if (lastTemplateLoader != null) {
+ Object source = lastTemplateLoader.findTemplateSource(name);
if (source != null) {
- return new MultiSource(source, lastLoader);
+ return new MultiSource(source, lastTemplateLoader);
}
}
}
@@ -69,30 +74,25 @@ public class MultiTemplateLoader implements StatefulTemplateLoader {
// again, try all loaders in order of appearance. If any manages
// to find the resource, then associate it as the new affine loader
// for this resource.
- for (TemplateLoader loader : loaders) {
- if (lastLoader != loader) {
- Object source = loader.findTemplateSource(name);
+ for (TemplateLoader templateLoader : templateLoaders) {
+ if (lastTemplateLoader != templateLoader) {
+ Object source = templateLoader.findTemplateSource(name);
if (source != null) {
if (sticky) {
- lastLoaderForName.put(name, loader);
+ lastTemplateLoaderForName.put(name, templateLoader);
}
- return new MultiSource(source, loader);
+ return new MultiSource(source, templateLoader);
}
}
}
if (sticky) {
- lastLoaderForName.remove(name);
+ lastTemplateLoaderForName.remove(name);
}
// Resource not found
return null;
}
- private Object modifyForIcI(Object source) {
- // TODO Auto-generated method stub
- return null;
- }
-
public long getLastModified(Object templateSource) {
return ((MultiSource) templateSource).getLastModified();
}
@@ -108,12 +108,11 @@ public class MultiTemplateLoader implements StatefulTemplateLoader {
}
/**
- * Clears the soft affinity memory, also resets all enclosed {@link StatefulTemplateLoader}-s.
+ * Clears the sickiness memory, also resets the state of all enclosed {@link StatefulTemplateLoader}-s.
*/
public void resetState() {
- lastLoaderForName.clear();
- for (int i = 0; i < loaders.length; i++) {
- TemplateLoader loader = loaders[i];
+ lastTemplateLoaderForName.clear();
+ for (TemplateLoader loader : templateLoaders) {
if (loader instanceof StatefulTemplateLoader) {
((StatefulTemplateLoader) loader).resetState();
}
@@ -181,11 +180,11 @@ public class MultiTemplateLoader implements StatefulTemplateLoader {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("MultiTemplateLoader(");
- for (int i = 0; i < loaders.length; i++) {
+ for (int i = 0; i < templateLoaders.length; i++) {
if (i != 0) {
sb.append(", ");
}
- sb.append("loader").append(i + 1).append(" = ").append(loaders[i]);
+ sb.append("loader").append(i + 1).append(" = ").append(templateLoaders[i]);
}
sb.append(")");
return sb.toString();
@@ -197,7 +196,7 @@ public class MultiTemplateLoader implements StatefulTemplateLoader {
* @since 2.3.23
*/
public int getTemplateLoaderCount() {
- return loaders.length;
+ return templateLoaders.length;
}
/**
@@ -207,10 +206,12 @@ public class MultiTemplateLoader implements StatefulTemplateLoader {
* Must be below {@link #getTemplateLoaderCount()}.
*/
public TemplateLoader getTemplateLoader(int index) {
- return loaders[index];
+ return templateLoaders[index];
}
/**
+ * Getter pair of {@link #setSticky(boolean)}.
+ *
* @since 2.3.24
*/
public boolean isSticky() {
@@ -218,6 +219,10 @@ public class MultiTemplateLoader implements StatefulTemplateLoader {
}
/**
+ * Sets if for a name that was already loaded earlier the same {@link TemplateLoader} will be tried first, or
+ * we always try the {@link TemplateLoader}-s strictly in the order as it was specified in the constructor.
+ * The default is {@code true}.
+ *
* @since 2.3.24
*/
public void setSticky(boolean sticky) {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b1e28b0f/src/main/java/freemarker/cache/StringTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/StringTemplateLoader.java b/src/main/java/freemarker/cache/StringTemplateLoader.java
index 94e1af3..13b7548 100644
--- a/src/main/java/freemarker/cache/StringTemplateLoader.java
+++ b/src/main/java/freemarker/cache/StringTemplateLoader.java
@@ -72,10 +72,10 @@ public class StringTemplateLoader implements TemplateLoader {
* loader.
*
* @param name the name of the template.
- * @param templateSource the source code of the template.
+ * @param templateContent the source code of the template.
*/
- public void putTemplate(String name, String templateSource) {
- putTemplate(name, templateSource, System.currentTimeMillis());
+ public void putTemplate(String name, String templateContent) {
+ putTemplate(name, templateContent, System.currentTimeMillis());
}
/**
@@ -93,12 +93,12 @@ public class StringTemplateLoader implements TemplateLoader {
* loader.
*
* @param name the name of the template.
- * @param templateSource the source code of the template.
+ * @param templateContent the source code of the template.
* @param lastModified the time of last modification of the template in
* terms of <tt>System.currentTimeMillis()</tt>
*/
- public void putTemplate(String name, String templateSource, long lastModified) {
- templates.put(name, new StringTemplateSource(name, templateSource, lastModified));
+ public void putTemplate(String name, String templateContent, long lastModified) {
+ templates.put(name, new StringTemplateSource(name, templateContent, lastModified));
}
/**
@@ -129,26 +129,26 @@ public class StringTemplateLoader implements TemplateLoader {
}
public Reader getReader(Object templateSource, String encoding) {
- return new StringReader(((StringTemplateSource) templateSource).source);
+ return new StringReader(((StringTemplateSource) templateSource).templateContent);
}
private static class StringTemplateSource {
private final String name;
- private final String source;
+ private final String templateContent;
private final long lastModified;
- StringTemplateSource(String name, String source, long lastModified) {
+ StringTemplateSource(String name, String templateContent, long lastModified) {
if (name == null) {
throw new IllegalArgumentException("name == null");
}
- if (source == null) {
+ if (templateContent == null) {
throw new IllegalArgumentException("source == null");
}
if (lastModified < -1L) {
throw new IllegalArgumentException("lastModified < -1L");
}
this.name = name;
- this.source = source;
+ this.templateContent = templateContent;
this.lastModified = lastModified;
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b1e28b0f/src/main/java/freemarker/cache/URLTemplateSource.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/URLTemplateSource.java b/src/main/java/freemarker/cache/URLTemplateSource.java
index 716b642..0bfd49f 100644
--- a/src/main/java/freemarker/cache/URLTemplateSource.java
+++ b/src/main/java/freemarker/cache/URLTemplateSource.java
@@ -27,7 +27,7 @@ import java.net.URL;
import java.net.URLConnection;
/**
- * Wraps a <code>java.net.URL</code>, and implements methods required for a typical template source.
+ * Wraps a {@link URL}, and implements methods required for a typical template source.
*/
class URLTemplateSource {
private final URL url;
@@ -69,6 +69,7 @@ class URLTemplateSource {
long lastModified() {
if (conn instanceof JarURLConnection) {
// There is a bug in sun's jar url connection that causes file handle leaks when calling getLastModified()
+ // (see https://bugs.openjdk.java.net/browse/JDK-6956385).
// Since the time stamps of jar file contents can't vary independent from the jar file timestamp, just use
// the jar file timestamp
URL jarURL = ((JarURLConnection) conn).getJarFileURL();
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b1e28b0f/src/main/java/freemarker/cache/WebappTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/WebappTemplateLoader.java b/src/main/java/freemarker/cache/WebappTemplateLoader.java
index 44c40df..24e64fa 100644
--- a/src/main/java/freemarker/cache/WebappTemplateLoader.java
+++ b/src/main/java/freemarker/cache/WebappTemplateLoader.java
@@ -33,6 +33,7 @@ import javax.servlet.ServletContext;
import freemarker.log.Logger;
import freemarker.template.Configuration;
import freemarker.template.utility.CollectionUtils;
+import freemarker.template.utility.NullArgumentException;
import freemarker.template.utility.StringUtil;
/**
@@ -76,12 +77,8 @@ public class WebappTemplateLoader implements TemplateLoader {
* the base path to template resources.
*/
public WebappTemplateLoader(ServletContext servletContext, String subdirPath) {
- if (servletContext == null) {
- throw new IllegalArgumentException("servletContext == null");
- }
- if (subdirPath == null) {
- throw new IllegalArgumentException("path == null");
- }
+ NullArgumentException.check("servletContext", servletContext);
+ NullArgumentException.check("subdirPath", subdirPath);
subdirPath = subdirPath.replace('\\', '/');
if (!subdirPath.endsWith("/")) {
[39/50] [abbrv] incubator-freemarker git commit: Changing copyright
header format to be identical to IntelliJ generated copyright headers
Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 2.jar/META-INF/taglib.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 2.jar/META-INF/taglib.tld b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 2.jar/META-INF/taglib.tld
index ce5d873..5553935 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 2.jar/META-INF/taglib.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 2.jar/META-INF/taglib.tld
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml
index 0cb719e..919f5c6 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld
index d58a2d1..4e1c156 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/subdir/test-rel.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/subdir/test-rel.ftl b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/subdir/test-rel.ftl
index 870eae4..fdf9c25 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/subdir/test-rel.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/subdir/test-rel.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test-noClasspath.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test-noClasspath.ftl b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test-noClasspath.ftl
index 1616bef..e7a65a9 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test-noClasspath.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test-noClasspath.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test1.ftl b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test1.ftl
index 7fd620f..b4f2a7b 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test1.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test1.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh b/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh
index 61cd076..24bd0ee 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out
index baedcb3..cf0da7e 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
index c3105f5..e0d3348 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
index f325f85..65be2a0 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl b/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl
index e604816..80ae292 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out b/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out
index 8f04b99..cd84bd2 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh
index e1612fe..9b8dbd9 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
index 4433d8d..9471ab7 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh b/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh
index 1d9ea95..f9deeae 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out
index 39fd18a..0420cca 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh b/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh
index a2ef2db..f7884bb 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out
index f60149c..d016072 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh
index 1b6f5ad..4904f60 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
index 09752b3..c6bd10d 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh
index f8c81c5..52db70b 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
index d044a43..f47e521 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
index e39a50e..0df9e33 100644
--- a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
+++ b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
index 904b851..5d2a738 100644
--- a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
+++ b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh b/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh
index 24c4a9f..fe9690c 100644
--- a/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh
+++ b/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out b/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out
index 7ae8cc6..717431f 100644
--- a/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out
+++ b/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh b/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh
index 49dffe9..624950f 100644
--- a/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh
+++ b/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out b/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out
index cffc123..08d0fea 100644
--- a/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out
+++ b/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh b/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh
index 1ca5e69..9a34ac0 100644
--- a/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh
+++ b/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out b/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out
index ae84ded..25d6155 100644
--- a/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out
+++ b/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties b/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
index 537efe2..cffadfb 100644
--- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
+++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties b/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
index c8740cf..f879e70 100644
--- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
+++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties b/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
index 126f674..cf4c5a4 100644
--- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
+++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/test.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/test.ftlh b/src/test/resources/freemarker/manual/test.ftlh
index 833816e..852b82b 100644
--- a/src/test/resources/freemarker/manual/test.ftlh
+++ b/src/test/resources/freemarker/manual/test.ftlh
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/template/SimpleObjectWrapperTest.java
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/template/SimpleObjectWrapperTest.java b/src/test/resources/freemarker/template/SimpleObjectWrapperTest.java
index b4b6dfd..798bcca 100644
--- a/src/test/resources/freemarker/template/SimpleObjectWrapperTest.java
+++ b/src/test/resources/freemarker/template/SimpleObjectWrapperTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/template/toCache1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/template/toCache1.ftl b/src/test/resources/freemarker/template/toCache1.ftl
index 49f4ede..462f1ae 100644
--- a/src/test/resources/freemarker/template/toCache1.ftl
+++ b/src/test/resources/freemarker/template/toCache1.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/template/toCache2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/template/toCache2.ftl b/src/test/resources/freemarker/template/toCache2.ftl
index 9d8a1c5..f59424c 100644
--- a/src/test/resources/freemarker/template/toCache2.ftl
+++ b/src/test/resources/freemarker/template/toCache2.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt b/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt
index 0744732..33a7186 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt b/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt
index 58b10de..3f7dad5 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/beans.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/beans.txt b/src/test/resources/freemarker/test/templatesuite/expected/beans.txt
index ab41e26..50b0423 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/beans.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/beans.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt b/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt
index d736687..11d780f 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt b/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt
index 7a9af73..8dc1290 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt b/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt
index 11be5a7..4532027 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt b/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt
index c092e3a..780d135 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/comment.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/comment.txt b/src/test/resources/freemarker/test/templatesuite/expected/comment.txt
index 53d05b3..d5902e3 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/comment.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/comment.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt b/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt
index ba37de0..8d9d372 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/compress.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/compress.txt b/src/test/resources/freemarker/test/templatesuite/expected/compress.txt
index 6db1069..43c7eed 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/compress.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/compress.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt b/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt
index c8273f6..9180262 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt b/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt
index d45c533..3a52c46 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/default.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/default.txt b/src/test/resources/freemarker/test/templatesuite/expected/default.txt
index 36f5e9b..fd48463 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/default.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/default.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt b/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt
index aff6329..ccfe5c8 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt b/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt
index 2ea37e2..26de5ac 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt b/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt
index a3aea05..c0a5440 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/exception.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/exception.txt b/src/test/resources/freemarker/test/templatesuite/expected/exception.txt
index 6655e11..0ea4395 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/exception.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/exception.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt b/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt
index 7da8d24..bf441d3 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt b/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt
index 028247a..6089e87 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt b/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt
index 8314405..acb1f78 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt b/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt
index a604e86..9736322 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt b/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt
index db88300..3af1052 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt b/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt
index 9dc3412..b1072fd 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt b/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt
index afc2db3..1c62bd5 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt b/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt
index 5158a4a..8a8d04f 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/if.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/if.txt b/src/test/resources/freemarker/test/templatesuite/expected/if.txt
index 56019cb..7c9d1d8 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/if.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/if.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/import.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/import.txt b/src/test/resources/freemarker/test/templatesuite/expected/import.txt
index bb59ca6..b51a4f4 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/import.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/import.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/include.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/include.txt b/src/test/resources/freemarker/test/templatesuite/expected/include.txt
index fc83a90..8255470 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/include.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/include.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/include2.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/include2.txt b/src/test/resources/freemarker/test/templatesuite/expected/include2.txt
index 888d05e..5037260 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/include2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/include2.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt b/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt
index 4851e0e..fe862e6 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt b/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt
index 30d00cf..ef1954c 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt b/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
index 015ce14..dbe5fd0 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt b/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
index ecb634c..3b9b76d 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/list.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/list.txt b/src/test/resources/freemarker/test/templatesuite/expected/list.txt
index ca01076..05373bd 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt b/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
index 52f49f0..cb9e6d4 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/list3.txt b/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
index 5641694..26fc60d 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/listhash.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/listhash.txt b/src/test/resources/freemarker/test/templatesuite/expected/listhash.txt
index c713195..bc753a1 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/listhash.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/listhash.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.20.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.20.txt b/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.20.txt
index df0becc..eb265dc 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.20.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.20.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.21.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.21.txt b/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.21.txt
index 653cbe3..937f0ea 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.21.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.21.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt b/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
index 84fc384..2048ac5 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/localization.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/localization.txt b/src/test/resources/freemarker/test/templatesuite/expected/localization.txt
index 66ac79a..bd3c87d 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/localization.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/localization.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/logging.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/logging.txt b/src/test/resources/freemarker/test/templatesuite/expected/logging.txt
index e13f02c..bb192ea 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/logging.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/logging.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt b/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt
index d7d509d..25c20ac 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt b/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt
index a2fc98a..5aa47ff 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/macros.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/macros.txt b/src/test/resources/freemarker/test/templatesuite/expected/macros.txt
index 67874e8..680a08e 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/macros.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/macros.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt b/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt
index 953786f..1b4e007 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt b/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt
index 0d24c7a..54ec68d 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/nested.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/nested.txt b/src/test/resources/freemarker/test/templatesuite/expected/nested.txt
index 99a2ab6..bcfb104 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/nested.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/nested.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt b/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt
index adeaee0..b8384c7 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt b/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt
index 5d50e10..2ea00fa 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt b/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt
index dfbad74..9d8e883 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[33/50] [abbrv] incubator-freemarker git commit: (IntelliJ code style
fix)
Posted by dd...@apache.org.
(IntelliJ code style fix)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/11419bbc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/11419bbc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/11419bbc
Branch: refs/heads/2.3
Commit: 11419bbccb0d368d2dabacbe7276a52080a85e43
Parents: af5968e
Author: ddekany <dd...@apache.org>
Authored: Wed Mar 1 00:17:05 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Mar 1 00:17:33 2017 +0100
----------------------------------------------------------------------
src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/11419bbc/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
----------------------------------------------------------------------
diff --git a/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml b/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
index eed7028..ae87ca3 100644
--- a/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
+++ b/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
@@ -45,7 +45,7 @@
<option name="JD_PARAM_DESCRIPTION_ON_NEW_LINE" value="true" />
<option name="WRAP_COMMENTS" value="true" />
<JavaCodeStyleSettings>
- <option name="CLASS_NAMES_IN_JAVADOC" value="2" />
+ <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
</JavaCodeStyleSettings>
<codeStyleSettings language="JAVA">
<option name="RIGHT_MARGIN" value="120" />
[28/50] [abbrv] incubator-freemarker git commit: Marked some 2.3.22
TemplateModel stuff as non-experimental
Posted by dd...@apache.org.
Marked some 2.3.22 TemplateModel stuff as non-experimental
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/99c5a653
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/99c5a653
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/99c5a653
Branch: refs/heads/2.3
Commit: 99c5a653415fdf925d4993fe8b4b14868b564448
Parents: e34f70b
Author: ddekany <dd...@apache.org>
Authored: Sun Feb 26 21:54:50 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Feb 26 21:54:50 2017 +0100
----------------------------------------------------------------------
.../template/DefaultNonListCollectionAdapter.java | 10 +++-------
.../freemarker/template/TemplateCollectionModelEx.java | 10 +++-------
2 files changed, 6 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/99c5a653/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java b/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java
index 30d2df7..3d0f57e 100644
--- a/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java
+++ b/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java
@@ -29,9 +29,9 @@ import freemarker.ext.util.WrapperTemplateModel;
import freemarker.template.utility.ObjectWrapperWithAPISupport;
/**
- * <b>Experimental - subject to change:</b> Adapts a non-{@link List} Java {@link Collection} to the corresponding
- * {@link TemplateModel} interface(s), most importantly to {@link TemplateCollectionModelEx}. For {@link List}-s, use
- * {@link DefaultListAdapter}, or else you lose indexed element access.
+ * Adapts a non-{@link List} Java {@link Collection} to the corresponding {@link TemplateModel} interface(s), most
+ * importantly to {@link TemplateCollectionModelEx}. For {@link List}-s, use {@link DefaultListAdapter}, or else you
+ * lose indexed element access.
*
* <p>
* Thread safety: A {@link DefaultNonListCollectionAdapter} is as thread-safe as the {@link Collection} that it wraps
@@ -44,10 +44,6 @@ import freemarker.template.utility.ObjectWrapperWithAPISupport;
* {@link DefaultObjectWrapper#setForceLegacyNonListCollections(boolean) forceLegacyNonListCollections} property is
* {@code false}, which is still not the default as of 2.3.22 (so you have to set it explicitly).
*
- * <p>
- * <b>Experimental status warning:</b> This class is subject to change on non-backward compatible ways, hence, it
- * shouldn't be used from outside FreeMarker yet.
- *
* @since 2.3.22
*/
public class DefaultNonListCollectionAdapter extends WrappingTemplateModel implements TemplateCollectionModelEx,
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/99c5a653/src/main/java/freemarker/template/TemplateCollectionModelEx.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateCollectionModelEx.java b/src/main/java/freemarker/template/TemplateCollectionModelEx.java
index 8101f2b..7f4dcf1 100644
--- a/src/main/java/freemarker/template/TemplateCollectionModelEx.java
+++ b/src/main/java/freemarker/template/TemplateCollectionModelEx.java
@@ -22,13 +22,9 @@ package freemarker.template;
import java.util.Collection;
/**
- * <b>Experimental - subject to change:</b> "extended collection" template language data type: Adds size/emptiness
- * querybility and "contains" test to {@link TemplateCollectionModel}. The added extra operations is provided by all
- * Java {@link Collection}-s, and this interface was added to make that accessible for templates too.
- *
- * <p>
- * <b>Experimental status warning:</b> This interface is subject to change on non-backward compatible ways, hence, it
- * shouldn't be implemented outside FreeMarker yet.
+ * "extended collection" template language data type: Adds size/emptiness querybility and "contains" test to
+ * {@link TemplateCollectionModel}. The added extra operations is provided by all Java {@link Collection}-s, and this
+ * interface was added to make that accessible for templates too.
*
* @since 2.3.22
*/
[03/50] [abbrv] incubator-freemarker git commit: Manual: Added <#list
map as k, v> to the FAQ regarding non-String keys.
Posted by dd...@apache.org.
Manual: Added <#list map as k, v> to the FAQ regarding non-String keys.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/1ca0b01f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/1ca0b01f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/1ca0b01f
Branch: refs/heads/2.3
Commit: 1ca0b01f365a050ccbfa7d6fac7cbb1f62314e69
Parents: bc20288
Author: ddekany <dd...@apache.org>
Authored: Thu Jan 26 00:06:05 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Jan 26 00:06:05 2017 +0100
----------------------------------------------------------------------
src/manual/en_US/book.xml | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1ca0b01f/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 3449535..af466b3 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26136,13 +26136,24 @@ End book</programlisting>
<literal>user["password"]</literal>), and variable names are
strings.</para>
- <para>So until FTL has a type that supports non-string keys, you
- will have to turn to the Java API of the <literal>Map</literal>.
- You can do it like this:
- <literal>myMap?api.get(nonStringKey)</literal>. However, for
- <literal>?api</literal> to work, you may need to configure
- FreeMarker a bit; <link linkend="ref_buitin_api_and_has_api">see
- more here...</link></para>
+ <para>If you only need to list the key-value pairs of a
+ <literal>Map</literal>, you can just write something like
+ <literal><#list myMap as k, v>${k}:
+ ${v}</#list></literal> (see more about <link
+ linkend="ref.directive.list">the <literal>list directive</literal>
+ here</link>). This enumerates the <literal>Map</literal> entries,
+ and supports non-string keys. This requires FreeMarker 2.3.25 or
+ later. (If for some reason you can't upgrade to 2.3.25, you can
+ use the Java API of <literal>Map</literal> instead, like
+ <literal><#list myMap?api.entrySet() as kvp>${kvp.key}:
+ ${kvp.value}</#list></literal>.)</para>
+
+ <para>If you need to do more than listing, you will have to turn
+ to the Java API of the <literal>Map</literal>. You can do it like
+ this: <literal>myMap?api.get(nonStringKey)</literal>. However, for
+ <literal>?api</literal> to be enabled, you may need to configure
+ FreeMarker a bit (<link linkend="ref_buitin_api_and_has_api">see
+ more here</link>).</para>
<para>Note that as Java's <literal>Map</literal> is particular
about the exact class of the key, at least for numerical keys
@@ -26153,7 +26164,7 @@ End book</programlisting>
is because of FTL's deliberately simplified type system has only a
single numerical type, while Java distinguishes a lot of numerical
types. Note that the casting is not needed when the key value
- comes directly from the data-model (i.e. you didn't modified its
+ comes directly from the data-model (i.e., you didn't modified its
value with arithmetical calculations in the template), including
the case when it's the return value of a method, and it was of the
proper class before wrapping, because then the result of the
[34/50] [abbrv] incubator-freemarker git commit: Added minimum Java
version to the README.
Posted by dd...@apache.org.
Added minimum Java version to the README.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/973ea4cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/973ea4cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/973ea4cb
Branch: refs/heads/2.3
Commit: 973ea4cb019e8fc79e3a7ae9efcd83b653ee81c1
Parents: 11419bb
Author: ddekany <dd...@apache.org>
Authored: Wed Mar 1 08:15:45 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Mar 1 08:15:45 2017 +0100
----------------------------------------------------------------------
README | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/973ea4cb/README
----------------------------------------------------------------------
diff --git a/README b/README
index f51afad..8fa6e07 100644
--- a/README
+++ b/README
@@ -95,6 +95,10 @@ dependencies, but usually you don't have to deal with them, because if
you are using an optional feature that's certainly because your
application already uses the related library.
+The minimum required Java version is currently Java SE 5. (The presence
+of a later version may be detected on runtime and utilized by
+FreeMarker.)
+
Change log
----------
[18/50] [abbrv] incubator-freemarker git commit: (JavaDoc improvement)
Posted by dd...@apache.org.
(JavaDoc improvement)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/272008e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/272008e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/272008e3
Branch: refs/heads/2.3
Commit: 272008e33fea0cb2369b9ed6a29a310e3a1f390f
Parents: 6a3b926
Author: ddekany <dd...@apache.org>
Authored: Sat Feb 11 18:50:35 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Feb 11 18:50:35 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/cache/URLTemplateLoader.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/272008e3/src/main/java/freemarker/cache/URLTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/URLTemplateLoader.java b/src/main/java/freemarker/cache/URLTemplateLoader.java
index d8474dd..816d2c8 100644
--- a/src/main/java/freemarker/cache/URLTemplateLoader.java
+++ b/src/main/java/freemarker/cache/URLTemplateLoader.java
@@ -29,9 +29,10 @@ import java.net.URLConnection;
import freemarker.template.Configuration;
/**
- * This is an abstract template loader that can load templates whose
- * location can be described by an URL. Subclasses only need to override
- * the {@link #getURL(String)} method.
+ * This is an abstract template loader that can load templates whose location can be described by an URL. This
+ * superclass only works for cases where merely getting the URL immediately tells if the resource exists, not for cases
+ * where for example you had to check response headers to know that. The subclasses only need to override the
+ * {@link #getURL(String)} method.
*/
public abstract class URLTemplateLoader implements TemplateLoader {
@@ -93,8 +94,7 @@ public abstract class URLTemplateLoader implements TemplateLoader {
* an URL that points the template source.
* @param name the name of the sought template, including the locale
* decorations.
- * @return an URL that points to the template source, or null if it can
- * determine that the template source does not exist.
+ * @return an URL that points to the template source, or {@code null} if the template does not exist.
*/
protected abstract URL getURL(String name);
[11/50] [abbrv] incubator-freemarker git commit: (JavaDoc typo)
Posted by dd...@apache.org.
(JavaDoc typo)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/b687c6d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b687c6d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b687c6d7
Branch: refs/heads/2.3
Commit: b687c6d7e094ec6a689b5214ea460a3f3a68f359
Parents: 547a79f
Author: ddekany <dd...@apache.org>
Authored: Tue Feb 7 19:38:23 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Tue Feb 7 19:38:23 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/core/Environment.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b687c6d7/src/main/java/freemarker/core/Environment.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Environment.java b/src/main/java/freemarker/core/Environment.java
index 876fbba..feae500 100644
--- a/src/main/java/freemarker/core/Environment.java
+++ b/src/main/java/freemarker/core/Environment.java
@@ -2404,7 +2404,7 @@ public final class Environment extends Configurable {
}
/**
- * Emulates <code>include</code> directive, except that <code>name</code> must be tempate root relative.
+ * Emulates <code>include</code> directive, except that <code>name</code> must be template root relative.
*
* <p>
* It's the same as <code>include(getTemplateForInclusion(name, encoding, parse))</code>. But, you may want to
[20/50] [abbrv] incubator-freemarker git commit: Initialization
should fail if UnsafeMethods can't be read.
Posted by dd...@apache.org.
Initialization should fail if UnsafeMethods can't be read.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/f188f972
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/f188f972
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/f188f972
Branch: refs/heads/2.3
Commit: f188f97296f2925fd3bf38275af483555b5bac83
Parents: 3c0f190
Author: ddekany <dd...@apache.org>
Authored: Fri Feb 17 00:06:14 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Feb 17 00:06:14 2017 +0100
----------------------------------------------------------------------
.../freemarker/ext/beans/UnsafeMethods.java | 51 ++++++++++----------
1 file changed, 26 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f188f972/src/main/java/freemarker/ext/beans/UnsafeMethods.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/UnsafeMethods.java b/src/main/java/freemarker/ext/beans/UnsafeMethods.java
index 6d398ec..5ed3877 100644
--- a/src/main/java/freemarker/ext/beans/UnsafeMethods.java
+++ b/src/main/java/freemarker/ext/beans/UnsafeMethods.java
@@ -21,7 +21,6 @@ package freemarker.ext.beans;
import java.io.InputStream;
import java.lang.reflect.Method;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -34,6 +33,7 @@ import freemarker.template.utility.ClassUtil;
class UnsafeMethods {
+ private static final String UNSAFE_METHODS_PROPERTIES = "unsafeMethods.properties";
private static final Set UNSAFE_METHODS = createUnsafeMethodsSet();
private UnsafeMethods() { }
@@ -45,36 +45,37 @@ class UnsafeMethods {
private static final Set createUnsafeMethodsSet() {
Properties props = new Properties();
InputStream in = BeansWrapper.class.getResourceAsStream("unsafeMethods.properties");
- if (in != null) {
- String methodSpec = null;
+ if (in == null) {
+ throw new IllegalStateException("Class loader resource not found: "
+ + BeansWrapper.class.getPackage().getName() + UNSAFE_METHODS_PROPERTIES);
+ }
+ String methodSpec = null;
+ try {
try {
+ props.load(in);
+ } finally {
+ in.close();
+ }
+ Set set = new HashSet(props.size() * 4 / 3, 1f);
+ Map primClasses = createPrimitiveClassesMap();
+ for (Iterator iterator = props.keySet().iterator(); iterator.hasNext(); ) {
+ methodSpec = (String) iterator.next();
try {
- props.load(in);
- } finally {
- in.close();
- }
- Set set = new HashSet(props.size() * 4 / 3, 1f);
- Map primClasses = createPrimitiveClassesMap();
- for (Iterator iterator = props.keySet().iterator(); iterator.hasNext(); ) {
- methodSpec = (String) iterator.next();
- try {
- set.add(parseMethodSpec(methodSpec, primClasses));
- } catch (ClassNotFoundException e) {
- if (ClassIntrospector.DEVELOPMENT_MODE) {
- throw e;
- }
- } catch (NoSuchMethodException e) {
- if (ClassIntrospector.DEVELOPMENT_MODE) {
- throw e;
- }
+ set.add(parseMethodSpec(methodSpec, primClasses));
+ } catch (ClassNotFoundException e) {
+ if (ClassIntrospector.DEVELOPMENT_MODE) {
+ throw e;
+ }
+ } catch (NoSuchMethodException e) {
+ if (ClassIntrospector.DEVELOPMENT_MODE) {
+ throw e;
}
}
- return set;
- } catch (Exception e) {
- throw new RuntimeException("Could not load unsafe method " + methodSpec + " " + e.getClass().getName() + " " + e.getMessage());
}
+ return set;
+ } catch (Exception e) {
+ throw new RuntimeException("Could not load unsafe method " + methodSpec + " " + e.getClass().getName() + " " + e.getMessage());
}
- return Collections.EMPTY_SET;
}
private static Method parseMethodSpec(String methodSpec, Map primClasses)
[27/50] [abbrv] incubator-freemarker git commit: (Fixed some typos)
Posted by dd...@apache.org.
(Fixed some typos)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/e34f70ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e34f70ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e34f70ba
Branch: refs/heads/2.3
Commit: e34f70bac64fd2ae1defa0e0b25c00a6c7a19ad4
Parents: 68382bb
Author: ddekany <dd...@apache.org>
Authored: Sun Feb 26 01:55:46 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Feb 26 01:55:46 2017 +0100
----------------------------------------------------------------------
.../java/freemarker/core/JavaTemplateDateFormatFactory.java | 8 ++++----
src/main/java/freemarker/template/_TemplateAPI.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e34f70ba/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java b/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java
index 4ef439e..74fb467 100644
--- a/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java
+++ b/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java
@@ -37,7 +37,7 @@ class JavaTemplateDateFormatFactory extends TemplateDateFormatFactory {
private static final ConcurrentHashMap<CacheKey, DateFormat> GLOBAL_FORMAT_CACHE
= new ConcurrentHashMap<CacheKey, DateFormat>();
- private static final int LEAK_ALERT_NUMBER_FORMAT_CACHE_SIZE = 1024;
+ private static final int LEAK_ALERT_DATE_FORMAT_CACHE_SIZE = 1024;
private JavaTemplateDateFormatFactory() {
// Can't be instantiated
@@ -101,16 +101,16 @@ class JavaTemplateDateFormatFactory extends TemplateDateFormatFactory {
}
jFormat.setTimeZone(cacheKey.timeZone);
- if (GLOBAL_FORMAT_CACHE.size() >= LEAK_ALERT_NUMBER_FORMAT_CACHE_SIZE) {
+ if (GLOBAL_FORMAT_CACHE.size() >= LEAK_ALERT_DATE_FORMAT_CACHE_SIZE) {
boolean triggered = false;
synchronized (JavaTemplateDateFormatFactory.class) {
- if (GLOBAL_FORMAT_CACHE.size() >= LEAK_ALERT_NUMBER_FORMAT_CACHE_SIZE) {
+ if (GLOBAL_FORMAT_CACHE.size() >= LEAK_ALERT_DATE_FORMAT_CACHE_SIZE) {
triggered = true;
GLOBAL_FORMAT_CACHE.clear();
}
}
if (triggered) {
- LOG.warn("Global Java DateFormat cache has exceeded " + LEAK_ALERT_NUMBER_FORMAT_CACHE_SIZE
+ LOG.warn("Global Java DateFormat cache has exceeded " + LEAK_ALERT_DATE_FORMAT_CACHE_SIZE
+ " entries => cache flushed. "
+ "Typical cause: Some template generates high variety of format pattern strings.");
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e34f70ba/src/main/java/freemarker/template/_TemplateAPI.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/_TemplateAPI.java b/src/main/java/freemarker/template/_TemplateAPI.java
index 52606f6..5942a35 100644
--- a/src/main/java/freemarker/template/_TemplateAPI.java
+++ b/src/main/java/freemarker/template/_TemplateAPI.java
@@ -142,7 +142,7 @@ public class _TemplateAPI {
&& tagSyntax != Configuration.ANGLE_BRACKET_TAG_SYNTAX) {
throw new IllegalArgumentException("\"tag_syntax\" can only be set to one of these: "
+ "Configuration.AUTO_DETECT_TAG_SYNTAX, Configuration.ANGLE_BRACKET_SYNTAX, "
- + "or Configuration.SQAUARE_BRACKET_SYNTAX");
+ + "or Configuration.SQUARE_BRACKET_SYNTAX");
}
}
[06/50] [abbrv] incubator-freemarker git commit: (TemplateLoader
JavaDoc adjustments)
Posted by dd...@apache.org.
(TemplateLoader JavaDoc adjustments)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/23852f03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/23852f03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/23852f03
Branch: refs/heads/2.3
Commit: 23852f0352b8c200bcd4e62f19fb001c8b3ea142
Parents: dd2c6a3
Author: ddekany <dd...@apache.org>
Authored: Sun Feb 5 19:14:32 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Feb 5 19:14:32 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/cache/TemplateLoader.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/23852f03/src/main/java/freemarker/cache/TemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateLoader.java b/src/main/java/freemarker/cache/TemplateLoader.java
index bab7cae..014b004 100644
--- a/src/main/java/freemarker/cache/TemplateLoader.java
+++ b/src/main/java/freemarker/cache/TemplateLoader.java
@@ -54,12 +54,12 @@ public interface TemplateLoader {
* template can be loaded from. See the return value for more information.
*
* @param name
- * The name of the template, already localized and normalized by the
- * {@link freemarker.cache.TemplateCache cache}. It is completely up to the loader implementation to
+ * The name (template root directory relative path) of the template, already localized and normalized by
+ * the {@link freemarker.cache.TemplateCache cache}. It is completely up to the loader implementation to
* interpret the name, however it should expect to receive hierarchical paths where path components are
* separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are
* not considered as separators by FreeMarker, and thus they will not be replaced with slash before
- * passing to this method, so it's up to the template loader to handle them (say, be throwing and
+ * passing to this method, so it's up to the template loader to handle them (say, by throwing an
* exception that tells the user that the path (s)he has entered is invalid, as (s)he must use slash --
* typical mistake of Windows users). The passed names are always considered relative to some
* loader-defined root location (often referred as the "template root directory"), and will never start
@@ -133,8 +133,7 @@ public interface TemplateLoader {
* @throws IOException
* if an I/O error occurs while accessing the stream.
*/
- public Reader getReader(Object templateSource, String encoding)
- throws IOException;
+ public Reader getReader(Object templateSource, String encoding) throws IOException;
/**
* Closes the template source, releasing any resources held that are only required for reading the template and/or
@@ -145,6 +144,6 @@ public interface TemplateLoader {
* @param templateSource
* the template source that should be closed.
*/
- public void closeTemplateSource(Object templateSource)
- throws IOException;
+ public void closeTemplateSource(Object templateSource) throws IOException;
+
}
[12/50] [abbrv] incubator-freemarker git commit: Reverted source
comparison bugfix for StringTemplateLoader and ByteArrayTemplateLoader;
this thing will only causes problems in FM3, because in FM2 the
MultiTemplateLoader has its own source class that com
Posted by dd...@apache.org.
Reverted source comparison bugfix for StringTemplateLoader and ByteArrayTemplateLoader; this thing will only causes problems in FM3, because in FM2 the MultiTemplateLoader has its own source class that compares the TemplateLoader-s too.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/708097f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/708097f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/708097f7
Branch: refs/heads/2.3
Commit: 708097f70c1783c4df789ff376dc480af10d7f64
Parents: b687c6d
Author: ddekany <dd...@apache.org>
Authored: Wed Feb 8 00:29:36 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Feb 8 00:32:34 2017 +0100
----------------------------------------------------------------------
.../freemarker/cache/ByteArrayTemplateLoader.java | 15 +++------------
.../java/freemarker/cache/StringTemplateLoader.java | 14 +++-----------
src/manual/en_US/book.xml | 9 ---------
3 files changed, 6 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/708097f7/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java b/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
index c089a85..84251fb 100644
--- a/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
+++ b/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
@@ -25,7 +25,6 @@ import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
import freemarker.template.utility.StringUtil;
@@ -37,13 +36,10 @@ import freemarker.template.utility.StringUtil;
*/
public class ByteArrayTemplateLoader implements TemplateLoader {
- private static final AtomicLong INSTANCE_COUNTER = new AtomicLong();
-
- private final long instanceId = INSTANCE_COUNTER.incrementAndGet();
private final Map<String, ByteArrayTemplateSource> templates = new HashMap<String, ByteArrayTemplateSource>();
/**
- * Adds a template to this template loader; see {@link StringTemplateLoader#putTemplate(String, String)} for mpre.
+ * Adds a template to this template loader; see {@link StringTemplateLoader#putTemplate(String, String)} for more.
*/
public void putTemplate(String name, byte[] templateSource) {
putTemplate(name, templateSource, System.currentTimeMillis());
@@ -54,7 +50,7 @@ public class ByteArrayTemplateLoader implements TemplateLoader {
* more.
*/
public void putTemplate(String name, byte[] templateSource, long lastModified) {
- templates.put(name, new ByteArrayTemplateSource(instanceId, name, templateSource, lastModified));
+ templates.put(name, new ByteArrayTemplateSource(name, templateSource, lastModified));
}
/**
@@ -85,13 +81,11 @@ public class ByteArrayTemplateLoader implements TemplateLoader {
}
private static class ByteArrayTemplateSource {
- private final long instanceId;
private final String name;
private final byte[] source;
private final long lastModified;
- ByteArrayTemplateSource(long instanceId, String name, byte[] source, long lastModified) {
- this.instanceId = instanceId;
+ ByteArrayTemplateSource(String name, byte[] source, long lastModified) {
if (name == null) {
throw new IllegalArgumentException("name == null");
}
@@ -110,7 +104,6 @@ public class ByteArrayTemplateLoader implements TemplateLoader {
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + (int) (instanceId ^ (instanceId >>> 32));
result = prime * result + ((name == null) ? 0 : name.hashCode());
return result;
}
@@ -124,8 +117,6 @@ public class ByteArrayTemplateLoader implements TemplateLoader {
if (getClass() != obj.getClass())
return false;
ByteArrayTemplateSource other = (ByteArrayTemplateSource) obj;
- if (instanceId != other.instanceId)
- return false;
if (name == null) {
if (other.name != null)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/708097f7/src/main/java/freemarker/cache/StringTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/StringTemplateLoader.java b/src/main/java/freemarker/cache/StringTemplateLoader.java
index 3f348b0..94e1af3 100644
--- a/src/main/java/freemarker/cache/StringTemplateLoader.java
+++ b/src/main/java/freemarker/cache/StringTemplateLoader.java
@@ -23,7 +23,6 @@ import java.io.Reader;
import java.io.StringReader;
import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
import freemarker.template.utility.StringUtil;
@@ -62,9 +61,6 @@ import freemarker.template.utility.StringUtil;
*/
public class StringTemplateLoader implements TemplateLoader {
- private static final AtomicLong INSTANCE_COUNTER = new AtomicLong();
-
- private final long instanceId = INSTANCE_COUNTER.incrementAndGet();
private final Map<String, StringTemplateSource> templates = new HashMap<String, StringTemplateSource>();
/**
@@ -102,7 +98,7 @@ public class StringTemplateLoader implements TemplateLoader {
* terms of <tt>System.currentTimeMillis()</tt>
*/
public void putTemplate(String name, String templateSource, long lastModified) {
- templates.put(name, new StringTemplateSource(instanceId, name, templateSource, lastModified));
+ templates.put(name, new StringTemplateSource(name, templateSource, lastModified));
}
/**
@@ -137,13 +133,11 @@ public class StringTemplateLoader implements TemplateLoader {
}
private static class StringTemplateSource {
- private final long instanceId;
private final String name;
private final String source;
private final long lastModified;
- StringTemplateSource(long instanceId, String name, String source, long lastModified) {
- this.instanceId = instanceId;
+ StringTemplateSource(String name, String source, long lastModified) {
if (name == null) {
throw new IllegalArgumentException("name == null");
}
@@ -162,7 +156,6 @@ public class StringTemplateLoader implements TemplateLoader {
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + (int) (instanceId ^ (instanceId >>> 32));
result = prime * result + ((name == null) ? 0 : name.hashCode());
return result;
}
@@ -176,8 +169,6 @@ public class StringTemplateLoader implements TemplateLoader {
if (getClass() != obj.getClass())
return false;
StringTemplateSource other = (StringTemplateSource) obj;
- if (instanceId != other.instanceId)
- return false;
if (name == null) {
if (other.name != null)
return false;
@@ -186,6 +177,7 @@ public class StringTemplateLoader implements TemplateLoader {
return true;
}
+
@Override
public String toString() {
return name;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/708097f7/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 1903d0c..9be62fd 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26875,15 +26875,6 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
</listitem>
<listitem>
- <para>Fixed problem in <literal>StringTemplateLoader</literal>
- and <literal>ByteArrayTemplateLoader</literal>, which, in some
- fairly unlikely setups, could confuse the template cache if you
- are using multiple template loaders of the same class (via
- <literal>MultiTemplateLoader</literal>) with clashing template
- names.</para>
- </listitem>
-
- <listitem>
<para>Various smaller code cleanups.</para>
</listitem>
</itemizedlist>
[45/50] [abbrv] incubator-freemarker git commit: Changing copyright
header format to be identical to IntelliJ generated copyright headers
Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/BeansWrapperSingletonHolder.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/BeansWrapperSingletonHolder.java b/src/main/java/freemarker/ext/beans/BeansWrapperSingletonHolder.java
index 6f7f491..f2342c1 100644
--- a/src/main/java/freemarker/ext/beans/BeansWrapperSingletonHolder.java
+++ b/src/main/java/freemarker/ext/beans/BeansWrapperSingletonHolder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/BooleanModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/BooleanModel.java b/src/main/java/freemarker/ext/beans/BooleanModel.java
index 31f386d..016a221 100644
--- a/src/main/java/freemarker/ext/beans/BooleanModel.java
+++ b/src/main/java/freemarker/ext/beans/BooleanModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/CallableMemberDescriptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/CallableMemberDescriptor.java b/src/main/java/freemarker/ext/beans/CallableMemberDescriptor.java
index d0e7245..3e55cde 100644
--- a/src/main/java/freemarker/ext/beans/CallableMemberDescriptor.java
+++ b/src/main/java/freemarker/ext/beans/CallableMemberDescriptor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/CharacterOrString.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/CharacterOrString.java b/src/main/java/freemarker/ext/beans/CharacterOrString.java
index 8b66462..ff69e3f 100644
--- a/src/main/java/freemarker/ext/beans/CharacterOrString.java
+++ b/src/main/java/freemarker/ext/beans/CharacterOrString.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/ClassBasedModelFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/ClassBasedModelFactory.java b/src/main/java/freemarker/ext/beans/ClassBasedModelFactory.java
index d34ace5..1395b8e 100644
--- a/src/main/java/freemarker/ext/beans/ClassBasedModelFactory.java
+++ b/src/main/java/freemarker/ext/beans/ClassBasedModelFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/ClassChangeNotifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/ClassChangeNotifier.java b/src/main/java/freemarker/ext/beans/ClassChangeNotifier.java
index 85e3cbe..be8ea86 100644
--- a/src/main/java/freemarker/ext/beans/ClassChangeNotifier.java
+++ b/src/main/java/freemarker/ext/beans/ClassChangeNotifier.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/ClassIntrospector.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/ClassIntrospector.java b/src/main/java/freemarker/ext/beans/ClassIntrospector.java
index 7c08e49..56e510b 100644
--- a/src/main/java/freemarker/ext/beans/ClassIntrospector.java
+++ b/src/main/java/freemarker/ext/beans/ClassIntrospector.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/ClassIntrospectorBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/ClassIntrospectorBuilder.java b/src/main/java/freemarker/ext/beans/ClassIntrospectorBuilder.java
index ca35aef..cbeffc3 100644
--- a/src/main/java/freemarker/ext/beans/ClassIntrospectorBuilder.java
+++ b/src/main/java/freemarker/ext/beans/ClassIntrospectorBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/CollectionAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/CollectionAdapter.java b/src/main/java/freemarker/ext/beans/CollectionAdapter.java
index 8234851..efe1c42 100644
--- a/src/main/java/freemarker/ext/beans/CollectionAdapter.java
+++ b/src/main/java/freemarker/ext/beans/CollectionAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/CollectionModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/CollectionModel.java b/src/main/java/freemarker/ext/beans/CollectionModel.java
index d82ff4b..ba79cb2 100644
--- a/src/main/java/freemarker/ext/beans/CollectionModel.java
+++ b/src/main/java/freemarker/ext/beans/CollectionModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/DateModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/DateModel.java b/src/main/java/freemarker/ext/beans/DateModel.java
index 228df23..aeca3f5 100644
--- a/src/main/java/freemarker/ext/beans/DateModel.java
+++ b/src/main/java/freemarker/ext/beans/DateModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/EmptyCallableMemberDescriptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/EmptyCallableMemberDescriptor.java b/src/main/java/freemarker/ext/beans/EmptyCallableMemberDescriptor.java
index 01d5c89..4ceb45d 100644
--- a/src/main/java/freemarker/ext/beans/EmptyCallableMemberDescriptor.java
+++ b/src/main/java/freemarker/ext/beans/EmptyCallableMemberDescriptor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/EmptyMemberAndArguments.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/EmptyMemberAndArguments.java b/src/main/java/freemarker/ext/beans/EmptyMemberAndArguments.java
index 088d4e2..fb2231a 100644
--- a/src/main/java/freemarker/ext/beans/EmptyMemberAndArguments.java
+++ b/src/main/java/freemarker/ext/beans/EmptyMemberAndArguments.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/EnumerationModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/EnumerationModel.java b/src/main/java/freemarker/ext/beans/EnumerationModel.java
index e6596ba..fc34c50 100644
--- a/src/main/java/freemarker/ext/beans/EnumerationModel.java
+++ b/src/main/java/freemarker/ext/beans/EnumerationModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/HashAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/HashAdapter.java b/src/main/java/freemarker/ext/beans/HashAdapter.java
index 24b282b..d7be930 100644
--- a/src/main/java/freemarker/ext/beans/HashAdapter.java
+++ b/src/main/java/freemarker/ext/beans/HashAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/InvalidPropertyException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/InvalidPropertyException.java b/src/main/java/freemarker/ext/beans/InvalidPropertyException.java
index 483788a..cd01ccc 100755
--- a/src/main/java/freemarker/ext/beans/InvalidPropertyException.java
+++ b/src/main/java/freemarker/ext/beans/InvalidPropertyException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/IteratorModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/IteratorModel.java b/src/main/java/freemarker/ext/beans/IteratorModel.java
index 6a3371c..f21f641 100644
--- a/src/main/java/freemarker/ext/beans/IteratorModel.java
+++ b/src/main/java/freemarker/ext/beans/IteratorModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/JRebelClassChangeNotifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/JRebelClassChangeNotifier.java b/src/main/java/freemarker/ext/beans/JRebelClassChangeNotifier.java
index 120a92d..21a39df 100644
--- a/src/main/java/freemarker/ext/beans/JRebelClassChangeNotifier.java
+++ b/src/main/java/freemarker/ext/beans/JRebelClassChangeNotifier.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/MapModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/MapModel.java b/src/main/java/freemarker/ext/beans/MapModel.java
index b3c85bb..c672f49 100644
--- a/src/main/java/freemarker/ext/beans/MapModel.java
+++ b/src/main/java/freemarker/ext/beans/MapModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/MaybeEmptyCallableMemberDescriptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/MaybeEmptyCallableMemberDescriptor.java b/src/main/java/freemarker/ext/beans/MaybeEmptyCallableMemberDescriptor.java
index 460d9a2..93147d4 100644
--- a/src/main/java/freemarker/ext/beans/MaybeEmptyCallableMemberDescriptor.java
+++ b/src/main/java/freemarker/ext/beans/MaybeEmptyCallableMemberDescriptor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/MaybeEmptyMemberAndArguments.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/MaybeEmptyMemberAndArguments.java b/src/main/java/freemarker/ext/beans/MaybeEmptyMemberAndArguments.java
index 8b4e18b..94de135 100644
--- a/src/main/java/freemarker/ext/beans/MaybeEmptyMemberAndArguments.java
+++ b/src/main/java/freemarker/ext/beans/MaybeEmptyMemberAndArguments.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/MemberAndArguments.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/MemberAndArguments.java b/src/main/java/freemarker/ext/beans/MemberAndArguments.java
index 88cfa08..3618b78 100644
--- a/src/main/java/freemarker/ext/beans/MemberAndArguments.java
+++ b/src/main/java/freemarker/ext/beans/MemberAndArguments.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/MethodAppearanceFineTuner.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/MethodAppearanceFineTuner.java b/src/main/java/freemarker/ext/beans/MethodAppearanceFineTuner.java
index eeefb68..6b80893 100644
--- a/src/main/java/freemarker/ext/beans/MethodAppearanceFineTuner.java
+++ b/src/main/java/freemarker/ext/beans/MethodAppearanceFineTuner.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/MethodSorter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/MethodSorter.java b/src/main/java/freemarker/ext/beans/MethodSorter.java
index b30c4a9..f7f7335 100644
--- a/src/main/java/freemarker/ext/beans/MethodSorter.java
+++ b/src/main/java/freemarker/ext/beans/MethodSorter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/NonPrimitiveArrayBackedReadOnlyList.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/NonPrimitiveArrayBackedReadOnlyList.java b/src/main/java/freemarker/ext/beans/NonPrimitiveArrayBackedReadOnlyList.java
index 170dace..3c8ebcc 100644
--- a/src/main/java/freemarker/ext/beans/NonPrimitiveArrayBackedReadOnlyList.java
+++ b/src/main/java/freemarker/ext/beans/NonPrimitiveArrayBackedReadOnlyList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/NumberModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/NumberModel.java b/src/main/java/freemarker/ext/beans/NumberModel.java
index 9b3b14b..4e6e679 100644
--- a/src/main/java/freemarker/ext/beans/NumberModel.java
+++ b/src/main/java/freemarker/ext/beans/NumberModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/OverloadedFixArgsMethods.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/OverloadedFixArgsMethods.java b/src/main/java/freemarker/ext/beans/OverloadedFixArgsMethods.java
index 69d44ca..1fec30a 100644
--- a/src/main/java/freemarker/ext/beans/OverloadedFixArgsMethods.java
+++ b/src/main/java/freemarker/ext/beans/OverloadedFixArgsMethods.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/OverloadedMethods.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/OverloadedMethods.java b/src/main/java/freemarker/ext/beans/OverloadedMethods.java
index 3d0a4f2..586714d 100644
--- a/src/main/java/freemarker/ext/beans/OverloadedMethods.java
+++ b/src/main/java/freemarker/ext/beans/OverloadedMethods.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/OverloadedMethodsModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/OverloadedMethodsModel.java b/src/main/java/freemarker/ext/beans/OverloadedMethodsModel.java
index 4db410a..9fe4362 100644
--- a/src/main/java/freemarker/ext/beans/OverloadedMethodsModel.java
+++ b/src/main/java/freemarker/ext/beans/OverloadedMethodsModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/OverloadedMethodsSubset.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/OverloadedMethodsSubset.java b/src/main/java/freemarker/ext/beans/OverloadedMethodsSubset.java
index eeac0d0..ea7f091 100644
--- a/src/main/java/freemarker/ext/beans/OverloadedMethodsSubset.java
+++ b/src/main/java/freemarker/ext/beans/OverloadedMethodsSubset.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/OverloadedNumberUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/OverloadedNumberUtil.java b/src/main/java/freemarker/ext/beans/OverloadedNumberUtil.java
index 6b804fd..352d1de 100644
--- a/src/main/java/freemarker/ext/beans/OverloadedNumberUtil.java
+++ b/src/main/java/freemarker/ext/beans/OverloadedNumberUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/OverloadedVarArgsMethods.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/OverloadedVarArgsMethods.java b/src/main/java/freemarker/ext/beans/OverloadedVarArgsMethods.java
index feda735..5474f85 100644
--- a/src/main/java/freemarker/ext/beans/OverloadedVarArgsMethods.java
+++ b/src/main/java/freemarker/ext/beans/OverloadedVarArgsMethods.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/PrimtiveArrayBackedReadOnlyList.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/PrimtiveArrayBackedReadOnlyList.java b/src/main/java/freemarker/ext/beans/PrimtiveArrayBackedReadOnlyList.java
index 84ab759..d6dab0a 100644
--- a/src/main/java/freemarker/ext/beans/PrimtiveArrayBackedReadOnlyList.java
+++ b/src/main/java/freemarker/ext/beans/PrimtiveArrayBackedReadOnlyList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/ReflectionCallableMemberDescriptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/ReflectionCallableMemberDescriptor.java b/src/main/java/freemarker/ext/beans/ReflectionCallableMemberDescriptor.java
index 1834c22..2f26162 100644
--- a/src/main/java/freemarker/ext/beans/ReflectionCallableMemberDescriptor.java
+++ b/src/main/java/freemarker/ext/beans/ReflectionCallableMemberDescriptor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/ResourceBundleModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/ResourceBundleModel.java b/src/main/java/freemarker/ext/beans/ResourceBundleModel.java
index 37e836f..f6ff899 100644
--- a/src/main/java/freemarker/ext/beans/ResourceBundleModel.java
+++ b/src/main/java/freemarker/ext/beans/ResourceBundleModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/SequenceAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/SequenceAdapter.java b/src/main/java/freemarker/ext/beans/SequenceAdapter.java
index 734462a..340a754 100644
--- a/src/main/java/freemarker/ext/beans/SequenceAdapter.java
+++ b/src/main/java/freemarker/ext/beans/SequenceAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/SetAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/SetAdapter.java b/src/main/java/freemarker/ext/beans/SetAdapter.java
index 010d1fc..e2bdb01 100644
--- a/src/main/java/freemarker/ext/beans/SetAdapter.java
+++ b/src/main/java/freemarker/ext/beans/SetAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/SimpleMapModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/SimpleMapModel.java b/src/main/java/freemarker/ext/beans/SimpleMapModel.java
index fab7805..587888c 100644
--- a/src/main/java/freemarker/ext/beans/SimpleMapModel.java
+++ b/src/main/java/freemarker/ext/beans/SimpleMapModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/SimpleMethod.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/SimpleMethod.java b/src/main/java/freemarker/ext/beans/SimpleMethod.java
index 4a42e71..ff20685 100644
--- a/src/main/java/freemarker/ext/beans/SimpleMethod.java
+++ b/src/main/java/freemarker/ext/beans/SimpleMethod.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/SimpleMethodModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/SimpleMethodModel.java b/src/main/java/freemarker/ext/beans/SimpleMethodModel.java
index f7b347c..e7e1ae1 100644
--- a/src/main/java/freemarker/ext/beans/SimpleMethodModel.java
+++ b/src/main/java/freemarker/ext/beans/SimpleMethodModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/SingletonCustomizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/SingletonCustomizer.java b/src/main/java/freemarker/ext/beans/SingletonCustomizer.java
index 89af09c..ed040b1 100644
--- a/src/main/java/freemarker/ext/beans/SingletonCustomizer.java
+++ b/src/main/java/freemarker/ext/beans/SingletonCustomizer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/StaticModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/StaticModel.java b/src/main/java/freemarker/ext/beans/StaticModel.java
index e55f3c2..28c84bb 100644
--- a/src/main/java/freemarker/ext/beans/StaticModel.java
+++ b/src/main/java/freemarker/ext/beans/StaticModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/StaticModels.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/StaticModels.java b/src/main/java/freemarker/ext/beans/StaticModels.java
index f4dc8cc..28896be 100644
--- a/src/main/java/freemarker/ext/beans/StaticModels.java
+++ b/src/main/java/freemarker/ext/beans/StaticModels.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/StringModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/StringModel.java b/src/main/java/freemarker/ext/beans/StringModel.java
index 4619e4f..719e899 100644
--- a/src/main/java/freemarker/ext/beans/StringModel.java
+++ b/src/main/java/freemarker/ext/beans/StringModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/TypeFlags.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/TypeFlags.java b/src/main/java/freemarker/ext/beans/TypeFlags.java
index 3507519..a67e438 100644
--- a/src/main/java/freemarker/ext/beans/TypeFlags.java
+++ b/src/main/java/freemarker/ext/beans/TypeFlags.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/UnsafeMethods.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/UnsafeMethods.java b/src/main/java/freemarker/ext/beans/UnsafeMethods.java
index 5ed3877..ed6d248 100644
--- a/src/main/java/freemarker/ext/beans/UnsafeMethods.java
+++ b/src/main/java/freemarker/ext/beans/UnsafeMethods.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/_BeansAPI.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/_BeansAPI.java b/src/main/java/freemarker/ext/beans/_BeansAPI.java
index a2c648d..f77a415 100644
--- a/src/main/java/freemarker/ext/beans/_BeansAPI.java
+++ b/src/main/java/freemarker/ext/beans/_BeansAPI.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/_EnumModels.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/_EnumModels.java b/src/main/java/freemarker/ext/beans/_EnumModels.java
index ff51bfb..5d3047d 100644
--- a/src/main/java/freemarker/ext/beans/_EnumModels.java
+++ b/src/main/java/freemarker/ext/beans/_EnumModels.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/_MethodUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/_MethodUtil.java b/src/main/java/freemarker/ext/beans/_MethodUtil.java
index 8eed9f2..c313309 100644
--- a/src/main/java/freemarker/ext/beans/_MethodUtil.java
+++ b/src/main/java/freemarker/ext/beans/_MethodUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/beans/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/package.html b/src/main/java/freemarker/ext/beans/package.html
index 3481288..8c9fce0 100644
--- a/src/main/java/freemarker/ext/beans/package.html
+++ b/src/main/java/freemarker/ext/beans/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/AtAtKey.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/AtAtKey.java b/src/main/java/freemarker/ext/dom/AtAtKey.java
index 6efc127..1de6907 100644
--- a/src/main/java/freemarker/ext/dom/AtAtKey.java
+++ b/src/main/java/freemarker/ext/dom/AtAtKey.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/AttributeNodeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/AttributeNodeModel.java b/src/main/java/freemarker/ext/dom/AttributeNodeModel.java
index 8b49a77..0575cc3 100644
--- a/src/main/java/freemarker/ext/dom/AttributeNodeModel.java
+++ b/src/main/java/freemarker/ext/dom/AttributeNodeModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/CharacterDataNodeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/CharacterDataNodeModel.java b/src/main/java/freemarker/ext/dom/CharacterDataNodeModel.java
index 36ce03c..6f6c53a 100644
--- a/src/main/java/freemarker/ext/dom/CharacterDataNodeModel.java
+++ b/src/main/java/freemarker/ext/dom/CharacterDataNodeModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/DocumentModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/DocumentModel.java b/src/main/java/freemarker/ext/dom/DocumentModel.java
index d1ad828..63783dd 100644
--- a/src/main/java/freemarker/ext/dom/DocumentModel.java
+++ b/src/main/java/freemarker/ext/dom/DocumentModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/DocumentTypeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/DocumentTypeModel.java b/src/main/java/freemarker/ext/dom/DocumentTypeModel.java
index 30fa382..fe65b60 100644
--- a/src/main/java/freemarker/ext/dom/DocumentTypeModel.java
+++ b/src/main/java/freemarker/ext/dom/DocumentTypeModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/DomStringUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/DomStringUtil.java b/src/main/java/freemarker/ext/dom/DomStringUtil.java
index b93192b..a36b00b 100644
--- a/src/main/java/freemarker/ext/dom/DomStringUtil.java
+++ b/src/main/java/freemarker/ext/dom/DomStringUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/ElementModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/ElementModel.java b/src/main/java/freemarker/ext/dom/ElementModel.java
index 1d0c2b5..20481a8 100644
--- a/src/main/java/freemarker/ext/dom/ElementModel.java
+++ b/src/main/java/freemarker/ext/dom/ElementModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/JaxenXPathSupport.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/JaxenXPathSupport.java b/src/main/java/freemarker/ext/dom/JaxenXPathSupport.java
index 109e82b..eda4b87 100644
--- a/src/main/java/freemarker/ext/dom/JaxenXPathSupport.java
+++ b/src/main/java/freemarker/ext/dom/JaxenXPathSupport.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/NodeListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/NodeListModel.java b/src/main/java/freemarker/ext/dom/NodeListModel.java
index 1a97e37..a18b4bc 100644
--- a/src/main/java/freemarker/ext/dom/NodeListModel.java
+++ b/src/main/java/freemarker/ext/dom/NodeListModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/NodeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/NodeModel.java b/src/main/java/freemarker/ext/dom/NodeModel.java
index b5b0ebe..a4ef7d2 100644
--- a/src/main/java/freemarker/ext/dom/NodeModel.java
+++ b/src/main/java/freemarker/ext/dom/NodeModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/NodeOutputter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/NodeOutputter.java b/src/main/java/freemarker/ext/dom/NodeOutputter.java
index e4417a2..f0dd1e0 100644
--- a/src/main/java/freemarker/ext/dom/NodeOutputter.java
+++ b/src/main/java/freemarker/ext/dom/NodeOutputter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/PINodeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/PINodeModel.java b/src/main/java/freemarker/ext/dom/PINodeModel.java
index 18bccdb..1e7e8a3 100644
--- a/src/main/java/freemarker/ext/dom/PINodeModel.java
+++ b/src/main/java/freemarker/ext/dom/PINodeModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/SunInternalXalanXPathSupport.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/SunInternalXalanXPathSupport.java b/src/main/java/freemarker/ext/dom/SunInternalXalanXPathSupport.java
index 593a031..98035f3 100644
--- a/src/main/java/freemarker/ext/dom/SunInternalXalanXPathSupport.java
+++ b/src/main/java/freemarker/ext/dom/SunInternalXalanXPathSupport.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/Transform.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/Transform.java b/src/main/java/freemarker/ext/dom/Transform.java
index 5df9683..dbc0b96 100644
--- a/src/main/java/freemarker/ext/dom/Transform.java
+++ b/src/main/java/freemarker/ext/dom/Transform.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/XPathSupport.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/XPathSupport.java b/src/main/java/freemarker/ext/dom/XPathSupport.java
index e51d812..6c61ea3 100644
--- a/src/main/java/freemarker/ext/dom/XPathSupport.java
+++ b/src/main/java/freemarker/ext/dom/XPathSupport.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/XalanXPathSupport.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/XalanXPathSupport.java b/src/main/java/freemarker/ext/dom/XalanXPathSupport.java
index d48e11f..2a17813 100644
--- a/src/main/java/freemarker/ext/dom/XalanXPathSupport.java
+++ b/src/main/java/freemarker/ext/dom/XalanXPathSupport.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/_ExtDomApi.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/_ExtDomApi.java b/src/main/java/freemarker/ext/dom/_ExtDomApi.java
index 178d8a8..e34fa60 100644
--- a/src/main/java/freemarker/ext/dom/_ExtDomApi.java
+++ b/src/main/java/freemarker/ext/dom/_ExtDomApi.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/dom/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/package.html b/src/main/java/freemarker/ext/dom/package.html
index a3518ff..d9239e4 100644
--- a/src/main/java/freemarker/ext/dom/package.html
+++ b/src/main/java/freemarker/ext/dom/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jdom/NodeListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jdom/NodeListModel.java b/src/main/java/freemarker/ext/jdom/NodeListModel.java
index 077a7e0..bc39bef 100644
--- a/src/main/java/freemarker/ext/jdom/NodeListModel.java
+++ b/src/main/java/freemarker/ext/jdom/NodeListModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jdom/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jdom/package.html b/src/main/java/freemarker/ext/jdom/package.html
index dba93d8..8752b9a 100644
--- a/src/main/java/freemarker/ext/jdom/package.html
+++ b/src/main/java/freemarker/ext/jdom/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/CustomTagAndELFunctionCombiner.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/CustomTagAndELFunctionCombiner.java b/src/main/java/freemarker/ext/jsp/CustomTagAndELFunctionCombiner.java
index cba6a16..8cf493e 100644
--- a/src/main/java/freemarker/ext/jsp/CustomTagAndELFunctionCombiner.java
+++ b/src/main/java/freemarker/ext/jsp/CustomTagAndELFunctionCombiner.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/EventForwarding.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/EventForwarding.java b/src/main/java/freemarker/ext/jsp/EventForwarding.java
index cb617cf..770ef5e 100644
--- a/src/main/java/freemarker/ext/jsp/EventForwarding.java
+++ b/src/main/java/freemarker/ext/jsp/EventForwarding.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/FreeMarkerJspApplicationContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/FreeMarkerJspApplicationContext.java b/src/main/java/freemarker/ext/jsp/FreeMarkerJspApplicationContext.java
index 63077b3..4160f0d 100644
--- a/src/main/java/freemarker/ext/jsp/FreeMarkerJspApplicationContext.java
+++ b/src/main/java/freemarker/ext/jsp/FreeMarkerJspApplicationContext.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory.java b/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory.java
index 0b9245b..9f67335 100644
--- a/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory.java
+++ b/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory2.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory2.java b/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory2.java
index 88af211..f4205e4 100644
--- a/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory2.java
+++ b/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory2.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory21.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory21.java b/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory21.java
index a8def22..d7670c0 100644
--- a/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory21.java
+++ b/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory21.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/FreeMarkerPageContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/FreeMarkerPageContext.java b/src/main/java/freemarker/ext/jsp/FreeMarkerPageContext.java
index d8c3bda..0ff0a1d 100644
--- a/src/main/java/freemarker/ext/jsp/FreeMarkerPageContext.java
+++ b/src/main/java/freemarker/ext/jsp/FreeMarkerPageContext.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/FreemarkerTag.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/FreemarkerTag.java b/src/main/java/freemarker/ext/jsp/FreemarkerTag.java
index cc1f584..837ce3f 100644
--- a/src/main/java/freemarker/ext/jsp/FreemarkerTag.java
+++ b/src/main/java/freemarker/ext/jsp/FreemarkerTag.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/JspContextModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/JspContextModel.java b/src/main/java/freemarker/ext/jsp/JspContextModel.java
index fd40e2a..3c28468 100644
--- a/src/main/java/freemarker/ext/jsp/JspContextModel.java
+++ b/src/main/java/freemarker/ext/jsp/JspContextModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/JspTagModelBase.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/JspTagModelBase.java b/src/main/java/freemarker/ext/jsp/JspTagModelBase.java
index a1fb081..7d72df5 100644
--- a/src/main/java/freemarker/ext/jsp/JspTagModelBase.java
+++ b/src/main/java/freemarker/ext/jsp/JspTagModelBase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/JspWriterAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/JspWriterAdapter.java b/src/main/java/freemarker/ext/jsp/JspWriterAdapter.java
index 5f69f73..3dd402d 100644
--- a/src/main/java/freemarker/ext/jsp/JspWriterAdapter.java
+++ b/src/main/java/freemarker/ext/jsp/JspWriterAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/PageContextFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/PageContextFactory.java b/src/main/java/freemarker/ext/jsp/PageContextFactory.java
index 653a805..51aad6d 100644
--- a/src/main/java/freemarker/ext/jsp/PageContextFactory.java
+++ b/src/main/java/freemarker/ext/jsp/PageContextFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/SimpleTagDirectiveModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/SimpleTagDirectiveModel.java b/src/main/java/freemarker/ext/jsp/SimpleTagDirectiveModel.java
index 9c802fb..882456e 100644
--- a/src/main/java/freemarker/ext/jsp/SimpleTagDirectiveModel.java
+++ b/src/main/java/freemarker/ext/jsp/SimpleTagDirectiveModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/TagTransformModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/TagTransformModel.java b/src/main/java/freemarker/ext/jsp/TagTransformModel.java
index a69d5ec..bc0fda3 100644
--- a/src/main/java/freemarker/ext/jsp/TagTransformModel.java
+++ b/src/main/java/freemarker/ext/jsp/TagTransformModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/TaglibFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/TaglibFactory.java b/src/main/java/freemarker/ext/jsp/TaglibFactory.java
index 028bb16..fbb11a4 100644
--- a/src/main/java/freemarker/ext/jsp/TaglibFactory.java
+++ b/src/main/java/freemarker/ext/jsp/TaglibFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/TaglibMethodUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/TaglibMethodUtil.java b/src/main/java/freemarker/ext/jsp/TaglibMethodUtil.java
index 3780bf5..8ce1b05 100644
--- a/src/main/java/freemarker/ext/jsp/TaglibMethodUtil.java
+++ b/src/main/java/freemarker/ext/jsp/TaglibMethodUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext2.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext2.java b/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext2.java
index 2169157..e091342 100644
--- a/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext2.java
+++ b/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext2.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext21.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext21.java b/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext21.java
index 58adbe8..998a5b0 100644
--- a/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext21.java
+++ b/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext21.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jsp/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/package.html b/src/main/java/freemarker/ext/jsp/package.html
index 23a891b..6a97480 100644
--- a/src/main/java/freemarker/ext/jsp/package.html
+++ b/src/main/java/freemarker/ext/jsp/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jython/JythonHashModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jython/JythonHashModel.java b/src/main/java/freemarker/ext/jython/JythonHashModel.java
index b44488c..1a3e8df 100644
--- a/src/main/java/freemarker/ext/jython/JythonHashModel.java
+++ b/src/main/java/freemarker/ext/jython/JythonHashModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jython/JythonModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jython/JythonModel.java b/src/main/java/freemarker/ext/jython/JythonModel.java
index 2476c72..0438e2a 100644
--- a/src/main/java/freemarker/ext/jython/JythonModel.java
+++ b/src/main/java/freemarker/ext/jython/JythonModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jython/JythonModelCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jython/JythonModelCache.java b/src/main/java/freemarker/ext/jython/JythonModelCache.java
index 1ffaab3..eab5456 100644
--- a/src/main/java/freemarker/ext/jython/JythonModelCache.java
+++ b/src/main/java/freemarker/ext/jython/JythonModelCache.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jython/JythonNumberModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jython/JythonNumberModel.java b/src/main/java/freemarker/ext/jython/JythonNumberModel.java
index 036447e..a784b62 100644
--- a/src/main/java/freemarker/ext/jython/JythonNumberModel.java
+++ b/src/main/java/freemarker/ext/jython/JythonNumberModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jython/JythonSequenceModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jython/JythonSequenceModel.java b/src/main/java/freemarker/ext/jython/JythonSequenceModel.java
index 6614094..e92ed62 100644
--- a/src/main/java/freemarker/ext/jython/JythonSequenceModel.java
+++ b/src/main/java/freemarker/ext/jython/JythonSequenceModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/ext/jython/JythonVersionAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jython/JythonVersionAdapter.java b/src/main/java/freemarker/ext/jython/JythonVersionAdapter.java
index 6ec42f4..a10f65a 100644
--- a/src/main/java/freemarker/ext/jython/JythonVersionAdapter.java
+++ b/src/main/java/freemarker/ext/jython/JythonVersionAdapter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[05/50] [abbrv] incubator-freemarker git commit: (Added toString to
StringTemplateSource)
Posted by dd...@apache.org.
(Added toString to StringTemplateSource)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/dd2c6a36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/dd2c6a36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/dd2c6a36
Branch: refs/heads/2.3
Commit: dd2c6a36ef588e73999bebb7b51dd9717b0df42c
Parents: 6105420
Author: ddekany <dd...@apache.org>
Authored: Sun Feb 5 19:14:02 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Feb 5 19:14:02 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/cache/StringTemplateLoader.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dd2c6a36/src/main/java/freemarker/cache/StringTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/StringTemplateLoader.java b/src/main/java/freemarker/cache/StringTemplateLoader.java
index 8b8bd4a..25abd35 100644
--- a/src/main/java/freemarker/cache/StringTemplateLoader.java
+++ b/src/main/java/freemarker/cache/StringTemplateLoader.java
@@ -154,6 +154,12 @@ public class StringTemplateLoader implements TemplateLoader {
public int hashCode() {
return name.hashCode();
}
+
+ @Override
+ public String toString() {
+ return name;
+ }
+
}
/**
[19/50] [abbrv] incubator-freemarker git commit: TemplateNameFormat
internal API clarifications (terminology, JavaDocs)
Posted by dd...@apache.org.
TemplateNameFormat internal API clarifications (terminology, JavaDocs)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/3c0f1903
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/3c0f1903
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/3c0f1903
Branch: refs/heads/2.3
Commit: 3c0f1903a9b39153588fcdf5b3ba73dccc159784
Parents: 272008e
Author: ddekany <dd...@apache.org>
Authored: Sun Feb 12 12:55:30 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Feb 12 16:22:40 2017 +0100
----------------------------------------------------------------------
.../java/freemarker/cache/TemplateCache.java | 4 +-
.../freemarker/cache/TemplateNameFormat.java | 54 +++++---
src/main/java/freemarker/cache/_CacheAPI.java | 8 +-
src/main/java/freemarker/core/Environment.java | 12 +-
.../cache/TemplateNameFormatTest.java | 128 +++++++++----------
5 files changed, 112 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3c0f1903/src/main/java/freemarker/cache/TemplateCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateCache.java b/src/main/java/freemarker/cache/TemplateCache.java
index ba37c57..6980cb5 100644
--- a/src/main/java/freemarker/cache/TemplateCache.java
+++ b/src/main/java/freemarker/cache/TemplateCache.java
@@ -275,7 +275,7 @@ public class TemplateCache {
NullArgumentException.check("encoding", encoding);
try {
- name = templateNameFormat.normalizeAbsoluteName(name);
+ name = templateNameFormat.normalizeRootBasedName(name);
} catch (MalformedTemplateNameException e) {
// If we don't have to emulate backward compatible behavior, then just rethrow it:
if (templateNameFormat != TemplateNameFormat.DEFAULT_2_3_0
@@ -687,7 +687,7 @@ public class TemplateCache {
if (encoding == null) {
throw new IllegalArgumentException("Argument \"encoding\" can't be null");
}
- name = templateNameFormat.normalizeAbsoluteName(name);
+ name = templateNameFormat.normalizeRootBasedName(name);
if (name != null && templateLoader != null) {
boolean debug = LOG.isDebugEnabled();
String debugName = debug
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3c0f1903/src/main/java/freemarker/cache/TemplateNameFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateNameFormat.java b/src/main/java/freemarker/cache/TemplateNameFormat.java
index 2e06795..34782c5 100644
--- a/src/main/java/freemarker/cache/TemplateNameFormat.java
+++ b/src/main/java/freemarker/cache/TemplateNameFormat.java
@@ -100,24 +100,46 @@ public abstract class TemplateNameFormat {
public static final TemplateNameFormat DEFAULT_2_4_0 = new Default020400();
/**
- * @param baseName Maybe {@code null}, maybe a "file" name instead of a "directory" name.
- * @param targetName No {@code null}. Maybe relative, maybe absolute.
+ * Converts a name to a template root directory based name, so that it can be used to find a template without
+ * knowing what (like which template) has referred to it. The rules depend on the name format, but a typical example
+ * is converting "t.ftl" with base "sub/contex.ftl" to "sub/t.ftl".
+ *
+ * @param baseName
+ * Maybe a file name, maybe a directory name. The meaning of file name VS directory name depends on the
+ * name format, but typically, something like "foo/bar/" is a directory name, and something like
+ * "foo/bar" is a file name, and thus in the last case the effective base is "foo/" (i.e., the directory
+ * that contains the file). Not {@code null}.
+ * @param targetName
+ * The name to convert. This usually comes from a template that refers to another template by name. It
+ * can be a relative name, or an absolute name. (In typical name formats absolute names start with
+ * {@code "/"} or maybe with an URL scheme, and all others are relative). Not {@code null}.
+ *
+ * @return The path in template root directory relative format, or even an absolute name (where the root directory
+ * is not the real root directory of the file system, but the imaginary directory that exists to store the
+ * templates). The standard implementations shipped with FreeMarker always return a root relative path
+ * (except if the name starts with an URI schema, in which case a full URI is returned).
*/
- abstract String toAbsoluteName(String baseName, String targetName) throws MalformedTemplateNameException;
+ abstract String toRootBasedName(String baseName, String targetName) throws MalformedTemplateNameException;
/**
- * @return For backward compatibility only, {@code null} is allowed and will be treated as if the template doesn't
- * exist (despite that a normalizer doesn't access the storage, so it's not its duty to decide that).
+ * Normalizes a template root directory based name (relative to the root or absolute), so that equivalent names
+ * become equivalent according {@link String#equals(Object)} too. The rules depend on the name format, but typical
+ * examples are "sub/../t.ftl" to "t.ftl", "sub/./t.ftl" to "sub/t.ftl" and "/t.ftl" to "t.ftl".
+ *
+ * <p>The standard implementations shipped with FreeMarker always returns a root relative path
+ * (except if the name starts with an URI schema, in which case a full URI is returned), for example, "/foo.ftl"
+ * becomes to "foo.ftl".
+ *
+ * @param name
+ * The root based name. Not {@code null}.
+ *
+ * @return The normalized root based name. Not {@code null}.
*/
- abstract String normalizeAbsoluteName(String name) throws MalformedTemplateNameException;
+ abstract String normalizeRootBasedName(String name) throws MalformedTemplateNameException;
private static final class Default020300 extends TemplateNameFormat {
@Override
- String toAbsoluteName(String baseName, String targetName) {
- if (baseName == null) {
- return targetName;
- }
-
+ String toRootBasedName(String baseName, String targetName) {
if (targetName.indexOf("://") > 0) {
return targetName;
} else if (targetName.startsWith("/")) {
@@ -136,7 +158,7 @@ public abstract class TemplateNameFormat {
}
@Override
- String normalizeAbsoluteName(final String name) throws MalformedTemplateNameException {
+ String normalizeRootBasedName(final String name) throws MalformedTemplateNameException {
// Disallow 0 for security reasons.
checkNameHasNoNullCharacter(name);
@@ -188,11 +210,7 @@ public abstract class TemplateNameFormat {
private static final class Default020400 extends TemplateNameFormat {
@Override
- String toAbsoluteName(String baseName, String targetName) {
- if (baseName == null) {
- return targetName;
- }
-
+ String toRootBasedName(String baseName, String targetName) {
if (findSchemeSectionEnd(targetName) != 0) {
return targetName;
} else if (targetName.startsWith("/")) { // targetName is an absolute path
@@ -219,7 +237,7 @@ public abstract class TemplateNameFormat {
}
@Override
- String normalizeAbsoluteName(final String name) throws MalformedTemplateNameException {
+ String normalizeRootBasedName(final String name) throws MalformedTemplateNameException {
// Disallow 0 for security reasons.
checkNameHasNoNullCharacter(name);
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3c0f1903/src/main/java/freemarker/cache/_CacheAPI.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/_CacheAPI.java b/src/main/java/freemarker/cache/_CacheAPI.java
index fee6531..638be92 100644
--- a/src/main/java/freemarker/cache/_CacheAPI.java
+++ b/src/main/java/freemarker/cache/_CacheAPI.java
@@ -32,14 +32,14 @@ public final class _CacheAPI {
// Not meant to be instantiated
}
- public static String toAbsoluteName(TemplateNameFormat templateNameFormat, String baseName, String targetName)
+ public static String toRootBasedName(TemplateNameFormat templateNameFormat, String baseName, String targetName)
throws MalformedTemplateNameException {
- return templateNameFormat.toAbsoluteName(baseName, targetName);
+ return templateNameFormat.toRootBasedName(baseName, targetName);
}
- public static String normalizeAbsoluteName(TemplateNameFormat templateNameFormat, String name)
+ public static String normalizeRootBasedName(TemplateNameFormat templateNameFormat, String name)
throws MalformedTemplateNameException {
- return templateNameFormat.normalizeAbsoluteName(name);
+ return templateNameFormat.normalizeRootBasedName(name);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3c0f1903/src/main/java/freemarker/core/Environment.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Environment.java b/src/main/java/freemarker/core/Environment.java
index feae500..306cf48 100644
--- a/src/main/java/freemarker/core/Environment.java
+++ b/src/main/java/freemarker/core/Environment.java
@@ -2610,7 +2610,7 @@ public final class Environment extends Configurable {
// that (at least in 2.3.x) the name used for eager import namespace key isn't the template.sourceName, but
// the looked up name (template.name), which we can get quickly:
TemplateNameFormat tnf = getConfiguration().getTemplateNameFormat();
- templateName = _CacheAPI.normalizeAbsoluteName(tnf, _CacheAPI.toAbsoluteName(tnf, null, templateName));
+ templateName = _CacheAPI.normalizeRootBasedName(tnf, templateName);
}
if (loadedLibs == null) {
@@ -2667,8 +2667,9 @@ public final class Environment extends Configurable {
* template refers to another template.
*
* @param baseName
- * The name to which relative {@code targetName}-s are relative to. Maybe {@code null}, which usually
- * means that the base is the root "directory". Assuming {@link TemplateNameFormat#DEFAULT_2_3_0} or
+ * The name to which relative {@code targetName}-s are relative to. Maybe {@code null} (happens when
+ * resolving names in nameless templates), which means that the base is the root "directory", and so the
+ * {@code targetName} is returned without change. Assuming {@link TemplateNameFormat#DEFAULT_2_3_0} or
* {@link TemplateNameFormat#DEFAULT_2_4_0}, the rules are as follows. If you want to specify a base
* directory here, it must end with {@code "/"}. If it doesn't end with {@code "/"}, it's parent
* directory will be used as the base path. Might starts with a scheme part (like {@code "foo://"}, or
@@ -2687,12 +2688,11 @@ public final class Environment extends Configurable {
*/
public String toFullTemplateName(String baseName, String targetName)
throws MalformedTemplateNameException {
- if (isClassicCompatible()) {
- // Early FM only had absolute names.
+ if (isClassicCompatible() /* FM1 only had absolute names */ || baseName == null) {
return targetName;
}
- return _CacheAPI.toAbsoluteName(configuration.getTemplateNameFormat(), baseName, targetName);
+ return _CacheAPI.toRootBasedName(configuration.getTemplateNameFormat(), baseName, targetName);
}
String renderElementToString(TemplateElement te) throws IOException, TemplateException {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3c0f1903/src/test/java/freemarker/cache/TemplateNameFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/cache/TemplateNameFormatTest.java b/src/test/java/freemarker/cache/TemplateNameFormatTest.java
index d001965..77f9274 100644
--- a/src/test/java/freemarker/cache/TemplateNameFormatTest.java
+++ b/src/test/java/freemarker/cache/TemplateNameFormatTest.java
@@ -43,77 +43,77 @@ import freemarker.test.MonitoredTemplateLoader;
public class TemplateNameFormatTest {
@Test
- public void testToAbsoluteName() throws MalformedTemplateNameException {
+ public void testToRootBasedName() throws MalformedTemplateNameException {
// Path that are treated the same both in 2.3 and 2.4 format:
for (TemplateNameFormat tnf : new TemplateNameFormat[] {
TemplateNameFormat.DEFAULT_2_3_0, TemplateNameFormat.DEFAULT_2_4_0 }) {
// Relative paths:
// - No scheme:
- assertEquals("a/b", tnf.toAbsoluteName("a/", "b"));
- assertEquals("/a/b", tnf.toAbsoluteName("/a/", "b"));
- assertEquals("a/b", tnf.toAbsoluteName("a/f", "b"));
- assertEquals("/a/b", tnf.toAbsoluteName("/a/f", "b"));
+ assertEquals("a/b", tnf.toRootBasedName("a/", "b"));
+ assertEquals("/a/b", tnf.toRootBasedName("/a/", "b"));
+ assertEquals("a/b", tnf.toRootBasedName("a/f", "b"));
+ assertEquals("/a/b", tnf.toRootBasedName("/a/f", "b"));
// - Scheme:
- assertEquals("s://a/b", tnf.toAbsoluteName("s://a/", "b"));
- assertEquals("s:///a/b", tnf.toAbsoluteName("s:///a/", "b"));
- assertEquals("s://a/b", tnf.toAbsoluteName("s://a/f", "b"));
- assertEquals("s:///a/b", tnf.toAbsoluteName("s:///a/f", "b"));
- assertEquals("s://b", tnf.toAbsoluteName("s://f", "b"));
- assertEquals("s:///b", tnf.toAbsoluteName("s:///f", "b"));
+ assertEquals("s://a/b", tnf.toRootBasedName("s://a/", "b"));
+ assertEquals("s:///a/b", tnf.toRootBasedName("s:///a/", "b"));
+ assertEquals("s://a/b", tnf.toRootBasedName("s://a/f", "b"));
+ assertEquals("s:///a/b", tnf.toRootBasedName("s:///a/f", "b"));
+ assertEquals("s://b", tnf.toRootBasedName("s://f", "b"));
+ assertEquals("s:///b", tnf.toRootBasedName("s:///f", "b"));
// Absolute paths:
// - No scheme:
- assertEquals("b", tnf.toAbsoluteName("a/", "/b"));
- assertEquals("b", tnf.toAbsoluteName("/a/", "/b"));
- assertEquals("b", tnf.toAbsoluteName("a/s:/f/", "/b"));
+ assertEquals("b", tnf.toRootBasedName("a/", "/b"));
+ assertEquals("b", tnf.toRootBasedName("/a/", "/b"));
+ assertEquals("b", tnf.toRootBasedName("a/s:/f/", "/b"));
// - Scheme:
- assertEquals("s://b", tnf.toAbsoluteName("s://x/", "/b"));
- assertEquals("s://b", tnf.toAbsoluteName("s:///x/", "/b"));
+ assertEquals("s://b", tnf.toRootBasedName("s://x/", "/b"));
+ assertEquals("s://b", tnf.toRootBasedName("s:///x/", "/b"));
// Schemed absolute paths:
- assertEquals("s://b", tnf.toAbsoluteName("a/", "s://b"));
- assertEquals("s://b", tnf.toAbsoluteName("i://a/", "s://b"));
+ assertEquals("s://b", tnf.toRootBasedName("a/", "s://b"));
+ assertEquals("s://b", tnf.toRootBasedName("i://a/", "s://b"));
}
// Scheme names in 2.4 format only:
{
final TemplateNameFormat tnf = TemplateNameFormat.DEFAULT_2_4_0;
- assertEquals("s:b", tnf.toAbsoluteName("s:f", "b"));
- assertEquals("s:/b", tnf.toAbsoluteName("s:/f", "b"));
- assertEquals("s:b", tnf.toAbsoluteName("s:f", "/b"));
- assertEquals("s:b", tnf.toAbsoluteName("s:/f", "/b"));
- assertEquals("s:f/b", tnf.toAbsoluteName("s:f/", "b"));
- assertEquals("s:/f/b", tnf.toAbsoluteName("s:/f/", "b"));
- assertEquals("s:b", tnf.toAbsoluteName("s:f/", "/b"));
- assertEquals("s:b", tnf.toAbsoluteName("s:/f/", "/b"));
- assertEquals("s:b", tnf.toAbsoluteName("s:/f/", "/b"));
- assertEquals("b", tnf.toAbsoluteName("a/s://f/", "/b"));
+ assertEquals("s:b", tnf.toRootBasedName("s:f", "b"));
+ assertEquals("s:/b", tnf.toRootBasedName("s:/f", "b"));
+ assertEquals("s:b", tnf.toRootBasedName("s:f", "/b"));
+ assertEquals("s:b", tnf.toRootBasedName("s:/f", "/b"));
+ assertEquals("s:f/b", tnf.toRootBasedName("s:f/", "b"));
+ assertEquals("s:/f/b", tnf.toRootBasedName("s:/f/", "b"));
+ assertEquals("s:b", tnf.toRootBasedName("s:f/", "/b"));
+ assertEquals("s:b", tnf.toRootBasedName("s:/f/", "/b"));
+ assertEquals("s:b", tnf.toRootBasedName("s:/f/", "/b"));
+ assertEquals("b", tnf.toRootBasedName("a/s://f/", "/b"));
}
// Scheme names in 2.3 format only:
{
final TemplateNameFormat tnf = TemplateNameFormat.DEFAULT_2_3_0;
- assertEquals("a/s://b", tnf.toAbsoluteName("a/s://f/", "/b"));
+ assertEquals("a/s://b", tnf.toRootBasedName("a/s://f/", "/b"));
}
}
@Test
- public void testNormalizeAbsoluteName() throws MalformedTemplateNameException {
+ public void testNormalizeRootBasedName() throws MalformedTemplateNameException {
// Normalizations that are the same in legacy and modern format:
for (TemplateNameFormat tnf : new TemplateNameFormat[] {
TemplateNameFormat.DEFAULT_2_3_0, TemplateNameFormat.DEFAULT_2_4_0 }) {
- assertEquals("", tnf.normalizeAbsoluteName(""));
+ assertEquals("", tnf.normalizeRootBasedName(""));
for (String lead : new String[] { "", "/" }) {
- assertEquals("foo", tnf.normalizeAbsoluteName(lead + "foo"));
- assertEquals("foo", tnf.normalizeAbsoluteName(lead + "./foo"));
- assertEquals("foo", tnf.normalizeAbsoluteName(lead + "./././foo"));
- assertEquals("foo", tnf.normalizeAbsoluteName(lead + "bar/../foo"));
- assertEquals("a/b/", tnf.normalizeAbsoluteName("a/b/"));
- assertEquals("a/", tnf.normalizeAbsoluteName("a/b/../"));
- assertEquals("a/c../..d/e*/*f", tnf.normalizeAbsoluteName("a/c../..d/e*/*f"));
- assertEquals("", tnf.normalizeAbsoluteName(""));
- assertEquals("foo/bar/*", tnf.normalizeAbsoluteName("foo/bar/*"));
- assertEquals("schema://", tnf.normalizeAbsoluteName("schema://"));
+ assertEquals("foo", tnf.normalizeRootBasedName(lead + "foo"));
+ assertEquals("foo", tnf.normalizeRootBasedName(lead + "./foo"));
+ assertEquals("foo", tnf.normalizeRootBasedName(lead + "./././foo"));
+ assertEquals("foo", tnf.normalizeRootBasedName(lead + "bar/../foo"));
+ assertEquals("a/b/", tnf.normalizeRootBasedName("a/b/"));
+ assertEquals("a/", tnf.normalizeRootBasedName("a/b/../"));
+ assertEquals("a/c../..d/e*/*f", tnf.normalizeRootBasedName("a/c../..d/e*/*f"));
+ assertEquals("", tnf.normalizeRootBasedName(""));
+ assertEquals("foo/bar/*", tnf.normalizeRootBasedName("foo/bar/*"));
+ assertEquals("schema://", tnf.normalizeRootBasedName("schema://"));
assertThrowsWithBackingOutException(lead + "bar/../../x/foo", tnf);
assertThrowsWithBackingOutException(lead + "../x", tnf);
@@ -124,7 +124,7 @@ public class TemplateNameFormatTest {
{
final String name = lead + "foo\u0000";
try {
- tnf.normalizeAbsoluteName(name);
+ tnf.normalizeRootBasedName(name);
fail();
} catch (MalformedTemplateNameException e) {
assertEquals(name, e.getTemplateName());
@@ -139,15 +139,15 @@ public class TemplateNameFormatTest {
assertEqualsOn23AndOn24("bar/foo", "foo", "bar/./../foo");
// Even number of leading ".."-s bug:
- assertNormAbsNameEqualsOn23ButThrowsBackOutExcOn24("foo", "../../foo");
- assertNormAbsNameEqualsOn23ButThrowsBackOutExcOn24("foo", "../../../../foo");
+ assertNormRBNameEqualsOn23ButThrowsBackOutExcOn24("foo", "../../foo");
+ assertNormRBNameEqualsOn23ButThrowsBackOutExcOn24("foo", "../../../../foo");
// ".." and "*"
assertEqualsOn23AndOn24("a/b/foo", "a/*/foo", "a/b/*/../foo");
//
assertEqualsOn23AndOn24("a/foo", "foo", "a/b/*/../../foo");
//
- assertNormAbsNameEqualsOn23ButThrowsBackOutExcOn24("foo", "a/b/*/../../../foo");
+ assertNormRBNameEqualsOn23ButThrowsBackOutExcOn24("foo", "a/b/*/../../../foo");
//
assertEqualsOn23AndOn24("a/b/*/foo", "a/*/foo", "a/b/*/*/../foo");
//
@@ -162,13 +162,13 @@ public class TemplateNameFormatTest {
assertEqualsOn23AndOn24("*/", "", "a/../*/");
// ".." and "scheme"
- assertNormAbsNameEqualsOn23ButThrowsBackOutExcOn24("x:/foo", "x://../foo");
+ assertNormRBNameEqualsOn23ButThrowsBackOutExcOn24("x:/foo", "x://../foo");
//
- assertNormAbsNameEqualsOn23ButThrowsBackOutExcOn24("foo", "x://../../foo");
+ assertNormRBNameEqualsOn23ButThrowsBackOutExcOn24("foo", "x://../../foo");
//
- assertNormAbsNameEqualsOn23ButThrowsBackOutExcOn24("x:../foo", "x:../foo");
+ assertNormRBNameEqualsOn23ButThrowsBackOutExcOn24("x:../foo", "x:../foo");
//
- assertNormAbsNameEqualsOn23ButThrowsBackOutExcOn24("foo", "x:../../foo");
+ assertNormRBNameEqualsOn23ButThrowsBackOutExcOn24("foo", "x:../../foo");
// Tricky cases with terminating "/":
assertEqualsOn23AndOn24("/", "", "/");
@@ -180,7 +180,7 @@ public class TemplateNameFormatTest {
// Lonely "."
assertEqualsOn23AndOn24(".", "", ".");
// Lonely ".."
- assertNormAbsNameEqualsOn23ButThrowsBackOutExcOn24("..", "..");
+ assertNormRBNameEqualsOn23ButThrowsBackOutExcOn24("..", "..");
// Lonely "*"
// Eliminating redundant "//":
@@ -213,15 +213,15 @@ public class TemplateNameFormatTest {
// New kind of scheme handling:
- assertEquals("s:a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeAbsoluteName("s:a/b"));
- assertEquals("s:a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeAbsoluteName("s:/a/b"));
- assertEquals("s://a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeAbsoluteName("s://a/b"));
- assertEquals("s://a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeAbsoluteName("s:///a/b"));
- assertEquals("s://a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeAbsoluteName("s:////a/b"));
+ assertEquals("s:a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeRootBasedName("s:a/b"));
+ assertEquals("s:a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeRootBasedName("s:/a/b"));
+ assertEquals("s://a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeRootBasedName("s://a/b"));
+ assertEquals("s://a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeRootBasedName("s:///a/b"));
+ assertEquals("s://a/b", TemplateNameFormat.DEFAULT_2_4_0.normalizeRootBasedName("s:////a/b"));
// Illegal use a of ":":
- assertNormAbsNameThrowsColonExceptionOn24("a/b:c/d");
- assertNormAbsNameThrowsColonExceptionOn24("a/b:/..");
+ assertNormRBNameThrowsColonExceptionOn24("a/b:c/d");
+ assertNormRBNameThrowsColonExceptionOn24("a/b:/..");
}
@Test
@@ -289,19 +289,19 @@ public class TemplateNameFormatTest {
private void assertEqualsOn23AndOn24(String expected23, String expected24, String name)
throws MalformedTemplateNameException {
- assertEquals(expected23, TemplateNameFormat.DEFAULT_2_3_0.normalizeAbsoluteName(name));
- assertEquals(expected24, TemplateNameFormat.DEFAULT_2_4_0.normalizeAbsoluteName(name));
+ assertEquals(expected23, TemplateNameFormat.DEFAULT_2_3_0.normalizeRootBasedName(name));
+ assertEquals(expected24, TemplateNameFormat.DEFAULT_2_4_0.normalizeRootBasedName(name));
}
- private void assertNormAbsNameEqualsOn23ButThrowsBackOutExcOn24(final String expected23, final String name)
+ private void assertNormRBNameEqualsOn23ButThrowsBackOutExcOn24(final String expected23, final String name)
throws MalformedTemplateNameException {
- assertEquals(expected23, TemplateNameFormat.DEFAULT_2_3_0.normalizeAbsoluteName(name));
+ assertEquals(expected23, TemplateNameFormat.DEFAULT_2_3_0.normalizeRootBasedName(name));
assertThrowsWithBackingOutException(name, TemplateNameFormat.DEFAULT_2_4_0);
}
private void assertThrowsWithBackingOutException(final String name, final TemplateNameFormat tnf) {
try {
- tnf.normalizeAbsoluteName(name);
+ tnf.normalizeRootBasedName(name);
fail();
} catch (MalformedTemplateNameException e) {
assertEquals(name, e.getTemplateName());
@@ -309,9 +309,9 @@ public class TemplateNameFormatTest {
}
}
- private void assertNormAbsNameThrowsColonExceptionOn24(final String name) throws MalformedTemplateNameException {
+ private void assertNormRBNameThrowsColonExceptionOn24(final String name) throws MalformedTemplateNameException {
try {
- TemplateNameFormat.DEFAULT_2_4_0.normalizeAbsoluteName(name);
+ TemplateNameFormat.DEFAULT_2_4_0.normalizeRootBasedName(name);
fail();
} catch (MalformedTemplateNameException e) {
assertEquals(name, e.getTemplateName());
[15/50] [abbrv] incubator-freemarker git commit: Testing commit right
(woonsan)
Posted by dd...@apache.org.
Testing commit right (woonsan)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/143a8f0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/143a8f0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/143a8f0c
Branch: refs/heads/2.3
Commit: 143a8f0c9bab9b801ccab4d39731b75df01c75b3
Parents: b1e28b0
Author: Woonsan Ko <wo...@apache.org>
Authored: Sat Feb 11 02:50:33 2017 -0500
Committer: Woonsan Ko <wo...@apache.org>
Committed: Sat Feb 11 02:50:33 2017 -0500
----------------------------------------------------------------------
src/dist/bin/README.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/143a8f0c/src/dist/bin/README.md
----------------------------------------------------------------------
diff --git a/src/dist/bin/README.md b/src/dist/bin/README.md
new file mode 100644
index 0000000..25f8d45
--- /dev/null
+++ b/src/dist/bin/README.md
@@ -0,0 +1 @@
+# Documentation
[26/50] [abbrv] incubator-freemarker git commit: Bugfix:
JavaTemplateDateFormatFactory has used the same lock as
JavaTemplateNumberFactory (causes unnecessary contention).
Posted by dd...@apache.org.
Bugfix: JavaTemplateDateFormatFactory has used the same lock as JavaTemplateNumberFactory (causes unnecessary contention).
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/68382bb9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/68382bb9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/68382bb9
Branch: refs/heads/2.3
Commit: 68382bb93905c82c884b9989891f2dadec4697ea
Parents: 148d8c2
Author: ddekany <dd...@apache.org>
Authored: Fri Feb 24 22:38:29 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Feb 24 22:38:29 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/68382bb9/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java b/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java
index 286eeff..4ef439e 100644
--- a/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java
+++ b/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java
@@ -103,7 +103,7 @@ class JavaTemplateDateFormatFactory extends TemplateDateFormatFactory {
if (GLOBAL_FORMAT_CACHE.size() >= LEAK_ALERT_NUMBER_FORMAT_CACHE_SIZE) {
boolean triggered = false;
- synchronized (JavaTemplateNumberFormatFactory.class) {
+ synchronized (JavaTemplateDateFormatFactory.class) {
if (GLOBAL_FORMAT_CACHE.size() >= LEAK_ALERT_NUMBER_FORMAT_CACHE_SIZE) {
triggered = true;
GLOBAL_FORMAT_CACHE.clear();
[31/50] [abbrv] incubator-freemarker git commit: Removed dynamic
java.lang.Enum access, as we require Java 5 now.
Posted by dd...@apache.org.
Removed dynamic java.lang.Enum access, as we require Java 5 now.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/bf58114b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/bf58114b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/bf58114b
Branch: refs/heads/2.3
Commit: bf58114b8ad8349ad6f2f770498eeb42bcfff707
Parents: f4d2ae3
Author: ddekany <dd...@apache.org>
Authored: Mon Feb 27 19:05:58 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Mon Feb 27 19:05:58 2017 +0100
----------------------------------------------------------------------
.../java/freemarker/ext/beans/BeansWrapper.java | 36 ++------------------
1 file changed, 3 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bf58114b/src/main/java/freemarker/ext/beans/BeansWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/BeansWrapper.java b/src/main/java/freemarker/ext/beans/BeansWrapper.java
index 9731975..372dc5a 100644
--- a/src/main/java/freemarker/ext/beans/BeansWrapper.java
+++ b/src/main/java/freemarker/ext/beans/BeansWrapper.java
@@ -67,7 +67,6 @@ import freemarker.template.Version;
import freemarker.template._TemplateAPI;
import freemarker.template.utility.ClassUtil;
import freemarker.template.utility.RichObjectWrapper;
-import freemarker.template.utility.UndeclaredThrowableException;
import freemarker.template.utility.WriteProtectable;
/**
@@ -94,8 +93,6 @@ public class BeansWrapper implements RichObjectWrapper, WriteProtectable {
@Deprecated
static final Object CAN_NOT_UNWRAP = ObjectWrapperAndUnwrapper.CANT_UNWRAP_TO_TARGET_CLASS;
- private static final Constructor<?> ENUMS_MODEL_CTOR = enumsModelCtor();
-
/**
* At this level of exposure, all methods and properties of the
* wrapped objects are exposed to the template.
@@ -350,9 +347,9 @@ public class BeansWrapper implements RichObjectWrapper, WriteProtectable {
falseModel = new BooleanModel(Boolean.FALSE, this);
trueModel = new BooleanModel(Boolean.TRUE, this);
- staticModels = new StaticModels(BeansWrapper.this);
- enumModels = createEnumModels(BeansWrapper.this);
- modelCache = new BeansModelCache(BeansWrapper.this);
+ staticModels = new StaticModels(this);
+ enumModels = new _EnumModels(this);
+ modelCache = new BeansModelCache(this);
setUseCache(bwConf.getUseModelCache());
finalizeConstruction(writeProtected);
@@ -1699,33 +1696,6 @@ public class BeansWrapper implements RichObjectWrapper, WriteProtectable {
+ (classIntrospector.isShared() ? "@" + System.identityHashCode(classIntrospector) : "none");
}
- private static ClassBasedModelFactory createEnumModels(BeansWrapper wrapper) {
- if (ENUMS_MODEL_CTOR != null) {
- try {
- return (ClassBasedModelFactory) ENUMS_MODEL_CTOR.newInstance(
- new Object[] { wrapper });
- } catch (Exception e) {
- throw new UndeclaredThrowableException(e);
- }
- } else {
- return null;
- }
- }
-
- private static Constructor enumsModelCtor() {
- try {
- // Check if Enums are available on this platform
- Class.forName("java.lang.Enum");
- // If they are, return the appropriate constructor for enum models
- return Class.forName(
- "freemarker.ext.beans._EnumModels").getDeclaredConstructor(
- new Class[] { BeansWrapper.class });
- } catch (Exception e) {
- // Otherwise, return null
- return null;
- }
- }
-
/**
* Used for
* {@link MethodAppearanceFineTuner#process}
[10/50] [abbrv] incubator-freemarker git commit: - Fixed problem in
StringTemplateLoader and ByteArrayTemplateLoader, which,
in some fairly unlikely setups,
could confuse the template cache if you are using multiple template loaders of
the same class (vi
Posted by dd...@apache.org.
- Fixed problem in StringTemplateLoader and ByteArrayTemplateLoader, which, in some fairly unlikely setups, could confuse the template cache if you are using multiple template loaders of the same class (via MultiTemplateLoader) with clashing template names.
- Added missing removeTemplate method to ByteArrayTemplateLoader
- Documented that adding/removing templates is not thread safe in the TemplateLoader-s
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/547a79fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/547a79fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/547a79fe
Branch: refs/heads/2.3
Commit: 547a79fed471d91e372b81c1db68501296cb38bd
Parents: 2065c57
Author: ddekany <dd...@apache.org>
Authored: Tue Feb 7 19:38:07 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Tue Feb 7 19:38:07 2017 +0100
----------------------------------------------------------------------
.../cache/ByteArrayTemplateLoader.java | 80 ++++++++++++--------
.../freemarker/cache/StringTemplateLoader.java | 69 ++++++++++++-----
src/manual/en_US/book.xml | 31 +++-----
3 files changed, 109 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/547a79fe/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java b/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
index 11b2182..c089a85 100644
--- a/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
+++ b/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
@@ -24,8 +24,8 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
import freemarker.template.utility.StringUtil;
@@ -36,37 +36,35 @@ import freemarker.template.utility.StringUtil;
* @since 2.3.24
*/
public class ByteArrayTemplateLoader implements TemplateLoader {
+
+ private static final AtomicLong INSTANCE_COUNTER = new AtomicLong();
+ private final long instanceId = INSTANCE_COUNTER.incrementAndGet();
private final Map<String, ByteArrayTemplateSource> templates = new HashMap<String, ByteArrayTemplateSource>();
/**
- * Puts a template into the loader. A call to this method is identical to
- * the call to the three-arg {@link #putTemplate(String, byte[], long)}
- * passing <tt>System.currentTimeMillis()</tt> as the third argument.
- * @param name the name of the template.
- * @param templateSource the source code of the template.
+ * Adds a template to this template loader; see {@link StringTemplateLoader#putTemplate(String, String)} for mpre.
*/
public void putTemplate(String name, byte[] templateSource) {
putTemplate(name, templateSource, System.currentTimeMillis());
}
/**
- * Puts a template into the loader. The name can contain slashes to denote
- * logical directory structure, but must not start with a slash. If the
- * method is called multiple times for the same name and with different
- * last modified time, the configuration's template cache will reload the
- * template according to its own refresh settings (note that if the refresh
- * is disabled in the template cache, the template will not be reloaded).
- * Also, since the cache uses lastModified to trigger reloads, calling the
- * method with different source and identical timestamp won't trigger
- * reloading.
- * @param name the name of the template.
- * @param templateSource the source code of the template.
- * @param lastModified the time of last modification of the template in
- * terms of <tt>System.currentTimeMillis()</tt>
+ * Adds a template to this template loader; see {@link StringTemplateLoader#putTemplate(String, String, long)} for
+ * more.
*/
public void putTemplate(String name, byte[] templateSource, long lastModified) {
- templates.put(name, new ByteArrayTemplateSource(name, templateSource, lastModified));
+ templates.put(name, new ByteArrayTemplateSource(instanceId, name, templateSource, lastModified));
+ }
+
+ /**
+ * Removes the template with the specified name if it was added earlier.; see
+ * {@link StringTemplateLoader#removeTemplate(String)} for more details.
+ *
+ * @since 2.3.26
+ */
+ public boolean removeTemplate(String name) {
+ return templates.remove(name) != null;
}
public void closeTemplateSource(Object templateSource) {
@@ -87,11 +85,13 @@ public class ByteArrayTemplateLoader implements TemplateLoader {
}
private static class ByteArrayTemplateSource {
+ private final long instanceId;
private final String name;
private final byte[] source;
private final long lastModified;
- ByteArrayTemplateSource(String name, byte[] source, long lastModified) {
+ ByteArrayTemplateSource(long instanceId, String name, byte[] source, long lastModified) {
+ this.instanceId = instanceId;
if (name == null) {
throw new IllegalArgumentException("name == null");
}
@@ -105,19 +105,35 @@ public class ByteArrayTemplateLoader implements TemplateLoader {
this.source = source;
this.lastModified = lastModified;
}
-
+
@Override
- public boolean equals(Object obj) {
- if (obj instanceof ByteArrayTemplateSource) {
- return name.equals(((ByteArrayTemplateSource) obj).name);
- }
- return false;
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + (int) (instanceId ^ (instanceId >>> 32));
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ return result;
}
-
+
@Override
- public int hashCode() {
- return name.hashCode();
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ ByteArrayTemplateSource other = (ByteArrayTemplateSource) obj;
+ if (instanceId != other.instanceId)
+ return false;
+ if (name == null) {
+ if (other.name != null)
+ return false;
+ } else if (!name.equals(other.name))
+ return false;
+ return true;
}
+
}
/**
@@ -129,7 +145,7 @@ public class ByteArrayTemplateLoader implements TemplateLoader {
sb.append(TemplateLoaderUtils.getClassNameForToString(this));
sb.append("(Map { ");
int cnt = 0;
- for (Iterator it = templates.keySet().iterator(); it.hasNext(); ) {
+ for (String name : templates.keySet()) {
cnt++;
if (cnt != 1) {
sb.append(", ");
@@ -138,7 +154,7 @@ public class ByteArrayTemplateLoader implements TemplateLoader {
sb.append("...");
break;
}
- sb.append(StringUtil.jQuote(it.next()));
+ sb.append(StringUtil.jQuote(name));
sb.append("=...");
}
if (cnt != 0) {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/547a79fe/src/main/java/freemarker/cache/StringTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/StringTemplateLoader.java b/src/main/java/freemarker/cache/StringTemplateLoader.java
index 25abd35..3f348b0 100644
--- a/src/main/java/freemarker/cache/StringTemplateLoader.java
+++ b/src/main/java/freemarker/cache/StringTemplateLoader.java
@@ -22,8 +22,8 @@ package freemarker.cache;
import java.io.Reader;
import java.io.StringReader;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
import freemarker.template.utility.StringUtil;
@@ -31,7 +31,7 @@ import freemarker.template.utility.StringUtil;
* A {@link TemplateLoader} that uses a {@link Map} with {@link String}-s as its source of
* templates.
*
- * In most case the regular way of loading templates from files will be fine.
+ * <p>In most case the regular way of loading templates from files will be fine.
* However, there can be situations where you don't want to or can't load a
* template from a file, e.g. if you have to deploy a single jar for
* JavaWebStart or if they are contained within a database.
@@ -42,32 +42,39 @@ import freemarker.template.utility.StringUtil;
* Template t = new Template("name", new StringReader(templateStr),
* new Configuration());
* </pre>
- * If, however, you want to create templates from strings which import other
+ * <p>If, however, you want to create templates from strings which import other
* templates this method doesn't work.
*
- * In that case you can create a StringTemplateLoader and add each template to
+ * <p>In that case you can create a StringTemplateLoader and add each template to
* it:
* <pre>
* StringTemplateLoader stringLoader = new StringTemplateLoader();
* stringLoader.putTemplate("greetTemplate", "<#macro greet>Hello</#macro>");
* stringLoader.putTemplate("myTemplate", "<#include \"greetTemplate\"><@greet/> World!");
* </pre>
- * Then you tell your Configuration object to use it:
+ * <p>Then you tell your Configuration object to use it:
* <pre>
* cfg.setTemplateLoader(stringLoader);
* </pre>
- * After that you should be able to use the templates as usual. Often you will
+ * <p>After that you should be able to use the templates as usual. Often you will
* want to combine a <tt>StringTemplateLoader</tt> with another loader. You can
* do so using a {@link freemarker.cache.MultiTemplateLoader}.
*/
public class StringTemplateLoader implements TemplateLoader {
+ private static final AtomicLong INSTANCE_COUNTER = new AtomicLong();
+
+ private final long instanceId = INSTANCE_COUNTER.incrementAndGet();
private final Map<String, StringTemplateSource> templates = new HashMap<String, StringTemplateSource>();
/**
* Puts a template into the loader. A call to this method is identical to
* the call to the three-arg {@link #putTemplate(String, String, long)}
* passing <tt>System.currentTimeMillis()</tt> as the third argument.
+ *
+ * <p>Note that this method is not thread safe! Don't call it after FreeMarker has started using this template
+ * loader.
+ *
* @param name the name of the template.
* @param templateSource the source code of the template.
*/
@@ -85,18 +92,25 @@ public class StringTemplateLoader implements TemplateLoader {
* Also, since the cache uses lastModified to trigger reloads, calling the
* method with different source and identical timestamp won't trigger
* reloading.
+ *
+ * <p>Note that this method is not thread safe! Don't call it after FreeMarker has started using this template
+ * loader.
+ *
* @param name the name of the template.
* @param templateSource the source code of the template.
* @param lastModified the time of last modification of the template in
* terms of <tt>System.currentTimeMillis()</tt>
*/
public void putTemplate(String name, String templateSource, long lastModified) {
- templates.put(name, new StringTemplateSource(name, templateSource, lastModified));
+ templates.put(name, new StringTemplateSource(instanceId, name, templateSource, lastModified));
}
/**
* Removes the template with the specified name if it was added earlier.
*
+ * <p>Note that this method is not thread safe! Don't call it after FreeMarker has started using this template
+ * loader.
+ *
* @param name Exactly the key with which the template was added.
*
* @return Whether a template was found with the given key (and hence was removed now)
@@ -123,11 +137,13 @@ public class StringTemplateLoader implements TemplateLoader {
}
private static class StringTemplateSource {
+ private final long instanceId;
private final String name;
private final String source;
private final long lastModified;
- StringTemplateSource(String name, String source, long lastModified) {
+ StringTemplateSource(long instanceId, String name, String source, long lastModified) {
+ this.instanceId = instanceId;
if (name == null) {
throw new IllegalArgumentException("name == null");
}
@@ -143,18 +159,33 @@ public class StringTemplateLoader implements TemplateLoader {
}
@Override
- public boolean equals(Object obj) {
- if (obj instanceof StringTemplateSource) {
- return name.equals(((StringTemplateSource) obj).name);
- }
- return false;
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + (int) (instanceId ^ (instanceId >>> 32));
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ return result;
}
-
+
@Override
- public int hashCode() {
- return name.hashCode();
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ StringTemplateSource other = (StringTemplateSource) obj;
+ if (instanceId != other.instanceId)
+ return false;
+ if (name == null) {
+ if (other.name != null)
+ return false;
+ } else if (!name.equals(other.name))
+ return false;
+ return true;
}
-
+
@Override
public String toString() {
return name;
@@ -173,7 +204,7 @@ public class StringTemplateLoader implements TemplateLoader {
sb.append(TemplateLoaderUtils.getClassNameForToString(this));
sb.append("(Map { ");
int cnt = 0;
- for (Iterator it = templates.keySet().iterator(); it.hasNext(); ) {
+ for (String name : templates.keySet()) {
cnt++;
if (cnt != 1) {
sb.append(", ");
@@ -182,7 +213,7 @@ public class StringTemplateLoader implements TemplateLoader {
sb.append("...");
break;
}
- sb.append(StringUtil.jQuote(it.next()));
+ sb.append(StringUtil.jQuote(name));
sb.append("=...");
}
if (cnt != 0) {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/547a79fe/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 3f9ccef..1903d0c 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26873,31 +26873,18 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<literal>Configuration.setTemplateLoader(null)</literal> is also
allowed for a while.).</para>
</listitem>
- </itemizedlist>
- </section>
-
- <section>
- <title>Other changes</title>
- <itemizedlist>
<listitem>
- <para><link
- xlink:href="https://issues.apache.org/jira/browse/FREEMARKER-17">FREEMARKER-17</link>:
- Removed the Servlet- and JSP-related <literal>*.dtd</literal>
- files to simplify licensing. We can operate without them as
- before, as validation with them was disabled earlier too. At
- this point, everything in the source code of the FreeMarker
- engine, and everything in the produced
- <literal>freemarker.jar</literal> was created inside the
- FreeMarker project.</para>
+ <para>Fixed problem in <literal>StringTemplateLoader</literal>
+ and <literal>ByteArrayTemplateLoader</literal>, which, in some
+ fairly unlikely setups, could confuse the template cache if you
+ are using multiple template loaders of the same class (via
+ <literal>MultiTemplateLoader</literal>) with clashing template
+ names.</para>
</listitem>
<listitem>
- <para><link
- xlink:href="https://issues.apache.org/jira/browse/FREEMARKER-27">FREEMARKER-27</link>:
- Moved some content from the <literal>NOTICES</literal> files
- over to the <literal>LICENSE</literal> file, to follow the
- Apache Incubator guidelines closer.</para>
+ <para>Various smaller code cleanups.</para>
</listitem>
</itemizedlist>
</section>
@@ -26925,6 +26912,10 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
over to the <literal>LICENSE</literal> file, to follow the
Apache Incubator guidelines closer.</para>
</listitem>
+
+ <listitem>
+ <para>Various smaller JavaDoc improvements.</para>
+ </listitem>
</itemizedlist>
</section>
</section>
[13/50] [abbrv] incubator-freemarker git commit: MultiTemplateLoader,
when it's in sticky mode (the default),
and the TemplateLoader that was successfully used for a given name last time
doesn't find the template now (let's call it the sticked TemplateLo
Posted by dd...@apache.org.
MultiTemplateLoader, when it's in sticky mode (the default), and the TemplateLoader that was successfully used for a given name last time doesn't find the template now (let's call it the sticked TemplateLoader), and thus MultiTemplateLoader falls back to trying all the TemplateLoader-s in order, will now skip the sticked TemplateLoader, as that was already attempted in the same MultiTemplateLoader.findTemplateSource invocation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/6837e4c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/6837e4c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/6837e4c5
Branch: refs/heads/2.3
Commit: 6837e4c532ed91357fa18aa0fe3d06cf13cdcb51
Parents: 708097f
Author: ddekany <dd...@apache.org>
Authored: Wed Feb 8 01:07:18 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Feb 8 01:07:34 2017 +0100
----------------------------------------------------------------------
.../freemarker/cache/MultiTemplateLoader.java | 18 ++++++++++--------
src/manual/en_US/book.xml | 14 ++++++++++++++
2 files changed, 24 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6837e4c5/src/main/java/freemarker/cache/MultiTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/MultiTemplateLoader.java b/src/main/java/freemarker/cache/MultiTemplateLoader.java
index c86baa3..5457a88 100644
--- a/src/main/java/freemarker/cache/MultiTemplateLoader.java
+++ b/src/main/java/freemarker/cache/MultiTemplateLoader.java
@@ -52,10 +52,11 @@ public class MultiTemplateLoader implements StatefulTemplateLoader {
public Object findTemplateSource(String name)
throws IOException {
+ TemplateLoader lastLoader = null;
if (sticky) {
// Use soft affinity - give the loader that last found this
// resource a chance to find it again first.
- TemplateLoader lastLoader = lastLoaderForName.get(name);
+ lastLoader = lastLoaderForName.get(name);
if (lastLoader != null) {
Object source = lastLoader.findTemplateSource(name);
if (source != null) {
@@ -68,14 +69,15 @@ public class MultiTemplateLoader implements StatefulTemplateLoader {
// again, try all loaders in order of appearance. If any manages
// to find the resource, then associate it as the new affine loader
// for this resource.
- for (int i = 0; i < loaders.length; ++i) {
- TemplateLoader loader = loaders[i];
- Object source = loader.findTemplateSource(name);
- if (source != null) {
- if (sticky) {
- lastLoaderForName.put(name, loader);
+ for (TemplateLoader loader : loaders) {
+ if (lastLoader != loader) {
+ Object source = loader.findTemplateSource(name);
+ if (source != null) {
+ if (sticky) {
+ lastLoaderForName.put(name, loader);
+ }
+ return new MultiSource(source, loader);
}
- return new MultiSource(source, loader);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6837e4c5/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 9be62fd..2e9015b 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26834,6 +26834,20 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
</listitem>
<listitem>
+ <para><literal>MultiTemplateLoader</literal>, when it's in
+ sticky mode (the default), and the
+ <literal>TemplateLoader</literal> that was successfully used for
+ a given name last time doesn't find the template now (let's call
+ it the sticked <literal>TemplateLoader</literal>), and thus
+ <literal>MultiTemplateLoader</literal> falls back to trying all
+ the <literal>TemplateLoader</literal>-s in order, will now skip
+ the sticked <literal>TemplateLoader</literal>, as that was
+ already attempted in the same
+ <literal>MultiTemplateLoader.findTemplateSource</literal>
+ invocation.</para>
+ </listitem>
+
+ <listitem>
<para>Bug fixed:
<literal>NodeModel.mergeAdjacentText(Node)</literal> didn't
merged all adjacent text nodes, only pairs of adjacent text
[50/50] [abbrv] incubator-freemarker git commit: Merge
remote-tracking branch 'origin/2.3-gae' into 2.3
Posted by dd...@apache.org.
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/617ad6fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/617ad6fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/617ad6fc
Branch: refs/heads/2.3
Commit: 617ad6fc005fefc0a0e4cd211c903a6b5a84e5bb
Parents: 402d667 83eac15
Author: ddekany <dd...@apache.org>
Authored: Wed Mar 1 15:20:22 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Mar 1 15:20:22 2017 +0100
----------------------------------------------------------------------
LICENSE | 12 +
NOTICE | 28 +-
README | 30 +-
build.xml | 14 +-
ivy.xml | 12 +-
src/dist/bin/LICENSE | 232 ++++
src/dist/bin/NOTICE | 50 -
src/dist/bin/documentation/index.html | 4 +-
src/dist/jar/META-INF/LICENSE | 202 ++++
src/dist/jar/META-INF/NOTICE | 23 -
src/dist/javadoc/META-INF/LICENSE | 202 ++++
src/dist/javadoc/META-INF/NOTICE | 5 -
.../Formatter-profile-FreeMarker.xml | 313 ------
.../Eclipse/Formatter-profile-FreeMarker.xml | 313 ++++++
.../Java-code-style-FreeMarker.xml | 53 +
src/main/java/freemarker/cache/AndMatcher.java | 4 +-
.../cache/ByteArrayTemplateLoader.java | 93 +-
.../java/freemarker/cache/CacheStorage.java | 4 +-
.../cache/CacheStorageWithGetSize.java | 4 +-
.../freemarker/cache/ClassTemplateLoader.java | 16 +-
.../cache/ConcurrentCacheStorage.java | 4 +-
...ConditionalTemplateConfigurationFactory.java | 4 +-
.../freemarker/cache/FileExtensionMatcher.java | 4 +-
.../freemarker/cache/FileNameGlobMatcher.java | 4 +-
.../freemarker/cache/FileTemplateLoader.java | 50 +-
.../FirstMatchTemplateConfigurationFactory.java | 4 +-
.../MergingTemplateConfigurationFactory.java | 4 +-
.../java/freemarker/cache/MruCacheStorage.java | 4 +-
.../freemarker/cache/MultiTemplateLoader.java | 75 +-
src/main/java/freemarker/cache/NotMatcher.java | 4 +-
.../java/freemarker/cache/NullCacheStorage.java | 4 +-
src/main/java/freemarker/cache/OrMatcher.java | 4 +-
.../java/freemarker/cache/PathGlobMatcher.java | 4 +-
.../java/freemarker/cache/PathRegexMatcher.java | 4 +-
.../java/freemarker/cache/SoftCacheStorage.java | 4 +-
.../cache/StatefulTemplateLoader.java | 4 +-
.../freemarker/cache/StringTemplateLoader.java | 85 +-
.../freemarker/cache/StrongCacheStorage.java | 4 +-
.../java/freemarker/cache/TemplateCache.java | 15 +-
.../cache/TemplateConfigurationFactory.java | 4 +-
.../TemplateConfigurationFactoryException.java | 4 +-
.../java/freemarker/cache/TemplateLoader.java | 17 +-
.../freemarker/cache/TemplateLoaderUtils.java | 4 +-
.../freemarker/cache/TemplateLookupContext.java | 9 +-
.../freemarker/cache/TemplateLookupResult.java | 4 +-
.../cache/TemplateLookupStrategy.java | 4 +-
.../freemarker/cache/TemplateNameFormat.java | 58 +-
.../freemarker/cache/TemplateSourceMatcher.java | 4 +-
.../freemarker/cache/URLTemplateLoader.java | 65 +-
.../freemarker/cache/URLTemplateSource.java | 7 +-
.../freemarker/cache/WebappTemplateLoader.java | 13 +-
src/main/java/freemarker/cache/_CacheAPI.java | 12 +-
src/main/java/freemarker/cache/package.html | 4 +-
.../core/APINotSupportedTemplateException.java | 4 +-
.../freemarker/core/AddConcatExpression.java | 4 +-
...AliasTargetTemplateValueFormatException.java | 4 +-
.../core/AliasTemplateDateFormatFactory.java | 4 +-
.../core/AliasTemplateNumberFormatFactory.java | 4 +-
.../java/freemarker/core/AndExpression.java | 4 +-
.../java/freemarker/core/ArithmeticEngine.java | 4 +-
.../freemarker/core/ArithmeticExpression.java | 4 +-
src/main/java/freemarker/core/Assignment.java | 4 +-
.../freemarker/core/AssignmentInstruction.java | 4 +-
src/main/java/freemarker/core/AttemptBlock.java | 4 +-
src/main/java/freemarker/core/AutoEscBlock.java | 4 +-
.../BackwardCompatibleTemplateNumberFormat.java | 4 +-
.../java/freemarker/core/BlockAssignment.java | 4 +-
.../java/freemarker/core/BodyInstruction.java | 4 +-
.../java/freemarker/core/BooleanExpression.java | 4 +-
.../java/freemarker/core/BooleanLiteral.java | 4 +-
.../java/freemarker/core/BoundedRangeModel.java | 4 +-
.../java/freemarker/core/BreakInstruction.java | 4 +-
src/main/java/freemarker/core/BugException.java | 4 +-
src/main/java/freemarker/core/BuiltIn.java | 21 +-
.../core/BuiltInBannedWhenAutoEscaping.java | 4 +-
.../java/freemarker/core/BuiltInForDate.java | 4 +-
.../java/freemarker/core/BuiltInForHashEx.java | 4 +-
.../core/BuiltInForLegacyEscaping.java | 4 +-
.../freemarker/core/BuiltInForLoopVariable.java | 4 +-
.../freemarker/core/BuiltInForMarkupOutput.java | 4 +-
.../java/freemarker/core/BuiltInForNode.java | 4 +-
.../java/freemarker/core/BuiltInForNodeEx.java | 38 +
.../java/freemarker/core/BuiltInForNumber.java | 4 +-
.../freemarker/core/BuiltInForSequence.java | 4 +-
.../java/freemarker/core/BuiltInForString.java | 4 +-
.../core/BuiltInWithParseTimeParameters.java | 4 +-
.../java/freemarker/core/BuiltInsForDates.java | 4 +-
.../core/BuiltInsForExistenceHandling.java | 132 +++
.../java/freemarker/core/BuiltInsForHashes.java | 4 +-
.../core/BuiltInsForLoopVariables.java | 4 +-
.../core/BuiltInsForMarkupOutputs.java | 4 +-
.../core/BuiltInsForMultipleTypes.java | 4 +-
.../java/freemarker/core/BuiltInsForNodes.java | 24 +-
.../freemarker/core/BuiltInsForNumbers.java | 4 +-
.../core/BuiltInsForOutputFormatRelated.java | 4 +-
.../freemarker/core/BuiltInsForSequences.java | 4 +-
.../core/BuiltInsForStringsBasic.java | 4 +-
.../core/BuiltInsForStringsEncoding.java | 4 +-
.../freemarker/core/BuiltInsForStringsMisc.java | 4 +-
.../core/BuiltInsForStringsRegexp.java | 4 +-
.../core/BuiltInsWithParseTimeParameters.java | 4 +-
.../java/freemarker/core/BuiltinVariable.java | 4 +-
.../java/freemarker/core/CSSOutputFormat.java | 4 +-
...lPlaceCustomDataInitializationException.java | 4 +-
src/main/java/freemarker/core/Case.java | 4 +-
.../freemarker/core/CollectionAndSequence.java | 4 +-
.../core/CombinedMarkupOutputFormat.java | 4 +-
src/main/java/freemarker/core/CommandLine.java | 4 +-
src/main/java/freemarker/core/Comment.java | 4 +-
.../core/CommonMarkupOutputFormat.java | 4 +-
.../core/CommonTemplateMarkupOutputModel.java | 4 +-
.../freemarker/core/ComparisonExpression.java | 4 +-
.../java/freemarker/core/CompressedBlock.java | 4 +-
.../java/freemarker/core/ConditionalBlock.java | 4 +-
src/main/java/freemarker/core/Configurable.java | 10 +-
.../java/freemarker/core/CustomAttribute.java | 5 +-
src/main/java/freemarker/core/DebugBreak.java | 4 +-
.../freemarker/core/DefaultToExpression.java | 4 +-
.../freemarker/core/DirectiveCallPlace.java | 4 +-
.../java/freemarker/core/DollarVariable.java | 4 +-
src/main/java/freemarker/core/Dot.java | 4 +-
.../java/freemarker/core/DynamicKeyName.java | 4 +-
src/main/java/freemarker/core/ElseOfList.java | 4 +-
src/main/java/freemarker/core/Environment.java | 21 +-
src/main/java/freemarker/core/EscapeBlock.java | 4 +-
src/main/java/freemarker/core/EvalUtil.java | 5 +-
.../java/freemarker/core/ExistenceBuiltins.java | 132 ---
.../java/freemarker/core/ExistsExpression.java | 4 +-
src/main/java/freemarker/core/Expression.java | 4 +-
.../core/ExtendedDecimalFormatParser.java | 4 +-
.../freemarker/core/FallbackInstruction.java | 4 +-
.../java/freemarker/core/FlushInstruction.java | 4 +-
.../java/freemarker/core/FreeMarkerTree.java | 4 +-
.../java/freemarker/core/HTMLOutputFormat.java | 4 +-
src/main/java/freemarker/core/HashLiteral.java | 5 +-
.../java/freemarker/core/ICIChainMember.java | 4 +-
.../core/ISOLikeTemplateDateFormat.java | 4 +-
.../core/ISOLikeTemplateDateFormatFactory.java | 4 +-
.../freemarker/core/ISOTemplateDateFormat.java | 4 +-
.../core/ISOTemplateDateFormatFactory.java | 4 +-
src/main/java/freemarker/core/Identifier.java | 4 +-
src/main/java/freemarker/core/IfBlock.java | 4 +-
src/main/java/freemarker/core/Include.java | 4 +-
.../java/freemarker/core/Interpolation.java | 4 +-
src/main/java/freemarker/core/Interpret.java | 4 +-
.../core/InvalidFormatParametersException.java | 4 +-
.../core/InvalidFormatStringException.java | 4 +-
.../core/InvalidReferenceException.java | 4 +-
src/main/java/freemarker/core/Items.java | 4 +-
.../java/freemarker/core/IteratorBlock.java | 5 +-
.../java/freemarker/core/JSONOutputFormat.java | 4 +-
.../freemarker/core/JavaScriptOutputFormat.java | 4 +-
.../freemarker/core/JavaTemplateDateFormat.java | 4 +-
.../core/JavaTemplateDateFormatFactory.java | 14 +-
.../core/JavaTemplateNumberFormat.java | 4 +-
.../core/JavaTemplateNumberFormatFactory.java | 4 +-
.../LegacyConstructorParserConfiguration.java | 4 +-
src/main/java/freemarker/core/LibraryLoad.java | 4 +-
.../java/freemarker/core/ListElseContainer.java | 4 +-
src/main/java/freemarker/core/ListLiteral.java | 4 +-
.../core/ListableRightUnboundedRangeModel.java | 4 +-
src/main/java/freemarker/core/LocalContext.java | 4 +-
.../java/freemarker/core/LocalContextStack.java | 4 +-
src/main/java/freemarker/core/Macro.java | 4 +-
.../freemarker/core/MarkupOutputFormat.java | 12 +-
.../core/MarkupOutputFormatBoundBuiltIn.java | 4 +-
src/main/java/freemarker/core/MessageUtil.java | 4 +-
src/main/java/freemarker/core/MethodCall.java | 4 +-
src/main/java/freemarker/core/MiscUtil.java | 4 +-
src/main/java/freemarker/core/MixedContent.java | 4 +-
.../NestedContentNotSupportedException.java | 4 +-
src/main/java/freemarker/core/NewBI.java | 4 +-
.../java/freemarker/core/NoAutoEscBlock.java | 4 +-
.../java/freemarker/core/NoEscapeBlock.java | 4 +-
.../freemarker/core/NonBooleanException.java | 4 +-
.../java/freemarker/core/NonDateException.java | 4 +-
.../core/NonExtendedHashException.java | 4 +-
.../core/NonExtendedNodeException.java | 64 ++
.../java/freemarker/core/NonHashException.java | 4 +-
.../NonListableRightUnboundedRangeModel.java | 4 +-
.../core/NonMarkupOutputException.java | 4 +-
.../freemarker/core/NonMethodException.java | 4 +-
.../freemarker/core/NonNamespaceException.java | 4 +-
.../java/freemarker/core/NonNodeException.java | 4 +-
.../freemarker/core/NonNumericalException.java | 4 +-
.../freemarker/core/NonSequenceException.java | 4 +-
.../core/NonSequenceOrCollectionException.java | 6 +-
.../freemarker/core/NonStringException.java | 4 +-
.../NonStringOrTemplateOutputException.java | 4 +-
.../NonUserDefinedDirectiveLikeException.java | 4 +-
.../java/freemarker/core/NotExpression.java | 4 +-
.../java/freemarker/core/NumberLiteral.java | 4 +-
.../java/freemarker/core/NumericalOutput.java | 4 +-
.../core/OptInTemplateClassResolver.java | 4 +-
src/main/java/freemarker/core/OrExpression.java | 4 +-
src/main/java/freemarker/core/OutputFormat.java | 18 +-
.../java/freemarker/core/OutputFormatBlock.java | 4 +-
.../core/OutputFormatBoundBuiltIn.java | 4 +-
.../java/freemarker/core/ParameterRole.java | 4 +-
.../core/ParentheticalExpression.java | 4 +-
.../java/freemarker/core/ParseException.java | 4 +-
.../freemarker/core/ParserConfiguration.java | 4 +-
.../core/ParsingNotSupportedException.java | 4 +-
.../freemarker/core/PlainTextOutputFormat.java | 4 +-
.../java/freemarker/core/PropertySetting.java | 4 +-
.../java/freemarker/core/RTFOutputFormat.java | 4 +-
src/main/java/freemarker/core/Range.java | 4 +-
src/main/java/freemarker/core/RangeModel.java | 4 +-
.../java/freemarker/core/RecoveryBlock.java | 4 +-
src/main/java/freemarker/core/RecurseNode.java | 4 +-
src/main/java/freemarker/core/RegexpHelper.java | 4 +-
.../java/freemarker/core/ReturnInstruction.java | 4 +-
.../core/RightUnboundedRangeModel.java | 4 +-
src/main/java/freemarker/core/Sep.java | 4 +-
.../java/freemarker/core/SpecialBuiltIn.java | 4 +-
.../java/freemarker/core/StopException.java | 4 +-
.../java/freemarker/core/StopInstruction.java | 4 +-
.../freemarker/core/StringArraySequence.java | 4 +-
.../java/freemarker/core/StringLiteral.java | 4 +-
src/main/java/freemarker/core/SwitchBlock.java | 4 +-
.../freemarker/core/TemplateClassResolver.java | 4 +-
.../core/TemplateCombinedMarkupOutputModel.java | 4 +-
.../freemarker/core/TemplateConfiguration.java | 36 +-
.../freemarker/core/TemplateDateFormat.java | 4 +-
.../core/TemplateDateFormatFactory.java | 4 +-
.../java/freemarker/core/TemplateElement.java | 42 +-
.../core/TemplateElementArrayBuilder.java | 4 +-
.../core/TemplateElementsToVisit.java | 4 +-
.../freemarker/core/TemplateFormatUtil.java | 4 +-
.../core/TemplateHTMLOutputModel.java | 4 +-
.../core/TemplateMarkupOutputModel.java | 4 +-
.../freemarker/core/TemplateNumberFormat.java | 4 +-
.../core/TemplateNumberFormatFactory.java | 4 +-
.../java/freemarker/core/TemplateObject.java | 4 +-
.../freemarker/core/TemplatePostProcessor.java | 4 +-
.../core/TemplatePostProcessorException.java | 4 +-
.../freemarker/core/TemplateRTFOutputModel.java | 4 +-
.../freemarker/core/TemplateValueFormat.java | 4 +-
.../core/TemplateValueFormatException.java | 4 +-
.../core/TemplateValueFormatFactory.java | 4 +-
.../core/TemplateXHTMLOutputModel.java | 4 +-
.../freemarker/core/TemplateXMLOutputModel.java | 4 +-
src/main/java/freemarker/core/TextBlock.java | 4 +-
...nterruptionSupportTemplatePostProcessor.java | 8 +-
.../java/freemarker/core/TokenMgrError.java | 4 +-
.../java/freemarker/core/TransformBlock.java | 4 +-
.../java/freemarker/core/TrimInstruction.java | 12 +-
.../core/UnaryPlusMinusExpression.java | 8 +-
.../core/UndefinedCustomFormatException.java | 4 +-
.../freemarker/core/UndefinedOutputFormat.java | 4 +-
.../core/UnexpectedTypeException.java | 4 +-
.../core/UnformattableValueException.java | 4 +-
src/main/java/freemarker/core/UnifiedCall.java | 4 +-
...nDateTypeFormattingUnsupportedException.java | 4 +-
...nownDateTypeParsingUnsupportedException.java | 4 +-
.../core/UnparsableValueException.java | 4 +-
.../core/UnregisteredOutputFormatException.java | 4 +-
src/main/java/freemarker/core/VisitNode.java | 4 +-
.../java/freemarker/core/XHTMLOutputFormat.java | 4 +-
.../java/freemarker/core/XMLOutputFormat.java | 4 +-
.../freemarker/core/XSTemplateDateFormat.java | 4 +-
.../core/XSTemplateDateFormatFactory.java | 4 +-
.../java/freemarker/core/_ArrayEnumeration.java | 4 +-
.../java/freemarker/core/_ArrayIterator.java | 4 +-
src/main/java/freemarker/core/_CoreAPI.java | 7 +-
.../java/freemarker/core/_CoreLocaleUtils.java | 4 +-
.../java/freemarker/core/_CoreStringUtils.java | 4 +-
.../java/freemarker/core/_DelayedAOrAn.java | 4 +-
.../core/_DelayedConversionToString.java | 4 +-
.../core/_DelayedFTLTypeDescription.java | 4 +-
.../core/_DelayedGetCanonicalForm.java | 4 +-
.../freemarker/core/_DelayedGetMessage.java | 4 +-
.../core/_DelayedGetMessageWithoutStackTop.java | 4 +-
.../java/freemarker/core/_DelayedJQuote.java | 4 +-
.../freemarker/core/_DelayedJoinWithComma.java | 4 +-
.../java/freemarker/core/_DelayedOrdinal.java | 4 +-
.../freemarker/core/_DelayedShortClassName.java | 4 +-
.../java/freemarker/core/_DelayedToString.java | 4 +-
.../core/_ErrorDescriptionBuilder.java | 4 +-
src/main/java/freemarker/core/_Java6.java | 4 +-
src/main/java/freemarker/core/_Java6Impl.java | 4 +-
.../java/freemarker/core/_JavaVersions.java | 4 +-
.../freemarker/core/_MiscTemplateException.java | 4 +-
...ObjectBuilderSettingEvaluationException.java | 4 +-
.../core/_ObjectBuilderSettingEvaluator.java | 4 +-
..._ParserConfigurationWithInheritedFormat.java | 4 +-
.../core/_SettingEvaluationEnvironment.java | 4 +-
.../java/freemarker/core/_SortedArraySet.java | 4 +-
.../core/_TemplateModelException.java | 4 +-
.../java/freemarker/core/_TimeZoneBuilder.java | 4 +-
...expectedTypeErrorExplainerTemplateModel.java | 4 +-
.../core/_UnmodifiableCompositeSet.java | 4 +-
.../java/freemarker/core/_UnmodifiableSet.java | 4 +-
src/main/java/freemarker/core/package.html | 4 +-
src/main/java/freemarker/debug/Breakpoint.java | 4 +-
src/main/java/freemarker/debug/DebugModel.java | 4 +-
.../freemarker/debug/DebuggedEnvironment.java | 4 +-
src/main/java/freemarker/debug/Debugger.java | 4 +-
.../java/freemarker/debug/DebuggerClient.java | 4 +-
.../java/freemarker/debug/DebuggerListener.java | 4 +-
.../debug/EnvironmentSuspendedEvent.java | 4 +-
.../freemarker/debug/impl/DebuggerServer.java | 4 +-
.../freemarker/debug/impl/DebuggerService.java | 4 +-
.../debug/impl/RmiDebugModelImpl.java | 4 +-
.../debug/impl/RmiDebuggedEnvironmentImpl.java | 4 +-
.../freemarker/debug/impl/RmiDebuggerImpl.java | 4 +-
.../debug/impl/RmiDebuggerListenerImpl.java | 4 +-
.../debug/impl/RmiDebuggerService.java | 4 +-
src/main/java/freemarker/debug/package.html | 4 +-
.../freemarker/ext/ant/FreemarkerXmlTask.java | 4 +-
.../java/freemarker/ext/ant/JythonAntTask.java | 4 +-
.../ext/ant/UnlinkedJythonOperations.java | 4 +-
.../ext/ant/UnlinkedJythonOperationsImpl.java | 4 +-
src/main/java/freemarker/ext/ant/package.html | 4 +-
.../java/freemarker/ext/beans/APIModel.java | 4 +-
.../freemarker/ext/beans/ArgumentTypes.java | 4 +-
.../java/freemarker/ext/beans/ArrayModel.java | 4 +-
.../java/freemarker/ext/beans/BeanModel.java | 4 +-
.../freemarker/ext/beans/BeansModelCache.java | 4 +-
.../java/freemarker/ext/beans/BeansWrapper.java | 56 +-
.../ext/beans/BeansWrapperBuilder.java | 4 +-
.../ext/beans/BeansWrapperConfiguration.java | 4 +-
.../ext/beans/BeansWrapperSingletonHolder.java | 4 +-
.../java/freemarker/ext/beans/BooleanModel.java | 4 +-
.../ext/beans/CallableMemberDescriptor.java | 4 +-
.../freemarker/ext/beans/CharacterOrString.java | 4 +-
.../ext/beans/ClassBasedModelFactory.java | 4 +-
.../ext/beans/ClassChangeNotifier.java | 4 +-
.../freemarker/ext/beans/ClassIntrospector.java | 4 +-
.../ext/beans/ClassIntrospectorBuilder.java | 4 +-
.../freemarker/ext/beans/CollectionAdapter.java | 4 +-
.../freemarker/ext/beans/CollectionModel.java | 4 +-
.../java/freemarker/ext/beans/DateModel.java | 4 +-
.../beans/EmptyCallableMemberDescriptor.java | 4 +-
.../ext/beans/EmptyMemberAndArguments.java | 4 +-
.../freemarker/ext/beans/EnumerationModel.java | 4 +-
.../java/freemarker/ext/beans/HashAdapter.java | 4 +-
.../ext/beans/InvalidPropertyException.java | 4 +-
.../freemarker/ext/beans/IteratorModel.java | 4 +-
.../ext/beans/JRebelClassChangeNotifier.java | 4 +-
.../java/freemarker/ext/beans/MapModel.java | 4 +-
.../MaybeEmptyCallableMemberDescriptor.java | 4 +-
.../ext/beans/MaybeEmptyMemberAndArguments.java | 4 +-
.../ext/beans/MemberAndArguments.java | 4 +-
.../ext/beans/MethodAppearanceFineTuner.java | 4 +-
.../java/freemarker/ext/beans/MethodSorter.java | 4 +-
.../NonPrimitiveArrayBackedReadOnlyList.java | 4 +-
.../java/freemarker/ext/beans/NumberModel.java | 4 +-
.../ext/beans/OverloadedFixArgsMethods.java | 4 +-
.../freemarker/ext/beans/OverloadedMethods.java | 4 +-
.../ext/beans/OverloadedMethodsModel.java | 4 +-
.../ext/beans/OverloadedMethodsSubset.java | 4 +-
.../ext/beans/OverloadedNumberUtil.java | 4 +-
.../ext/beans/OverloadedVarArgsMethods.java | 4 +-
.../beans/PrimtiveArrayBackedReadOnlyList.java | 4 +-
.../ReflectionCallableMemberDescriptor.java | 4 +-
.../ext/beans/ResourceBundleModel.java | 4 +-
.../freemarker/ext/beans/SequenceAdapter.java | 4 +-
.../java/freemarker/ext/beans/SetAdapter.java | 4 +-
.../freemarker/ext/beans/SimpleMapModel.java | 5 +-
.../java/freemarker/ext/beans/SimpleMethod.java | 4 +-
.../freemarker/ext/beans/SimpleMethodModel.java | 4 +-
.../ext/beans/SingletonCustomizer.java | 4 +-
.../java/freemarker/ext/beans/StaticModel.java | 4 +-
.../java/freemarker/ext/beans/StaticModels.java | 4 +-
.../java/freemarker/ext/beans/StringModel.java | 4 +-
.../java/freemarker/ext/beans/TypeFlags.java | 4 +-
.../freemarker/ext/beans/UnsafeMethods.java | 55 +-
.../java/freemarker/ext/beans/_BeansAPI.java | 4 +-
.../java/freemarker/ext/beans/_EnumModels.java | 4 +-
.../java/freemarker/ext/beans/_MethodUtil.java | 4 +-
src/main/java/freemarker/ext/beans/package.html | 9 +-
src/main/java/freemarker/ext/dom/AtAtKey.java | 58 +
.../freemarker/ext/dom/AttributeNodeModel.java | 4 +-
.../ext/dom/CharacterDataNodeModel.java | 4 +-
.../java/freemarker/ext/dom/DocumentModel.java | 7 +-
.../freemarker/ext/dom/DocumentTypeModel.java | 4 +-
.../java/freemarker/ext/dom/DomStringUtil.java | 93 ++
.../java/freemarker/ext/dom/ElementModel.java | 124 ++-
.../freemarker/ext/dom/JaxenXPathSupport.java | 41 +-
.../java/freemarker/ext/dom/NodeListModel.java | 63 +-
src/main/java/freemarker/ext/dom/NodeModel.java | 366 ++++---
.../java/freemarker/ext/dom/NodeOutputter.java | 4 +-
.../java/freemarker/ext/dom/PINodeModel.java | 4 +-
.../ext/dom/SunInternalXalanXPathSupport.java | 32 +-
src/main/java/freemarker/ext/dom/Transform.java | 4 +-
.../java/freemarker/ext/dom/XPathSupport.java | 7 +-
.../freemarker/ext/dom/XalanXPathSupport.java | 4 +-
.../java/freemarker/ext/dom/_ExtDomApi.java | 43 +
src/main/java/freemarker/ext/dom/package.html | 4 +-
.../java/freemarker/ext/jdom/NodeListModel.java | 4 +-
src/main/java/freemarker/ext/jdom/package.html | 4 +-
.../ext/jsp/CustomTagAndELFunctionCombiner.java | 6 +-
.../freemarker/ext/jsp/EventForwarding.java | 4 +-
.../jsp/FreeMarkerJspApplicationContext.java | 4 +-
.../ext/jsp/FreeMarkerJspFactory.java | 4 +-
.../ext/jsp/FreeMarkerJspFactory2.java | 4 +-
.../ext/jsp/FreeMarkerJspFactory21.java | 4 +-
.../ext/jsp/FreeMarkerPageContext.java | 4 +-
.../java/freemarker/ext/jsp/FreemarkerTag.java | 4 +-
.../freemarker/ext/jsp/JspContextModel.java | 4 +-
.../freemarker/ext/jsp/JspTagModelBase.java | 4 +-
.../freemarker/ext/jsp/JspWriterAdapter.java | 4 +-
.../freemarker/ext/jsp/PageContextFactory.java | 4 +-
.../ext/jsp/SimpleTagDirectiveModel.java | 4 +-
.../freemarker/ext/jsp/TagTransformModel.java | 4 +-
.../java/freemarker/ext/jsp/TaglibFactory.java | 46 +-
.../freemarker/ext/jsp/TaglibMethodUtil.java | 4 +-
.../ext/jsp/_FreeMarkerPageContext2.java | 4 +-
.../ext/jsp/_FreeMarkerPageContext21.java | 4 +-
src/main/java/freemarker/ext/jsp/package.html | 4 +-
.../freemarker/ext/jython/JythonHashModel.java | 4 +-
.../java/freemarker/ext/jython/JythonModel.java | 4 +-
.../freemarker/ext/jython/JythonModelCache.java | 4 +-
.../ext/jython/JythonNumberModel.java | 4 +-
.../ext/jython/JythonSequenceModel.java | 4 +-
.../ext/jython/JythonVersionAdapter.java | 4 +-
.../ext/jython/JythonVersionAdapterHolder.java | 4 +-
.../freemarker/ext/jython/JythonWrapper.java | 4 +-
.../jython/_Jython20And21VersionAdapter.java | 4 +-
.../ext/jython/_Jython22VersionAdapter.java | 4 +-
.../ext/jython/_Jython25VersionAdapter.java | 4 +-
.../java/freemarker/ext/jython/package.html | 4 +-
src/main/java/freemarker/ext/package.html | 4 +-
.../ext/rhino/RhinoFunctionModel.java | 4 +-
.../ext/rhino/RhinoScriptableModel.java | 4 +-
.../java/freemarker/ext/rhino/RhinoWrapper.java | 4 +-
src/main/java/freemarker/ext/rhino/package.html | 4 +-
.../ext/servlet/AllHttpScopesHashModel.java | 4 +-
.../ext/servlet/FreemarkerServlet.java | 4 +-
.../ext/servlet/HttpRequestHashModel.java | 4 +-
.../servlet/HttpRequestParametersHashModel.java | 4 +-
.../ext/servlet/HttpSessionHashModel.java | 4 +-
.../freemarker/ext/servlet/IncludePage.java | 4 +-
.../freemarker/ext/servlet/InitParamParser.java | 4 +-
.../ext/servlet/ServletContextHashModel.java | 4 +-
.../java/freemarker/ext/servlet/package.html | 4 +-
.../freemarker/ext/util/IdentityHashMap.java | 4 +-
.../java/freemarker/ext/util/ModelCache.java | 7 +-
.../java/freemarker/ext/util/ModelFactory.java | 4 +-
.../ext/util/WrapperTemplateModel.java | 4 +-
src/main/java/freemarker/ext/util/package.html | 4 +-
.../java/freemarker/ext/xml/Namespaces.java | 4 +-
src/main/java/freemarker/ext/xml/Navigator.java | 4 +-
.../java/freemarker/ext/xml/NodeListModel.java | 4 +-
.../java/freemarker/ext/xml/NodeOperator.java | 4 +-
.../freemarker/ext/xml/_Dom4jNavigator.java | 4 +-
.../java/freemarker/ext/xml/_DomNavigator.java | 4 +-
.../freemarker/ext/xml/_JaxenNamespaces.java | 4 +-
.../java/freemarker/ext/xml/_JdomNavigator.java | 4 +-
src/main/java/freemarker/ext/xml/package.html | 4 +-
.../log/CommonsLoggingLoggerFactory.java | 4 +-
src/main/java/freemarker/log/Logger.java | 4 +-
src/main/java/freemarker/log/LoggerFactory.java | 4 +-
.../java/freemarker/log/SLF4JLoggerFactory.java | 4 +-
.../freemarker/log/_AvalonLoggerFactory.java | 4 +-
.../log/_CommonsLoggingLoggerFactory.java | 4 +-
.../java/freemarker/log/_JULLoggerFactory.java | 4 +-
.../freemarker/log/_Log4jLoggerFactory.java | 4 +-
.../freemarker/log/_Log4jOverSLF4JTester.java | 4 +-
.../java/freemarker/log/_NullLoggerFactory.java | 4 +-
.../freemarker/log/_SLF4JLoggerFactory.java | 4 +-
src/main/java/freemarker/log/package.html | 4 +-
.../template/AdapterTemplateModel.java | 4 +-
.../java/freemarker/template/Configuration.java | 9 +-
.../template/DefaultArrayAdapter.java | 4 +-
.../template/DefaultIterableAdapter.java | 7 +-
.../template/DefaultIteratorAdapter.java | 4 +-
.../freemarker/template/DefaultListAdapter.java | 4 +-
.../freemarker/template/DefaultMapAdapter.java | 4 +-
.../DefaultNonListCollectionAdapter.java | 15 +-
.../template/DefaultObjectWrapper.java | 4 +-
.../template/DefaultObjectWrapperBuilder.java | 4 +-
.../DefaultObjectWrapperConfiguration.java | 4 +-
.../DefaultUnassignableIteratorAdapter.java | 4 +-
src/main/java/freemarker/template/EmptyMap.java | 4 +-
.../template/FalseTemplateBooleanModel.java | 4 +-
.../template/GeneralPurposeNothing.java | 4 +-
.../freemarker/template/LocalizedString.java | 4 +-
.../MalformedTemplateNameException.java | 4 +-
.../template/MapKeyValuePairIterator.java | 4 +-
.../java/freemarker/template/ObjectWrapper.java | 4 +-
.../template/ObjectWrapperAndUnwrapper.java | 4 +-
.../template/ResourceBundleLocalizedString.java | 4 +-
.../SerializableTemplateBooleanModel.java | 4 +-
.../freemarker/template/SimpleCollection.java | 4 +-
.../java/freemarker/template/SimpleDate.java | 4 +-
.../java/freemarker/template/SimpleHash.java | 4 +-
.../java/freemarker/template/SimpleList.java | 4 +-
.../java/freemarker/template/SimpleNumber.java | 4 +-
.../template/SimpleObjectWrapper.java | 4 +-
.../java/freemarker/template/SimpleScalar.java | 4 +-
.../freemarker/template/SimpleSequence.java | 4 +-
src/main/java/freemarker/template/Template.java | 46 +-
.../template/TemplateBooleanModel.java | 4 +-
.../template/TemplateCollectionModel.java | 4 +-
.../template/TemplateCollectionModelEx.java | 14 +-
.../freemarker/template/TemplateDateModel.java | 4 +-
.../template/TemplateDirectiveBody.java | 4 +-
.../template/TemplateDirectiveModel.java | 4 +-
.../freemarker/template/TemplateException.java | 4 +-
.../template/TemplateExceptionHandler.java | 4 +-
.../freemarker/template/TemplateHashModel.java | 4 +-
.../template/TemplateHashModelEx.java | 4 +-
.../template/TemplateHashModelEx2.java | 4 +-
.../template/TemplateMethodModel.java | 4 +-
.../template/TemplateMethodModelEx.java | 4 +-
.../java/freemarker/template/TemplateModel.java | 4 +-
.../template/TemplateModelAdapter.java | 4 +-
.../template/TemplateModelException.java | 4 +-
.../template/TemplateModelIterator.java | 4 +-
.../template/TemplateModelListSequence.java | 4 +-
.../template/TemplateModelWithAPISupport.java | 4 +-
.../freemarker/template/TemplateNodeModel.java | 4 +-
.../template/TemplateNodeModelEx.java | 40 +
.../template/TemplateNotFoundException.java | 4 +-
.../template/TemplateNumberModel.java | 4 +-
.../template/TemplateScalarModel.java | 4 +-
.../template/TemplateSequenceModel.java | 4 +-
.../template/TemplateTransformModel.java | 4 +-
.../freemarker/template/TransformControl.java | 4 +-
.../template/TrueTemplateBooleanModel.java | 4 +-
src/main/java/freemarker/template/Version.java | 4 +-
.../template/WrappingTemplateModel.java | 4 +-
.../java/freemarker/template/_TemplateAPI.java | 8 +-
src/main/java/freemarker/template/package.html | 4 +-
.../template/utility/CaptureOutput.java | 4 +-
.../freemarker/template/utility/ClassUtil.java | 9 +-
.../template/utility/CollectionUtils.java | 4 +-
.../template/utility/Collections12.java | 4 +-
.../freemarker/template/utility/Constants.java | 4 +-
.../template/utility/DOMNodeModel.java | 4 +-
.../freemarker/template/utility/DateUtil.java | 4 +-
.../freemarker/template/utility/DeepUnwrap.java | 4 +-
.../freemarker/template/utility/Execute.java | 4 +-
.../freemarker/template/utility/HtmlEscape.java | 4 +-
.../template/utility/JythonRuntime.java | 4 +-
.../template/utility/NormalizeNewlines.java | 4 +-
.../template/utility/NullArgumentException.java | 4 +-
.../freemarker/template/utility/NullWriter.java | 4 +-
.../freemarker/template/utility/NumberUtil.java | 4 +-
.../template/utility/ObjectConstructor.java | 4 +-
.../template/utility/ObjectFactory.java | 4 +-
.../utility/ObjectWrapperWithAPISupport.java | 4 +-
.../template/utility/OptimizerUtil.java | 4 +-
.../template/utility/RichObjectWrapper.java | 4 +-
.../template/utility/SecurityUtilities.java | 4 +-
.../template/utility/StandardCompress.java | 4 +-
.../freemarker/template/utility/StringUtil.java | 49 +-
.../template/utility/ToCanonical.java | 4 +-
.../utility/UndeclaredThrowableException.java | 4 +-
.../utility/UnrecognizedTimeZoneException.java | 4 +-
.../UnsupportedNumberClassException.java | 4 +-
.../template/utility/WriteProtectable.java | 4 +-
.../freemarker/template/utility/XmlEscape.java | 4 +-
.../freemarker/template/utility/package.html | 4 +-
.../adhoc/IdentifierCharGenerator.java | 4 +-
src/main/misc/overloadedNumberRules/README.txt | 4 +-
src/main/misc/overloadedNumberRules/config.fmpp | 4 +-
.../misc/overloadedNumberRules/generator.ftl | 4 +-
.../ext/beans/unsafeMethods.properties | 4 +-
.../freemarker/ext/jsp/web-app_2_2.dtd | 581 ----------
.../freemarker/ext/jsp/web-app_2_3.dtd | 1003 ------------------
.../ext/jsp/web-jsptaglibrary_1_1.dtd | 207 ----
.../ext/jsp/web-jsptaglibrary_1_2.dtd | 478 ---------
.../resources/freemarker/version.properties | 6 +-
src/manual/en_US/book.xml | 964 +++++++++++------
src/manual/en_US/docgen-help/editors-readme.txt | 4 +-
.../figures/odg-convert-howto.txt | 4 +-
src/manual/en_US/docgen.cjson | 1 +
src/manual/zh_CN/book.xml | 4 +-
.../cache/FileTemplateLoaderTest.java | 4 +-
.../cache/MultiTemplateLoaderTest.java | 22 +-
.../freemarker/cache/TemplateCacheTest.java | 36 +-
.../cache/TemplateConfigurationFactoryTest.java | 4 +-
.../cache/TemplateNameFormatTest.java | 140 +--
.../cache/TemplateSourceMatcherTest.java | 4 +-
.../core/ASTBasedErrorMessagesTest.java | 4 +-
src/test/java/freemarker/core/ASTPrinter.java | 26 +-
src/test/java/freemarker/core/ASTTest.java | 4 +-
.../core/AppMetaTemplateDateFormatFactory.java | 4 +-
.../core/BaseNTemplateNumberFormatFactory.java | 4 +-
.../freemarker/core/BreakPlacementTest.java | 4 +-
.../java/freemarker/core/CamelCaseTest.java | 4 +-
.../java/freemarker/core/CanonicalFormTest.java | 4 +-
.../freemarker/core/CoercionToTextualTest.java | 4 +-
.../core/CombinedMarkupOutputFormatTest.java | 4 +-
.../java/freemarker/core/ConfigurableTest.java | 4 +-
.../freemarker/core/CoreLocaleUtilsTest.java | 4 +-
.../freemarker/core/CustomHTMLOutputFormat.java | 4 +-
.../core/CustomTemplateHTMLModel.java | 4 +-
.../java/freemarker/core/DateFormatTest.java | 4 +-
.../freemarker/core/DirectiveCallPlaceTest.java | 4 +-
.../java/freemarker/core/DummyOutputFormat.java | 4 +-
.../freemarker/core/EncodingOverrideTest.java | 4 +-
.../core/EnvironmentCustomStateTest.java | 4 +-
.../EnvironmentGetTemplateVariantsTest.java | 4 +-
...EpochMillisDivTemplateDateFormatFactory.java | 4 +-
.../EpochMillisTemplateDateFormatFactory.java | 4 +-
.../core/ExtendedDecimalFormatTest.java | 4 +-
.../core/HTMLISOTemplateDateFormatFactory.java | 4 +-
.../freemarker/core/HTMLOutputFormatTest.java | 4 +-
.../java/freemarker/core/HeaderParsingTest.java | 4 +-
.../core/HexTemplateNumberFormatFactory.java | 4 +-
.../IncludeAndImportConfigurableLayersTest.java | 6 +-
.../freemarker/core/IncludeAndImportTest.java | 4 +-
.../core/InterpretAndEvalTemplateNameTest.java | 4 +-
.../core/InterpretSettingInheritanceTest.java | 4 +-
.../freemarker/core/IteratorIssuesTest.java | 4 +-
.../core/LegacyFMParserConstructorsTest.java | 4 +-
.../java/freemarker/core/ListErrorsTest.java | 4 +-
...AndTZSensitiveTemplateDateFormatFactory.java | 4 +-
...aleSensitiveTemplateNumberFormatFactory.java | 4 +-
.../freemarker/core/MiscErrorMessagesTest.java | 4 +-
.../java/freemarker/core/NumberFormatTest.java | 4 +-
.../core/ObjectBuilderSettingsTest.java | 4 +-
.../core/OptInTemplateClassResolverTest.java | 8 +-
.../java/freemarker/core/OutputFormatTest.java | 4 +-
.../ParseTimeParameterBIErrorMessagesTest.java | 4 +-
.../core/ParsingErrorMessagesTest.java | 4 +-
.../PrintfGTemplateNumberFormatFactory.java | 4 +-
.../freemarker/core/RTFOutputFormatTest.java | 4 +-
.../java/freemarker/core/SQLTimeZoneTest.java | 4 +-
.../core/SeldomEscapedOutputFormat.java | 4 +-
.../freemarker/core/SettingDirectiveTest.java | 4 +-
.../freemarker/core/SpecialVariableTest.java | 4 +-
.../core/StringLiteralInterpolationTest.java | 4 +-
src/test/java/freemarker/core/TabSizeTest.java | 4 +-
.../core/TagSyntaxVariationsTest.java | 6 +-
.../freemarker/core/TemplatGetEncodingTest.java | 4 +-
.../core/TemplateConfigurationTest.java | 5 +-
...plateConfigurationWithTemplateCacheTest.java | 4 +-
.../core/TemplateDummyOutputModel.java | 4 +-
.../freemarker/core/TemplateLevelSettings.java | 4 +-
.../core/TemplateNameSpecialVariablesTest.java | 4 +-
.../core/TemplateSeldomEscapedOutputModel.java | 4 +-
.../core/TheadInterruptingSupportTest.java | 4 +-
.../freemarker/core/TypeErrorMessagesTest.java | 4 +-
.../freemarker/core/UnclosedCommentTest.java | 4 +-
.../core/WhitespaceStrippingTest.java | 4 +-
.../freemarker/core/XHTMLOutputFormatTest.java | 4 +-
.../freemarker/core/XMLOutputFormatTest.java | 4 +-
.../core/subpkg/PackageVisibleAll.java | 4 +-
.../subpkg/PackageVisibleAllWithBuilder.java | 4 +-
.../PackageVisibleAllWithBuilderBuilder.java | 4 +-
.../PackageVisibleWithPublicConstructor.java | 4 +-
.../java/freemarker/core/subpkg/PublicAll.java | 4 +-
.../subpkg/PublicWithMixedConstructors.java | 4 +-
.../PublicWithPackageVisibleConstructor.java | 4 +-
.../AbstractParallelIntrospectionTest.java | 6 +-
.../ext/beans/AlphabeticalMethodSorter.java | 4 +-
.../ext/beans/BeansAPINewInstanceTest.java | 6 +-
.../ext/beans/BeansWrapperBasics.java | 4 +-
.../ext/beans/BeansWrapperCachesTest.java | 4 +-
.../ext/beans/BeansWrapperDesc2003020.java | 4 +-
.../ext/beans/BeansWrapperDesc2003021.java | 4 +-
.../ext/beans/BeansWrapperInc2003020.java | 4 +-
.../ext/beans/BeansWrapperInc2003021.java | 4 +-
.../ext/beans/BeansWrapperMiscTest.java | 4 +-
.../ext/beans/BeansWrapperReadOnlyTest.java | 6 +-
.../ext/beans/BeansWrapperSingletonsTest.java | 4 +-
.../beans/BeansWrapperWithShortedMethods.java | 4 +-
.../CommonSupertypeForUnwrappingHintTest.java | 6 +-
.../beans/DefaultObjectWrapperDesc2003020.java | 4 +-
.../beans/DefaultObjectWrapperDesc2003021.java | 4 +-
.../beans/DefaultObjectWrapperDesc2003022.java | 4 +-
.../beans/DefaultObjectWrapperInc2003020.java | 4 +-
.../beans/DefaultObjectWrapperInc2003021.java | 4 +-
.../beans/DefaultObjectWrapperInc2003022.java | 4 +-
.../DefaultObjectWrapperWithSortedMethods.java | 4 +-
.../freemarker/ext/beans/EnumModelsTest.java | 4 +-
.../freemarker/ext/beans/ErrorMessagesTest.java | 4 +-
.../ext/beans/FineTuneMethodAppearanceTest.java | 4 +-
.../GetlessMethodsAsPropertyGettersRule.java | 4 +-
.../freemarker/ext/beans/IsApplicableTest.java | 4 +-
.../beans/IsMoreSpecificParameterTypeTest.java | 4 +-
.../ext/beans/Java7MembersOnlyBeansWrapper.java | 4 +-
.../beans/ManyObjectsOfDifferentClasses.java | 4 +-
.../beans/ManyStaticsOfDifferentClasses.java | 4 +-
.../ext/beans/MiscNumericalOperationsTest.java | 7 +-
.../freemarker/ext/beans/ModelCacheTest.java | 4 +-
.../ext/beans/OverloadedNumberUtilTest.java | 4 +-
.../beans/ParameterListPreferabilityTest.java | 10 +-
.../beans/PrallelObjectIntrospectionTest.java | 4 +-
.../beans/PrallelStaticIntrospectionTest.java | 4 +-
.../freemarker/ext/beans/RationalNumber.java | 4 +-
.../freemarker/ext/beans/StaticModelsTest.java | 4 +-
.../freemarker/ext/beans/TypeFlagsTest.java | 6 +-
.../ext/dom/DOMConvenienceStaticsTest.java | 215 ++++
.../java/freemarker/ext/dom/DOMSiblingTest.java | 99 ++
src/test/java/freemarker/ext/dom/DOMTest.java | 53 +-
.../ext/jsp/JspTestFreemarkerServlet.java | 4 +-
...estFreemarkerServletWithDefaultOverride.java | 4 +-
.../ext/jsp/RealServletContainertTest.java | 4 +-
.../java/freemarker/ext/jsp/TLDParsingTest.java | 4 +-
.../ext/jsp/TaglibMethodUtilTest.java | 4 +-
.../jsp/taglibmembers/AttributeAccessorTag.java | 4 +-
.../ext/jsp/taglibmembers/AttributeInfoTag.java | 4 +-
.../ext/jsp/taglibmembers/EnclosingClass.java | 4 +-
.../ext/jsp/taglibmembers/GetAndSetTag.java | 4 +-
.../ext/jsp/taglibmembers/TestFunctions.java | 4 +-
.../ext/jsp/taglibmembers/TestSimpleTag.java | 4 +-
.../ext/jsp/taglibmembers/TestSimpleTag2.java | 4 +-
.../ext/jsp/taglibmembers/TestSimpleTag3.java | 4 +-
.../ext/jsp/taglibmembers/TestTag.java | 4 +-
.../ext/jsp/taglibmembers/TestTag2.java | 4 +-
.../ext/jsp/taglibmembers/TestTag3.java | 4 +-
.../config/WebappLocalFreemarkerServlet.java | 4 +-
.../ext/servlet/FreemarkerServletTest.java | 4 +-
.../ext/servlet/InitParamParserTest.java | 4 +-
.../freemarker/manual/AutoEscapingExample.java | 4 +-
.../manual/ConfigureOutputFormatExamples.java | 4 +-
.../freemarker/manual/CustomFormatsExample.java | 4 +-
.../java/freemarker/manual/ExamplesTest.java | 4 +-
.../manual/GettingStartedExample.java | 4 +-
src/test/java/freemarker/manual/Product.java | 4 +-
.../manual/TemplateConfigurationExamples.java | 4 +-
.../UnitAwareTemplateNumberFormatFactory.java | 4 +-
.../manual/UnitAwareTemplateNumberModel.java | 4 +-
.../template/ActualNamingConvetionTest.java | 4 +-
.../template/ActualTagSyntaxTest.java | 4 +-
.../freemarker/template/ConfigurationTest.java | 26 +-
.../template/CustomAttributeTest.java | 4 +-
.../template/DefaultObjectWrapperTest.java | 5 +-
.../java/freemarker/template/ExceptionTest.java | 6 +-
.../java/freemarker/template/GetSourceTest.java | 6 +-
.../template/IncudeFromNamelessTest.java | 6 +-
.../template/JavaCCExceptionAsEOFFixTest.java | 4 +-
.../MistakenlyPublicImportAPIsTest.java | 4 +-
.../template/MistakenlyPublicMacroAPIsTest.java | 4 +-
.../freemarker/template/MockServletContext.java | 4 +-
.../template/NullConfigurationTest.java | 4 +-
.../template/SimpleObjetWrapperTest.java | 4 +-
.../template/StaticObjectWrappersTest.java | 4 +-
.../template/TemplateConstructorsTest.java | 4 +-
.../template/TemplateLanguageVersionTest.java | 4 +-
.../template/TemplateLookupStrategyTest.java | 122 +--
.../template/TemplateNotFoundMessageTest.java | 4 +-
.../java/freemarker/template/VersionTest.java | 4 +-
.../template/utility/DateUtilTest.java | 6 +-
.../template/utility/NumberUtilTest.java | 8 +-
.../template/utility/StringUtilTest.java | 4 +-
.../CopyrightCommentRemoverTemplateLoader.java | 9 +-
.../test/MonitoredTemplateLoader.java | 230 +++-
.../freemarker/test/ResourcesExtractor.java | 4 +-
src/test/java/freemarker/test/TemplateTest.java | 4 +-
src/test/java/freemarker/test/TreeView.java | 4 +-
.../java/freemarker/test/hamcerst/Matchers.java | 4 +-
.../hamcerst/StringContainsIgnoringCase.java | 4 +-
src/test/java/freemarker/test/package.html | 4 +-
.../test/servlet/DefaultModel2TesterAction.java | 4 +-
.../freemarker/test/servlet/Model2Action.java | 4 +-
.../test/servlet/Model2TesterServlet.java | 9 +-
.../freemarker/test/servlet/WebAppTestCase.java | 4 +-
src/test/java/freemarker/test/servlet/web.xml | 4 +-
.../test/templatesuite/TemplateTestCase.java | 4 +-
.../test/templatesuite/TemplateTestSuite.java | 7 +-
.../templatesuite/models/AllTemplateModels.java | 4 +-
.../templatesuite/models/BeanTestClass.java | 4 +-
.../templatesuite/models/BeanTestInterface.java | 4 +-
.../models/BeanTestSuperclass.java | 4 +-
.../models/BooleanAndScalarModel.java | 4 +-
.../models/BooleanAndStringTemplateModel.java | 4 +-
.../test/templatesuite/models/BooleanHash1.java | 4 +-
.../test/templatesuite/models/BooleanHash2.java | 4 +-
.../test/templatesuite/models/BooleanList1.java | 4 +-
.../test/templatesuite/models/BooleanList2.java | 4 +-
.../models/BooleanVsStringMethods.java | 4 +-
.../templatesuite/models/EnumTestClass.java | 4 +-
.../templatesuite/models/ExceptionModel.java | 4 +-
.../models/HashAndScalarModel.java | 4 +-
.../templatesuite/models/JavaObjectInfo.java | 4 +-
.../test/templatesuite/models/LegacyList.java | 4 +-
.../test/templatesuite/models/Listables.java | 16 +-
.../test/templatesuite/models/MultiModel1.java | 4 +-
.../test/templatesuite/models/MultiModel2.java | 4 +-
.../test/templatesuite/models/MultiModel3.java | 4 +-
.../test/templatesuite/models/MultiModel4.java | 4 +-
.../test/templatesuite/models/MultiModel5.java | 4 +-
.../test/templatesuite/models/NewTestModel.java | 4 +-
.../templatesuite/models/NewTestModel2.java | 4 +-
.../models/NumberAndStringModel.java | 4 +-
.../models/OverloadedConstructor.java | 4 +-
.../templatesuite/models/OverloadedMethods.java | 4 +-
.../models/OverloadedMethods2.java | 6 +-
.../templatesuite/models/SimpleTestMethod.java | 4 +-
.../models/TransformHashWrapper.java | 4 +-
.../models/TransformMethodWrapper1.java | 6 +-
.../models/TransformMethodWrapper2.java | 4 +-
.../templatesuite/models/TransformModel1.java | 4 +-
.../templatesuite/models/VarArgTestModel.java | 4 +-
.../freemarker/test/templatesuite/package.html | 4 +-
.../test/utility/AssertDirective.java | 4 +-
.../test/utility/AssertEqualsDirective.java | 4 +-
.../test/utility/AssertFailsDirective.java | 4 +-
.../AssertationFailedInTemplateException.java | 4 +-
.../test/utility/BadParameterTypeException.java | 4 +-
.../freemarker/test/utility/FileTestCase.java | 4 +-
.../MissingRequiredParameterException.java | 4 +-
.../test/utility/NoOutputDirective.java | 4 +-
.../test/utility/ParameterException.java | 4 +-
.../java/freemarker/test/utility/TestUtil.java | 4 +-
.../utility/UnsupportedParameterException.java | 4 +-
src/test/resources/META-INF/malformed.tld | 4 +-
.../tldDiscovery MetaInfTldSources-1.tld | 4 +-
src/test/resources/freemarker/cache/test.ftl | 4 +-
src/test/resources/freemarker/core/ast-1.ast | 4 +-
src/test/resources/freemarker/core/ast-1.ftl | 4 +-
.../freemarker/core/ast-assignments.ast | 4 +-
.../freemarker/core/ast-assignments.ftl | 4 +-
.../resources/freemarker/core/ast-builtins.ast | 4 +-
.../resources/freemarker/core/ast-builtins.ftl | 4 +-
.../resources/freemarker/core/ast-locations.ast | 4 +-
.../resources/freemarker/core/ast-locations.ftl | 4 +-
.../core/ast-mixedcontentsimplifications.ast | 4 +-
.../core/ast-mixedcontentsimplifications.ftl | 4 +-
.../core/ast-multipleignoredchildren.ast | 4 +-
.../core/ast-multipleignoredchildren.ftl | 4 +-
.../core/ast-nestedignoredchildren.ast | 4 +-
.../core/ast-nestedignoredchildren.ftl | 4 +-
.../resources/freemarker/core/ast-range.ast | 4 +-
.../resources/freemarker/core/ast-range.ftl | 4 +-
.../freemarker/core/ast-strlitinterpolation.ast | 4 +-
.../freemarker/core/ast-strlitinterpolation.ftl | 4 +-
.../freemarker/core/ast-whitespacestripping.ast | 4 +-
.../freemarker/core/ast-whitespacestripping.ftl | 4 +-
.../freemarker/core/cano-assignments.ftl | 4 +-
.../freemarker/core/cano-assignments.ftl.out | 4 +-
.../resources/freemarker/core/cano-builtins.ftl | 4 +-
.../freemarker/core/cano-builtins.ftl.out | 4 +-
.../core/cano-identifier-escaping.ftl | 4 +-
.../core/cano-identifier-escaping.ftl.out | 4 +-
.../resources/freemarker/core/cano-macros.ftl | 4 +-
.../freemarker/core/cano-macros.ftl.out | 4 +-
.../core/cano-strlitinterpolation.ftl | 4 +-
.../core/cano-strlitinterpolation.ftl.out | 4 +-
.../core/encodingOverride-ISO-8859-1.ftl | 4 +-
.../freemarker/core/encodingOverride-UTF-8.ftl | 4 +-
.../freemarker/ext/dom/DOMSiblingTest.xml | 31 +
.../freemarker/ext/jsp/TLDParsingTest.tld | 4 +-
.../ext/jsp/templates/classpath-test.ftl | 4 +-
.../ext/jsp/tldDiscovery-ClassPathTlds-1.tld | 4 +-
.../ext/jsp/tldDiscovery-ClassPathTlds-2.tld | 4 +-
.../ext/jsp/webapps/basic/CONTENTS.txt | 4 +-
.../WEB-INF/el-function-tag-name-clash.tld | 4 +-
.../jsp/webapps/basic/WEB-INF/el-functions.tld | 4 +-
.../basic/WEB-INF/expected/attributes-2.3.0.txt | 4 +-
.../expected/attributes-2.3.22-future.txt | 4 +-
.../basic/WEB-INF/expected/attributes.txt | 4 +-
.../basic/WEB-INF/expected/customTags1.txt | 4 +-
.../ext/jsp/webapps/basic/WEB-INF/test.tld | 4 +-
.../ext/jsp/webapps/basic/WEB-INF/web.xml | 4 +-
.../ext/jsp/webapps/basic/attributes.ftl | 4 +-
.../jsp/webapps/basic/customELFunctions1.ftl | 4 +-
.../jsp/webapps/basic/customELFunctions1.jsp | 4 +-
.../ext/jsp/webapps/basic/customTags1.ftl | 4 +-
.../webapps/basic/elFunctionsTagNameClash.ftl | 4 +-
.../webapps/basic/elFunctionsTagNameClash.jsp | 4 +-
.../jsp/webapps/basic/trivial-jstl-@Ignore.ftl | 4 +-
.../ext/jsp/webapps/basic/trivial.ftl | 4 +-
.../ext/jsp/webapps/basic/trivial.jsp | 4 +-
.../ext/jsp/webapps/config/CONTENTS.txt | 4 +-
.../webapps/config/WEB-INF/classes/sub/test.ftl | 4 +-
.../jsp/webapps/config/WEB-INF/classes/test.ftl | 4 +-
.../WEB-INF/lib/templates.jar/sub/test2.ftl | 4 +-
.../webapps/config/WEB-INF/templates/test.ftl | 4 +-
.../ext/jsp/webapps/config/WEB-INF/web.xml | 4 +-
.../freemarker/ext/jsp/webapps/config/test.ftl | 4 +-
.../ext/jsp/webapps/errors/CONTENTS.txt | 4 +-
.../ext/jsp/webapps/errors/WEB-INF/web.xml | 4 +-
.../jsp/webapps/errors/failing-parsetime.jsp | 4 +-
.../ext/jsp/webapps/errors/failing-runtime.ftl | 4 +-
.../ext/jsp/webapps/errors/failing-runtime.jsp | 4 +-
.../ext/jsp/webapps/errors/not-failing.ftl | 4 +-
.../jsp/webapps/multipleLoaders/CONTENTS.txt | 4 +-
.../multipleLoaders/WEB-INF/templates/test.ftl | 4 +-
.../jsp/webapps/multipleLoaders/WEB-INF/web.xml | 4 +-
.../ext/jsp/webapps/tldDiscovery/CONTENTS.txt | 4 +-
.../WEB-INF/expected/subdir/test-rel.txt | 4 +-
.../WEB-INF/expected/test-noClasspath.txt | 4 +-
.../tldDiscovery/WEB-INF/expected/test1.txt | 4 +-
.../tldDiscovery/WEB-INF/fmtesttag 2.tld | 4 +-
.../webapps/tldDiscovery/WEB-INF/fmtesttag4.tld | 4 +-
.../lib/taglib-foo.jar/META-INF/foo bar.tld | 4 +-
.../WEB-INF/subdir-with-tld/fmtesttag3.tld | 4 +-
.../WEB-INF/taglib 2.jar/META-INF/taglib.tld | 4 +-
.../jsp/webapps/tldDiscovery/WEB-INF/web.xml | 4 +-
.../tldDiscovery/not-auto-scanned/fmtesttag.tld | 4 +-
.../webapps/tldDiscovery/subdir/test-rel.ftl | 4 +-
.../webapps/tldDiscovery/test-noClasspath.ftl | 4 +-
.../ext/jsp/webapps/tldDiscovery/test1.ftl | 4 +-
.../manual/AutoEscapingExample-capture.ftlh | 4 +-
.../manual/AutoEscapingExample-capture.ftlh.out | 4 +-
.../manual/AutoEscapingExample-convert.ftlh | 4 +-
.../manual/AutoEscapingExample-convert.ftlh.out | 4 +-
.../manual/AutoEscapingExample-convert2.ftl | 4 +-
.../manual/AutoEscapingExample-convert2.ftl.out | 4 +-
.../manual/AutoEscapingExample-infoBox.ftlh | 4 +-
.../manual/AutoEscapingExample-infoBox.ftlh.out | 4 +-
.../manual/AutoEscapingExample-markup.ftlh | 4 +-
.../manual/AutoEscapingExample-markup.ftlh.out | 4 +-
.../AutoEscapingExample-stringConcat.ftlh | 4 +-
.../AutoEscapingExample-stringConcat.ftlh.out | 4 +-
.../AutoEscapingExample-stringLiteral.ftlh | 4 +-
.../AutoEscapingExample-stringLiteral.ftlh.out | 4 +-
.../AutoEscapingExample-stringLiteral2.ftlh | 4 +-
.../AutoEscapingExample-stringLiteral2.ftlh.out | 4 +-
.../ConfigureOutputFormatExamples1.properties | 4 +-
.../ConfigureOutputFormatExamples2.properties | 4 +-
.../manual/CustomFormatsExample-alias1.ftlh | 4 +-
.../manual/CustomFormatsExample-alias1.ftlh.out | 4 +-
.../manual/CustomFormatsExample-alias2.ftlh | 4 +-
.../manual/CustomFormatsExample-alias2.ftlh.out | 4 +-
.../manual/CustomFormatsExample-modelAware.ftlh | 4 +-
.../CustomFormatsExample-modelAware.ftlh.out | 4 +-
.../TemplateConfigurationExamples1.properties | 4 +-
.../TemplateConfigurationExamples2.properties | 4 +-
.../TemplateConfigurationExamples3.properties | 4 +-
src/test/resources/freemarker/manual/test.ftlh | 4 +-
.../template/SimpleObjectWrapperTest.java | 4 +-
.../resources/freemarker/template/toCache1.ftl | 4 +-
.../resources/freemarker/template/toCache2.ftl | 4 +-
.../test/templatesuite/expected/arithmetic.txt | 4 +-
.../test/templatesuite/expected/bean-maps.txt | 4 +-
.../test/templatesuite/expected/beans.txt | 4 +-
.../expected/boolean-formatting.txt | 4 +-
.../test/templatesuite/expected/boolean.txt | 4 +-
.../expected/charset-in-header.txt | 4 +-
.../expected/classic-compatible.txt | 4 +-
.../test/templatesuite/expected/comment.txt | 4 +-
.../test/templatesuite/expected/comparisons.txt | 4 +-
.../test/templatesuite/expected/compress.txt | 4 +-
.../templatesuite/expected/dateformat-java.txt | 4 +-
.../templatesuite/expected/default-xmlns.txt | 4 +-
.../test/templatesuite/expected/default.txt | 4 +-
.../expected/encoding-builtins-ici-2.3.20.txt | 4 +-
.../expected/encoding-builtins.txt | 4 +-
.../test/templatesuite/expected/escapes.txt | 4 +-
.../test/templatesuite/expected/exception.txt | 4 +-
.../test/templatesuite/expected/exception2.txt | 4 +-
.../test/templatesuite/expected/exception3.txt | 4 +-
.../test/templatesuite/expected/exthash.txt | 4 +-
.../test/templatesuite/expected/hashconcat.txt | 4 +-
.../test/templatesuite/expected/hashliteral.txt | 4 +-
.../test/templatesuite/expected/helloworld.txt | 4 +-
.../expected/identifier-escaping.txt | 4 +-
.../expected/identifier-non-ascii.txt | 4 +-
.../test/templatesuite/expected/if.txt | 4 +-
.../test/templatesuite/expected/import.txt | 4 +-
.../test/templatesuite/expected/include.txt | 4 +-
.../test/templatesuite/expected/include2.txt | 4 +-
.../test/templatesuite/expected/interpret.txt | 4 +-
.../test/templatesuite/expected/iterators.txt | 4 +-
.../templatesuite/expected/lastcharacter.txt | 4 +-
.../test/templatesuite/expected/list-bis.txt | 4 +-
.../test/templatesuite/expected/list.txt | 4 +-
.../test/templatesuite/expected/list2.txt | 4 +-
.../test/templatesuite/expected/list3.txt | 4 +-
.../test/templatesuite/expected/listhash.txt | 4 +-
.../expected/listhashliteral-ici-2.3.20.txt | 4 +-
.../expected/listhashliteral-ici-2.3.21.txt | 4 +-
.../test/templatesuite/expected/listliteral.txt | 4 +-
.../templatesuite/expected/localization.txt | 4 +-
.../test/templatesuite/expected/logging.txt | 4 +-
.../templatesuite/expected/loopvariable.txt | 4 +-
.../templatesuite/expected/macros-return.txt | 4 +-
.../test/templatesuite/expected/macros.txt | 4 +-
.../test/templatesuite/expected/macros2.txt | 4 +-
.../test/templatesuite/expected/multimodels.txt | 4 +-
.../test/templatesuite/expected/nested.txt | 4 +-
.../expected/new-allowsnothing.txt | 4 +-
.../expected/new-defaultresolver.txt | 4 +-
.../test/templatesuite/expected/new-optin.txt | 4 +-
.../test/templatesuite/expected/new-safer.txt | 4 +-
.../templatesuite/expected/new-unrestricted.txt | 4 +-
.../test/templatesuite/expected/newlines1.txt | 4 +-
.../test/templatesuite/expected/newlines2.txt | 4 +-
.../expected/non-strict-syntax.txt | 4 +-
.../test/templatesuite/expected/noparse.txt | 4 +-
.../templatesuite/expected/number-format.txt | 4 +-
.../templatesuite/expected/number-literal.txt | 4 +-
.../templatesuite/expected/number-to-date.txt | 4 +-
.../templatesuite/expected/numerical-cast.txt | 4 +-
.../templatesuite/expected/output-encoding1.txt | 4 +-
.../templatesuite/expected/output-encoding2.txt | Bin 1976 -> 1972 bytes
.../templatesuite/expected/output-encoding3.txt | 4 +-
.../test/templatesuite/expected/precedence.txt | 4 +-
.../test/templatesuite/expected/recover.txt | 4 +-
.../test/templatesuite/expected/root.txt | 4 +-
.../expected/sequence-builtins.txt | 4 +-
.../test/templatesuite/expected/specialvars.txt | 4 +-
.../templatesuite/expected/strictinheader.txt | 4 +-
.../string-builtins-regexps-matches.txt | 4 +-
.../expected/string-builtins-regexps.txt | 4 +-
.../templatesuite/expected/string-builtins1.txt | 4 +-
.../templatesuite/expected/string-builtins2.txt | 4 +-
.../templatesuite/expected/stringbimethods.txt | 4 +-
.../templatesuite/expected/stringliteral.txt | Bin 1552 -> 1550 bytes
.../test/templatesuite/expected/switch.txt | 4 +-
.../test/templatesuite/expected/transforms.txt | 4 +-
.../expected/type-builtins-ici-2.3.21.txt | 4 +-
.../expected/type-builtins-ici-2.3.24.txt | 4 +-
.../templatesuite/expected/type-builtins.txt | 4 +-
.../test/templatesuite/expected/var-layers.txt | 4 +-
.../test/templatesuite/expected/varargs.txt | 4 +-
.../test/templatesuite/expected/variables.txt | 4 +-
.../templatesuite/expected/whitespace-trim.txt | 4 +-
.../templatesuite/expected/wstrip-in-header.txt | 4 +-
.../test/templatesuite/expected/wstripping.txt | 4 +-
.../templatesuite/expected/xml-fragment.txt | 4 +-
.../expected/xml-ns_prefix-scope.txt | 4 +-
.../test/templatesuite/expected/xml.txt | 4 +-
.../test/templatesuite/expected/xmlns1.txt | 4 +-
.../test/templatesuite/expected/xmlns3.txt | 4 +-
.../test/templatesuite/expected/xmlns4.txt | 4 +-
.../test/templatesuite/expected/xmlns5.txt | 4 +-
.../models/BeansTestResources.properties | 4 +-
.../test/templatesuite/models/defaultxmlns1.xml | 4 +-
.../models/xml-ns_prefix-scope.xml | 4 +-
.../test/templatesuite/models/xml.xml | 4 +-
.../test/templatesuite/models/xmlfragment.xml | 4 +-
.../test/templatesuite/models/xmlns.xml | 4 +-
.../test/templatesuite/models/xmlns2.xml | 4 +-
.../test/templatesuite/models/xmlns3.xml | 4 +-
.../templatesuite/templates/api-builtins.ftl | 4 +-
.../test/templatesuite/templates/arithmetic.ftl | 4 +-
.../templatesuite/templates/assignments.ftl | 4 +-
.../test/templatesuite/templates/bean-maps.ftl | 4 +-
.../test/templatesuite/templates/beans.ftl | 4 +-
.../templates/boolean-formatting.ftl | 4 +-
.../test/templatesuite/templates/boolean.ftl | 4 +-
.../templates/charset-in-header.ftl | 4 +-
.../templates/charset-in-header_inc1.ftl | 4 +-
.../templates/charset-in-header_inc2.ftl | 4 +-
.../templates/classic-compatible-mode2.ftl | 4 +-
.../templates/classic-compatible.ftl | 4 +-
.../test/templatesuite/templates/comment.ftl | 4 +-
.../templatesuite/templates/comparisons.ftl | 4 +-
.../test/templatesuite/templates/compress.ftl | 4 +-
.../templates/date-type-builtins.ftl | 4 +-
.../templates/dateformat-iso-bi-common.ftl | 4 +-
.../templates/dateformat-iso-bi-ici-2.3.21.ftl | 4 +-
.../templates/dateformat-iso-bi.ftl | 4 +-
.../templates/dateformat-iso-like.ftl | 4 +-
.../templatesuite/templates/dateformat-java.ftl | 4 +-
.../templatesuite/templates/dateparsing.ftl | 4 +-
.../templatesuite/templates/default-xmlns.ftl | 4 +-
.../test/templatesuite/templates/default.ftl | 4 +-
.../templates/encoding-builtins.ftl | 4 +-
.../test/templatesuite/templates/escapes.ftl | 4 +-
.../test/templatesuite/templates/exception.ftl | 4 +-
.../test/templatesuite/templates/exception2.ftl | 4 +-
.../test/templatesuite/templates/exception3.ftl | 4 +-
.../templates/existence-operators.ftl | 4 +-
.../test/templatesuite/templates/exthash.ftl | 4 +-
.../test/templatesuite/templates/hashconcat.ftl | 4 +-
.../templatesuite/templates/hashliteral.ftl | 4 +-
.../test/templatesuite/templates/helloworld.ftl | 4 +-
.../templates/identifier-escaping.ftl | 4 +-
.../templates/identifier-non-ascii.ftl | 4 +-
.../test/templatesuite/templates/if.ftl | 4 +-
.../test/templatesuite/templates/import.ftl | 4 +-
.../test/templatesuite/templates/import_lib.ftl | 4 +-
.../test/templatesuite/templates/include.ftl | 4 +-
.../templates/include2-included-encoding.ftl | 4 +-
.../templates/include2-included.ftl | 4 +-
.../test/templatesuite/templates/include2.ftl | 4 +-
.../test/templatesuite/templates/included.ftl | 4 +-
.../test/templatesuite/templates/interpret.ftl | 4 +-
.../test/templatesuite/templates/iterators.ftl | 4 +-
.../templatesuite/templates/lastcharacter.ftl | 4 +-
.../test/templatesuite/templates/list-bis.ftl | 4 +-
.../test/templatesuite/templates/list.ftl | 4 +-
.../test/templatesuite/templates/list2.ftl | 4 +-
.../test/templatesuite/templates/list3.ftl | 4 +-
.../test/templatesuite/templates/listhash.ftl | 4 +-
.../templatesuite/templates/listhashliteral.ftl | 4 +-
.../templatesuite/templates/listliteral.ftl | 4 +-
.../templatesuite/templates/localization.ftl | 4 +-
.../templatesuite/templates/localization_en.ftl | 4 +-
.../templates/localization_en_AU.ftl | 4 +-
.../test/templatesuite/templates/logging.ftl | 4 +-
.../templatesuite/templates/loopvariable.ftl | 4 +-
.../templatesuite/templates/macros-return.ftl | 4 +-
.../test/templatesuite/templates/macros.ftl | 4 +-
.../test/templatesuite/templates/macros2.ftl | 4 +-
.../templatesuite/templates/multimodels.ftl | 4 +-
.../test/templatesuite/templates/nested.ftl | 4 +-
.../templatesuite/templates/nestedinclude.ftl | 4 +-
.../templates/new-allowsnothing.ftl | 4 +-
.../templates/new-defaultresolver.ftl | 4 +-
.../test/templatesuite/templates/new-optin.ftl | 4 +-
.../test/templatesuite/templates/new-safer.ftl | 4 +-
.../templates/new-unrestricted.ftl | 4 +-
.../test/templatesuite/templates/newlines1.ftl | 4 +-
.../test/templatesuite/templates/newlines2.ftl | 4 +-
.../templates/non-strict-syntax.ftl | 4 +-
.../test/templatesuite/templates/noparse.ftl | 4 +-
.../templatesuite/templates/number-format.ftl | 4 +-
.../templatesuite/templates/number-literal.ftl | 4 +-
.../templates/number-math-builtins.ftl | 4 +-
.../templatesuite/templates/number-to-date.ftl | 4 +-
.../templatesuite/templates/numerical-cast.ftl | 4 +-
.../templates/output-encoding1.ftl | 4 +-
.../templates/output-encoding2.ftl | 4 +-
.../templates/output-encoding3.ftl | 4 +-
.../overloaded-methods-2-bwici-2.3.20.ftl | 4 +-
.../overloaded-methods-2-bwici-2.3.21.ftl | 4 +-
.../templates/overloaded-methods-2-common.ftl | 4 +-
.../overloaded-methods-2-desc-bwici-2.3.20.ftl | 4 +-
.../overloaded-methods-2-inc-bwici-2.3.20.ftl | 4 +-
.../templates/overloaded-methods-23bc.ftl | 4 +-
.../test/templatesuite/templates/precedence.ftl | 4 +-
.../templatesuite/templates/range-common.ftl | 4 +-
.../templates/range-ici-2.3.20.ftl | 4 +-
.../templates/range-ici-2.3.21.ftl | 4 +-
.../test/templatesuite/templates/recover.ftl | 4 +-
.../test/templatesuite/templates/root.ftl | 4 +-
.../templates/sequence-builtins.ftl | 4 +-
.../test/templatesuite/templates/setting.ftl | 4 +-
.../templates/simplehash-char-key.ftl | 4 +-
.../templatesuite/templates/specialvars.ftl | 4 +-
.../templatesuite/templates/strictinheader.ftl | 4 +-
.../templates/strictinheader_inc1.ftl | 4 +-
.../templates/strictinheader_inc2.ftl | 4 +-
.../templates/string-builtin-coercion.ftl | 4 +-
.../templates/string-builtins-ici-2.3.19.ftl | 4 +-
.../templates/string-builtins-ici-2.3.20.ftl | 4 +-
.../string-builtins-regexps-matches.ftl | 4 +-
.../templates/string-builtins-regexps.ftl | 4 +-
.../templates/string-builtins1.ftl | 4 +-
.../templates/string-builtins2.ftl | 4 +-
.../templates/string-builtins3.ftl | 4 +-
.../templatesuite/templates/stringbimethods.ftl | 4 +-
.../templatesuite/templates/stringliteral.ftl | 4 +-
.../templates/subdir/include-subdir.ftl | 4 +-
.../templates/subdir/include-subdir2.ftl | 4 +-
.../templates/subdir/new-optin-2.ftl | 4 +-
.../templates/subdir/new-optin.ftl | 4 +-
.../templates/subdir/subsub/new-optin.ftl | 4 +-
.../templatesuite/templates/switch-builtin.ftl | 4 +-
.../test/templatesuite/templates/switch.ftl | 4 +-
.../templatesuite/templates/then-builtin.ftl | 4 +-
.../test/templatesuite/templates/transforms.ftl | 4 +-
.../templatesuite/templates/type-builtins.ftl | 4 +-
.../test/templatesuite/templates/undefined.ftl | 4 +-
.../test/templatesuite/templates/url.ftl | 4 +-
.../test/templatesuite/templates/var-layers.ftl | 4 +-
.../test/templatesuite/templates/varargs.ftl | 4 +-
.../test/templatesuite/templates/variables.ftl | 4 +-
.../templatesuite/templates/varlayers_lib.ftl | 4 +-
.../templatesuite/templates/whitespace-trim.ftl | 4 +-
.../templates/wsstripinheader_inc.ftl | 4 +-
.../templates/wstrip-in-header.ftl | 4 +-
.../templatesuite/templates/xml-fragment.ftl | 4 +-
.../templates/xml-ns_prefix-scope-lib.ftl | 4 +-
.../templates/xml-ns_prefix-scope-main.ftl | 4 +-
.../test/templatesuite/templates/xml.ftl | 4 +-
.../test/templatesuite/templates/xmlns1.ftl | 4 +-
.../test/templatesuite/templates/xmlns3.ftl | 4 +-
.../test/templatesuite/templates/xmlns4.ftl | 4 +-
.../test/templatesuite/templates/xmlns5.ftl | 4 +-
.../freemarker/test/templatesuite/testcases.xml | 4 +-
src/test/resources/logback-test.xml | 4 +-
1164 files changed, 6061 insertions(+), 6369 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/617ad6fc/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/617ad6fc/src/main/java/freemarker/core/FreeMarkerTree.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/617ad6fc/src/main/java/freemarker/core/TemplateElement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/617ad6fc/src/main/java/freemarker/template/Template.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/617ad6fc/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/617ad6fc/src/test/java/freemarker/test/TreeView.java
----------------------------------------------------------------------
[29/50] [abbrv] incubator-freemarker git commit: Set up Eclipse and
IntelliJ IDEA to organize imports on the same way (so that they don't fight
each other, generating unnecessary diffs on commit)
Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/template/utility/DateUtilTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/utility/DateUtilTest.java b/src/test/java/freemarker/template/utility/DateUtilTest.java
index d97ef4b..c5b5e93 100644
--- a/src/test/java/freemarker/template/utility/DateUtilTest.java
+++ b/src/test/java/freemarker/template/utility/DateUtilTest.java
@@ -30,11 +30,11 @@ import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
-import junit.framework.TestCase;
import freemarker.template.utility.DateUtil.CalendarFieldsToDateConverter;
import freemarker.template.utility.DateUtil.DateParseException;
import freemarker.template.utility.DateUtil.DateToISO8601CalendarFactory;
import freemarker.template.utility.DateUtil.TrivialCalendarFieldsToDateConverter;
+import junit.framework.TestCase;
public class DateUtilTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/template/utility/NumberUtilTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/utility/NumberUtilTest.java b/src/test/java/freemarker/template/utility/NumberUtilTest.java
index 011704b..12bcd56 100644
--- a/src/test/java/freemarker/template/utility/NumberUtilTest.java
+++ b/src/test/java/freemarker/template/utility/NumberUtilTest.java
@@ -22,10 +22,10 @@ package freemarker.template.utility;
import java.math.BigDecimal;
import java.math.BigInteger;
-import junit.framework.TestCase;
-
import org.junit.Test;
+import junit.framework.TestCase;
+
public class NumberUtilTest extends TestCase {
@Test
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/test/servlet/WebAppTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/servlet/WebAppTestCase.java b/src/test/java/freemarker/test/servlet/WebAppTestCase.java
index ba309b0..0df5d54 100644
--- a/src/test/java/freemarker/test/servlet/WebAppTestCase.java
+++ b/src/test/java/freemarker/test/servlet/WebAppTestCase.java
@@ -19,8 +19,7 @@
package freemarker.test.servlet;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import java.io.File;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java b/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java
index 2ba6dac..93482c2 100644
--- a/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java
+++ b/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java
@@ -32,8 +32,6 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import junit.framework.TestSuite;
-
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -46,6 +44,7 @@ import freemarker.ext.dom.NodeModel;
import freemarker.template.Configuration;
import freemarker.template.Version;
import freemarker.template.utility.StringUtil;
+import junit.framework.TestSuite;
/**
* Test suite where the test cases are defined in testcases.xml, and usually process
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/test/templatesuite/models/Listables.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/Listables.java b/src/test/java/freemarker/test/templatesuite/models/Listables.java
index d607a7e..f06eaad 100644
--- a/src/test/java/freemarker/test/templatesuite/models/Listables.java
+++ b/src/test/java/freemarker/test/templatesuite/models/Listables.java
@@ -18,31 +18,22 @@
*/
package freemarker.test.templatesuite.models;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.SortedMap;
import java.util.TreeSet;
-import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import freemarker.core._DelayedJQuote;
-import freemarker.core._TemplateModelException;
import freemarker.ext.beans.BeansWrapperBuilder;
-import freemarker.ext.util.WrapperTemplateModel;
-import freemarker.template.AdapterTemplateModel;
import freemarker.template.Configuration;
import freemarker.template.DefaultMapAdapter;
import freemarker.template.DefaultObjectWrapperBuilder;
-import freemarker.template.MapKeyValuePairIterator;
import freemarker.template.ObjectWrapper;
import freemarker.template.SimpleCollection;
import freemarker.template.SimpleHash;
@@ -51,10 +42,7 @@ import freemarker.template.TemplateHashModelEx;
import freemarker.template.TemplateHashModelEx2;
import freemarker.template.TemplateModel;
import freemarker.template.TemplateModelException;
-import freemarker.template.TemplateModelWithAPISupport;
import freemarker.template.WrappingTemplateModel;
-import freemarker.template.TemplateHashModelEx2.KeyValuePairIterator;
-import freemarker.template.utility.ObjectWrapperWithAPISupport;
@SuppressWarnings("boxing")
public class Listables {
[48/50] [abbrv] incubator-freemarker git commit: Changing copyright
header format to be identical to IntelliJ generated copyright headers
Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/PathGlobMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/PathGlobMatcher.java b/src/main/java/freemarker/cache/PathGlobMatcher.java
index ac66c9a..13c7e18 100644
--- a/src/main/java/freemarker/cache/PathGlobMatcher.java
+++ b/src/main/java/freemarker/cache/PathGlobMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/PathRegexMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/PathRegexMatcher.java b/src/main/java/freemarker/cache/PathRegexMatcher.java
index eb19c54..5db703d 100644
--- a/src/main/java/freemarker/cache/PathRegexMatcher.java
+++ b/src/main/java/freemarker/cache/PathRegexMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/SoftCacheStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/SoftCacheStorage.java b/src/main/java/freemarker/cache/SoftCacheStorage.java
index 0aa871a..e28e1f1 100644
--- a/src/main/java/freemarker/cache/SoftCacheStorage.java
+++ b/src/main/java/freemarker/cache/SoftCacheStorage.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/StatefulTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/StatefulTemplateLoader.java b/src/main/java/freemarker/cache/StatefulTemplateLoader.java
index 0e0a21c..8682e5a 100644
--- a/src/main/java/freemarker/cache/StatefulTemplateLoader.java
+++ b/src/main/java/freemarker/cache/StatefulTemplateLoader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/StringTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/StringTemplateLoader.java b/src/main/java/freemarker/cache/StringTemplateLoader.java
index 13b7548..972b60d 100644
--- a/src/main/java/freemarker/cache/StringTemplateLoader.java
+++ b/src/main/java/freemarker/cache/StringTemplateLoader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/StrongCacheStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/StrongCacheStorage.java b/src/main/java/freemarker/cache/StrongCacheStorage.java
index 53008bf..c423142 100644
--- a/src/main/java/freemarker/cache/StrongCacheStorage.java
+++ b/src/main/java/freemarker/cache/StrongCacheStorage.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/TemplateCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateCache.java b/src/main/java/freemarker/cache/TemplateCache.java
index 6980cb5..b5485dc 100644
--- a/src/main/java/freemarker/cache/TemplateCache.java
+++ b/src/main/java/freemarker/cache/TemplateCache.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/TemplateConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateConfigurationFactory.java b/src/main/java/freemarker/cache/TemplateConfigurationFactory.java
index ec8d2ae..9f29ac5 100644
--- a/src/main/java/freemarker/cache/TemplateConfigurationFactory.java
+++ b/src/main/java/freemarker/cache/TemplateConfigurationFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/TemplateConfigurationFactoryException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateConfigurationFactoryException.java b/src/main/java/freemarker/cache/TemplateConfigurationFactoryException.java
index abbce62..7a41a2d 100644
--- a/src/main/java/freemarker/cache/TemplateConfigurationFactoryException.java
+++ b/src/main/java/freemarker/cache/TemplateConfigurationFactoryException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/TemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateLoader.java b/src/main/java/freemarker/cache/TemplateLoader.java
index 014b004..42d5677 100644
--- a/src/main/java/freemarker/cache/TemplateLoader.java
+++ b/src/main/java/freemarker/cache/TemplateLoader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/TemplateLoaderUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateLoaderUtils.java b/src/main/java/freemarker/cache/TemplateLoaderUtils.java
index e229e76..9866232 100644
--- a/src/main/java/freemarker/cache/TemplateLoaderUtils.java
+++ b/src/main/java/freemarker/cache/TemplateLoaderUtils.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/TemplateLookupContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateLookupContext.java b/src/main/java/freemarker/cache/TemplateLookupContext.java
index bcb5dbf..060a673 100644
--- a/src/main/java/freemarker/cache/TemplateLookupContext.java
+++ b/src/main/java/freemarker/cache/TemplateLookupContext.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/TemplateLookupResult.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateLookupResult.java b/src/main/java/freemarker/cache/TemplateLookupResult.java
index cb7a58b..8452b2c 100644
--- a/src/main/java/freemarker/cache/TemplateLookupResult.java
+++ b/src/main/java/freemarker/cache/TemplateLookupResult.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/TemplateLookupStrategy.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateLookupStrategy.java b/src/main/java/freemarker/cache/TemplateLookupStrategy.java
index 6b50aa9..b7b089c 100644
--- a/src/main/java/freemarker/cache/TemplateLookupStrategy.java
+++ b/src/main/java/freemarker/cache/TemplateLookupStrategy.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/TemplateNameFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateNameFormat.java b/src/main/java/freemarker/cache/TemplateNameFormat.java
index 34782c5..99763d0 100644
--- a/src/main/java/freemarker/cache/TemplateNameFormat.java
+++ b/src/main/java/freemarker/cache/TemplateNameFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/TemplateSourceMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateSourceMatcher.java b/src/main/java/freemarker/cache/TemplateSourceMatcher.java
index 478aaee..a9e6031 100644
--- a/src/main/java/freemarker/cache/TemplateSourceMatcher.java
+++ b/src/main/java/freemarker/cache/TemplateSourceMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/URLTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/URLTemplateLoader.java b/src/main/java/freemarker/cache/URLTemplateLoader.java
index 816d2c8..ae8cda5 100644
--- a/src/main/java/freemarker/cache/URLTemplateLoader.java
+++ b/src/main/java/freemarker/cache/URLTemplateLoader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/URLTemplateSource.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/URLTemplateSource.java b/src/main/java/freemarker/cache/URLTemplateSource.java
index 0bfd49f..f6f44ee 100644
--- a/src/main/java/freemarker/cache/URLTemplateSource.java
+++ b/src/main/java/freemarker/cache/URLTemplateSource.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/WebappTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/WebappTemplateLoader.java b/src/main/java/freemarker/cache/WebappTemplateLoader.java
index 24e64fa..f3376d3 100644
--- a/src/main/java/freemarker/cache/WebappTemplateLoader.java
+++ b/src/main/java/freemarker/cache/WebappTemplateLoader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/_CacheAPI.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/_CacheAPI.java b/src/main/java/freemarker/cache/_CacheAPI.java
index 638be92..ead17de 100644
--- a/src/main/java/freemarker/cache/_CacheAPI.java
+++ b/src/main/java/freemarker/cache/_CacheAPI.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/package.html b/src/main/java/freemarker/cache/package.html
index bf806df..2466205 100644
--- a/src/main/java/freemarker/cache/package.html
+++ b/src/main/java/freemarker/cache/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/APINotSupportedTemplateException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/APINotSupportedTemplateException.java b/src/main/java/freemarker/core/APINotSupportedTemplateException.java
index d218beb..f21fa0e 100644
--- a/src/main/java/freemarker/core/APINotSupportedTemplateException.java
+++ b/src/main/java/freemarker/core/APINotSupportedTemplateException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/AddConcatExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/AddConcatExpression.java b/src/main/java/freemarker/core/AddConcatExpression.java
index 5523118..f7e53ca 100644
--- a/src/main/java/freemarker/core/AddConcatExpression.java
+++ b/src/main/java/freemarker/core/AddConcatExpression.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/AliasTargetTemplateValueFormatException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/AliasTargetTemplateValueFormatException.java b/src/main/java/freemarker/core/AliasTargetTemplateValueFormatException.java
index bf37e66..a36f324 100644
--- a/src/main/java/freemarker/core/AliasTargetTemplateValueFormatException.java
+++ b/src/main/java/freemarker/core/AliasTargetTemplateValueFormatException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/AliasTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/AliasTemplateDateFormatFactory.java b/src/main/java/freemarker/core/AliasTemplateDateFormatFactory.java
index b8db181..4dec545 100644
--- a/src/main/java/freemarker/core/AliasTemplateDateFormatFactory.java
+++ b/src/main/java/freemarker/core/AliasTemplateDateFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/AliasTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/AliasTemplateNumberFormatFactory.java b/src/main/java/freemarker/core/AliasTemplateNumberFormatFactory.java
index 69d3ece..c0abdc9 100644
--- a/src/main/java/freemarker/core/AliasTemplateNumberFormatFactory.java
+++ b/src/main/java/freemarker/core/AliasTemplateNumberFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/AndExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/AndExpression.java b/src/main/java/freemarker/core/AndExpression.java
index c44b816..7663cfe 100644
--- a/src/main/java/freemarker/core/AndExpression.java
+++ b/src/main/java/freemarker/core/AndExpression.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ArithmeticEngine.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ArithmeticEngine.java b/src/main/java/freemarker/core/ArithmeticEngine.java
index 7ce6347..c07dc92 100644
--- a/src/main/java/freemarker/core/ArithmeticEngine.java
+++ b/src/main/java/freemarker/core/ArithmeticEngine.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ArithmeticExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ArithmeticExpression.java b/src/main/java/freemarker/core/ArithmeticExpression.java
index b33e960..4fbe778 100644
--- a/src/main/java/freemarker/core/ArithmeticExpression.java
+++ b/src/main/java/freemarker/core/ArithmeticExpression.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Assignment.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Assignment.java b/src/main/java/freemarker/core/Assignment.java
index bdce203..0f15112 100644
--- a/src/main/java/freemarker/core/Assignment.java
+++ b/src/main/java/freemarker/core/Assignment.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/AssignmentInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/AssignmentInstruction.java b/src/main/java/freemarker/core/AssignmentInstruction.java
index 87a7d56..c6404d8 100644
--- a/src/main/java/freemarker/core/AssignmentInstruction.java
+++ b/src/main/java/freemarker/core/AssignmentInstruction.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/AttemptBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/AttemptBlock.java b/src/main/java/freemarker/core/AttemptBlock.java
index 5222500..59a1711 100644
--- a/src/main/java/freemarker/core/AttemptBlock.java
+++ b/src/main/java/freemarker/core/AttemptBlock.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/AutoEscBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/AutoEscBlock.java b/src/main/java/freemarker/core/AutoEscBlock.java
index b8a75e2..b4e7cbb 100644
--- a/src/main/java/freemarker/core/AutoEscBlock.java
+++ b/src/main/java/freemarker/core/AutoEscBlock.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BackwardCompatibleTemplateNumberFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BackwardCompatibleTemplateNumberFormat.java b/src/main/java/freemarker/core/BackwardCompatibleTemplateNumberFormat.java
index 9f7dcc8..8d003e5 100644
--- a/src/main/java/freemarker/core/BackwardCompatibleTemplateNumberFormat.java
+++ b/src/main/java/freemarker/core/BackwardCompatibleTemplateNumberFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BlockAssignment.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BlockAssignment.java b/src/main/java/freemarker/core/BlockAssignment.java
index 6de0c8f..07ff070 100644
--- a/src/main/java/freemarker/core/BlockAssignment.java
+++ b/src/main/java/freemarker/core/BlockAssignment.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BodyInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BodyInstruction.java b/src/main/java/freemarker/core/BodyInstruction.java
index 0c82841..d158822 100644
--- a/src/main/java/freemarker/core/BodyInstruction.java
+++ b/src/main/java/freemarker/core/BodyInstruction.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BooleanExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BooleanExpression.java b/src/main/java/freemarker/core/BooleanExpression.java
index b0f3181..08a4a22 100644
--- a/src/main/java/freemarker/core/BooleanExpression.java
+++ b/src/main/java/freemarker/core/BooleanExpression.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BooleanLiteral.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BooleanLiteral.java b/src/main/java/freemarker/core/BooleanLiteral.java
index abeba75..1698b65 100644
--- a/src/main/java/freemarker/core/BooleanLiteral.java
+++ b/src/main/java/freemarker/core/BooleanLiteral.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BoundedRangeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BoundedRangeModel.java b/src/main/java/freemarker/core/BoundedRangeModel.java
index 65f7840..4240e89 100644
--- a/src/main/java/freemarker/core/BoundedRangeModel.java
+++ b/src/main/java/freemarker/core/BoundedRangeModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BreakInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BreakInstruction.java b/src/main/java/freemarker/core/BreakInstruction.java
index 475ed3d..b41f05b 100644
--- a/src/main/java/freemarker/core/BreakInstruction.java
+++ b/src/main/java/freemarker/core/BreakInstruction.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BugException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BugException.java b/src/main/java/freemarker/core/BugException.java
index 119a143..8ae8c6e 100644
--- a/src/main/java/freemarker/core/BugException.java
+++ b/src/main/java/freemarker/core/BugException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltIn.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltIn.java b/src/main/java/freemarker/core/BuiltIn.java
index 99be0b8..70a94bc 100644
--- a/src/main/java/freemarker/core/BuiltIn.java
+++ b/src/main/java/freemarker/core/BuiltIn.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInBannedWhenAutoEscaping.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInBannedWhenAutoEscaping.java b/src/main/java/freemarker/core/BuiltInBannedWhenAutoEscaping.java
index 012d983..d3488ff 100644
--- a/src/main/java/freemarker/core/BuiltInBannedWhenAutoEscaping.java
+++ b/src/main/java/freemarker/core/BuiltInBannedWhenAutoEscaping.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInForDate.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInForDate.java b/src/main/java/freemarker/core/BuiltInForDate.java
index 834cf2c..0bfab70 100644
--- a/src/main/java/freemarker/core/BuiltInForDate.java
+++ b/src/main/java/freemarker/core/BuiltInForDate.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInForHashEx.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInForHashEx.java b/src/main/java/freemarker/core/BuiltInForHashEx.java
index 234794a..93db9bc 100644
--- a/src/main/java/freemarker/core/BuiltInForHashEx.java
+++ b/src/main/java/freemarker/core/BuiltInForHashEx.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInForLegacyEscaping.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInForLegacyEscaping.java b/src/main/java/freemarker/core/BuiltInForLegacyEscaping.java
index 81fbe30..9c04b06 100644
--- a/src/main/java/freemarker/core/BuiltInForLegacyEscaping.java
+++ b/src/main/java/freemarker/core/BuiltInForLegacyEscaping.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInForLoopVariable.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInForLoopVariable.java b/src/main/java/freemarker/core/BuiltInForLoopVariable.java
index 758e5bf..8ba7f45 100644
--- a/src/main/java/freemarker/core/BuiltInForLoopVariable.java
+++ b/src/main/java/freemarker/core/BuiltInForLoopVariable.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInForMarkupOutput.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInForMarkupOutput.java b/src/main/java/freemarker/core/BuiltInForMarkupOutput.java
index 795080e..67196c9 100644
--- a/src/main/java/freemarker/core/BuiltInForMarkupOutput.java
+++ b/src/main/java/freemarker/core/BuiltInForMarkupOutput.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInForNode.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInForNode.java b/src/main/java/freemarker/core/BuiltInForNode.java
index 6fa8802..08c2e83 100644
--- a/src/main/java/freemarker/core/BuiltInForNode.java
+++ b/src/main/java/freemarker/core/BuiltInForNode.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInForNodeEx.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInForNodeEx.java b/src/main/java/freemarker/core/BuiltInForNodeEx.java
index 5acd339..36c69a9 100644
--- a/src/main/java/freemarker/core/BuiltInForNodeEx.java
+++ b/src/main/java/freemarker/core/BuiltInForNodeEx.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInForNumber.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInForNumber.java b/src/main/java/freemarker/core/BuiltInForNumber.java
index 6692e8e..be64f8d 100644
--- a/src/main/java/freemarker/core/BuiltInForNumber.java
+++ b/src/main/java/freemarker/core/BuiltInForNumber.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInForSequence.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInForSequence.java b/src/main/java/freemarker/core/BuiltInForSequence.java
index 9b08123..61668a1 100644
--- a/src/main/java/freemarker/core/BuiltInForSequence.java
+++ b/src/main/java/freemarker/core/BuiltInForSequence.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInForString.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInForString.java b/src/main/java/freemarker/core/BuiltInForString.java
index d38dfd7..74c5793 100644
--- a/src/main/java/freemarker/core/BuiltInForString.java
+++ b/src/main/java/freemarker/core/BuiltInForString.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInWithParseTimeParameters.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInWithParseTimeParameters.java b/src/main/java/freemarker/core/BuiltInWithParseTimeParameters.java
index 1820d98..429c6a8 100644
--- a/src/main/java/freemarker/core/BuiltInWithParseTimeParameters.java
+++ b/src/main/java/freemarker/core/BuiltInWithParseTimeParameters.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsForDates.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForDates.java b/src/main/java/freemarker/core/BuiltInsForDates.java
index af81a3d..ec7d471 100644
--- a/src/main/java/freemarker/core/BuiltInsForDates.java
+++ b/src/main/java/freemarker/core/BuiltInsForDates.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsForExistenceHandling.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForExistenceHandling.java b/src/main/java/freemarker/core/BuiltInsForExistenceHandling.java
index 7b1ba3e..f25e5dd 100644
--- a/src/main/java/freemarker/core/BuiltInsForExistenceHandling.java
+++ b/src/main/java/freemarker/core/BuiltInsForExistenceHandling.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsForHashes.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForHashes.java b/src/main/java/freemarker/core/BuiltInsForHashes.java
index 79d63de..c19603e 100644
--- a/src/main/java/freemarker/core/BuiltInsForHashes.java
+++ b/src/main/java/freemarker/core/BuiltInsForHashes.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsForLoopVariables.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForLoopVariables.java b/src/main/java/freemarker/core/BuiltInsForLoopVariables.java
index 8c680a5..416774a 100644
--- a/src/main/java/freemarker/core/BuiltInsForLoopVariables.java
+++ b/src/main/java/freemarker/core/BuiltInsForLoopVariables.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsForMarkupOutputs.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForMarkupOutputs.java b/src/main/java/freemarker/core/BuiltInsForMarkupOutputs.java
index fede7b0..5fe2094 100644
--- a/src/main/java/freemarker/core/BuiltInsForMarkupOutputs.java
+++ b/src/main/java/freemarker/core/BuiltInsForMarkupOutputs.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsForMultipleTypes.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForMultipleTypes.java b/src/main/java/freemarker/core/BuiltInsForMultipleTypes.java
index 81bcf59..d434504 100644
--- a/src/main/java/freemarker/core/BuiltInsForMultipleTypes.java
+++ b/src/main/java/freemarker/core/BuiltInsForMultipleTypes.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsForNodes.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForNodes.java b/src/main/java/freemarker/core/BuiltInsForNodes.java
index 9b72f8e..4077b95 100644
--- a/src/main/java/freemarker/core/BuiltInsForNodes.java
+++ b/src/main/java/freemarker/core/BuiltInsForNodes.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsForNumbers.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForNumbers.java b/src/main/java/freemarker/core/BuiltInsForNumbers.java
index 2a3bb31..a2d9cbb 100644
--- a/src/main/java/freemarker/core/BuiltInsForNumbers.java
+++ b/src/main/java/freemarker/core/BuiltInsForNumbers.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsForOutputFormatRelated.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForOutputFormatRelated.java b/src/main/java/freemarker/core/BuiltInsForOutputFormatRelated.java
index 8c8da51..b4b9fe8 100644
--- a/src/main/java/freemarker/core/BuiltInsForOutputFormatRelated.java
+++ b/src/main/java/freemarker/core/BuiltInsForOutputFormatRelated.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsForSequences.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForSequences.java b/src/main/java/freemarker/core/BuiltInsForSequences.java
index d56a95f..4139534 100644
--- a/src/main/java/freemarker/core/BuiltInsForSequences.java
+++ b/src/main/java/freemarker/core/BuiltInsForSequences.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsForStringsBasic.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForStringsBasic.java b/src/main/java/freemarker/core/BuiltInsForStringsBasic.java
index cc0cba8..77f64ec 100644
--- a/src/main/java/freemarker/core/BuiltInsForStringsBasic.java
+++ b/src/main/java/freemarker/core/BuiltInsForStringsBasic.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsForStringsEncoding.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForStringsEncoding.java b/src/main/java/freemarker/core/BuiltInsForStringsEncoding.java
index 3cedd62..d6c2e12 100644
--- a/src/main/java/freemarker/core/BuiltInsForStringsEncoding.java
+++ b/src/main/java/freemarker/core/BuiltInsForStringsEncoding.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsForStringsMisc.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForStringsMisc.java b/src/main/java/freemarker/core/BuiltInsForStringsMisc.java
index 1b67eed..eeeb270 100644
--- a/src/main/java/freemarker/core/BuiltInsForStringsMisc.java
+++ b/src/main/java/freemarker/core/BuiltInsForStringsMisc.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsForStringsRegexp.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsForStringsRegexp.java b/src/main/java/freemarker/core/BuiltInsForStringsRegexp.java
index 9cb2010..c2c054e 100644
--- a/src/main/java/freemarker/core/BuiltInsForStringsRegexp.java
+++ b/src/main/java/freemarker/core/BuiltInsForStringsRegexp.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltInsWithParseTimeParameters.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltInsWithParseTimeParameters.java b/src/main/java/freemarker/core/BuiltInsWithParseTimeParameters.java
index 5901c28..ec48f7f 100644
--- a/src/main/java/freemarker/core/BuiltInsWithParseTimeParameters.java
+++ b/src/main/java/freemarker/core/BuiltInsWithParseTimeParameters.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/BuiltinVariable.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/BuiltinVariable.java b/src/main/java/freemarker/core/BuiltinVariable.java
index 5b0f4d2..41286dd 100644
--- a/src/main/java/freemarker/core/BuiltinVariable.java
+++ b/src/main/java/freemarker/core/BuiltinVariable.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/CSSOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/CSSOutputFormat.java b/src/main/java/freemarker/core/CSSOutputFormat.java
index 6b2cf3c..34c370d 100644
--- a/src/main/java/freemarker/core/CSSOutputFormat.java
+++ b/src/main/java/freemarker/core/CSSOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/CallPlaceCustomDataInitializationException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/CallPlaceCustomDataInitializationException.java b/src/main/java/freemarker/core/CallPlaceCustomDataInitializationException.java
index 7fce97c..a80440f 100644
--- a/src/main/java/freemarker/core/CallPlaceCustomDataInitializationException.java
+++ b/src/main/java/freemarker/core/CallPlaceCustomDataInitializationException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Case.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Case.java b/src/main/java/freemarker/core/Case.java
index 4f9c5c8..c580c4d 100644
--- a/src/main/java/freemarker/core/Case.java
+++ b/src/main/java/freemarker/core/Case.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/CollectionAndSequence.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/CollectionAndSequence.java b/src/main/java/freemarker/core/CollectionAndSequence.java
index 01524c2..79e7576 100644
--- a/src/main/java/freemarker/core/CollectionAndSequence.java
+++ b/src/main/java/freemarker/core/CollectionAndSequence.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/CombinedMarkupOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/CombinedMarkupOutputFormat.java b/src/main/java/freemarker/core/CombinedMarkupOutputFormat.java
index 53827ef..fd1e823 100644
--- a/src/main/java/freemarker/core/CombinedMarkupOutputFormat.java
+++ b/src/main/java/freemarker/core/CombinedMarkupOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/CommandLine.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/CommandLine.java b/src/main/java/freemarker/core/CommandLine.java
index 6e4e29f..ab94d2e 100644
--- a/src/main/java/freemarker/core/CommandLine.java
+++ b/src/main/java/freemarker/core/CommandLine.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Comment.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Comment.java b/src/main/java/freemarker/core/Comment.java
index 89ac087..0e7e11a 100644
--- a/src/main/java/freemarker/core/Comment.java
+++ b/src/main/java/freemarker/core/Comment.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/CommonMarkupOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/CommonMarkupOutputFormat.java b/src/main/java/freemarker/core/CommonMarkupOutputFormat.java
index ed9a3c6..80ecd2f 100644
--- a/src/main/java/freemarker/core/CommonMarkupOutputFormat.java
+++ b/src/main/java/freemarker/core/CommonMarkupOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/CommonTemplateMarkupOutputModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/CommonTemplateMarkupOutputModel.java b/src/main/java/freemarker/core/CommonTemplateMarkupOutputModel.java
index 3f1a43e..9cf670a 100644
--- a/src/main/java/freemarker/core/CommonTemplateMarkupOutputModel.java
+++ b/src/main/java/freemarker/core/CommonTemplateMarkupOutputModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ComparisonExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ComparisonExpression.java b/src/main/java/freemarker/core/ComparisonExpression.java
index d2536a1..f647ce4 100644
--- a/src/main/java/freemarker/core/ComparisonExpression.java
+++ b/src/main/java/freemarker/core/ComparisonExpression.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/CompressedBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/CompressedBlock.java b/src/main/java/freemarker/core/CompressedBlock.java
index 9a497e3..56a952f 100644
--- a/src/main/java/freemarker/core/CompressedBlock.java
+++ b/src/main/java/freemarker/core/CompressedBlock.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ConditionalBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ConditionalBlock.java b/src/main/java/freemarker/core/ConditionalBlock.java
index 3b94001..4c423c7 100644
--- a/src/main/java/freemarker/core/ConditionalBlock.java
+++ b/src/main/java/freemarker/core/ConditionalBlock.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Configurable.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Configurable.java b/src/main/java/freemarker/core/Configurable.java
index fd1f8f1..76a3922 100644
--- a/src/main/java/freemarker/core/Configurable.java
+++ b/src/main/java/freemarker/core/Configurable.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/CustomAttribute.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/CustomAttribute.java b/src/main/java/freemarker/core/CustomAttribute.java
index 249a97f..df4e933 100644
--- a/src/main/java/freemarker/core/CustomAttribute.java
+++ b/src/main/java/freemarker/core/CustomAttribute.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/DebugBreak.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/DebugBreak.java b/src/main/java/freemarker/core/DebugBreak.java
index 2fa1cf3..9ab99ce 100644
--- a/src/main/java/freemarker/core/DebugBreak.java
+++ b/src/main/java/freemarker/core/DebugBreak.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/DefaultToExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/DefaultToExpression.java b/src/main/java/freemarker/core/DefaultToExpression.java
index d5ed084..1406fa6 100755
--- a/src/main/java/freemarker/core/DefaultToExpression.java
+++ b/src/main/java/freemarker/core/DefaultToExpression.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/DirectiveCallPlace.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/DirectiveCallPlace.java b/src/main/java/freemarker/core/DirectiveCallPlace.java
index a16c311..f9c1dfc 100644
--- a/src/main/java/freemarker/core/DirectiveCallPlace.java
+++ b/src/main/java/freemarker/core/DirectiveCallPlace.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/DollarVariable.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/DollarVariable.java b/src/main/java/freemarker/core/DollarVariable.java
index 1f7c933..7e7bd1f 100644
--- a/src/main/java/freemarker/core/DollarVariable.java
+++ b/src/main/java/freemarker/core/DollarVariable.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Dot.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Dot.java b/src/main/java/freemarker/core/Dot.java
index 1eb1307..a7a9428 100644
--- a/src/main/java/freemarker/core/Dot.java
+++ b/src/main/java/freemarker/core/Dot.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/DynamicKeyName.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/DynamicKeyName.java b/src/main/java/freemarker/core/DynamicKeyName.java
index b0addad..d369e8e 100644
--- a/src/main/java/freemarker/core/DynamicKeyName.java
+++ b/src/main/java/freemarker/core/DynamicKeyName.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ElseOfList.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ElseOfList.java b/src/main/java/freemarker/core/ElseOfList.java
index 3557e38..6cec749 100644
--- a/src/main/java/freemarker/core/ElseOfList.java
+++ b/src/main/java/freemarker/core/ElseOfList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Environment.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Environment.java b/src/main/java/freemarker/core/Environment.java
index 306cf48..ce34a65 100644
--- a/src/main/java/freemarker/core/Environment.java
+++ b/src/main/java/freemarker/core/Environment.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/EscapeBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/EscapeBlock.java b/src/main/java/freemarker/core/EscapeBlock.java
index 9f17626..f5d5921 100644
--- a/src/main/java/freemarker/core/EscapeBlock.java
+++ b/src/main/java/freemarker/core/EscapeBlock.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/EvalUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/EvalUtil.java b/src/main/java/freemarker/core/EvalUtil.java
index 061ae19..1dbcfb9 100644
--- a/src/main/java/freemarker/core/EvalUtil.java
+++ b/src/main/java/freemarker/core/EvalUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ExistsExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ExistsExpression.java b/src/main/java/freemarker/core/ExistsExpression.java
index b6f60a6..cf3d427 100755
--- a/src/main/java/freemarker/core/ExistsExpression.java
+++ b/src/main/java/freemarker/core/ExistsExpression.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Expression.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Expression.java b/src/main/java/freemarker/core/Expression.java
index 1b07c7d..2823bb9 100644
--- a/src/main/java/freemarker/core/Expression.java
+++ b/src/main/java/freemarker/core/Expression.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ExtendedDecimalFormatParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ExtendedDecimalFormatParser.java b/src/main/java/freemarker/core/ExtendedDecimalFormatParser.java
index 8824531..c31171b 100644
--- a/src/main/java/freemarker/core/ExtendedDecimalFormatParser.java
+++ b/src/main/java/freemarker/core/ExtendedDecimalFormatParser.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[25/50] [abbrv] incubator-freemarker git commit: (JavaDoc fixes)
Posted by dd...@apache.org.
(JavaDoc fixes)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/148d8c21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/148d8c21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/148d8c21
Branch: refs/heads/2.3
Commit: 148d8c21329b5e742a7c32c3f293517ea1931883
Parents: 870f0a7
Author: ddekany <dd...@apache.org>
Authored: Fri Feb 24 18:49:52 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Feb 24 18:49:52 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/core/MarkupOutputFormat.java | 8 ++++----
src/main/java/freemarker/core/OutputFormat.java | 14 +++++++-------
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/148d8c21/src/main/java/freemarker/core/MarkupOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/MarkupOutputFormat.java b/src/main/java/freemarker/core/MarkupOutputFormat.java
index b058591..39eaaca 100644
--- a/src/main/java/freemarker/core/MarkupOutputFormat.java
+++ b/src/main/java/freemarker/core/MarkupOutputFormat.java
@@ -31,10 +31,10 @@ import freemarker.template.TemplateModelException;
* {@link Configuration#setOutputFormat(OutputFormat)}.)
*
* <p>
- * An {@link OutputFormat} subclass always has a corresponding {@link TemplateMarkupOutputModel} subclass pair (like
- * {@link HTMLOutputFormat} has {@link TemplateHTMLOutputModel}). The {@link OutputFormat} implements the operations
- * related to {@link TemplateMarkupOutputModel} objects of that kind, while the {@link TemplateMarkupOutputModel} only
- * encapsulates the data (the actual markup or text).
+ * A {@link MarkupOutputFormat} subclass always has a corresponding {@link TemplateMarkupOutputModel} subclass pair
+ * (like {@link HTMLOutputFormat} has {@link TemplateHTMLOutputModel}). The {@link OutputFormat} implements the
+ * operations related to {@link TemplateMarkupOutputModel} objects of that kind, while the
+ * {@link TemplateMarkupOutputModel} only encapsulates the data (the actual markup or text).
*
* <p>
* To implement a custom output format, you may want to extend {@link CommonMarkupOutputFormat}.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/148d8c21/src/main/java/freemarker/core/OutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/OutputFormat.java b/src/main/java/freemarker/core/OutputFormat.java
index 5f4bc60..5a262aa 100644
--- a/src/main/java/freemarker/core/OutputFormat.java
+++ b/src/main/java/freemarker/core/OutputFormat.java
@@ -40,19 +40,19 @@ public abstract class OutputFormat {
/**
* Returns the MIME type of the output format. This might comes handy when generating a HTTP response. {@code null}
- * if this output format doesn't clearly corresponds to a specific MIME type.
+ * {@code null} if this output format doesn't clearly corresponds to a specific MIME type.
*/
public abstract String getMimeType();
/**
* Tells if this output format allows inserting {@link TemplateMarkupOutputModel}-s of another output formats into
* it. If {@code true}, the foreign {@link TemplateMarkupOutputModel} will be inserted into the output as is (like
- * if the surrounding output format was the same). This is usually a bad idea allow, as such an event could indicate
- * application bugs. If this method returns {@code false} (recommended), then FreeMarker will try to assimilate the
- * inserted value by converting its format to this format, which will currently (2.3.24) cause exception, unless the
- * inserted value is made by escaping plain text and the target format is non-escaping, in which case format
- * conversion is trivially possible. (It's not impossible that conversions will be extended beyond this, if there
- * will be demand for that.)
+ * if the surrounding output format was the same). This is usually a bad idea to allow, as such an event could
+ * indicate application bugs. If this method returns {@code false} (recommended), then FreeMarker will try to
+ * assimilate the inserted value by converting its format to this format, which will currently (2.3.24) cause
+ * exception, unless the inserted value is made by escaping plain text and the target format is non-escaping, in
+ * which case format conversion is trivially possible. (It's not impossible that conversions will be extended beyond
+ * this, if there will be demand for that.)
*
* <p>
* {@code true} value is used by {@link UndefinedOutputFormat}.
[22/50] [abbrv] incubator-freemarker git commit: (JavaDoc typo)
Posted by dd...@apache.org.
(JavaDoc typo)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/1b94c280
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/1b94c280
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/1b94c280
Branch: refs/heads/2.3
Commit: 1b94c280c6fd2d603dfc0b1d831fcc3dc34ee8a8
Parents: 0d069dc
Author: ddekany <dd...@apache.org>
Authored: Wed Feb 22 09:00:33 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Feb 22 09:00:33 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/core/Configurable.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1b94c280/src/main/java/freemarker/core/Configurable.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Configurable.java b/src/main/java/freemarker/core/Configurable.java
index 60372b9..ae14643 100644
--- a/src/main/java/freemarker/core/Configurable.java
+++ b/src/main/java/freemarker/core/Configurable.java
@@ -722,7 +722,7 @@ public class Configurable {
* {@link java.sql.Date java.sql.Date} and {@link java.sql.Time java.sql.Time}, and then if, for example,
* {@code time_zone} is GMT+00:00, the
* values from the earlier examples will be shown as 2014-07-11 (one day off) and 09:57:00 (2 hours off). While
- * those are the time zone correct renderings, those values probably was meant to shown "as is".
+ * those are the time zone correct renderings, those values are probably meant to be shown "as is".
*
* <li>You may wonder why this setting isn't simply "SQL time zone", since the time zone related behavior of JDBC
* applies to {@link java.sql.Timestamp java.sql.Timestamp} too. FreeMarker assumes that you have set up your
[41/50] [abbrv] incubator-freemarker git commit: Changing copyright
header format to be identical to IntelliJ generated copyright headers
Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag3.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag3.java b/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag3.java
index 061f788..ba9d1dd 100644
--- a/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag3.java
+++ b/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag3.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag.java b/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag.java
index fbe7194..0d2e3c9 100644
--- a/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag.java
+++ b/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag2.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag2.java b/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag2.java
index 176f6d0..a5f209b 100644
--- a/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag2.java
+++ b/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag2.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag3.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag3.java b/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag3.java
index 04cab35..4cce585 100644
--- a/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag3.java
+++ b/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag3.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/jsp/webapps/config/WebappLocalFreemarkerServlet.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/jsp/webapps/config/WebappLocalFreemarkerServlet.java b/src/test/java/freemarker/ext/jsp/webapps/config/WebappLocalFreemarkerServlet.java
index 9411633..7035d9a 100644
--- a/src/test/java/freemarker/ext/jsp/webapps/config/WebappLocalFreemarkerServlet.java
+++ b/src/test/java/freemarker/ext/jsp/webapps/config/WebappLocalFreemarkerServlet.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/servlet/FreemarkerServletTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/servlet/FreemarkerServletTest.java b/src/test/java/freemarker/ext/servlet/FreemarkerServletTest.java
index 396e4ca..072ee9a 100644
--- a/src/test/java/freemarker/ext/servlet/FreemarkerServletTest.java
+++ b/src/test/java/freemarker/ext/servlet/FreemarkerServletTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/ext/servlet/InitParamParserTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/servlet/InitParamParserTest.java b/src/test/java/freemarker/ext/servlet/InitParamParserTest.java
index 4408d0d..c712ef2 100644
--- a/src/test/java/freemarker/ext/servlet/InitParamParserTest.java
+++ b/src/test/java/freemarker/ext/servlet/InitParamParserTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/manual/AutoEscapingExample.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/manual/AutoEscapingExample.java b/src/test/java/freemarker/manual/AutoEscapingExample.java
index 3359297..bc2bf1d 100644
--- a/src/test/java/freemarker/manual/AutoEscapingExample.java
+++ b/src/test/java/freemarker/manual/AutoEscapingExample.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/manual/ConfigureOutputFormatExamples.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/manual/ConfigureOutputFormatExamples.java b/src/test/java/freemarker/manual/ConfigureOutputFormatExamples.java
index 8aa6ff4..b816829 100644
--- a/src/test/java/freemarker/manual/ConfigureOutputFormatExamples.java
+++ b/src/test/java/freemarker/manual/ConfigureOutputFormatExamples.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/manual/CustomFormatsExample.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/manual/CustomFormatsExample.java b/src/test/java/freemarker/manual/CustomFormatsExample.java
index 2f8778e..2070217 100644
--- a/src/test/java/freemarker/manual/CustomFormatsExample.java
+++ b/src/test/java/freemarker/manual/CustomFormatsExample.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/manual/ExamplesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/manual/ExamplesTest.java b/src/test/java/freemarker/manual/ExamplesTest.java
index 6ea8254..7738bc5 100644
--- a/src/test/java/freemarker/manual/ExamplesTest.java
+++ b/src/test/java/freemarker/manual/ExamplesTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/manual/GettingStartedExample.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/manual/GettingStartedExample.java b/src/test/java/freemarker/manual/GettingStartedExample.java
index af67eb1..923838e 100644
--- a/src/test/java/freemarker/manual/GettingStartedExample.java
+++ b/src/test/java/freemarker/manual/GettingStartedExample.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/manual/Product.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/manual/Product.java b/src/test/java/freemarker/manual/Product.java
index 7f27456..299e4ba 100644
--- a/src/test/java/freemarker/manual/Product.java
+++ b/src/test/java/freemarker/manual/Product.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/manual/TemplateConfigurationExamples.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/manual/TemplateConfigurationExamples.java b/src/test/java/freemarker/manual/TemplateConfigurationExamples.java
index 97e16f9..1ddfc65 100644
--- a/src/test/java/freemarker/manual/TemplateConfigurationExamples.java
+++ b/src/test/java/freemarker/manual/TemplateConfigurationExamples.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/manual/UnitAwareTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/manual/UnitAwareTemplateNumberFormatFactory.java b/src/test/java/freemarker/manual/UnitAwareTemplateNumberFormatFactory.java
index c737653..d95317e 100644
--- a/src/test/java/freemarker/manual/UnitAwareTemplateNumberFormatFactory.java
+++ b/src/test/java/freemarker/manual/UnitAwareTemplateNumberFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/manual/UnitAwareTemplateNumberModel.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/manual/UnitAwareTemplateNumberModel.java b/src/test/java/freemarker/manual/UnitAwareTemplateNumberModel.java
index 74aacbd..979f606 100644
--- a/src/test/java/freemarker/manual/UnitAwareTemplateNumberModel.java
+++ b/src/test/java/freemarker/manual/UnitAwareTemplateNumberModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/ActualNamingConvetionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/ActualNamingConvetionTest.java b/src/test/java/freemarker/template/ActualNamingConvetionTest.java
index ff44635..705420a 100644
--- a/src/test/java/freemarker/template/ActualNamingConvetionTest.java
+++ b/src/test/java/freemarker/template/ActualNamingConvetionTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/ActualTagSyntaxTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/ActualTagSyntaxTest.java b/src/test/java/freemarker/template/ActualTagSyntaxTest.java
index 85a0735..cc9b1bd 100644
--- a/src/test/java/freemarker/template/ActualTagSyntaxTest.java
+++ b/src/test/java/freemarker/template/ActualTagSyntaxTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/ConfigurationTest.java b/src/test/java/freemarker/template/ConfigurationTest.java
index 25986a6..e3117ad 100644
--- a/src/test/java/freemarker/template/ConfigurationTest.java
+++ b/src/test/java/freemarker/template/ConfigurationTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/CustomAttributeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/CustomAttributeTest.java b/src/test/java/freemarker/template/CustomAttributeTest.java
index 9ff5152..612d2ca 100644
--- a/src/test/java/freemarker/template/CustomAttributeTest.java
+++ b/src/test/java/freemarker/template/CustomAttributeTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
index 9482810..28dcb7c 100644
--- a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
+++ b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/ExceptionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/ExceptionTest.java b/src/test/java/freemarker/template/ExceptionTest.java
index ee20966..938cc16 100644
--- a/src/test/java/freemarker/template/ExceptionTest.java
+++ b/src/test/java/freemarker/template/ExceptionTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/GetSourceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/GetSourceTest.java b/src/test/java/freemarker/template/GetSourceTest.java
index e9a0ba1..72780c2 100644
--- a/src/test/java/freemarker/template/GetSourceTest.java
+++ b/src/test/java/freemarker/template/GetSourceTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/IncudeFromNamelessTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/IncudeFromNamelessTest.java b/src/test/java/freemarker/template/IncudeFromNamelessTest.java
index 64fd8e8..19dbe58 100644
--- a/src/test/java/freemarker/template/IncudeFromNamelessTest.java
+++ b/src/test/java/freemarker/template/IncudeFromNamelessTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/JavaCCExceptionAsEOFFixTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/JavaCCExceptionAsEOFFixTest.java b/src/test/java/freemarker/template/JavaCCExceptionAsEOFFixTest.java
index a65eb20..be3dfb7 100644
--- a/src/test/java/freemarker/template/JavaCCExceptionAsEOFFixTest.java
+++ b/src/test/java/freemarker/template/JavaCCExceptionAsEOFFixTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/MistakenlyPublicImportAPIsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/MistakenlyPublicImportAPIsTest.java b/src/test/java/freemarker/template/MistakenlyPublicImportAPIsTest.java
index 6395263..7fc2785 100644
--- a/src/test/java/freemarker/template/MistakenlyPublicImportAPIsTest.java
+++ b/src/test/java/freemarker/template/MistakenlyPublicImportAPIsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/MistakenlyPublicMacroAPIsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/MistakenlyPublicMacroAPIsTest.java b/src/test/java/freemarker/template/MistakenlyPublicMacroAPIsTest.java
index aa357f5..622f31e 100644
--- a/src/test/java/freemarker/template/MistakenlyPublicMacroAPIsTest.java
+++ b/src/test/java/freemarker/template/MistakenlyPublicMacroAPIsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/MockServletContext.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/MockServletContext.java b/src/test/java/freemarker/template/MockServletContext.java
index b3fea7a..f833bec 100644
--- a/src/test/java/freemarker/template/MockServletContext.java
+++ b/src/test/java/freemarker/template/MockServletContext.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/NullConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/NullConfigurationTest.java b/src/test/java/freemarker/template/NullConfigurationTest.java
index 9fcb1fb..e7e29f1 100644
--- a/src/test/java/freemarker/template/NullConfigurationTest.java
+++ b/src/test/java/freemarker/template/NullConfigurationTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/SimpleObjetWrapperTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/SimpleObjetWrapperTest.java b/src/test/java/freemarker/template/SimpleObjetWrapperTest.java
index 35d8cb1..4af7f2f 100644
--- a/src/test/java/freemarker/template/SimpleObjetWrapperTest.java
+++ b/src/test/java/freemarker/template/SimpleObjetWrapperTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/StaticObjectWrappersTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/StaticObjectWrappersTest.java b/src/test/java/freemarker/template/StaticObjectWrappersTest.java
index 6e36e90..7375dd1 100644
--- a/src/test/java/freemarker/template/StaticObjectWrappersTest.java
+++ b/src/test/java/freemarker/template/StaticObjectWrappersTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/TemplateConstructorsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/TemplateConstructorsTest.java b/src/test/java/freemarker/template/TemplateConstructorsTest.java
index 838a9d5..18ddf75 100644
--- a/src/test/java/freemarker/template/TemplateConstructorsTest.java
+++ b/src/test/java/freemarker/template/TemplateConstructorsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/TemplateLanguageVersionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/TemplateLanguageVersionTest.java b/src/test/java/freemarker/template/TemplateLanguageVersionTest.java
index 490c3c0..0d93f92 100644
--- a/src/test/java/freemarker/template/TemplateLanguageVersionTest.java
+++ b/src/test/java/freemarker/template/TemplateLanguageVersionTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/TemplateLookupStrategyTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/TemplateLookupStrategyTest.java b/src/test/java/freemarker/template/TemplateLookupStrategyTest.java
index 085814e..52181ee 100644
--- a/src/test/java/freemarker/template/TemplateLookupStrategyTest.java
+++ b/src/test/java/freemarker/template/TemplateLookupStrategyTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/TemplateNotFoundMessageTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/TemplateNotFoundMessageTest.java b/src/test/java/freemarker/template/TemplateNotFoundMessageTest.java
index c96015c..e7d8d6f 100644
--- a/src/test/java/freemarker/template/TemplateNotFoundMessageTest.java
+++ b/src/test/java/freemarker/template/TemplateNotFoundMessageTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/VersionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/VersionTest.java b/src/test/java/freemarker/template/VersionTest.java
index 560e428..917b96e 100644
--- a/src/test/java/freemarker/template/VersionTest.java
+++ b/src/test/java/freemarker/template/VersionTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/utility/DateUtilTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/utility/DateUtilTest.java b/src/test/java/freemarker/template/utility/DateUtilTest.java
index c5b5e93..27243d9 100644
--- a/src/test/java/freemarker/template/utility/DateUtilTest.java
+++ b/src/test/java/freemarker/template/utility/DateUtilTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/utility/NumberUtilTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/utility/NumberUtilTest.java b/src/test/java/freemarker/template/utility/NumberUtilTest.java
index 12bcd56..3e13b6c 100644
--- a/src/test/java/freemarker/template/utility/NumberUtilTest.java
+++ b/src/test/java/freemarker/template/utility/NumberUtilTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/template/utility/StringUtilTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/utility/StringUtilTest.java b/src/test/java/freemarker/template/utility/StringUtilTest.java
index 4a78f39..49556e2 100644
--- a/src/test/java/freemarker/template/utility/StringUtilTest.java
+++ b/src/test/java/freemarker/template/utility/StringUtilTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java b/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
index b6b058e..f09b88c 100644
--- a/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
+++ b/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/MonitoredTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/MonitoredTemplateLoader.java b/src/test/java/freemarker/test/MonitoredTemplateLoader.java
index f51b109..cc504d8 100644
--- a/src/test/java/freemarker/test/MonitoredTemplateLoader.java
+++ b/src/test/java/freemarker/test/MonitoredTemplateLoader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/ResourcesExtractor.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/ResourcesExtractor.java b/src/test/java/freemarker/test/ResourcesExtractor.java
index 88e1bed..b1cca04 100644
--- a/src/test/java/freemarker/test/ResourcesExtractor.java
+++ b/src/test/java/freemarker/test/ResourcesExtractor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/TemplateTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/TemplateTest.java b/src/test/java/freemarker/test/TemplateTest.java
index 5a1cdec..4747ed0 100644
--- a/src/test/java/freemarker/test/TemplateTest.java
+++ b/src/test/java/freemarker/test/TemplateTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/TreeView.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/TreeView.java b/src/test/java/freemarker/test/TreeView.java
index 0c8b162..0c89f5f 100644
--- a/src/test/java/freemarker/test/TreeView.java
+++ b/src/test/java/freemarker/test/TreeView.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/hamcerst/Matchers.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/hamcerst/Matchers.java b/src/test/java/freemarker/test/hamcerst/Matchers.java
index 134f2bf..1e4416d 100644
--- a/src/test/java/freemarker/test/hamcerst/Matchers.java
+++ b/src/test/java/freemarker/test/hamcerst/Matchers.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/hamcerst/StringContainsIgnoringCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/hamcerst/StringContainsIgnoringCase.java b/src/test/java/freemarker/test/hamcerst/StringContainsIgnoringCase.java
index fa1b222..a7b142e 100644
--- a/src/test/java/freemarker/test/hamcerst/StringContainsIgnoringCase.java
+++ b/src/test/java/freemarker/test/hamcerst/StringContainsIgnoringCase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/package.html
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/package.html b/src/test/java/freemarker/test/package.html
index 293c7b6..3dbb3fb 100644
--- a/src/test/java/freemarker/test/package.html
+++ b/src/test/java/freemarker/test/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/servlet/DefaultModel2TesterAction.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/servlet/DefaultModel2TesterAction.java b/src/test/java/freemarker/test/servlet/DefaultModel2TesterAction.java
index ecfa538..9dfdf5c 100644
--- a/src/test/java/freemarker/test/servlet/DefaultModel2TesterAction.java
+++ b/src/test/java/freemarker/test/servlet/DefaultModel2TesterAction.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/servlet/Model2Action.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/servlet/Model2Action.java b/src/test/java/freemarker/test/servlet/Model2Action.java
index b3aca9e..757a213 100644
--- a/src/test/java/freemarker/test/servlet/Model2Action.java
+++ b/src/test/java/freemarker/test/servlet/Model2Action.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/servlet/Model2TesterServlet.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/servlet/Model2TesterServlet.java b/src/test/java/freemarker/test/servlet/Model2TesterServlet.java
index e6414a8..c61d67a 100644
--- a/src/test/java/freemarker/test/servlet/Model2TesterServlet.java
+++ b/src/test/java/freemarker/test/servlet/Model2TesterServlet.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/servlet/WebAppTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/servlet/WebAppTestCase.java b/src/test/java/freemarker/test/servlet/WebAppTestCase.java
index 0df5d54..3471795 100644
--- a/src/test/java/freemarker/test/servlet/WebAppTestCase.java
+++ b/src/test/java/freemarker/test/servlet/WebAppTestCase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/servlet/web.xml
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/servlet/web.xml b/src/test/java/freemarker/test/servlet/web.xml
index 729979d..d12931b 100644
--- a/src/test/java/freemarker/test/servlet/web.xml
+++ b/src/test/java/freemarker/test/servlet/web.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java b/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java
index 24b67f8..63a7203 100644
--- a/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java
+++ b/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java b/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java
index 93482c2..17d35c2 100644
--- a/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java
+++ b/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/AllTemplateModels.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/AllTemplateModels.java b/src/test/java/freemarker/test/templatesuite/models/AllTemplateModels.java
index 4385646..000eca9 100644
--- a/src/test/java/freemarker/test/templatesuite/models/AllTemplateModels.java
+++ b/src/test/java/freemarker/test/templatesuite/models/AllTemplateModels.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/BeanTestClass.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/BeanTestClass.java b/src/test/java/freemarker/test/templatesuite/models/BeanTestClass.java
index a8532cd..37b51f6 100644
--- a/src/test/java/freemarker/test/templatesuite/models/BeanTestClass.java
+++ b/src/test/java/freemarker/test/templatesuite/models/BeanTestClass.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/BeanTestInterface.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/BeanTestInterface.java b/src/test/java/freemarker/test/templatesuite/models/BeanTestInterface.java
index 02d8457..9bdce8a 100644
--- a/src/test/java/freemarker/test/templatesuite/models/BeanTestInterface.java
+++ b/src/test/java/freemarker/test/templatesuite/models/BeanTestInterface.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/BeanTestSuperclass.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/BeanTestSuperclass.java b/src/test/java/freemarker/test/templatesuite/models/BeanTestSuperclass.java
index 57ffb74..7728247 100644
--- a/src/test/java/freemarker/test/templatesuite/models/BeanTestSuperclass.java
+++ b/src/test/java/freemarker/test/templatesuite/models/BeanTestSuperclass.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/BooleanAndScalarModel.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/BooleanAndScalarModel.java b/src/test/java/freemarker/test/templatesuite/models/BooleanAndScalarModel.java
index 2ec06bf..164768a 100644
--- a/src/test/java/freemarker/test/templatesuite/models/BooleanAndScalarModel.java
+++ b/src/test/java/freemarker/test/templatesuite/models/BooleanAndScalarModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/BooleanAndStringTemplateModel.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/BooleanAndStringTemplateModel.java b/src/test/java/freemarker/test/templatesuite/models/BooleanAndStringTemplateModel.java
index d0b5f3c..cba28a7 100644
--- a/src/test/java/freemarker/test/templatesuite/models/BooleanAndStringTemplateModel.java
+++ b/src/test/java/freemarker/test/templatesuite/models/BooleanAndStringTemplateModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/BooleanHash1.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/BooleanHash1.java b/src/test/java/freemarker/test/templatesuite/models/BooleanHash1.java
index 0b94be5..6e9993d 100644
--- a/src/test/java/freemarker/test/templatesuite/models/BooleanHash1.java
+++ b/src/test/java/freemarker/test/templatesuite/models/BooleanHash1.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/BooleanHash2.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/BooleanHash2.java b/src/test/java/freemarker/test/templatesuite/models/BooleanHash2.java
index 53ae017..b6c1147 100644
--- a/src/test/java/freemarker/test/templatesuite/models/BooleanHash2.java
+++ b/src/test/java/freemarker/test/templatesuite/models/BooleanHash2.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/BooleanList1.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/BooleanList1.java b/src/test/java/freemarker/test/templatesuite/models/BooleanList1.java
index 9e72c91..3fcef28 100644
--- a/src/test/java/freemarker/test/templatesuite/models/BooleanList1.java
+++ b/src/test/java/freemarker/test/templatesuite/models/BooleanList1.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/BooleanList2.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/BooleanList2.java b/src/test/java/freemarker/test/templatesuite/models/BooleanList2.java
index d5e9dec..1f2234e 100644
--- a/src/test/java/freemarker/test/templatesuite/models/BooleanList2.java
+++ b/src/test/java/freemarker/test/templatesuite/models/BooleanList2.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/BooleanVsStringMethods.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/BooleanVsStringMethods.java b/src/test/java/freemarker/test/templatesuite/models/BooleanVsStringMethods.java
index e50da9c..d6dc46c 100644
--- a/src/test/java/freemarker/test/templatesuite/models/BooleanVsStringMethods.java
+++ b/src/test/java/freemarker/test/templatesuite/models/BooleanVsStringMethods.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/EnumTestClass.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/EnumTestClass.java b/src/test/java/freemarker/test/templatesuite/models/EnumTestClass.java
index 6eb5da2..4b4254a 100644
--- a/src/test/java/freemarker/test/templatesuite/models/EnumTestClass.java
+++ b/src/test/java/freemarker/test/templatesuite/models/EnumTestClass.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/ExceptionModel.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/ExceptionModel.java b/src/test/java/freemarker/test/templatesuite/models/ExceptionModel.java
index ab30c79..8378bee 100644
--- a/src/test/java/freemarker/test/templatesuite/models/ExceptionModel.java
+++ b/src/test/java/freemarker/test/templatesuite/models/ExceptionModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/HashAndScalarModel.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/HashAndScalarModel.java b/src/test/java/freemarker/test/templatesuite/models/HashAndScalarModel.java
index fb7e740..b2c3b88 100644
--- a/src/test/java/freemarker/test/templatesuite/models/HashAndScalarModel.java
+++ b/src/test/java/freemarker/test/templatesuite/models/HashAndScalarModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/JavaObjectInfo.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/JavaObjectInfo.java b/src/test/java/freemarker/test/templatesuite/models/JavaObjectInfo.java
index f6fbda1..aa7a72e 100644
--- a/src/test/java/freemarker/test/templatesuite/models/JavaObjectInfo.java
+++ b/src/test/java/freemarker/test/templatesuite/models/JavaObjectInfo.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/LegacyList.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/LegacyList.java b/src/test/java/freemarker/test/templatesuite/models/LegacyList.java
index 799d212..06abaca 100644
--- a/src/test/java/freemarker/test/templatesuite/models/LegacyList.java
+++ b/src/test/java/freemarker/test/templatesuite/models/LegacyList.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/Listables.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/Listables.java b/src/test/java/freemarker/test/templatesuite/models/Listables.java
index f06eaad..165dce8 100644
--- a/src/test/java/freemarker/test/templatesuite/models/Listables.java
+++ b/src/test/java/freemarker/test/templatesuite/models/Listables.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/MultiModel1.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/MultiModel1.java b/src/test/java/freemarker/test/templatesuite/models/MultiModel1.java
index 57face9..f9ac0ca 100644
--- a/src/test/java/freemarker/test/templatesuite/models/MultiModel1.java
+++ b/src/test/java/freemarker/test/templatesuite/models/MultiModel1.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/MultiModel2.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/MultiModel2.java b/src/test/java/freemarker/test/templatesuite/models/MultiModel2.java
index 6d652fd..f5ef98b 100644
--- a/src/test/java/freemarker/test/templatesuite/models/MultiModel2.java
+++ b/src/test/java/freemarker/test/templatesuite/models/MultiModel2.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/MultiModel3.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/MultiModel3.java b/src/test/java/freemarker/test/templatesuite/models/MultiModel3.java
index 821f58b..bd362e5 100644
--- a/src/test/java/freemarker/test/templatesuite/models/MultiModel3.java
+++ b/src/test/java/freemarker/test/templatesuite/models/MultiModel3.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/MultiModel4.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/MultiModel4.java b/src/test/java/freemarker/test/templatesuite/models/MultiModel4.java
index e3a0793..b2848c6 100644
--- a/src/test/java/freemarker/test/templatesuite/models/MultiModel4.java
+++ b/src/test/java/freemarker/test/templatesuite/models/MultiModel4.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/MultiModel5.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/MultiModel5.java b/src/test/java/freemarker/test/templatesuite/models/MultiModel5.java
index f81a1a8..adf4aa3 100644
--- a/src/test/java/freemarker/test/templatesuite/models/MultiModel5.java
+++ b/src/test/java/freemarker/test/templatesuite/models/MultiModel5.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/NewTestModel.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/NewTestModel.java b/src/test/java/freemarker/test/templatesuite/models/NewTestModel.java
index 4fe7dbf..194cb39 100644
--- a/src/test/java/freemarker/test/templatesuite/models/NewTestModel.java
+++ b/src/test/java/freemarker/test/templatesuite/models/NewTestModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/NewTestModel2.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/NewTestModel2.java b/src/test/java/freemarker/test/templatesuite/models/NewTestModel2.java
index 4bbc414..b44b1f5 100644
--- a/src/test/java/freemarker/test/templatesuite/models/NewTestModel2.java
+++ b/src/test/java/freemarker/test/templatesuite/models/NewTestModel2.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/NumberAndStringModel.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/NumberAndStringModel.java b/src/test/java/freemarker/test/templatesuite/models/NumberAndStringModel.java
index 5c20bf2..9b38c9f 100644
--- a/src/test/java/freemarker/test/templatesuite/models/NumberAndStringModel.java
+++ b/src/test/java/freemarker/test/templatesuite/models/NumberAndStringModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/OverloadedConstructor.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/OverloadedConstructor.java b/src/test/java/freemarker/test/templatesuite/models/OverloadedConstructor.java
index bb98ceb..0becc02 100644
--- a/src/test/java/freemarker/test/templatesuite/models/OverloadedConstructor.java
+++ b/src/test/java/freemarker/test/templatesuite/models/OverloadedConstructor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods.java b/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods.java
index 2138d03..b71bf76 100644
--- a/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods.java
+++ b/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods2.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods2.java b/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods2.java
index 854c179..e73c696 100644
--- a/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods2.java
+++ b/src/test/java/freemarker/test/templatesuite/models/OverloadedMethods2.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/SimpleTestMethod.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/SimpleTestMethod.java b/src/test/java/freemarker/test/templatesuite/models/SimpleTestMethod.java
index bacfac1..9dc4ded 100644
--- a/src/test/java/freemarker/test/templatesuite/models/SimpleTestMethod.java
+++ b/src/test/java/freemarker/test/templatesuite/models/SimpleTestMethod.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/TransformHashWrapper.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/TransformHashWrapper.java b/src/test/java/freemarker/test/templatesuite/models/TransformHashWrapper.java
index 35daadb..f3de0a9 100644
--- a/src/test/java/freemarker/test/templatesuite/models/TransformHashWrapper.java
+++ b/src/test/java/freemarker/test/templatesuite/models/TransformHashWrapper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper1.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper1.java b/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper1.java
index 8c2db7a..51ae46c 100644
--- a/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper1.java
+++ b/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper1.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper2.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper2.java b/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper2.java
index 712d5dc..87c0768 100644
--- a/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper2.java
+++ b/src/test/java/freemarker/test/templatesuite/models/TransformMethodWrapper2.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/TransformModel1.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/TransformModel1.java b/src/test/java/freemarker/test/templatesuite/models/TransformModel1.java
index 79cc9b3..2d7dc27 100644
--- a/src/test/java/freemarker/test/templatesuite/models/TransformModel1.java
+++ b/src/test/java/freemarker/test/templatesuite/models/TransformModel1.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/models/VarArgTestModel.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/VarArgTestModel.java b/src/test/java/freemarker/test/templatesuite/models/VarArgTestModel.java
index ccaaf0d..6e010e1 100644
--- a/src/test/java/freemarker/test/templatesuite/models/VarArgTestModel.java
+++ b/src/test/java/freemarker/test/templatesuite/models/VarArgTestModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/templatesuite/package.html
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/package.html b/src/test/java/freemarker/test/templatesuite/package.html
index 80cb733..cabffb0 100644
--- a/src/test/java/freemarker/test/templatesuite/package.html
+++ b/src/test/java/freemarker/test/templatesuite/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/AssertDirective.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/AssertDirective.java b/src/test/java/freemarker/test/utility/AssertDirective.java
index 0e57234..5749cd5 100644
--- a/src/test/java/freemarker/test/utility/AssertDirective.java
+++ b/src/test/java/freemarker/test/utility/AssertDirective.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/AssertEqualsDirective.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/AssertEqualsDirective.java b/src/test/java/freemarker/test/utility/AssertEqualsDirective.java
index 7252a63..ddf23f6 100644
--- a/src/test/java/freemarker/test/utility/AssertEqualsDirective.java
+++ b/src/test/java/freemarker/test/utility/AssertEqualsDirective.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/AssertFailsDirective.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/AssertFailsDirective.java b/src/test/java/freemarker/test/utility/AssertFailsDirective.java
index 8a72bb9..4d8cb69 100644
--- a/src/test/java/freemarker/test/utility/AssertFailsDirective.java
+++ b/src/test/java/freemarker/test/utility/AssertFailsDirective.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[49/50] [abbrv] incubator-freemarker git commit: Changing copyright
header format to be identical to IntelliJ generated copyright headers
Posted by dd...@apache.org.
Changing copyright header format to be identical to IntelliJ generated copyright headers
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/83eac154
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/83eac154
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/83eac154
Branch: refs/heads/2.3
Commit: 83eac154e291217c6439166cdf4bb5a9edb8cd61
Parents: 2a39646
Author: ddekany <dd...@apache.org>
Authored: Wed Mar 1 15:16:38 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Mar 1 15:16:38 2017 +0100
----------------------------------------------------------------------
src/dist/bin/documentation/index.html | 4 ++--
.../Eclipse/Formatter-profile-FreeMarker.xml | 4 ++--
.../IntelliJ-IDEA/Java-code-style-FreeMarker.xml | 4 ++--
src/main/java/freemarker/cache/AndMatcher.java | 4 ++--
.../cache/ByteArrayTemplateLoader.java | 4 ++--
src/main/java/freemarker/cache/CacheStorage.java | 4 ++--
.../cache/CacheStorageWithGetSize.java | 4 ++--
.../freemarker/cache/ClassTemplateLoader.java | 4 ++--
.../freemarker/cache/ConcurrentCacheStorage.java | 4 ++--
.../ConditionalTemplateConfigurationFactory.java | 4 ++--
.../freemarker/cache/FileExtensionMatcher.java | 4 ++--
.../freemarker/cache/FileNameGlobMatcher.java | 4 ++--
.../freemarker/cache/FileTemplateLoader.java | 4 ++--
.../FirstMatchTemplateConfigurationFactory.java | 4 ++--
.../MergingTemplateConfigurationFactory.java | 4 ++--
.../java/freemarker/cache/MruCacheStorage.java | 4 ++--
.../freemarker/cache/MultiTemplateLoader.java | 4 ++--
src/main/java/freemarker/cache/NotMatcher.java | 4 ++--
.../java/freemarker/cache/NullCacheStorage.java | 4 ++--
src/main/java/freemarker/cache/OrMatcher.java | 4 ++--
.../java/freemarker/cache/PathGlobMatcher.java | 4 ++--
.../java/freemarker/cache/PathRegexMatcher.java | 4 ++--
.../java/freemarker/cache/SoftCacheStorage.java | 4 ++--
.../freemarker/cache/StatefulTemplateLoader.java | 4 ++--
.../freemarker/cache/StringTemplateLoader.java | 4 ++--
.../freemarker/cache/StrongCacheStorage.java | 4 ++--
.../java/freemarker/cache/TemplateCache.java | 4 ++--
.../cache/TemplateConfigurationFactory.java | 4 ++--
.../TemplateConfigurationFactoryException.java | 4 ++--
.../java/freemarker/cache/TemplateLoader.java | 4 ++--
.../freemarker/cache/TemplateLoaderUtils.java | 4 ++--
.../freemarker/cache/TemplateLookupContext.java | 4 ++--
.../freemarker/cache/TemplateLookupResult.java | 4 ++--
.../freemarker/cache/TemplateLookupStrategy.java | 4 ++--
.../freemarker/cache/TemplateNameFormat.java | 4 ++--
.../freemarker/cache/TemplateSourceMatcher.java | 4 ++--
.../java/freemarker/cache/URLTemplateLoader.java | 4 ++--
.../java/freemarker/cache/URLTemplateSource.java | 4 ++--
.../freemarker/cache/WebappTemplateLoader.java | 4 ++--
src/main/java/freemarker/cache/_CacheAPI.java | 4 ++--
src/main/java/freemarker/cache/package.html | 4 ++--
.../core/APINotSupportedTemplateException.java | 4 ++--
.../freemarker/core/AddConcatExpression.java | 4 ++--
.../AliasTargetTemplateValueFormatException.java | 4 ++--
.../core/AliasTemplateDateFormatFactory.java | 4 ++--
.../core/AliasTemplateNumberFormatFactory.java | 4 ++--
src/main/java/freemarker/core/AndExpression.java | 4 ++--
.../java/freemarker/core/ArithmeticEngine.java | 4 ++--
.../freemarker/core/ArithmeticExpression.java | 4 ++--
src/main/java/freemarker/core/Assignment.java | 4 ++--
.../freemarker/core/AssignmentInstruction.java | 4 ++--
src/main/java/freemarker/core/AttemptBlock.java | 4 ++--
src/main/java/freemarker/core/AutoEscBlock.java | 4 ++--
.../BackwardCompatibleTemplateNumberFormat.java | 4 ++--
.../java/freemarker/core/BlockAssignment.java | 4 ++--
.../java/freemarker/core/BodyInstruction.java | 4 ++--
.../java/freemarker/core/BooleanExpression.java | 4 ++--
.../java/freemarker/core/BooleanLiteral.java | 4 ++--
.../java/freemarker/core/BoundedRangeModel.java | 4 ++--
.../java/freemarker/core/BreakInstruction.java | 4 ++--
src/main/java/freemarker/core/BugException.java | 4 ++--
src/main/java/freemarker/core/BuiltIn.java | 4 ++--
.../core/BuiltInBannedWhenAutoEscaping.java | 4 ++--
.../java/freemarker/core/BuiltInForDate.java | 4 ++--
.../java/freemarker/core/BuiltInForHashEx.java | 4 ++--
.../core/BuiltInForLegacyEscaping.java | 4 ++--
.../freemarker/core/BuiltInForLoopVariable.java | 4 ++--
.../freemarker/core/BuiltInForMarkupOutput.java | 4 ++--
.../java/freemarker/core/BuiltInForNode.java | 4 ++--
.../java/freemarker/core/BuiltInForNodeEx.java | 4 ++--
.../java/freemarker/core/BuiltInForNumber.java | 4 ++--
.../java/freemarker/core/BuiltInForSequence.java | 4 ++--
.../java/freemarker/core/BuiltInForString.java | 4 ++--
.../core/BuiltInWithParseTimeParameters.java | 4 ++--
.../java/freemarker/core/BuiltInsForDates.java | 4 ++--
.../core/BuiltInsForExistenceHandling.java | 4 ++--
.../java/freemarker/core/BuiltInsForHashes.java | 4 ++--
.../core/BuiltInsForLoopVariables.java | 4 ++--
.../core/BuiltInsForMarkupOutputs.java | 4 ++--
.../core/BuiltInsForMultipleTypes.java | 4 ++--
.../java/freemarker/core/BuiltInsForNodes.java | 4 ++--
.../java/freemarker/core/BuiltInsForNumbers.java | 4 ++--
.../core/BuiltInsForOutputFormatRelated.java | 4 ++--
.../freemarker/core/BuiltInsForSequences.java | 4 ++--
.../freemarker/core/BuiltInsForStringsBasic.java | 4 ++--
.../core/BuiltInsForStringsEncoding.java | 4 ++--
.../freemarker/core/BuiltInsForStringsMisc.java | 4 ++--
.../core/BuiltInsForStringsRegexp.java | 4 ++--
.../core/BuiltInsWithParseTimeParameters.java | 4 ++--
.../java/freemarker/core/BuiltinVariable.java | 4 ++--
.../java/freemarker/core/CSSOutputFormat.java | 4 ++--
...llPlaceCustomDataInitializationException.java | 4 ++--
src/main/java/freemarker/core/Case.java | 4 ++--
.../freemarker/core/CollectionAndSequence.java | 4 ++--
.../core/CombinedMarkupOutputFormat.java | 4 ++--
src/main/java/freemarker/core/CommandLine.java | 4 ++--
src/main/java/freemarker/core/Comment.java | 4 ++--
.../core/CommonMarkupOutputFormat.java | 4 ++--
.../core/CommonTemplateMarkupOutputModel.java | 4 ++--
.../freemarker/core/ComparisonExpression.java | 4 ++--
.../java/freemarker/core/CompressedBlock.java | 4 ++--
.../java/freemarker/core/ConditionalBlock.java | 4 ++--
src/main/java/freemarker/core/Configurable.java | 4 ++--
.../java/freemarker/core/CustomAttribute.java | 4 ++--
src/main/java/freemarker/core/DebugBreak.java | 4 ++--
.../freemarker/core/DefaultToExpression.java | 4 ++--
.../java/freemarker/core/DirectiveCallPlace.java | 4 ++--
.../java/freemarker/core/DollarVariable.java | 4 ++--
src/main/java/freemarker/core/Dot.java | 4 ++--
.../java/freemarker/core/DynamicKeyName.java | 4 ++--
src/main/java/freemarker/core/ElseOfList.java | 4 ++--
src/main/java/freemarker/core/Environment.java | 4 ++--
src/main/java/freemarker/core/EscapeBlock.java | 4 ++--
src/main/java/freemarker/core/EvalUtil.java | 4 ++--
.../java/freemarker/core/ExistsExpression.java | 4 ++--
src/main/java/freemarker/core/Expression.java | 4 ++--
.../core/ExtendedDecimalFormatParser.java | 4 ++--
.../freemarker/core/FallbackInstruction.java | 4 ++--
.../java/freemarker/core/FlushInstruction.java | 4 ++--
.../java/freemarker/core/FreeMarkerTree.java | 4 ++--
.../java/freemarker/core/HTMLOutputFormat.java | 4 ++--
src/main/java/freemarker/core/HashLiteral.java | 4 ++--
.../java/freemarker/core/ICIChainMember.java | 4 ++--
.../core/ISOLikeTemplateDateFormat.java | 4 ++--
.../core/ISOLikeTemplateDateFormatFactory.java | 4 ++--
.../freemarker/core/ISOTemplateDateFormat.java | 4 ++--
.../core/ISOTemplateDateFormatFactory.java | 4 ++--
src/main/java/freemarker/core/Identifier.java | 4 ++--
src/main/java/freemarker/core/IfBlock.java | 4 ++--
src/main/java/freemarker/core/Include.java | 4 ++--
src/main/java/freemarker/core/Interpolation.java | 4 ++--
src/main/java/freemarker/core/Interpret.java | 4 ++--
.../core/InvalidFormatParametersException.java | 4 ++--
.../core/InvalidFormatStringException.java | 4 ++--
.../core/InvalidReferenceException.java | 4 ++--
src/main/java/freemarker/core/Items.java | 4 ++--
src/main/java/freemarker/core/IteratorBlock.java | 4 ++--
.../java/freemarker/core/JSONOutputFormat.java | 4 ++--
.../freemarker/core/JavaScriptOutputFormat.java | 4 ++--
.../freemarker/core/JavaTemplateDateFormat.java | 4 ++--
.../core/JavaTemplateDateFormatFactory.java | 4 ++--
.../core/JavaTemplateNumberFormat.java | 4 ++--
.../core/JavaTemplateNumberFormatFactory.java | 4 ++--
.../LegacyConstructorParserConfiguration.java | 4 ++--
src/main/java/freemarker/core/LibraryLoad.java | 4 ++--
.../java/freemarker/core/ListElseContainer.java | 4 ++--
src/main/java/freemarker/core/ListLiteral.java | 4 ++--
.../core/ListableRightUnboundedRangeModel.java | 4 ++--
src/main/java/freemarker/core/LocalContext.java | 4 ++--
.../java/freemarker/core/LocalContextStack.java | 4 ++--
src/main/java/freemarker/core/Macro.java | 4 ++--
.../java/freemarker/core/MarkupOutputFormat.java | 4 ++--
.../core/MarkupOutputFormatBoundBuiltIn.java | 4 ++--
src/main/java/freemarker/core/MessageUtil.java | 4 ++--
src/main/java/freemarker/core/MethodCall.java | 4 ++--
src/main/java/freemarker/core/MiscUtil.java | 4 ++--
src/main/java/freemarker/core/MixedContent.java | 4 ++--
.../core/NestedContentNotSupportedException.java | 4 ++--
src/main/java/freemarker/core/NewBI.java | 4 ++--
.../java/freemarker/core/NoAutoEscBlock.java | 4 ++--
src/main/java/freemarker/core/NoEscapeBlock.java | 4 ++--
.../freemarker/core/NonBooleanException.java | 4 ++--
.../java/freemarker/core/NonDateException.java | 4 ++--
.../core/NonExtendedHashException.java | 4 ++--
.../core/NonExtendedNodeException.java | 4 ++--
.../java/freemarker/core/NonHashException.java | 4 ++--
.../NonListableRightUnboundedRangeModel.java | 4 ++--
.../core/NonMarkupOutputException.java | 4 ++--
.../java/freemarker/core/NonMethodException.java | 4 ++--
.../freemarker/core/NonNamespaceException.java | 4 ++--
.../java/freemarker/core/NonNodeException.java | 4 ++--
.../freemarker/core/NonNumericalException.java | 4 ++--
.../freemarker/core/NonSequenceException.java | 4 ++--
.../core/NonSequenceOrCollectionException.java | 4 ++--
.../java/freemarker/core/NonStringException.java | 4 ++--
.../core/NonStringOrTemplateOutputException.java | 4 ++--
.../NonUserDefinedDirectiveLikeException.java | 4 ++--
src/main/java/freemarker/core/NotExpression.java | 4 ++--
src/main/java/freemarker/core/NumberLiteral.java | 4 ++--
.../java/freemarker/core/NumericalOutput.java | 4 ++--
.../core/OptInTemplateClassResolver.java | 4 ++--
src/main/java/freemarker/core/OrExpression.java | 4 ++--
src/main/java/freemarker/core/OutputFormat.java | 4 ++--
.../java/freemarker/core/OutputFormatBlock.java | 4 ++--
.../core/OutputFormatBoundBuiltIn.java | 4 ++--
src/main/java/freemarker/core/ParameterRole.java | 4 ++--
.../freemarker/core/ParentheticalExpression.java | 4 ++--
.../java/freemarker/core/ParseException.java | 4 ++--
.../freemarker/core/ParserConfiguration.java | 4 ++--
.../core/ParsingNotSupportedException.java | 4 ++--
.../freemarker/core/PlainTextOutputFormat.java | 4 ++--
.../java/freemarker/core/PropertySetting.java | 4 ++--
.../java/freemarker/core/RTFOutputFormat.java | 4 ++--
src/main/java/freemarker/core/Range.java | 4 ++--
src/main/java/freemarker/core/RangeModel.java | 4 ++--
src/main/java/freemarker/core/RecoveryBlock.java | 4 ++--
src/main/java/freemarker/core/RecurseNode.java | 4 ++--
src/main/java/freemarker/core/RegexpHelper.java | 4 ++--
.../java/freemarker/core/ReturnInstruction.java | 4 ++--
.../core/RightUnboundedRangeModel.java | 4 ++--
src/main/java/freemarker/core/Sep.java | 4 ++--
.../java/freemarker/core/SpecialBuiltIn.java | 4 ++--
src/main/java/freemarker/core/StopException.java | 4 ++--
.../java/freemarker/core/StopInstruction.java | 4 ++--
.../freemarker/core/StringArraySequence.java | 4 ++--
src/main/java/freemarker/core/StringLiteral.java | 4 ++--
src/main/java/freemarker/core/SwitchBlock.java | 4 ++--
.../freemarker/core/TemplateClassResolver.java | 4 ++--
.../core/TemplateCombinedMarkupOutputModel.java | 4 ++--
.../freemarker/core/TemplateConfiguration.java | 4 ++--
.../java/freemarker/core/TemplateDateFormat.java | 4 ++--
.../core/TemplateDateFormatFactory.java | 4 ++--
.../java/freemarker/core/TemplateElement.java | 4 ++--
.../core/TemplateElementArrayBuilder.java | 4 ++--
.../freemarker/core/TemplateElementsToVisit.java | 4 ++--
.../java/freemarker/core/TemplateFormatUtil.java | 4 ++--
.../freemarker/core/TemplateHTMLOutputModel.java | 4 ++--
.../core/TemplateMarkupOutputModel.java | 4 ++--
.../freemarker/core/TemplateNumberFormat.java | 4 ++--
.../core/TemplateNumberFormatFactory.java | 4 ++--
.../java/freemarker/core/TemplateObject.java | 4 ++--
.../freemarker/core/TemplatePostProcessor.java | 4 ++--
.../core/TemplatePostProcessorException.java | 4 ++--
.../freemarker/core/TemplateRTFOutputModel.java | 4 ++--
.../freemarker/core/TemplateValueFormat.java | 4 ++--
.../core/TemplateValueFormatException.java | 4 ++--
.../core/TemplateValueFormatFactory.java | 4 ++--
.../core/TemplateXHTMLOutputModel.java | 4 ++--
.../freemarker/core/TemplateXMLOutputModel.java | 4 ++--
src/main/java/freemarker/core/TextBlock.java | 4 ++--
...InterruptionSupportTemplatePostProcessor.java | 4 ++--
src/main/java/freemarker/core/TokenMgrError.java | 4 ++--
.../java/freemarker/core/TransformBlock.java | 4 ++--
.../java/freemarker/core/TrimInstruction.java | 4 ++--
.../core/UnaryPlusMinusExpression.java | 4 ++--
.../core/UndefinedCustomFormatException.java | 4 ++--
.../freemarker/core/UndefinedOutputFormat.java | 4 ++--
.../freemarker/core/UnexpectedTypeException.java | 4 ++--
.../core/UnformattableValueException.java | 4 ++--
src/main/java/freemarker/core/UnifiedCall.java | 4 ++--
...wnDateTypeFormattingUnsupportedException.java | 4 ++--
...knownDateTypeParsingUnsupportedException.java | 4 ++--
.../core/UnparsableValueException.java | 4 ++--
.../core/UnregisteredOutputFormatException.java | 4 ++--
src/main/java/freemarker/core/VisitNode.java | 4 ++--
.../java/freemarker/core/XHTMLOutputFormat.java | 4 ++--
.../java/freemarker/core/XMLOutputFormat.java | 4 ++--
.../freemarker/core/XSTemplateDateFormat.java | 4 ++--
.../core/XSTemplateDateFormatFactory.java | 4 ++--
.../java/freemarker/core/_ArrayEnumeration.java | 4 ++--
.../java/freemarker/core/_ArrayIterator.java | 4 ++--
src/main/java/freemarker/core/_CoreAPI.java | 4 ++--
.../java/freemarker/core/_CoreLocaleUtils.java | 4 ++--
.../java/freemarker/core/_CoreStringUtils.java | 4 ++--
src/main/java/freemarker/core/_DelayedAOrAn.java | 4 ++--
.../core/_DelayedConversionToString.java | 4 ++--
.../core/_DelayedFTLTypeDescription.java | 4 ++--
.../core/_DelayedGetCanonicalForm.java | 4 ++--
.../java/freemarker/core/_DelayedGetMessage.java | 4 ++--
.../core/_DelayedGetMessageWithoutStackTop.java | 4 ++--
.../java/freemarker/core/_DelayedJQuote.java | 4 ++--
.../freemarker/core/_DelayedJoinWithComma.java | 4 ++--
.../java/freemarker/core/_DelayedOrdinal.java | 4 ++--
.../freemarker/core/_DelayedShortClassName.java | 4 ++--
.../java/freemarker/core/_DelayedToString.java | 4 ++--
.../core/_ErrorDescriptionBuilder.java | 4 ++--
src/main/java/freemarker/core/_Java6.java | 4 ++--
src/main/java/freemarker/core/_Java6Impl.java | 4 ++--
src/main/java/freemarker/core/_JavaVersions.java | 4 ++--
.../freemarker/core/_MiscTemplateException.java | 4 ++--
..._ObjectBuilderSettingEvaluationException.java | 4 ++--
.../core/_ObjectBuilderSettingEvaluator.java | 4 ++--
.../_ParserConfigurationWithInheritedFormat.java | 4 ++--
.../core/_SettingEvaluationEnvironment.java | 4 ++--
.../java/freemarker/core/_SortedArraySet.java | 4 ++--
.../freemarker/core/_TemplateModelException.java | 4 ++--
.../java/freemarker/core/_TimeZoneBuilder.java | 4 ++--
...nexpectedTypeErrorExplainerTemplateModel.java | 4 ++--
.../core/_UnmodifiableCompositeSet.java | 4 ++--
.../java/freemarker/core/_UnmodifiableSet.java | 4 ++--
src/main/java/freemarker/core/package.html | 4 ++--
src/main/java/freemarker/debug/Breakpoint.java | 4 ++--
src/main/java/freemarker/debug/DebugModel.java | 4 ++--
.../freemarker/debug/DebuggedEnvironment.java | 4 ++--
src/main/java/freemarker/debug/Debugger.java | 4 ++--
.../java/freemarker/debug/DebuggerClient.java | 4 ++--
.../java/freemarker/debug/DebuggerListener.java | 4 ++--
.../debug/EnvironmentSuspendedEvent.java | 4 ++--
.../freemarker/debug/impl/DebuggerServer.java | 4 ++--
.../freemarker/debug/impl/DebuggerService.java | 4 ++--
.../freemarker/debug/impl/RmiDebugModelImpl.java | 4 ++--
.../debug/impl/RmiDebuggedEnvironmentImpl.java | 4 ++--
.../freemarker/debug/impl/RmiDebuggerImpl.java | 4 ++--
.../debug/impl/RmiDebuggerListenerImpl.java | 4 ++--
.../debug/impl/RmiDebuggerService.java | 4 ++--
src/main/java/freemarker/debug/package.html | 4 ++--
.../freemarker/ext/ant/FreemarkerXmlTask.java | 4 ++--
.../java/freemarker/ext/ant/JythonAntTask.java | 4 ++--
.../ext/ant/UnlinkedJythonOperations.java | 4 ++--
.../ext/ant/UnlinkedJythonOperationsImpl.java | 4 ++--
src/main/java/freemarker/ext/ant/package.html | 4 ++--
src/main/java/freemarker/ext/beans/APIModel.java | 4 ++--
.../java/freemarker/ext/beans/ArgumentTypes.java | 4 ++--
.../java/freemarker/ext/beans/ArrayModel.java | 4 ++--
.../java/freemarker/ext/beans/BeanModel.java | 4 ++--
.../freemarker/ext/beans/BeansModelCache.java | 4 ++--
.../java/freemarker/ext/beans/BeansWrapper.java | 4 ++--
.../ext/beans/BeansWrapperBuilder.java | 4 ++--
.../ext/beans/BeansWrapperConfiguration.java | 4 ++--
.../ext/beans/BeansWrapperSingletonHolder.java | 4 ++--
.../java/freemarker/ext/beans/BooleanModel.java | 4 ++--
.../ext/beans/CallableMemberDescriptor.java | 4 ++--
.../freemarker/ext/beans/CharacterOrString.java | 4 ++--
.../ext/beans/ClassBasedModelFactory.java | 4 ++--
.../ext/beans/ClassChangeNotifier.java | 4 ++--
.../freemarker/ext/beans/ClassIntrospector.java | 4 ++--
.../ext/beans/ClassIntrospectorBuilder.java | 4 ++--
.../freemarker/ext/beans/CollectionAdapter.java | 4 ++--
.../freemarker/ext/beans/CollectionModel.java | 4 ++--
.../java/freemarker/ext/beans/DateModel.java | 4 ++--
.../ext/beans/EmptyCallableMemberDescriptor.java | 4 ++--
.../ext/beans/EmptyMemberAndArguments.java | 4 ++--
.../freemarker/ext/beans/EnumerationModel.java | 4 ++--
.../java/freemarker/ext/beans/HashAdapter.java | 4 ++--
.../ext/beans/InvalidPropertyException.java | 4 ++--
.../java/freemarker/ext/beans/IteratorModel.java | 4 ++--
.../ext/beans/JRebelClassChangeNotifier.java | 4 ++--
src/main/java/freemarker/ext/beans/MapModel.java | 4 ++--
.../MaybeEmptyCallableMemberDescriptor.java | 4 ++--
.../ext/beans/MaybeEmptyMemberAndArguments.java | 4 ++--
.../freemarker/ext/beans/MemberAndArguments.java | 4 ++--
.../ext/beans/MethodAppearanceFineTuner.java | 4 ++--
.../java/freemarker/ext/beans/MethodSorter.java | 4 ++--
.../NonPrimitiveArrayBackedReadOnlyList.java | 4 ++--
.../java/freemarker/ext/beans/NumberModel.java | 4 ++--
.../ext/beans/OverloadedFixArgsMethods.java | 4 ++--
.../freemarker/ext/beans/OverloadedMethods.java | 4 ++--
.../ext/beans/OverloadedMethodsModel.java | 4 ++--
.../ext/beans/OverloadedMethodsSubset.java | 4 ++--
.../ext/beans/OverloadedNumberUtil.java | 4 ++--
.../ext/beans/OverloadedVarArgsMethods.java | 4 ++--
.../beans/PrimtiveArrayBackedReadOnlyList.java | 4 ++--
.../ReflectionCallableMemberDescriptor.java | 4 ++--
.../ext/beans/ResourceBundleModel.java | 4 ++--
.../freemarker/ext/beans/SequenceAdapter.java | 4 ++--
.../java/freemarker/ext/beans/SetAdapter.java | 4 ++--
.../freemarker/ext/beans/SimpleMapModel.java | 4 ++--
.../java/freemarker/ext/beans/SimpleMethod.java | 4 ++--
.../freemarker/ext/beans/SimpleMethodModel.java | 4 ++--
.../ext/beans/SingletonCustomizer.java | 4 ++--
.../java/freemarker/ext/beans/StaticModel.java | 4 ++--
.../java/freemarker/ext/beans/StaticModels.java | 4 ++--
.../java/freemarker/ext/beans/StringModel.java | 4 ++--
.../java/freemarker/ext/beans/TypeFlags.java | 4 ++--
.../java/freemarker/ext/beans/UnsafeMethods.java | 4 ++--
.../java/freemarker/ext/beans/_BeansAPI.java | 4 ++--
.../java/freemarker/ext/beans/_EnumModels.java | 4 ++--
.../java/freemarker/ext/beans/_MethodUtil.java | 4 ++--
src/main/java/freemarker/ext/beans/package.html | 4 ++--
src/main/java/freemarker/ext/dom/AtAtKey.java | 4 ++--
.../freemarker/ext/dom/AttributeNodeModel.java | 4 ++--
.../ext/dom/CharacterDataNodeModel.java | 4 ++--
.../java/freemarker/ext/dom/DocumentModel.java | 4 ++--
.../freemarker/ext/dom/DocumentTypeModel.java | 4 ++--
.../java/freemarker/ext/dom/DomStringUtil.java | 4 ++--
.../java/freemarker/ext/dom/ElementModel.java | 4 ++--
.../freemarker/ext/dom/JaxenXPathSupport.java | 4 ++--
.../java/freemarker/ext/dom/NodeListModel.java | 4 ++--
src/main/java/freemarker/ext/dom/NodeModel.java | 4 ++--
.../java/freemarker/ext/dom/NodeOutputter.java | 4 ++--
.../java/freemarker/ext/dom/PINodeModel.java | 4 ++--
.../ext/dom/SunInternalXalanXPathSupport.java | 4 ++--
src/main/java/freemarker/ext/dom/Transform.java | 4 ++--
.../java/freemarker/ext/dom/XPathSupport.java | 4 ++--
.../freemarker/ext/dom/XalanXPathSupport.java | 4 ++--
src/main/java/freemarker/ext/dom/_ExtDomApi.java | 4 ++--
src/main/java/freemarker/ext/dom/package.html | 4 ++--
.../java/freemarker/ext/jdom/NodeListModel.java | 4 ++--
src/main/java/freemarker/ext/jdom/package.html | 4 ++--
.../ext/jsp/CustomTagAndELFunctionCombiner.java | 4 ++--
.../java/freemarker/ext/jsp/EventForwarding.java | 4 ++--
.../ext/jsp/FreeMarkerJspApplicationContext.java | 4 ++--
.../freemarker/ext/jsp/FreeMarkerJspFactory.java | 4 ++--
.../ext/jsp/FreeMarkerJspFactory2.java | 4 ++--
.../ext/jsp/FreeMarkerJspFactory21.java | 4 ++--
.../ext/jsp/FreeMarkerPageContext.java | 4 ++--
.../java/freemarker/ext/jsp/FreemarkerTag.java | 4 ++--
.../java/freemarker/ext/jsp/JspContextModel.java | 4 ++--
.../java/freemarker/ext/jsp/JspTagModelBase.java | 4 ++--
.../freemarker/ext/jsp/JspWriterAdapter.java | 4 ++--
.../freemarker/ext/jsp/PageContextFactory.java | 4 ++--
.../ext/jsp/SimpleTagDirectiveModel.java | 4 ++--
.../freemarker/ext/jsp/TagTransformModel.java | 4 ++--
.../java/freemarker/ext/jsp/TaglibFactory.java | 4 ++--
.../freemarker/ext/jsp/TaglibMethodUtil.java | 4 ++--
.../ext/jsp/_FreeMarkerPageContext2.java | 4 ++--
.../ext/jsp/_FreeMarkerPageContext21.java | 4 ++--
src/main/java/freemarker/ext/jsp/package.html | 4 ++--
.../freemarker/ext/jython/JythonHashModel.java | 4 ++--
.../java/freemarker/ext/jython/JythonModel.java | 4 ++--
.../freemarker/ext/jython/JythonModelCache.java | 4 ++--
.../freemarker/ext/jython/JythonNumberModel.java | 4 ++--
.../ext/jython/JythonSequenceModel.java | 4 ++--
.../ext/jython/JythonVersionAdapter.java | 4 ++--
.../ext/jython/JythonVersionAdapterHolder.java | 4 ++--
.../freemarker/ext/jython/JythonWrapper.java | 4 ++--
.../ext/jython/_Jython20And21VersionAdapter.java | 4 ++--
.../ext/jython/_Jython22VersionAdapter.java | 4 ++--
.../ext/jython/_Jython25VersionAdapter.java | 4 ++--
src/main/java/freemarker/ext/jython/package.html | 4 ++--
src/main/java/freemarker/ext/package.html | 4 ++--
.../freemarker/ext/rhino/RhinoFunctionModel.java | 4 ++--
.../ext/rhino/RhinoScriptableModel.java | 4 ++--
.../java/freemarker/ext/rhino/RhinoWrapper.java | 4 ++--
src/main/java/freemarker/ext/rhino/package.html | 4 ++--
.../ext/servlet/AllHttpScopesHashModel.java | 4 ++--
.../ext/servlet/FreemarkerServlet.java | 4 ++--
.../ext/servlet/HttpRequestHashModel.java | 4 ++--
.../servlet/HttpRequestParametersHashModel.java | 4 ++--
.../ext/servlet/HttpSessionHashModel.java | 4 ++--
.../java/freemarker/ext/servlet/IncludePage.java | 4 ++--
.../freemarker/ext/servlet/InitParamParser.java | 4 ++--
.../ext/servlet/ServletContextHashModel.java | 4 ++--
.../java/freemarker/ext/servlet/package.html | 4 ++--
.../freemarker/ext/util/IdentityHashMap.java | 4 ++--
.../java/freemarker/ext/util/ModelCache.java | 4 ++--
.../java/freemarker/ext/util/ModelFactory.java | 4 ++--
.../ext/util/WrapperTemplateModel.java | 4 ++--
src/main/java/freemarker/ext/util/package.html | 4 ++--
src/main/java/freemarker/ext/xml/Namespaces.java | 4 ++--
src/main/java/freemarker/ext/xml/Navigator.java | 4 ++--
.../java/freemarker/ext/xml/NodeListModel.java | 4 ++--
.../java/freemarker/ext/xml/NodeOperator.java | 4 ++--
.../java/freemarker/ext/xml/_Dom4jNavigator.java | 4 ++--
.../java/freemarker/ext/xml/_DomNavigator.java | 4 ++--
.../freemarker/ext/xml/_JaxenNamespaces.java | 4 ++--
.../java/freemarker/ext/xml/_JdomNavigator.java | 4 ++--
src/main/java/freemarker/ext/xml/package.html | 4 ++--
.../log/CommonsLoggingLoggerFactory.java | 4 ++--
src/main/java/freemarker/log/Logger.java | 4 ++--
src/main/java/freemarker/log/LoggerFactory.java | 4 ++--
.../java/freemarker/log/SLF4JLoggerFactory.java | 4 ++--
.../freemarker/log/_AvalonLoggerFactory.java | 4 ++--
.../log/_CommonsLoggingLoggerFactory.java | 4 ++--
.../java/freemarker/log/_JULLoggerFactory.java | 4 ++--
.../java/freemarker/log/_Log4jLoggerFactory.java | 4 ++--
.../freemarker/log/_Log4jOverSLF4JTester.java | 4 ++--
.../java/freemarker/log/_NullLoggerFactory.java | 4 ++--
.../java/freemarker/log/_SLF4JLoggerFactory.java | 4 ++--
src/main/java/freemarker/log/package.html | 4 ++--
.../template/AdapterTemplateModel.java | 4 ++--
.../java/freemarker/template/Configuration.java | 4 ++--
.../freemarker/template/DefaultArrayAdapter.java | 4 ++--
.../template/DefaultIterableAdapter.java | 4 ++--
.../template/DefaultIteratorAdapter.java | 4 ++--
.../freemarker/template/DefaultListAdapter.java | 4 ++--
.../freemarker/template/DefaultMapAdapter.java | 4 ++--
.../DefaultNonListCollectionAdapter.java | 4 ++--
.../template/DefaultObjectWrapper.java | 4 ++--
.../template/DefaultObjectWrapperBuilder.java | 4 ++--
.../DefaultObjectWrapperConfiguration.java | 4 ++--
.../DefaultUnassignableIteratorAdapter.java | 4 ++--
src/main/java/freemarker/template/EmptyMap.java | 4 ++--
.../template/FalseTemplateBooleanModel.java | 4 ++--
.../template/GeneralPurposeNothing.java | 4 ++--
.../freemarker/template/LocalizedString.java | 4 ++--
.../template/MalformedTemplateNameException.java | 4 ++--
.../template/MapKeyValuePairIterator.java | 4 ++--
.../java/freemarker/template/ObjectWrapper.java | 4 ++--
.../template/ObjectWrapperAndUnwrapper.java | 4 ++--
.../template/ResourceBundleLocalizedString.java | 4 ++--
.../SerializableTemplateBooleanModel.java | 4 ++--
.../freemarker/template/SimpleCollection.java | 4 ++--
.../java/freemarker/template/SimpleDate.java | 4 ++--
.../java/freemarker/template/SimpleHash.java | 4 ++--
.../java/freemarker/template/SimpleList.java | 4 ++--
.../java/freemarker/template/SimpleNumber.java | 4 ++--
.../freemarker/template/SimpleObjectWrapper.java | 4 ++--
.../java/freemarker/template/SimpleScalar.java | 4 ++--
.../java/freemarker/template/SimpleSequence.java | 4 ++--
src/main/java/freemarker/template/Template.java | 4 ++--
.../template/TemplateBooleanModel.java | 4 ++--
.../template/TemplateCollectionModel.java | 4 ++--
.../template/TemplateCollectionModelEx.java | 4 ++--
.../freemarker/template/TemplateDateModel.java | 4 ++--
.../template/TemplateDirectiveBody.java | 4 ++--
.../template/TemplateDirectiveModel.java | 4 ++--
.../freemarker/template/TemplateException.java | 4 ++--
.../template/TemplateExceptionHandler.java | 4 ++--
.../freemarker/template/TemplateHashModel.java | 4 ++--
.../freemarker/template/TemplateHashModelEx.java | 4 ++--
.../template/TemplateHashModelEx2.java | 4 ++--
.../freemarker/template/TemplateMethodModel.java | 4 ++--
.../template/TemplateMethodModelEx.java | 4 ++--
.../java/freemarker/template/TemplateModel.java | 4 ++--
.../template/TemplateModelAdapter.java | 4 ++--
.../template/TemplateModelException.java | 4 ++--
.../template/TemplateModelIterator.java | 4 ++--
.../template/TemplateModelListSequence.java | 4 ++--
.../template/TemplateModelWithAPISupport.java | 4 ++--
.../freemarker/template/TemplateNodeModel.java | 4 ++--
.../freemarker/template/TemplateNodeModelEx.java | 4 ++--
.../template/TemplateNotFoundException.java | 4 ++--
.../freemarker/template/TemplateNumberModel.java | 4 ++--
.../freemarker/template/TemplateScalarModel.java | 4 ++--
.../template/TemplateSequenceModel.java | 4 ++--
.../template/TemplateTransformModel.java | 4 ++--
.../freemarker/template/TransformControl.java | 4 ++--
.../template/TrueTemplateBooleanModel.java | 4 ++--
src/main/java/freemarker/template/Version.java | 4 ++--
.../template/WrappingTemplateModel.java | 4 ++--
.../java/freemarker/template/_TemplateAPI.java | 4 ++--
src/main/java/freemarker/template/package.html | 4 ++--
.../template/utility/CaptureOutput.java | 4 ++--
.../freemarker/template/utility/ClassUtil.java | 4 ++--
.../template/utility/CollectionUtils.java | 4 ++--
.../template/utility/Collections12.java | 4 ++--
.../freemarker/template/utility/Constants.java | 4 ++--
.../template/utility/DOMNodeModel.java | 4 ++--
.../freemarker/template/utility/DateUtil.java | 4 ++--
.../freemarker/template/utility/DeepUnwrap.java | 4 ++--
.../freemarker/template/utility/Execute.java | 4 ++--
.../freemarker/template/utility/HtmlEscape.java | 4 ++--
.../template/utility/JythonRuntime.java | 4 ++--
.../template/utility/NormalizeNewlines.java | 4 ++--
.../template/utility/NullArgumentException.java | 4 ++--
.../freemarker/template/utility/NullWriter.java | 4 ++--
.../freemarker/template/utility/NumberUtil.java | 4 ++--
.../template/utility/ObjectConstructor.java | 4 ++--
.../template/utility/ObjectFactory.java | 4 ++--
.../utility/ObjectWrapperWithAPISupport.java | 4 ++--
.../template/utility/OptimizerUtil.java | 4 ++--
.../template/utility/RichObjectWrapper.java | 4 ++--
.../template/utility/SecurityUtilities.java | 4 ++--
.../template/utility/StandardCompress.java | 4 ++--
.../freemarker/template/utility/StringUtil.java | 4 ++--
.../freemarker/template/utility/ToCanonical.java | 4 ++--
.../utility/UndeclaredThrowableException.java | 4 ++--
.../utility/UnrecognizedTimeZoneException.java | 4 ++--
.../utility/UnsupportedNumberClassException.java | 4 ++--
.../template/utility/WriteProtectable.java | 4 ++--
.../freemarker/template/utility/XmlEscape.java | 4 ++--
.../freemarker/template/utility/package.html | 4 ++--
.../adhoc/IdentifierCharGenerator.java | 4 ++--
src/main/misc/overloadedNumberRules/README.txt | 4 ++--
src/main/misc/overloadedNumberRules/config.fmpp | 4 ++--
.../misc/overloadedNumberRules/generator.ftl | 4 ++--
.../ext/beans/unsafeMethods.properties | 4 ++--
src/main/resources/freemarker/version.properties | 4 ++--
src/manual/en_US/book.xml | 4 ++--
src/manual/en_US/docgen-help/editors-readme.txt | 4 ++--
.../figures/odg-convert-howto.txt | 4 ++--
src/manual/zh_CN/book.xml | 4 ++--
.../freemarker/cache/FileTemplateLoaderTest.java | 4 ++--
.../cache/MultiTemplateLoaderTest.java | 4 ++--
.../java/freemarker/cache/TemplateCacheTest.java | 4 ++--
.../cache/TemplateConfigurationFactoryTest.java | 4 ++--
.../freemarker/cache/TemplateNameFormatTest.java | 4 ++--
.../cache/TemplateSourceMatcherTest.java | 4 ++--
.../core/ASTBasedErrorMessagesTest.java | 4 ++--
src/test/java/freemarker/core/ASTPrinter.java | 4 ++--
src/test/java/freemarker/core/ASTTest.java | 4 ++--
.../core/AppMetaTemplateDateFormatFactory.java | 4 ++--
.../core/BaseNTemplateNumberFormatFactory.java | 4 ++--
.../java/freemarker/core/BreakPlacementTest.java | 4 ++--
src/test/java/freemarker/core/CamelCaseTest.java | 4 ++--
.../java/freemarker/core/CanonicalFormTest.java | 4 ++--
.../freemarker/core/CoercionToTextualTest.java | 4 ++--
.../core/CombinedMarkupOutputFormatTest.java | 4 ++--
.../java/freemarker/core/ConfigurableTest.java | 4 ++--
.../freemarker/core/CoreLocaleUtilsTest.java | 4 ++--
.../freemarker/core/CustomHTMLOutputFormat.java | 4 ++--
.../freemarker/core/CustomTemplateHTMLModel.java | 4 ++--
.../java/freemarker/core/DateFormatTest.java | 4 ++--
.../freemarker/core/DirectiveCallPlaceTest.java | 4 ++--
.../java/freemarker/core/DummyOutputFormat.java | 4 ++--
.../freemarker/core/EncodingOverrideTest.java | 4 ++--
.../core/EnvironmentCustomStateTest.java | 4 ++--
.../core/EnvironmentGetTemplateVariantsTest.java | 4 ++--
.../EpochMillisDivTemplateDateFormatFactory.java | 4 ++--
.../EpochMillisTemplateDateFormatFactory.java | 4 ++--
.../core/ExtendedDecimalFormatTest.java | 4 ++--
.../core/HTMLISOTemplateDateFormatFactory.java | 4 ++--
.../freemarker/core/HTMLOutputFormatTest.java | 4 ++--
.../java/freemarker/core/HeaderParsingTest.java | 4 ++--
.../core/HexTemplateNumberFormatFactory.java | 4 ++--
.../IncludeAndImportConfigurableLayersTest.java | 4 ++--
.../freemarker/core/IncludeAndImportTest.java | 4 ++--
.../core/InterpretAndEvalTemplateNameTest.java | 4 ++--
.../core/InterpretSettingInheritanceTest.java | 4 ++--
.../java/freemarker/core/IteratorIssuesTest.java | 4 ++--
.../core/LegacyFMParserConstructorsTest.java | 4 ++--
.../java/freemarker/core/ListErrorsTest.java | 4 ++--
...cAndTZSensitiveTemplateDateFormatFactory.java | 4 ++--
...caleSensitiveTemplateNumberFormatFactory.java | 4 ++--
.../freemarker/core/MiscErrorMessagesTest.java | 4 ++--
.../java/freemarker/core/NumberFormatTest.java | 4 ++--
.../core/ObjectBuilderSettingsTest.java | 4 ++--
.../core/OptInTemplateClassResolverTest.java | 4 ++--
.../java/freemarker/core/OutputFormatTest.java | 4 ++--
.../ParseTimeParameterBIErrorMessagesTest.java | 4 ++--
.../core/ParsingErrorMessagesTest.java | 4 ++--
.../core/PrintfGTemplateNumberFormatFactory.java | 4 ++--
.../freemarker/core/RTFOutputFormatTest.java | 4 ++--
.../java/freemarker/core/SQLTimeZoneTest.java | 4 ++--
.../core/SeldomEscapedOutputFormat.java | 4 ++--
.../freemarker/core/SettingDirectiveTest.java | 4 ++--
.../freemarker/core/SpecialVariableTest.java | 4 ++--
.../core/StringLiteralInterpolationTest.java | 4 ++--
src/test/java/freemarker/core/TabSizeTest.java | 4 ++--
.../freemarker/core/TagSyntaxVariationsTest.java | 4 ++--
.../freemarker/core/TemplatGetEncodingTest.java | 4 ++--
.../core/TemplateConfigurationTest.java | 4 ++--
...mplateConfigurationWithTemplateCacheTest.java | 4 ++--
.../core/TemplateDummyOutputModel.java | 4 ++--
.../freemarker/core/TemplateLevelSettings.java | 4 ++--
.../core/TemplateNameSpecialVariablesTest.java | 4 ++--
.../core/TemplateSeldomEscapedOutputModel.java | 4 ++--
.../core/TheadInterruptingSupportTest.java | 4 ++--
.../freemarker/core/TypeErrorMessagesTest.java | 4 ++--
.../freemarker/core/UnclosedCommentTest.java | 4 ++--
.../freemarker/core/WhitespaceStrippingTest.java | 4 ++--
.../freemarker/core/XHTMLOutputFormatTest.java | 4 ++--
.../freemarker/core/XMLOutputFormatTest.java | 4 ++--
.../core/subpkg/PackageVisibleAll.java | 4 ++--
.../subpkg/PackageVisibleAllWithBuilder.java | 4 ++--
.../PackageVisibleAllWithBuilderBuilder.java | 4 ++--
.../PackageVisibleWithPublicConstructor.java | 4 ++--
.../java/freemarker/core/subpkg/PublicAll.java | 4 ++--
.../core/subpkg/PublicWithMixedConstructors.java | 4 ++--
.../PublicWithPackageVisibleConstructor.java | 4 ++--
.../beans/AbstractParallelIntrospectionTest.java | 4 ++--
.../ext/beans/AlphabeticalMethodSorter.java | 4 ++--
.../ext/beans/BeansAPINewInstanceTest.java | 4 ++--
.../freemarker/ext/beans/BeansWrapperBasics.java | 4 ++--
.../ext/beans/BeansWrapperCachesTest.java | 4 ++--
.../ext/beans/BeansWrapperDesc2003020.java | 4 ++--
.../ext/beans/BeansWrapperDesc2003021.java | 4 ++--
.../ext/beans/BeansWrapperInc2003020.java | 4 ++--
.../ext/beans/BeansWrapperInc2003021.java | 4 ++--
.../ext/beans/BeansWrapperMiscTest.java | 4 ++--
.../ext/beans/BeansWrapperReadOnlyTest.java | 4 ++--
.../ext/beans/BeansWrapperSingletonsTest.java | 4 ++--
.../beans/BeansWrapperWithShortedMethods.java | 4 ++--
.../CommonSupertypeForUnwrappingHintTest.java | 4 ++--
.../beans/DefaultObjectWrapperDesc2003020.java | 4 ++--
.../beans/DefaultObjectWrapperDesc2003021.java | 4 ++--
.../beans/DefaultObjectWrapperDesc2003022.java | 4 ++--
.../beans/DefaultObjectWrapperInc2003020.java | 4 ++--
.../beans/DefaultObjectWrapperInc2003021.java | 4 ++--
.../beans/DefaultObjectWrapperInc2003022.java | 4 ++--
.../DefaultObjectWrapperWithSortedMethods.java | 4 ++--
.../freemarker/ext/beans/EnumModelsTest.java | 4 ++--
.../freemarker/ext/beans/ErrorMessagesTest.java | 4 ++--
.../ext/beans/FineTuneMethodAppearanceTest.java | 4 ++--
.../GetlessMethodsAsPropertyGettersRule.java | 4 ++--
.../freemarker/ext/beans/IsApplicableTest.java | 4 ++--
.../beans/IsMoreSpecificParameterTypeTest.java | 4 ++--
.../ext/beans/Java7MembersOnlyBeansWrapper.java | 4 ++--
.../ext/beans/ManyObjectsOfDifferentClasses.java | 4 ++--
.../ext/beans/ManyStaticsOfDifferentClasses.java | 4 ++--
.../ext/beans/MiscNumericalOperationsTest.java | 4 ++--
.../freemarker/ext/beans/ModelCacheTest.java | 4 ++--
.../ext/beans/OverloadedNumberUtilTest.java | 4 ++--
.../beans/ParameterListPreferabilityTest.java | 4 ++--
.../beans/PrallelObjectIntrospectionTest.java | 4 ++--
.../beans/PrallelStaticIntrospectionTest.java | 4 ++--
.../freemarker/ext/beans/RationalNumber.java | 4 ++--
.../freemarker/ext/beans/StaticModelsTest.java | 4 ++--
.../java/freemarker/ext/beans/TypeFlagsTest.java | 4 ++--
.../ext/dom/DOMConvenienceStaticsTest.java | 4 ++--
.../java/freemarker/ext/dom/DOMSiblingTest.java | 4 ++--
src/test/java/freemarker/ext/dom/DOMTest.java | 4 ++--
.../ext/jsp/JspTestFreemarkerServlet.java | 4 ++--
...TestFreemarkerServletWithDefaultOverride.java | 4 ++--
.../ext/jsp/RealServletContainertTest.java | 4 ++--
.../java/freemarker/ext/jsp/TLDParsingTest.java | 4 ++--
.../freemarker/ext/jsp/TaglibMethodUtilTest.java | 4 ++--
.../jsp/taglibmembers/AttributeAccessorTag.java | 4 ++--
.../ext/jsp/taglibmembers/AttributeInfoTag.java | 4 ++--
.../ext/jsp/taglibmembers/EnclosingClass.java | 4 ++--
.../ext/jsp/taglibmembers/GetAndSetTag.java | 4 ++--
.../ext/jsp/taglibmembers/TestFunctions.java | 4 ++--
.../ext/jsp/taglibmembers/TestSimpleTag.java | 4 ++--
.../ext/jsp/taglibmembers/TestSimpleTag2.java | 4 ++--
.../ext/jsp/taglibmembers/TestSimpleTag3.java | 4 ++--
.../ext/jsp/taglibmembers/TestTag.java | 4 ++--
.../ext/jsp/taglibmembers/TestTag2.java | 4 ++--
.../ext/jsp/taglibmembers/TestTag3.java | 4 ++--
.../config/WebappLocalFreemarkerServlet.java | 4 ++--
.../ext/servlet/FreemarkerServletTest.java | 4 ++--
.../ext/servlet/InitParamParserTest.java | 4 ++--
.../freemarker/manual/AutoEscapingExample.java | 4 ++--
.../manual/ConfigureOutputFormatExamples.java | 4 ++--
.../freemarker/manual/CustomFormatsExample.java | 4 ++--
.../java/freemarker/manual/ExamplesTest.java | 4 ++--
.../freemarker/manual/GettingStartedExample.java | 4 ++--
src/test/java/freemarker/manual/Product.java | 4 ++--
.../manual/TemplateConfigurationExamples.java | 4 ++--
.../UnitAwareTemplateNumberFormatFactory.java | 4 ++--
.../manual/UnitAwareTemplateNumberModel.java | 4 ++--
.../template/ActualNamingConvetionTest.java | 4 ++--
.../freemarker/template/ActualTagSyntaxTest.java | 4 ++--
.../freemarker/template/ConfigurationTest.java | 4 ++--
.../freemarker/template/CustomAttributeTest.java | 4 ++--
.../template/DefaultObjectWrapperTest.java | 4 ++--
.../java/freemarker/template/ExceptionTest.java | 4 ++--
.../java/freemarker/template/GetSourceTest.java | 4 ++--
.../template/IncudeFromNamelessTest.java | 4 ++--
.../template/JavaCCExceptionAsEOFFixTest.java | 4 ++--
.../template/MistakenlyPublicImportAPIsTest.java | 4 ++--
.../template/MistakenlyPublicMacroAPIsTest.java | 4 ++--
.../freemarker/template/MockServletContext.java | 4 ++--
.../template/NullConfigurationTest.java | 4 ++--
.../template/SimpleObjetWrapperTest.java | 4 ++--
.../template/StaticObjectWrappersTest.java | 4 ++--
.../template/TemplateConstructorsTest.java | 4 ++--
.../template/TemplateLanguageVersionTest.java | 4 ++--
.../template/TemplateLookupStrategyTest.java | 4 ++--
.../template/TemplateNotFoundMessageTest.java | 4 ++--
.../java/freemarker/template/VersionTest.java | 4 ++--
.../template/utility/DateUtilTest.java | 4 ++--
.../template/utility/NumberUtilTest.java | 4 ++--
.../template/utility/StringUtilTest.java | 4 ++--
.../CopyrightCommentRemoverTemplateLoader.java | 4 ++--
.../freemarker/test/MonitoredTemplateLoader.java | 4 ++--
.../java/freemarker/test/ResourcesExtractor.java | 4 ++--
src/test/java/freemarker/test/TemplateTest.java | 4 ++--
src/test/java/freemarker/test/TreeView.java | 4 ++--
.../java/freemarker/test/hamcerst/Matchers.java | 4 ++--
.../hamcerst/StringContainsIgnoringCase.java | 4 ++--
src/test/java/freemarker/test/package.html | 4 ++--
.../test/servlet/DefaultModel2TesterAction.java | 4 ++--
.../freemarker/test/servlet/Model2Action.java | 4 ++--
.../test/servlet/Model2TesterServlet.java | 4 ++--
.../freemarker/test/servlet/WebAppTestCase.java | 4 ++--
src/test/java/freemarker/test/servlet/web.xml | 4 ++--
.../test/templatesuite/TemplateTestCase.java | 4 ++--
.../test/templatesuite/TemplateTestSuite.java | 4 ++--
.../templatesuite/models/AllTemplateModels.java | 4 ++--
.../test/templatesuite/models/BeanTestClass.java | 4 ++--
.../templatesuite/models/BeanTestInterface.java | 4 ++--
.../templatesuite/models/BeanTestSuperclass.java | 4 ++--
.../models/BooleanAndScalarModel.java | 4 ++--
.../models/BooleanAndStringTemplateModel.java | 4 ++--
.../test/templatesuite/models/BooleanHash1.java | 4 ++--
.../test/templatesuite/models/BooleanHash2.java | 4 ++--
.../test/templatesuite/models/BooleanList1.java | 4 ++--
.../test/templatesuite/models/BooleanList2.java | 4 ++--
.../models/BooleanVsStringMethods.java | 4 ++--
.../test/templatesuite/models/EnumTestClass.java | 4 ++--
.../templatesuite/models/ExceptionModel.java | 4 ++--
.../templatesuite/models/HashAndScalarModel.java | 4 ++--
.../templatesuite/models/JavaObjectInfo.java | 4 ++--
.../test/templatesuite/models/LegacyList.java | 4 ++--
.../test/templatesuite/models/Listables.java | 4 ++--
.../test/templatesuite/models/MultiModel1.java | 4 ++--
.../test/templatesuite/models/MultiModel2.java | 4 ++--
.../test/templatesuite/models/MultiModel3.java | 4 ++--
.../test/templatesuite/models/MultiModel4.java | 4 ++--
.../test/templatesuite/models/MultiModel5.java | 4 ++--
.../test/templatesuite/models/NewTestModel.java | 4 ++--
.../test/templatesuite/models/NewTestModel2.java | 4 ++--
.../models/NumberAndStringModel.java | 4 ++--
.../models/OverloadedConstructor.java | 4 ++--
.../templatesuite/models/OverloadedMethods.java | 4 ++--
.../templatesuite/models/OverloadedMethods2.java | 4 ++--
.../templatesuite/models/SimpleTestMethod.java | 4 ++--
.../models/TransformHashWrapper.java | 4 ++--
.../models/TransformMethodWrapper1.java | 4 ++--
.../models/TransformMethodWrapper2.java | 4 ++--
.../templatesuite/models/TransformModel1.java | 4 ++--
.../templatesuite/models/VarArgTestModel.java | 4 ++--
.../freemarker/test/templatesuite/package.html | 4 ++--
.../freemarker/test/utility/AssertDirective.java | 4 ++--
.../test/utility/AssertEqualsDirective.java | 4 ++--
.../test/utility/AssertFailsDirective.java | 4 ++--
.../AssertationFailedInTemplateException.java | 4 ++--
.../test/utility/BadParameterTypeException.java | 4 ++--
.../freemarker/test/utility/FileTestCase.java | 4 ++--
.../MissingRequiredParameterException.java | 4 ++--
.../test/utility/NoOutputDirective.java | 4 ++--
.../test/utility/ParameterException.java | 4 ++--
.../java/freemarker/test/utility/TestUtil.java | 4 ++--
.../utility/UnsupportedParameterException.java | 4 ++--
src/test/resources/META-INF/malformed.tld | 4 ++--
.../tldDiscovery MetaInfTldSources-1.tld | 4 ++--
src/test/resources/freemarker/cache/test.ftl | 4 ++--
src/test/resources/freemarker/core/ast-1.ast | 4 ++--
src/test/resources/freemarker/core/ast-1.ftl | 4 ++--
.../freemarker/core/ast-assignments.ast | 4 ++--
.../freemarker/core/ast-assignments.ftl | 4 ++--
.../resources/freemarker/core/ast-builtins.ast | 4 ++--
.../resources/freemarker/core/ast-builtins.ftl | 4 ++--
.../resources/freemarker/core/ast-locations.ast | 4 ++--
.../resources/freemarker/core/ast-locations.ftl | 4 ++--
.../core/ast-mixedcontentsimplifications.ast | 4 ++--
.../core/ast-mixedcontentsimplifications.ftl | 4 ++--
.../core/ast-multipleignoredchildren.ast | 4 ++--
.../core/ast-multipleignoredchildren.ftl | 4 ++--
.../core/ast-nestedignoredchildren.ast | 4 ++--
.../core/ast-nestedignoredchildren.ftl | 4 ++--
src/test/resources/freemarker/core/ast-range.ast | 4 ++--
src/test/resources/freemarker/core/ast-range.ftl | 4 ++--
.../freemarker/core/ast-strlitinterpolation.ast | 4 ++--
.../freemarker/core/ast-strlitinterpolation.ftl | 4 ++--
.../freemarker/core/ast-whitespacestripping.ast | 4 ++--
.../freemarker/core/ast-whitespacestripping.ftl | 4 ++--
.../freemarker/core/cano-assignments.ftl | 4 ++--
.../freemarker/core/cano-assignments.ftl.out | 4 ++--
.../resources/freemarker/core/cano-builtins.ftl | 4 ++--
.../freemarker/core/cano-builtins.ftl.out | 4 ++--
.../freemarker/core/cano-identifier-escaping.ftl | 4 ++--
.../core/cano-identifier-escaping.ftl.out | 4 ++--
.../resources/freemarker/core/cano-macros.ftl | 4 ++--
.../freemarker/core/cano-macros.ftl.out | 4 ++--
.../freemarker/core/cano-strlitinterpolation.ftl | 4 ++--
.../core/cano-strlitinterpolation.ftl.out | 4 ++--
.../core/encodingOverride-ISO-8859-1.ftl | 4 ++--
.../freemarker/core/encodingOverride-UTF-8.ftl | 4 ++--
.../freemarker/ext/dom/DOMSiblingTest.xml | 4 ++--
.../freemarker/ext/jsp/TLDParsingTest.tld | 4 ++--
.../ext/jsp/templates/classpath-test.ftl | 4 ++--
.../ext/jsp/tldDiscovery-ClassPathTlds-1.tld | 4 ++--
.../ext/jsp/tldDiscovery-ClassPathTlds-2.tld | 4 ++--
.../ext/jsp/webapps/basic/CONTENTS.txt | 4 ++--
.../basic/WEB-INF/el-function-tag-name-clash.tld | 4 ++--
.../jsp/webapps/basic/WEB-INF/el-functions.tld | 4 ++--
.../basic/WEB-INF/expected/attributes-2.3.0.txt | 4 ++--
.../expected/attributes-2.3.22-future.txt | 4 ++--
.../basic/WEB-INF/expected/attributes.txt | 4 ++--
.../basic/WEB-INF/expected/customTags1.txt | 4 ++--
.../ext/jsp/webapps/basic/WEB-INF/test.tld | 4 ++--
.../ext/jsp/webapps/basic/WEB-INF/web.xml | 4 ++--
.../ext/jsp/webapps/basic/attributes.ftl | 4 ++--
.../ext/jsp/webapps/basic/customELFunctions1.ftl | 4 ++--
.../ext/jsp/webapps/basic/customELFunctions1.jsp | 4 ++--
.../ext/jsp/webapps/basic/customTags1.ftl | 4 ++--
.../webapps/basic/elFunctionsTagNameClash.ftl | 4 ++--
.../webapps/basic/elFunctionsTagNameClash.jsp | 4 ++--
.../jsp/webapps/basic/trivial-jstl-@Ignore.ftl | 4 ++--
.../freemarker/ext/jsp/webapps/basic/trivial.ftl | 4 ++--
.../freemarker/ext/jsp/webapps/basic/trivial.jsp | 4 ++--
.../ext/jsp/webapps/config/CONTENTS.txt | 4 ++--
.../webapps/config/WEB-INF/classes/sub/test.ftl | 4 ++--
.../jsp/webapps/config/WEB-INF/classes/test.ftl | 4 ++--
.../WEB-INF/lib/templates.jar/sub/test2.ftl | 4 ++--
.../webapps/config/WEB-INF/templates/test.ftl | 4 ++--
.../ext/jsp/webapps/config/WEB-INF/web.xml | 4 ++--
.../freemarker/ext/jsp/webapps/config/test.ftl | 4 ++--
.../ext/jsp/webapps/errors/CONTENTS.txt | 4 ++--
.../ext/jsp/webapps/errors/WEB-INF/web.xml | 4 ++--
.../ext/jsp/webapps/errors/failing-parsetime.jsp | 4 ++--
.../ext/jsp/webapps/errors/failing-runtime.ftl | 4 ++--
.../ext/jsp/webapps/errors/failing-runtime.jsp | 4 ++--
.../ext/jsp/webapps/errors/not-failing.ftl | 4 ++--
.../ext/jsp/webapps/multipleLoaders/CONTENTS.txt | 4 ++--
.../multipleLoaders/WEB-INF/templates/test.ftl | 4 ++--
.../jsp/webapps/multipleLoaders/WEB-INF/web.xml | 4 ++--
.../ext/jsp/webapps/tldDiscovery/CONTENTS.txt | 4 ++--
.../WEB-INF/expected/subdir/test-rel.txt | 4 ++--
.../WEB-INF/expected/test-noClasspath.txt | 4 ++--
.../tldDiscovery/WEB-INF/expected/test1.txt | 4 ++--
.../webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld | 4 ++--
.../webapps/tldDiscovery/WEB-INF/fmtesttag4.tld | 4 ++--
.../lib/taglib-foo.jar/META-INF/foo bar.tld | 4 ++--
.../WEB-INF/subdir-with-tld/fmtesttag3.tld | 4 ++--
.../WEB-INF/taglib 2.jar/META-INF/taglib.tld | 4 ++--
.../ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml | 4 ++--
.../tldDiscovery/not-auto-scanned/fmtesttag.tld | 4 ++--
.../jsp/webapps/tldDiscovery/subdir/test-rel.ftl | 4 ++--
.../webapps/tldDiscovery/test-noClasspath.ftl | 4 ++--
.../ext/jsp/webapps/tldDiscovery/test1.ftl | 4 ++--
.../manual/AutoEscapingExample-capture.ftlh | 4 ++--
.../manual/AutoEscapingExample-capture.ftlh.out | 4 ++--
.../manual/AutoEscapingExample-convert.ftlh | 4 ++--
.../manual/AutoEscapingExample-convert.ftlh.out | 4 ++--
.../manual/AutoEscapingExample-convert2.ftl | 4 ++--
.../manual/AutoEscapingExample-convert2.ftl.out | 4 ++--
.../manual/AutoEscapingExample-infoBox.ftlh | 4 ++--
.../manual/AutoEscapingExample-infoBox.ftlh.out | 4 ++--
.../manual/AutoEscapingExample-markup.ftlh | 4 ++--
.../manual/AutoEscapingExample-markup.ftlh.out | 4 ++--
.../manual/AutoEscapingExample-stringConcat.ftlh | 4 ++--
.../AutoEscapingExample-stringConcat.ftlh.out | 4 ++--
.../AutoEscapingExample-stringLiteral.ftlh | 4 ++--
.../AutoEscapingExample-stringLiteral.ftlh.out | 4 ++--
.../AutoEscapingExample-stringLiteral2.ftlh | 4 ++--
.../AutoEscapingExample-stringLiteral2.ftlh.out | 4 ++--
.../ConfigureOutputFormatExamples1.properties | 4 ++--
.../ConfigureOutputFormatExamples2.properties | 4 ++--
.../manual/CustomFormatsExample-alias1.ftlh | 4 ++--
.../manual/CustomFormatsExample-alias1.ftlh.out | 4 ++--
.../manual/CustomFormatsExample-alias2.ftlh | 4 ++--
.../manual/CustomFormatsExample-alias2.ftlh.out | 4 ++--
.../manual/CustomFormatsExample-modelAware.ftlh | 4 ++--
.../CustomFormatsExample-modelAware.ftlh.out | 4 ++--
.../TemplateConfigurationExamples1.properties | 4 ++--
.../TemplateConfigurationExamples2.properties | 4 ++--
.../TemplateConfigurationExamples3.properties | 4 ++--
src/test/resources/freemarker/manual/test.ftlh | 4 ++--
.../template/SimpleObjectWrapperTest.java | 4 ++--
.../resources/freemarker/template/toCache1.ftl | 4 ++--
.../resources/freemarker/template/toCache2.ftl | 4 ++--
.../test/templatesuite/expected/arithmetic.txt | 4 ++--
.../test/templatesuite/expected/bean-maps.txt | 4 ++--
.../test/templatesuite/expected/beans.txt | 4 ++--
.../expected/boolean-formatting.txt | 4 ++--
.../test/templatesuite/expected/boolean.txt | 4 ++--
.../templatesuite/expected/charset-in-header.txt | 4 ++--
.../expected/classic-compatible.txt | 4 ++--
.../test/templatesuite/expected/comment.txt | 4 ++--
.../test/templatesuite/expected/comparisons.txt | 4 ++--
.../test/templatesuite/expected/compress.txt | 4 ++--
.../templatesuite/expected/dateformat-java.txt | 4 ++--
.../templatesuite/expected/default-xmlns.txt | 4 ++--
.../test/templatesuite/expected/default.txt | 4 ++--
.../expected/encoding-builtins-ici-2.3.20.txt | 4 ++--
.../templatesuite/expected/encoding-builtins.txt | 4 ++--
.../test/templatesuite/expected/escapes.txt | 4 ++--
.../test/templatesuite/expected/exception.txt | 4 ++--
.../test/templatesuite/expected/exception2.txt | 4 ++--
.../test/templatesuite/expected/exception3.txt | 4 ++--
.../test/templatesuite/expected/exthash.txt | 4 ++--
.../test/templatesuite/expected/hashconcat.txt | 4 ++--
.../test/templatesuite/expected/hashliteral.txt | 4 ++--
.../test/templatesuite/expected/helloworld.txt | 4 ++--
.../expected/identifier-escaping.txt | 4 ++--
.../expected/identifier-non-ascii.txt | 4 ++--
.../test/templatesuite/expected/if.txt | 4 ++--
.../test/templatesuite/expected/import.txt | 4 ++--
.../test/templatesuite/expected/include.txt | 4 ++--
.../test/templatesuite/expected/include2.txt | 4 ++--
.../test/templatesuite/expected/interpret.txt | 4 ++--
.../test/templatesuite/expected/iterators.txt | 4 ++--
.../templatesuite/expected/lastcharacter.txt | 4 ++--
.../test/templatesuite/expected/list-bis.txt | 4 ++--
.../test/templatesuite/expected/list.txt | 4 ++--
.../test/templatesuite/expected/list2.txt | 4 ++--
.../test/templatesuite/expected/list3.txt | 4 ++--
.../test/templatesuite/expected/listhash.txt | 4 ++--
.../expected/listhashliteral-ici-2.3.20.txt | 4 ++--
.../expected/listhashliteral-ici-2.3.21.txt | 4 ++--
.../test/templatesuite/expected/listliteral.txt | 4 ++--
.../test/templatesuite/expected/localization.txt | 4 ++--
.../test/templatesuite/expected/logging.txt | 4 ++--
.../test/templatesuite/expected/loopvariable.txt | 4 ++--
.../templatesuite/expected/macros-return.txt | 4 ++--
.../test/templatesuite/expected/macros.txt | 4 ++--
.../test/templatesuite/expected/macros2.txt | 4 ++--
.../test/templatesuite/expected/multimodels.txt | 4 ++--
.../test/templatesuite/expected/nested.txt | 4 ++--
.../templatesuite/expected/new-allowsnothing.txt | 4 ++--
.../expected/new-defaultresolver.txt | 4 ++--
.../test/templatesuite/expected/new-optin.txt | 4 ++--
.../test/templatesuite/expected/new-safer.txt | 4 ++--
.../templatesuite/expected/new-unrestricted.txt | 4 ++--
.../test/templatesuite/expected/newlines1.txt | 4 ++--
.../test/templatesuite/expected/newlines2.txt | 4 ++--
.../templatesuite/expected/non-strict-syntax.txt | 4 ++--
.../test/templatesuite/expected/noparse.txt | 4 ++--
.../templatesuite/expected/number-format.txt | 4 ++--
.../templatesuite/expected/number-literal.txt | 4 ++--
.../templatesuite/expected/number-to-date.txt | 4 ++--
.../templatesuite/expected/numerical-cast.txt | 4 ++--
.../templatesuite/expected/output-encoding1.txt | 4 ++--
.../templatesuite/expected/output-encoding2.txt | Bin 1976 -> 1972 bytes
.../templatesuite/expected/output-encoding3.txt | 4 ++--
.../test/templatesuite/expected/precedence.txt | 4 ++--
.../test/templatesuite/expected/recover.txt | 4 ++--
.../test/templatesuite/expected/root.txt | 4 ++--
.../templatesuite/expected/sequence-builtins.txt | 4 ++--
.../test/templatesuite/expected/specialvars.txt | 4 ++--
.../templatesuite/expected/strictinheader.txt | 4 ++--
.../expected/string-builtins-regexps-matches.txt | 4 ++--
.../expected/string-builtins-regexps.txt | 4 ++--
.../templatesuite/expected/string-builtins1.txt | 4 ++--
.../templatesuite/expected/string-builtins2.txt | 4 ++--
.../templatesuite/expected/stringbimethods.txt | 4 ++--
.../templatesuite/expected/stringliteral.txt | Bin 1552 -> 1550 bytes
.../test/templatesuite/expected/switch.txt | 4 ++--
.../test/templatesuite/expected/transforms.txt | 4 ++--
.../expected/type-builtins-ici-2.3.21.txt | 4 ++--
.../expected/type-builtins-ici-2.3.24.txt | 4 ++--
.../templatesuite/expected/type-builtins.txt | 4 ++--
.../test/templatesuite/expected/var-layers.txt | 4 ++--
.../test/templatesuite/expected/varargs.txt | 4 ++--
.../test/templatesuite/expected/variables.txt | 4 ++--
.../templatesuite/expected/whitespace-trim.txt | 4 ++--
.../templatesuite/expected/wstrip-in-header.txt | 4 ++--
.../test/templatesuite/expected/wstripping.txt | 4 ++--
.../test/templatesuite/expected/xml-fragment.txt | 4 ++--
.../expected/xml-ns_prefix-scope.txt | 4 ++--
.../test/templatesuite/expected/xml.txt | 4 ++--
.../test/templatesuite/expected/xmlns1.txt | 4 ++--
.../test/templatesuite/expected/xmlns3.txt | 4 ++--
.../test/templatesuite/expected/xmlns4.txt | 4 ++--
.../test/templatesuite/expected/xmlns5.txt | 4 ++--
.../models/BeansTestResources.properties | 4 ++--
.../test/templatesuite/models/defaultxmlns1.xml | 4 ++--
.../templatesuite/models/xml-ns_prefix-scope.xml | 4 ++--
.../freemarker/test/templatesuite/models/xml.xml | 4 ++--
.../test/templatesuite/models/xmlfragment.xml | 4 ++--
.../test/templatesuite/models/xmlns.xml | 4 ++--
.../test/templatesuite/models/xmlns2.xml | 4 ++--
.../test/templatesuite/models/xmlns3.xml | 4 ++--
.../templatesuite/templates/api-builtins.ftl | 4 ++--
.../test/templatesuite/templates/arithmetic.ftl | 4 ++--
.../test/templatesuite/templates/assignments.ftl | 4 ++--
.../test/templatesuite/templates/bean-maps.ftl | 4 ++--
.../test/templatesuite/templates/beans.ftl | 4 ++--
.../templates/boolean-formatting.ftl | 4 ++--
.../test/templatesuite/templates/boolean.ftl | 4 ++--
.../templates/charset-in-header.ftl | 4 ++--
.../templates/charset-in-header_inc1.ftl | 4 ++--
.../templates/charset-in-header_inc2.ftl | 4 ++--
.../templates/classic-compatible-mode2.ftl | 4 ++--
.../templates/classic-compatible.ftl | 4 ++--
.../test/templatesuite/templates/comment.ftl | 4 ++--
.../test/templatesuite/templates/comparisons.ftl | 4 ++--
.../test/templatesuite/templates/compress.ftl | 4 ++--
.../templates/date-type-builtins.ftl | 4 ++--
.../templates/dateformat-iso-bi-common.ftl | 4 ++--
.../templates/dateformat-iso-bi-ici-2.3.21.ftl | 4 ++--
.../templates/dateformat-iso-bi.ftl | 4 ++--
.../templates/dateformat-iso-like.ftl | 4 ++--
.../templatesuite/templates/dateformat-java.ftl | 4 ++--
.../test/templatesuite/templates/dateparsing.ftl | 4 ++--
.../templatesuite/templates/default-xmlns.ftl | 4 ++--
.../test/templatesuite/templates/default.ftl | 4 ++--
.../templates/encoding-builtins.ftl | 4 ++--
.../test/templatesuite/templates/escapes.ftl | 4 ++--
.../test/templatesuite/templates/exception.ftl | 4 ++--
.../test/templatesuite/templates/exception2.ftl | 4 ++--
.../test/templatesuite/templates/exception3.ftl | 4 ++--
.../templates/existence-operators.ftl | 4 ++--
.../test/templatesuite/templates/exthash.ftl | 4 ++--
.../test/templatesuite/templates/hashconcat.ftl | 4 ++--
.../test/templatesuite/templates/hashliteral.ftl | 4 ++--
.../test/templatesuite/templates/helloworld.ftl | 4 ++--
.../templates/identifier-escaping.ftl | 4 ++--
.../templates/identifier-non-ascii.ftl | 4 ++--
.../test/templatesuite/templates/if.ftl | 4 ++--
.../test/templatesuite/templates/import.ftl | 4 ++--
.../test/templatesuite/templates/import_lib.ftl | 4 ++--
.../test/templatesuite/templates/include.ftl | 4 ++--
.../templates/include2-included-encoding.ftl | 4 ++--
.../templates/include2-included.ftl | 4 ++--
.../test/templatesuite/templates/include2.ftl | 4 ++--
.../test/templatesuite/templates/included.ftl | 4 ++--
.../test/templatesuite/templates/interpret.ftl | 4 ++--
.../test/templatesuite/templates/iterators.ftl | 4 ++--
.../templatesuite/templates/lastcharacter.ftl | 4 ++--
.../test/templatesuite/templates/list-bis.ftl | 4 ++--
.../test/templatesuite/templates/list.ftl | 4 ++--
.../test/templatesuite/templates/list2.ftl | 4 ++--
.../test/templatesuite/templates/list3.ftl | 4 ++--
.../test/templatesuite/templates/listhash.ftl | 4 ++--
.../templatesuite/templates/listhashliteral.ftl | 4 ++--
.../test/templatesuite/templates/listliteral.ftl | 4 ++--
.../templatesuite/templates/localization.ftl | 4 ++--
.../templatesuite/templates/localization_en.ftl | 4 ++--
.../templates/localization_en_AU.ftl | 4 ++--
.../test/templatesuite/templates/logging.ftl | 4 ++--
.../templatesuite/templates/loopvariable.ftl | 4 ++--
.../templatesuite/templates/macros-return.ftl | 4 ++--
.../test/templatesuite/templates/macros.ftl | 4 ++--
.../test/templatesuite/templates/macros2.ftl | 4 ++--
.../test/templatesuite/templates/multimodels.ftl | 4 ++--
.../test/templatesuite/templates/nested.ftl | 4 ++--
.../templatesuite/templates/nestedinclude.ftl | 4 ++--
.../templates/new-allowsnothing.ftl | 4 ++--
.../templates/new-defaultresolver.ftl | 4 ++--
.../test/templatesuite/templates/new-optin.ftl | 4 ++--
.../test/templatesuite/templates/new-safer.ftl | 4 ++--
.../templatesuite/templates/new-unrestricted.ftl | 4 ++--
.../test/templatesuite/templates/newlines1.ftl | 4 ++--
.../test/templatesuite/templates/newlines2.ftl | 4 ++--
.../templates/non-strict-syntax.ftl | 4 ++--
.../test/templatesuite/templates/noparse.ftl | 4 ++--
.../templatesuite/templates/number-format.ftl | 4 ++--
.../templatesuite/templates/number-literal.ftl | 4 ++--
.../templates/number-math-builtins.ftl | 4 ++--
.../templatesuite/templates/number-to-date.ftl | 4 ++--
.../templatesuite/templates/numerical-cast.ftl | 4 ++--
.../templatesuite/templates/output-encoding1.ftl | 4 ++--
.../templatesuite/templates/output-encoding2.ftl | 4 ++--
.../templatesuite/templates/output-encoding3.ftl | 4 ++--
.../overloaded-methods-2-bwici-2.3.20.ftl | 4 ++--
.../overloaded-methods-2-bwici-2.3.21.ftl | 4 ++--
.../templates/overloaded-methods-2-common.ftl | 4 ++--
.../overloaded-methods-2-desc-bwici-2.3.20.ftl | 4 ++--
.../overloaded-methods-2-inc-bwici-2.3.20.ftl | 4 ++--
.../templates/overloaded-methods-23bc.ftl | 4 ++--
.../test/templatesuite/templates/precedence.ftl | 4 ++--
.../templatesuite/templates/range-common.ftl | 4 ++--
.../templatesuite/templates/range-ici-2.3.20.ftl | 4 ++--
.../templatesuite/templates/range-ici-2.3.21.ftl | 4 ++--
.../test/templatesuite/templates/recover.ftl | 4 ++--
.../test/templatesuite/templates/root.ftl | 4 ++--
.../templates/sequence-builtins.ftl | 4 ++--
.../test/templatesuite/templates/setting.ftl | 4 ++--
.../templates/simplehash-char-key.ftl | 4 ++--
.../test/templatesuite/templates/specialvars.ftl | 4 ++--
.../templatesuite/templates/strictinheader.ftl | 4 ++--
.../templates/strictinheader_inc1.ftl | 4 ++--
.../templates/strictinheader_inc2.ftl | 4 ++--
.../templates/string-builtin-coercion.ftl | 4 ++--
.../templates/string-builtins-ici-2.3.19.ftl | 4 ++--
.../templates/string-builtins-ici-2.3.20.ftl | 4 ++--
.../string-builtins-regexps-matches.ftl | 4 ++--
.../templates/string-builtins-regexps.ftl | 4 ++--
.../templatesuite/templates/string-builtins1.ftl | 4 ++--
.../templatesuite/templates/string-builtins2.ftl | 4 ++--
.../templatesuite/templates/string-builtins3.ftl | 4 ++--
.../templatesuite/templates/stringbimethods.ftl | 4 ++--
.../templatesuite/templates/stringliteral.ftl | 4 ++--
.../templates/subdir/include-subdir.ftl | 4 ++--
.../templates/subdir/include-subdir2.ftl | 4 ++--
.../templates/subdir/new-optin-2.ftl | 4 ++--
.../templatesuite/templates/subdir/new-optin.ftl | 4 ++--
.../templates/subdir/subsub/new-optin.ftl | 4 ++--
.../templatesuite/templates/switch-builtin.ftl | 4 ++--
.../test/templatesuite/templates/switch.ftl | 4 ++--
.../templatesuite/templates/then-builtin.ftl | 4 ++--
.../test/templatesuite/templates/transforms.ftl | 4 ++--
.../templatesuite/templates/type-builtins.ftl | 4 ++--
.../test/templatesuite/templates/undefined.ftl | 4 ++--
.../test/templatesuite/templates/url.ftl | 4 ++--
.../test/templatesuite/templates/var-layers.ftl | 4 ++--
.../test/templatesuite/templates/varargs.ftl | 4 ++--
.../test/templatesuite/templates/variables.ftl | 4 ++--
.../templatesuite/templates/varlayers_lib.ftl | 4 ++--
.../templatesuite/templates/whitespace-trim.ftl | 4 ++--
.../templates/wsstripinheader_inc.ftl | 4 ++--
.../templatesuite/templates/wstrip-in-header.ftl | 4 ++--
.../templatesuite/templates/xml-fragment.ftl | 4 ++--
.../templates/xml-ns_prefix-scope-lib.ftl | 4 ++--
.../templates/xml-ns_prefix-scope-main.ftl | 4 ++--
.../test/templatesuite/templates/xml.ftl | 4 ++--
.../test/templatesuite/templates/xmlns1.ftl | 4 ++--
.../test/templatesuite/templates/xmlns3.ftl | 4 ++--
.../test/templatesuite/templates/xmlns4.ftl | 4 ++--
.../test/templatesuite/templates/xmlns5.ftl | 4 ++--
.../freemarker/test/templatesuite/testcases.xml | 4 ++--
src/test/resources/logback-test.xml | 4 ++--
1146 files changed, 2288 insertions(+), 2288 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/dist/bin/documentation/index.html
----------------------------------------------------------------------
diff --git a/src/dist/bin/documentation/index.html b/src/dist/bin/documentation/index.html
index cc5ce08..a482423 100644
--- a/src/dist/bin/documentation/index.html
+++ b/src/dist/bin/documentation/index.html
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/ide-settings/Eclipse/Formatter-profile-FreeMarker.xml
----------------------------------------------------------------------
diff --git a/src/ide-settings/Eclipse/Formatter-profile-FreeMarker.xml b/src/ide-settings/Eclipse/Formatter-profile-FreeMarker.xml
index e881eaa..2070004 100644
--- a/src/ide-settings/Eclipse/Formatter-profile-FreeMarker.xml
+++ b/src/ide-settings/Eclipse/Formatter-profile-FreeMarker.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
----------------------------------------------------------------------
diff --git a/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml b/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
index ae87ca3..c4bbf97 100644
--- a/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
+++ b/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/AndMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/AndMatcher.java b/src/main/java/freemarker/cache/AndMatcher.java
index 7cf9082..50b6715 100644
--- a/src/main/java/freemarker/cache/AndMatcher.java
+++ b/src/main/java/freemarker/cache/AndMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java b/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
index 950b7c6..2b47a29 100644
--- a/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
+++ b/src/main/java/freemarker/cache/ByteArrayTemplateLoader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/CacheStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/CacheStorage.java b/src/main/java/freemarker/cache/CacheStorage.java
index cd9d720..2c269bf 100644
--- a/src/main/java/freemarker/cache/CacheStorage.java
+++ b/src/main/java/freemarker/cache/CacheStorage.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/CacheStorageWithGetSize.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/CacheStorageWithGetSize.java b/src/main/java/freemarker/cache/CacheStorageWithGetSize.java
index 0d0f006..2c55904 100644
--- a/src/main/java/freemarker/cache/CacheStorageWithGetSize.java
+++ b/src/main/java/freemarker/cache/CacheStorageWithGetSize.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/ClassTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/ClassTemplateLoader.java b/src/main/java/freemarker/cache/ClassTemplateLoader.java
index 9860355..3756836 100644
--- a/src/main/java/freemarker/cache/ClassTemplateLoader.java
+++ b/src/main/java/freemarker/cache/ClassTemplateLoader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/ConcurrentCacheStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/ConcurrentCacheStorage.java b/src/main/java/freemarker/cache/ConcurrentCacheStorage.java
index a791cec..73b7799 100644
--- a/src/main/java/freemarker/cache/ConcurrentCacheStorage.java
+++ b/src/main/java/freemarker/cache/ConcurrentCacheStorage.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/ConditionalTemplateConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/ConditionalTemplateConfigurationFactory.java b/src/main/java/freemarker/cache/ConditionalTemplateConfigurationFactory.java
index 430632e..8081a68 100644
--- a/src/main/java/freemarker/cache/ConditionalTemplateConfigurationFactory.java
+++ b/src/main/java/freemarker/cache/ConditionalTemplateConfigurationFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/FileExtensionMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/FileExtensionMatcher.java b/src/main/java/freemarker/cache/FileExtensionMatcher.java
index 23d052f..f71281e 100644
--- a/src/main/java/freemarker/cache/FileExtensionMatcher.java
+++ b/src/main/java/freemarker/cache/FileExtensionMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/FileNameGlobMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/FileNameGlobMatcher.java b/src/main/java/freemarker/cache/FileNameGlobMatcher.java
index 12d2ac6..914414b 100644
--- a/src/main/java/freemarker/cache/FileNameGlobMatcher.java
+++ b/src/main/java/freemarker/cache/FileNameGlobMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/FileTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/FileTemplateLoader.java b/src/main/java/freemarker/cache/FileTemplateLoader.java
index a769146..2ee7342 100644
--- a/src/main/java/freemarker/cache/FileTemplateLoader.java
+++ b/src/main/java/freemarker/cache/FileTemplateLoader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/FirstMatchTemplateConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/FirstMatchTemplateConfigurationFactory.java b/src/main/java/freemarker/cache/FirstMatchTemplateConfigurationFactory.java
index 9382656..141a11c 100644
--- a/src/main/java/freemarker/cache/FirstMatchTemplateConfigurationFactory.java
+++ b/src/main/java/freemarker/cache/FirstMatchTemplateConfigurationFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/MergingTemplateConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/MergingTemplateConfigurationFactory.java b/src/main/java/freemarker/cache/MergingTemplateConfigurationFactory.java
index 3675d19..1387690 100644
--- a/src/main/java/freemarker/cache/MergingTemplateConfigurationFactory.java
+++ b/src/main/java/freemarker/cache/MergingTemplateConfigurationFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/MruCacheStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/MruCacheStorage.java b/src/main/java/freemarker/cache/MruCacheStorage.java
index 4717876..e0ecc09 100644
--- a/src/main/java/freemarker/cache/MruCacheStorage.java
+++ b/src/main/java/freemarker/cache/MruCacheStorage.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/MultiTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/MultiTemplateLoader.java b/src/main/java/freemarker/cache/MultiTemplateLoader.java
index bb8322d..c76846f 100644
--- a/src/main/java/freemarker/cache/MultiTemplateLoader.java
+++ b/src/main/java/freemarker/cache/MultiTemplateLoader.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/NotMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/NotMatcher.java b/src/main/java/freemarker/cache/NotMatcher.java
index 871b2bc..379752a 100644
--- a/src/main/java/freemarker/cache/NotMatcher.java
+++ b/src/main/java/freemarker/cache/NotMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/NullCacheStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/NullCacheStorage.java b/src/main/java/freemarker/cache/NullCacheStorage.java
index ff79412..c9a9cb5 100644
--- a/src/main/java/freemarker/cache/NullCacheStorage.java
+++ b/src/main/java/freemarker/cache/NullCacheStorage.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/cache/OrMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/OrMatcher.java b/src/main/java/freemarker/cache/OrMatcher.java
index 069063d..b3be391 100644
--- a/src/main/java/freemarker/cache/OrMatcher.java
+++ b/src/main/java/freemarker/cache/OrMatcher.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[47/50] [abbrv] incubator-freemarker git commit: Changing copyright
header format to be identical to IntelliJ generated copyright headers
Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/FallbackInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/FallbackInstruction.java b/src/main/java/freemarker/core/FallbackInstruction.java
index 58d6845..bd6f22e 100644
--- a/src/main/java/freemarker/core/FallbackInstruction.java
+++ b/src/main/java/freemarker/core/FallbackInstruction.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/FlushInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/FlushInstruction.java b/src/main/java/freemarker/core/FlushInstruction.java
index ff1338a..1490b9d 100644
--- a/src/main/java/freemarker/core/FlushInstruction.java
+++ b/src/main/java/freemarker/core/FlushInstruction.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/FreeMarkerTree.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/FreeMarkerTree.java b/src/main/java/freemarker/core/FreeMarkerTree.java
index 1375d11..ed2005f 100644
--- a/src/main/java/freemarker/core/FreeMarkerTree.java
+++ b/src/main/java/freemarker/core/FreeMarkerTree.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/HTMLOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/HTMLOutputFormat.java b/src/main/java/freemarker/core/HTMLOutputFormat.java
index 542b33a..a206ae4 100644
--- a/src/main/java/freemarker/core/HTMLOutputFormat.java
+++ b/src/main/java/freemarker/core/HTMLOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/HashLiteral.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/HashLiteral.java b/src/main/java/freemarker/core/HashLiteral.java
index 6d2c1c7..34c42e1 100644
--- a/src/main/java/freemarker/core/HashLiteral.java
+++ b/src/main/java/freemarker/core/HashLiteral.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ICIChainMember.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ICIChainMember.java b/src/main/java/freemarker/core/ICIChainMember.java
index c77b756..cc63cde 100644
--- a/src/main/java/freemarker/core/ICIChainMember.java
+++ b/src/main/java/freemarker/core/ICIChainMember.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ISOLikeTemplateDateFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ISOLikeTemplateDateFormat.java b/src/main/java/freemarker/core/ISOLikeTemplateDateFormat.java
index 690fd0f..aeff3c8 100644
--- a/src/main/java/freemarker/core/ISOLikeTemplateDateFormat.java
+++ b/src/main/java/freemarker/core/ISOLikeTemplateDateFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ISOLikeTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ISOLikeTemplateDateFormatFactory.java b/src/main/java/freemarker/core/ISOLikeTemplateDateFormatFactory.java
index a6b6479..6ac3743 100644
--- a/src/main/java/freemarker/core/ISOLikeTemplateDateFormatFactory.java
+++ b/src/main/java/freemarker/core/ISOLikeTemplateDateFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ISOTemplateDateFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ISOTemplateDateFormat.java b/src/main/java/freemarker/core/ISOTemplateDateFormat.java
index a9395ef..6657bcd 100644
--- a/src/main/java/freemarker/core/ISOTemplateDateFormat.java
+++ b/src/main/java/freemarker/core/ISOTemplateDateFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ISOTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ISOTemplateDateFormatFactory.java b/src/main/java/freemarker/core/ISOTemplateDateFormatFactory.java
index 4d82bfd..f263c10 100644
--- a/src/main/java/freemarker/core/ISOTemplateDateFormatFactory.java
+++ b/src/main/java/freemarker/core/ISOTemplateDateFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Identifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Identifier.java b/src/main/java/freemarker/core/Identifier.java
index 7ae62f3..ce64451 100644
--- a/src/main/java/freemarker/core/Identifier.java
+++ b/src/main/java/freemarker/core/Identifier.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/IfBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/IfBlock.java b/src/main/java/freemarker/core/IfBlock.java
index 42526f3..f61e2d3 100644
--- a/src/main/java/freemarker/core/IfBlock.java
+++ b/src/main/java/freemarker/core/IfBlock.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Include.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Include.java b/src/main/java/freemarker/core/Include.java
index 08c8459..f1680e4 100644
--- a/src/main/java/freemarker/core/Include.java
+++ b/src/main/java/freemarker/core/Include.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Interpolation.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Interpolation.java b/src/main/java/freemarker/core/Interpolation.java
index a58e9c2..fb25277 100644
--- a/src/main/java/freemarker/core/Interpolation.java
+++ b/src/main/java/freemarker/core/Interpolation.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Interpret.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Interpret.java b/src/main/java/freemarker/core/Interpret.java
index 01d2a80..818e7a9 100644
--- a/src/main/java/freemarker/core/Interpret.java
+++ b/src/main/java/freemarker/core/Interpret.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/InvalidFormatParametersException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/InvalidFormatParametersException.java b/src/main/java/freemarker/core/InvalidFormatParametersException.java
index 1e2c651..01a24a7 100644
--- a/src/main/java/freemarker/core/InvalidFormatParametersException.java
+++ b/src/main/java/freemarker/core/InvalidFormatParametersException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/InvalidFormatStringException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/InvalidFormatStringException.java b/src/main/java/freemarker/core/InvalidFormatStringException.java
index ca71dc5..42e5b6c 100644
--- a/src/main/java/freemarker/core/InvalidFormatStringException.java
+++ b/src/main/java/freemarker/core/InvalidFormatStringException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/InvalidReferenceException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/InvalidReferenceException.java b/src/main/java/freemarker/core/InvalidReferenceException.java
index 4808106..6f64942 100644
--- a/src/main/java/freemarker/core/InvalidReferenceException.java
+++ b/src/main/java/freemarker/core/InvalidReferenceException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Items.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Items.java b/src/main/java/freemarker/core/Items.java
index a56192b..47366f7 100644
--- a/src/main/java/freemarker/core/Items.java
+++ b/src/main/java/freemarker/core/Items.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/IteratorBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/IteratorBlock.java b/src/main/java/freemarker/core/IteratorBlock.java
index 61ca93b..0d9fcec 100644
--- a/src/main/java/freemarker/core/IteratorBlock.java
+++ b/src/main/java/freemarker/core/IteratorBlock.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/JSONOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/JSONOutputFormat.java b/src/main/java/freemarker/core/JSONOutputFormat.java
index 8577198..437b485 100644
--- a/src/main/java/freemarker/core/JSONOutputFormat.java
+++ b/src/main/java/freemarker/core/JSONOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/JavaScriptOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/JavaScriptOutputFormat.java b/src/main/java/freemarker/core/JavaScriptOutputFormat.java
index c766af9..a66de9e 100644
--- a/src/main/java/freemarker/core/JavaScriptOutputFormat.java
+++ b/src/main/java/freemarker/core/JavaScriptOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/JavaTemplateDateFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/JavaTemplateDateFormat.java b/src/main/java/freemarker/core/JavaTemplateDateFormat.java
index 1b630ae..3b340ba 100644
--- a/src/main/java/freemarker/core/JavaTemplateDateFormat.java
+++ b/src/main/java/freemarker/core/JavaTemplateDateFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java b/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java
index 74fb467..9aedec9 100644
--- a/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java
+++ b/src/main/java/freemarker/core/JavaTemplateDateFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/JavaTemplateNumberFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/JavaTemplateNumberFormat.java b/src/main/java/freemarker/core/JavaTemplateNumberFormat.java
index 27b85e2..59e3288 100644
--- a/src/main/java/freemarker/core/JavaTemplateNumberFormat.java
+++ b/src/main/java/freemarker/core/JavaTemplateNumberFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/JavaTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/JavaTemplateNumberFormatFactory.java b/src/main/java/freemarker/core/JavaTemplateNumberFormatFactory.java
index 330d4f6..6cbf9a9 100644
--- a/src/main/java/freemarker/core/JavaTemplateNumberFormatFactory.java
+++ b/src/main/java/freemarker/core/JavaTemplateNumberFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/LegacyConstructorParserConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/LegacyConstructorParserConfiguration.java b/src/main/java/freemarker/core/LegacyConstructorParserConfiguration.java
index 2ef3b89..479af9a 100644
--- a/src/main/java/freemarker/core/LegacyConstructorParserConfiguration.java
+++ b/src/main/java/freemarker/core/LegacyConstructorParserConfiguration.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/LibraryLoad.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/LibraryLoad.java b/src/main/java/freemarker/core/LibraryLoad.java
index 8d71b6a..64f659c 100644
--- a/src/main/java/freemarker/core/LibraryLoad.java
+++ b/src/main/java/freemarker/core/LibraryLoad.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ListElseContainer.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ListElseContainer.java b/src/main/java/freemarker/core/ListElseContainer.java
index 1065e9e..53aeee5 100644
--- a/src/main/java/freemarker/core/ListElseContainer.java
+++ b/src/main/java/freemarker/core/ListElseContainer.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ListLiteral.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ListLiteral.java b/src/main/java/freemarker/core/ListLiteral.java
index db7b4c5..c25191c 100644
--- a/src/main/java/freemarker/core/ListLiteral.java
+++ b/src/main/java/freemarker/core/ListLiteral.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ListableRightUnboundedRangeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ListableRightUnboundedRangeModel.java b/src/main/java/freemarker/core/ListableRightUnboundedRangeModel.java
index 2cf979c..b61cf76 100644
--- a/src/main/java/freemarker/core/ListableRightUnboundedRangeModel.java
+++ b/src/main/java/freemarker/core/ListableRightUnboundedRangeModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/LocalContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/LocalContext.java b/src/main/java/freemarker/core/LocalContext.java
index 95f7ce0..cc90e0a 100644
--- a/src/main/java/freemarker/core/LocalContext.java
+++ b/src/main/java/freemarker/core/LocalContext.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/LocalContextStack.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/LocalContextStack.java b/src/main/java/freemarker/core/LocalContextStack.java
index c22a09f..2d200e0 100644
--- a/src/main/java/freemarker/core/LocalContextStack.java
+++ b/src/main/java/freemarker/core/LocalContextStack.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Macro.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Macro.java b/src/main/java/freemarker/core/Macro.java
index 162cad3..53756df 100644
--- a/src/main/java/freemarker/core/Macro.java
+++ b/src/main/java/freemarker/core/Macro.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/MarkupOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/MarkupOutputFormat.java b/src/main/java/freemarker/core/MarkupOutputFormat.java
index 39eaaca..81ffe8b 100644
--- a/src/main/java/freemarker/core/MarkupOutputFormat.java
+++ b/src/main/java/freemarker/core/MarkupOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/MarkupOutputFormatBoundBuiltIn.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/MarkupOutputFormatBoundBuiltIn.java b/src/main/java/freemarker/core/MarkupOutputFormatBoundBuiltIn.java
index 5780124..9dceb01 100644
--- a/src/main/java/freemarker/core/MarkupOutputFormatBoundBuiltIn.java
+++ b/src/main/java/freemarker/core/MarkupOutputFormatBoundBuiltIn.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/MessageUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/MessageUtil.java b/src/main/java/freemarker/core/MessageUtil.java
index 3aebacc..ebdefb4 100644
--- a/src/main/java/freemarker/core/MessageUtil.java
+++ b/src/main/java/freemarker/core/MessageUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/MethodCall.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/MethodCall.java b/src/main/java/freemarker/core/MethodCall.java
index 1cb42de..a50e496 100644
--- a/src/main/java/freemarker/core/MethodCall.java
+++ b/src/main/java/freemarker/core/MethodCall.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/MiscUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/MiscUtil.java b/src/main/java/freemarker/core/MiscUtil.java
index bb65fb3..ccd0dd9 100644
--- a/src/main/java/freemarker/core/MiscUtil.java
+++ b/src/main/java/freemarker/core/MiscUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/MixedContent.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/MixedContent.java b/src/main/java/freemarker/core/MixedContent.java
index 3306988..f5b6747 100644
--- a/src/main/java/freemarker/core/MixedContent.java
+++ b/src/main/java/freemarker/core/MixedContent.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NestedContentNotSupportedException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NestedContentNotSupportedException.java b/src/main/java/freemarker/core/NestedContentNotSupportedException.java
index a667af1..ae5fb30 100644
--- a/src/main/java/freemarker/core/NestedContentNotSupportedException.java
+++ b/src/main/java/freemarker/core/NestedContentNotSupportedException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NewBI.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NewBI.java b/src/main/java/freemarker/core/NewBI.java
index eddd823..5d86a85 100644
--- a/src/main/java/freemarker/core/NewBI.java
+++ b/src/main/java/freemarker/core/NewBI.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NoAutoEscBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NoAutoEscBlock.java b/src/main/java/freemarker/core/NoAutoEscBlock.java
index 7e07bca..c30a764 100644
--- a/src/main/java/freemarker/core/NoAutoEscBlock.java
+++ b/src/main/java/freemarker/core/NoAutoEscBlock.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NoEscapeBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NoEscapeBlock.java b/src/main/java/freemarker/core/NoEscapeBlock.java
index 6ac3960..8e42d4c 100644
--- a/src/main/java/freemarker/core/NoEscapeBlock.java
+++ b/src/main/java/freemarker/core/NoEscapeBlock.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonBooleanException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonBooleanException.java b/src/main/java/freemarker/core/NonBooleanException.java
index bebd595..dcc28df 100644
--- a/src/main/java/freemarker/core/NonBooleanException.java
+++ b/src/main/java/freemarker/core/NonBooleanException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonDateException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonDateException.java b/src/main/java/freemarker/core/NonDateException.java
index e967412..4947ff4 100644
--- a/src/main/java/freemarker/core/NonDateException.java
+++ b/src/main/java/freemarker/core/NonDateException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonExtendedHashException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonExtendedHashException.java b/src/main/java/freemarker/core/NonExtendedHashException.java
index 0bb6119..93ca96f 100644
--- a/src/main/java/freemarker/core/NonExtendedHashException.java
+++ b/src/main/java/freemarker/core/NonExtendedHashException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonExtendedNodeException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonExtendedNodeException.java b/src/main/java/freemarker/core/NonExtendedNodeException.java
index 3377257..44d87ec 100644
--- a/src/main/java/freemarker/core/NonExtendedNodeException.java
+++ b/src/main/java/freemarker/core/NonExtendedNodeException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonHashException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonHashException.java b/src/main/java/freemarker/core/NonHashException.java
index 9ef2bab..ea7f942 100644
--- a/src/main/java/freemarker/core/NonHashException.java
+++ b/src/main/java/freemarker/core/NonHashException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonListableRightUnboundedRangeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonListableRightUnboundedRangeModel.java b/src/main/java/freemarker/core/NonListableRightUnboundedRangeModel.java
index 2633c42..b03d8f4 100644
--- a/src/main/java/freemarker/core/NonListableRightUnboundedRangeModel.java
+++ b/src/main/java/freemarker/core/NonListableRightUnboundedRangeModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonMarkupOutputException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonMarkupOutputException.java b/src/main/java/freemarker/core/NonMarkupOutputException.java
index d9cb6ee..d775211 100644
--- a/src/main/java/freemarker/core/NonMarkupOutputException.java
+++ b/src/main/java/freemarker/core/NonMarkupOutputException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonMethodException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonMethodException.java b/src/main/java/freemarker/core/NonMethodException.java
index 79b6727..dcda03e 100644
--- a/src/main/java/freemarker/core/NonMethodException.java
+++ b/src/main/java/freemarker/core/NonMethodException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonNamespaceException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonNamespaceException.java b/src/main/java/freemarker/core/NonNamespaceException.java
index 2d33dff..c6f4cba 100644
--- a/src/main/java/freemarker/core/NonNamespaceException.java
+++ b/src/main/java/freemarker/core/NonNamespaceException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonNodeException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonNodeException.java b/src/main/java/freemarker/core/NonNodeException.java
index b551ed7..767579b 100644
--- a/src/main/java/freemarker/core/NonNodeException.java
+++ b/src/main/java/freemarker/core/NonNodeException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonNumericalException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonNumericalException.java b/src/main/java/freemarker/core/NonNumericalException.java
index 2e00bd3..43a1872 100644
--- a/src/main/java/freemarker/core/NonNumericalException.java
+++ b/src/main/java/freemarker/core/NonNumericalException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonSequenceException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonSequenceException.java b/src/main/java/freemarker/core/NonSequenceException.java
index 7414ac3..2b85ab9 100644
--- a/src/main/java/freemarker/core/NonSequenceException.java
+++ b/src/main/java/freemarker/core/NonSequenceException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonSequenceOrCollectionException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonSequenceOrCollectionException.java b/src/main/java/freemarker/core/NonSequenceOrCollectionException.java
index d83ff9d..5b42358 100644
--- a/src/main/java/freemarker/core/NonSequenceOrCollectionException.java
+++ b/src/main/java/freemarker/core/NonSequenceOrCollectionException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonStringException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonStringException.java b/src/main/java/freemarker/core/NonStringException.java
index 2c8ec22..f84c87e 100644
--- a/src/main/java/freemarker/core/NonStringException.java
+++ b/src/main/java/freemarker/core/NonStringException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonStringOrTemplateOutputException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonStringOrTemplateOutputException.java b/src/main/java/freemarker/core/NonStringOrTemplateOutputException.java
index 9368839..7787a14 100644
--- a/src/main/java/freemarker/core/NonStringOrTemplateOutputException.java
+++ b/src/main/java/freemarker/core/NonStringOrTemplateOutputException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NonUserDefinedDirectiveLikeException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NonUserDefinedDirectiveLikeException.java b/src/main/java/freemarker/core/NonUserDefinedDirectiveLikeException.java
index ba37df1..093b199 100644
--- a/src/main/java/freemarker/core/NonUserDefinedDirectiveLikeException.java
+++ b/src/main/java/freemarker/core/NonUserDefinedDirectiveLikeException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NotExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NotExpression.java b/src/main/java/freemarker/core/NotExpression.java
index 504d997..6e7353a 100644
--- a/src/main/java/freemarker/core/NotExpression.java
+++ b/src/main/java/freemarker/core/NotExpression.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NumberLiteral.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NumberLiteral.java b/src/main/java/freemarker/core/NumberLiteral.java
index 40b63d5..b2a58d0 100644
--- a/src/main/java/freemarker/core/NumberLiteral.java
+++ b/src/main/java/freemarker/core/NumberLiteral.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/NumericalOutput.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/NumericalOutput.java b/src/main/java/freemarker/core/NumericalOutput.java
index 3e6e53a..bd1ed11 100644
--- a/src/main/java/freemarker/core/NumericalOutput.java
+++ b/src/main/java/freemarker/core/NumericalOutput.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/OptInTemplateClassResolver.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/OptInTemplateClassResolver.java b/src/main/java/freemarker/core/OptInTemplateClassResolver.java
index b64569d..94dd4e9 100644
--- a/src/main/java/freemarker/core/OptInTemplateClassResolver.java
+++ b/src/main/java/freemarker/core/OptInTemplateClassResolver.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/OrExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/OrExpression.java b/src/main/java/freemarker/core/OrExpression.java
index 62beafb..41836a4 100644
--- a/src/main/java/freemarker/core/OrExpression.java
+++ b/src/main/java/freemarker/core/OrExpression.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/OutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/OutputFormat.java b/src/main/java/freemarker/core/OutputFormat.java
index 5a262aa..8ab52da 100644
--- a/src/main/java/freemarker/core/OutputFormat.java
+++ b/src/main/java/freemarker/core/OutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/OutputFormatBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/OutputFormatBlock.java b/src/main/java/freemarker/core/OutputFormatBlock.java
index 1b5a746..44eabc3 100644
--- a/src/main/java/freemarker/core/OutputFormatBlock.java
+++ b/src/main/java/freemarker/core/OutputFormatBlock.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/OutputFormatBoundBuiltIn.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/OutputFormatBoundBuiltIn.java b/src/main/java/freemarker/core/OutputFormatBoundBuiltIn.java
index 2bcc106..55ebf6e 100644
--- a/src/main/java/freemarker/core/OutputFormatBoundBuiltIn.java
+++ b/src/main/java/freemarker/core/OutputFormatBoundBuiltIn.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ParameterRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ParameterRole.java b/src/main/java/freemarker/core/ParameterRole.java
index 1293d5c..45b7a11 100644
--- a/src/main/java/freemarker/core/ParameterRole.java
+++ b/src/main/java/freemarker/core/ParameterRole.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ParentheticalExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ParentheticalExpression.java b/src/main/java/freemarker/core/ParentheticalExpression.java
index 42fb0eb..f63e0b6 100644
--- a/src/main/java/freemarker/core/ParentheticalExpression.java
+++ b/src/main/java/freemarker/core/ParentheticalExpression.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ParseException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ParseException.java b/src/main/java/freemarker/core/ParseException.java
index b7cacf8..8aa5049 100644
--- a/src/main/java/freemarker/core/ParseException.java
+++ b/src/main/java/freemarker/core/ParseException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ParserConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ParserConfiguration.java b/src/main/java/freemarker/core/ParserConfiguration.java
index 4108952..0f097c9 100644
--- a/src/main/java/freemarker/core/ParserConfiguration.java
+++ b/src/main/java/freemarker/core/ParserConfiguration.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ParsingNotSupportedException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ParsingNotSupportedException.java b/src/main/java/freemarker/core/ParsingNotSupportedException.java
index 7b6e064..1cf3738 100644
--- a/src/main/java/freemarker/core/ParsingNotSupportedException.java
+++ b/src/main/java/freemarker/core/ParsingNotSupportedException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/PlainTextOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/PlainTextOutputFormat.java b/src/main/java/freemarker/core/PlainTextOutputFormat.java
index 82ac31b..525c840 100644
--- a/src/main/java/freemarker/core/PlainTextOutputFormat.java
+++ b/src/main/java/freemarker/core/PlainTextOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/PropertySetting.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/PropertySetting.java b/src/main/java/freemarker/core/PropertySetting.java
index 1cb81a3..0c2e22a 100644
--- a/src/main/java/freemarker/core/PropertySetting.java
+++ b/src/main/java/freemarker/core/PropertySetting.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/RTFOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/RTFOutputFormat.java b/src/main/java/freemarker/core/RTFOutputFormat.java
index 9aef2a7..f719af9 100644
--- a/src/main/java/freemarker/core/RTFOutputFormat.java
+++ b/src/main/java/freemarker/core/RTFOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Range.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Range.java b/src/main/java/freemarker/core/Range.java
index 2fde57c..5dec1a2 100644
--- a/src/main/java/freemarker/core/Range.java
+++ b/src/main/java/freemarker/core/Range.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/RangeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/RangeModel.java b/src/main/java/freemarker/core/RangeModel.java
index d0ef959..7e526e0 100644
--- a/src/main/java/freemarker/core/RangeModel.java
+++ b/src/main/java/freemarker/core/RangeModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/RecoveryBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/RecoveryBlock.java b/src/main/java/freemarker/core/RecoveryBlock.java
index 67ff1fb..cb8dd29 100644
--- a/src/main/java/freemarker/core/RecoveryBlock.java
+++ b/src/main/java/freemarker/core/RecoveryBlock.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/RecurseNode.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/RecurseNode.java b/src/main/java/freemarker/core/RecurseNode.java
index 1c15da8..42a8d32 100644
--- a/src/main/java/freemarker/core/RecurseNode.java
+++ b/src/main/java/freemarker/core/RecurseNode.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/RegexpHelper.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/RegexpHelper.java b/src/main/java/freemarker/core/RegexpHelper.java
index 3743b23..014dabf 100644
--- a/src/main/java/freemarker/core/RegexpHelper.java
+++ b/src/main/java/freemarker/core/RegexpHelper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/ReturnInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/ReturnInstruction.java b/src/main/java/freemarker/core/ReturnInstruction.java
index 51feab7..c363046 100644
--- a/src/main/java/freemarker/core/ReturnInstruction.java
+++ b/src/main/java/freemarker/core/ReturnInstruction.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/RightUnboundedRangeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/RightUnboundedRangeModel.java b/src/main/java/freemarker/core/RightUnboundedRangeModel.java
index bc95894..fb1559d 100644
--- a/src/main/java/freemarker/core/RightUnboundedRangeModel.java
+++ b/src/main/java/freemarker/core/RightUnboundedRangeModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/Sep.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Sep.java b/src/main/java/freemarker/core/Sep.java
index 848bcd8..d25981f 100644
--- a/src/main/java/freemarker/core/Sep.java
+++ b/src/main/java/freemarker/core/Sep.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/SpecialBuiltIn.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/SpecialBuiltIn.java b/src/main/java/freemarker/core/SpecialBuiltIn.java
index b7451ef..cf06fde 100644
--- a/src/main/java/freemarker/core/SpecialBuiltIn.java
+++ b/src/main/java/freemarker/core/SpecialBuiltIn.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/StopException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/StopException.java b/src/main/java/freemarker/core/StopException.java
index 5e3002d..7c3e508 100644
--- a/src/main/java/freemarker/core/StopException.java
+++ b/src/main/java/freemarker/core/StopException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/StopInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/StopInstruction.java b/src/main/java/freemarker/core/StopInstruction.java
index 590d9f1..b4811a4 100644
--- a/src/main/java/freemarker/core/StopInstruction.java
+++ b/src/main/java/freemarker/core/StopInstruction.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/StringArraySequence.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/StringArraySequence.java b/src/main/java/freemarker/core/StringArraySequence.java
index 5551a18..740172d 100644
--- a/src/main/java/freemarker/core/StringArraySequence.java
+++ b/src/main/java/freemarker/core/StringArraySequence.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/StringLiteral.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/StringLiteral.java b/src/main/java/freemarker/core/StringLiteral.java
index da1c1bd..c2b69a6 100644
--- a/src/main/java/freemarker/core/StringLiteral.java
+++ b/src/main/java/freemarker/core/StringLiteral.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/SwitchBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/SwitchBlock.java b/src/main/java/freemarker/core/SwitchBlock.java
index 2cef5ce..cfa354c 100644
--- a/src/main/java/freemarker/core/SwitchBlock.java
+++ b/src/main/java/freemarker/core/SwitchBlock.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateClassResolver.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateClassResolver.java b/src/main/java/freemarker/core/TemplateClassResolver.java
index ab2a713..e02b022 100644
--- a/src/main/java/freemarker/core/TemplateClassResolver.java
+++ b/src/main/java/freemarker/core/TemplateClassResolver.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateCombinedMarkupOutputModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateCombinedMarkupOutputModel.java b/src/main/java/freemarker/core/TemplateCombinedMarkupOutputModel.java
index 0bb72a2..9071d14 100644
--- a/src/main/java/freemarker/core/TemplateCombinedMarkupOutputModel.java
+++ b/src/main/java/freemarker/core/TemplateCombinedMarkupOutputModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateConfiguration.java b/src/main/java/freemarker/core/TemplateConfiguration.java
index 804446b..ea9e3a3 100644
--- a/src/main/java/freemarker/core/TemplateConfiguration.java
+++ b/src/main/java/freemarker/core/TemplateConfiguration.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateDateFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateDateFormat.java b/src/main/java/freemarker/core/TemplateDateFormat.java
index daec487..f5a2fb3 100644
--- a/src/main/java/freemarker/core/TemplateDateFormat.java
+++ b/src/main/java/freemarker/core/TemplateDateFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateDateFormatFactory.java b/src/main/java/freemarker/core/TemplateDateFormatFactory.java
index 9edda85..f6651d4 100644
--- a/src/main/java/freemarker/core/TemplateDateFormatFactory.java
+++ b/src/main/java/freemarker/core/TemplateDateFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateElement.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateElement.java b/src/main/java/freemarker/core/TemplateElement.java
index 5d12ff9..f63db63 100644
--- a/src/main/java/freemarker/core/TemplateElement.java
+++ b/src/main/java/freemarker/core/TemplateElement.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/core/TemplateElementArrayBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/TemplateElementArrayBuilder.java b/src/main/java/freemarker/core/TemplateElementArrayBuilder.java
index 0126c19..fff8210 100644
--- a/src/main/java/freemarker/core/TemplateElementArrayBuilder.java
+++ b/src/main/java/freemarker/core/TemplateElementArrayBuilder.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[21/50] [abbrv] incubator-freemarker git commit: (Outdated package
JavaDoc fix)
Posted by dd...@apache.org.
(Outdated package JavaDoc fix)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/0d069dc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/0d069dc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/0d069dc3
Branch: refs/heads/2.3
Commit: 0d069dc352698d0eed7265724784ce29d14cb420
Parents: f188f97
Author: ddekany <dd...@apache.org>
Authored: Fri Feb 17 02:52:56 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Feb 17 02:52:56 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/ext/beans/package.html | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0d069dc3/src/main/java/freemarker/ext/beans/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/package.html b/src/main/java/freemarker/ext/beans/package.html
index 2032969..3481288 100644
--- a/src/main/java/freemarker/ext/beans/package.html
+++ b/src/main/java/freemarker/ext/beans/package.html
@@ -22,9 +22,8 @@
</head>
<body>
-<p>The {@link freemarker.template.DefaultObjectWrapper default object wrapper} of FreeMarker uses
-this to expose Java Beans and POJO-s to templates, but it can also be used in itself as a
-better alternative {@link freemarker.template.ObjectWrapper}.</p>
+<p>The {@linkplain freemarker.template.DefaultObjectWrapper default object wrapper} of FreeMarker uses
+this to expose Java Beans and POJO-s to templates.</p>
<p>Most of the issues dealing with beans are handled by the
{@link freemarker.ext.beans.BeansWrapper#wrap(Object)}and {@link
[43/50] [abbrv] incubator-freemarker git commit: Changing copyright
header format to be identical to IntelliJ generated copyright headers
Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateModelWithAPISupport.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateModelWithAPISupport.java b/src/main/java/freemarker/template/TemplateModelWithAPISupport.java
index 00a4e6f..4765e03 100644
--- a/src/main/java/freemarker/template/TemplateModelWithAPISupport.java
+++ b/src/main/java/freemarker/template/TemplateModelWithAPISupport.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateNodeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateNodeModel.java b/src/main/java/freemarker/template/TemplateNodeModel.java
index c54b42c..684cdc9 100644
--- a/src/main/java/freemarker/template/TemplateNodeModel.java
+++ b/src/main/java/freemarker/template/TemplateNodeModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateNodeModelEx.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateNodeModelEx.java b/src/main/java/freemarker/template/TemplateNodeModelEx.java
index ca7d21d..16ef7d0 100644
--- a/src/main/java/freemarker/template/TemplateNodeModelEx.java
+++ b/src/main/java/freemarker/template/TemplateNodeModelEx.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateNotFoundException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateNotFoundException.java b/src/main/java/freemarker/template/TemplateNotFoundException.java
index 0a8b878..61fb6e7 100644
--- a/src/main/java/freemarker/template/TemplateNotFoundException.java
+++ b/src/main/java/freemarker/template/TemplateNotFoundException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateNumberModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateNumberModel.java b/src/main/java/freemarker/template/TemplateNumberModel.java
index 9b1b401..c42b5b1 100644
--- a/src/main/java/freemarker/template/TemplateNumberModel.java
+++ b/src/main/java/freemarker/template/TemplateNumberModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateScalarModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateScalarModel.java b/src/main/java/freemarker/template/TemplateScalarModel.java
index b57259b..ca67f75 100644
--- a/src/main/java/freemarker/template/TemplateScalarModel.java
+++ b/src/main/java/freemarker/template/TemplateScalarModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateSequenceModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateSequenceModel.java b/src/main/java/freemarker/template/TemplateSequenceModel.java
index 12d4acb..3247cd7 100644
--- a/src/main/java/freemarker/template/TemplateSequenceModel.java
+++ b/src/main/java/freemarker/template/TemplateSequenceModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TemplateTransformModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateTransformModel.java b/src/main/java/freemarker/template/TemplateTransformModel.java
index 636fd1e..9022658 100644
--- a/src/main/java/freemarker/template/TemplateTransformModel.java
+++ b/src/main/java/freemarker/template/TemplateTransformModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TransformControl.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TransformControl.java b/src/main/java/freemarker/template/TransformControl.java
index eedbd2b..562be9e 100644
--- a/src/main/java/freemarker/template/TransformControl.java
+++ b/src/main/java/freemarker/template/TransformControl.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/TrueTemplateBooleanModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TrueTemplateBooleanModel.java b/src/main/java/freemarker/template/TrueTemplateBooleanModel.java
index 0d97dc6..da26499 100644
--- a/src/main/java/freemarker/template/TrueTemplateBooleanModel.java
+++ b/src/main/java/freemarker/template/TrueTemplateBooleanModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/Version.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/Version.java b/src/main/java/freemarker/template/Version.java
index 91ee900..dc08926 100644
--- a/src/main/java/freemarker/template/Version.java
+++ b/src/main/java/freemarker/template/Version.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/WrappingTemplateModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/WrappingTemplateModel.java b/src/main/java/freemarker/template/WrappingTemplateModel.java
index e2a9c00..74fdda9 100644
--- a/src/main/java/freemarker/template/WrappingTemplateModel.java
+++ b/src/main/java/freemarker/template/WrappingTemplateModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/_TemplateAPI.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/_TemplateAPI.java b/src/main/java/freemarker/template/_TemplateAPI.java
index 5942a35..15d5e23 100644
--- a/src/main/java/freemarker/template/_TemplateAPI.java
+++ b/src/main/java/freemarker/template/_TemplateAPI.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/package.html b/src/main/java/freemarker/template/package.html
index e81035a..3f622ec 100644
--- a/src/main/java/freemarker/template/package.html
+++ b/src/main/java/freemarker/template/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/CaptureOutput.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/CaptureOutput.java b/src/main/java/freemarker/template/utility/CaptureOutput.java
index d505d0a..9bab1f1 100644
--- a/src/main/java/freemarker/template/utility/CaptureOutput.java
+++ b/src/main/java/freemarker/template/utility/CaptureOutput.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/ClassUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/ClassUtil.java b/src/main/java/freemarker/template/utility/ClassUtil.java
index 7a767bd..0aa40cb 100644
--- a/src/main/java/freemarker/template/utility/ClassUtil.java
+++ b/src/main/java/freemarker/template/utility/ClassUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/CollectionUtils.java b/src/main/java/freemarker/template/utility/CollectionUtils.java
index 38e1b91..814fd1f 100644
--- a/src/main/java/freemarker/template/utility/CollectionUtils.java
+++ b/src/main/java/freemarker/template/utility/CollectionUtils.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/Collections12.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/Collections12.java b/src/main/java/freemarker/template/utility/Collections12.java
index d8c3708..666f7b1 100644
--- a/src/main/java/freemarker/template/utility/Collections12.java
+++ b/src/main/java/freemarker/template/utility/Collections12.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/Constants.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/Constants.java b/src/main/java/freemarker/template/utility/Constants.java
index 1c74243..ac948a9 100644
--- a/src/main/java/freemarker/template/utility/Constants.java
+++ b/src/main/java/freemarker/template/utility/Constants.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/DOMNodeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/DOMNodeModel.java b/src/main/java/freemarker/template/utility/DOMNodeModel.java
index 1a0dd57..e8180ed 100644
--- a/src/main/java/freemarker/template/utility/DOMNodeModel.java
+++ b/src/main/java/freemarker/template/utility/DOMNodeModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/DateUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/DateUtil.java b/src/main/java/freemarker/template/utility/DateUtil.java
index 238da7a..eb37ba4 100644
--- a/src/main/java/freemarker/template/utility/DateUtil.java
+++ b/src/main/java/freemarker/template/utility/DateUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/DeepUnwrap.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/DeepUnwrap.java b/src/main/java/freemarker/template/utility/DeepUnwrap.java
index c35dd89..586787f 100644
--- a/src/main/java/freemarker/template/utility/DeepUnwrap.java
+++ b/src/main/java/freemarker/template/utility/DeepUnwrap.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/Execute.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/Execute.java b/src/main/java/freemarker/template/utility/Execute.java
index b122500..034c961 100644
--- a/src/main/java/freemarker/template/utility/Execute.java
+++ b/src/main/java/freemarker/template/utility/Execute.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/HtmlEscape.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/HtmlEscape.java b/src/main/java/freemarker/template/utility/HtmlEscape.java
index 25bbee0..6b6f100 100644
--- a/src/main/java/freemarker/template/utility/HtmlEscape.java
+++ b/src/main/java/freemarker/template/utility/HtmlEscape.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/JythonRuntime.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/JythonRuntime.java b/src/main/java/freemarker/template/utility/JythonRuntime.java
index 80bafe5..91e8625 100644
--- a/src/main/java/freemarker/template/utility/JythonRuntime.java
+++ b/src/main/java/freemarker/template/utility/JythonRuntime.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/NormalizeNewlines.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/NormalizeNewlines.java b/src/main/java/freemarker/template/utility/NormalizeNewlines.java
index 7075c42..59d5e00 100644
--- a/src/main/java/freemarker/template/utility/NormalizeNewlines.java
+++ b/src/main/java/freemarker/template/utility/NormalizeNewlines.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/NullArgumentException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/NullArgumentException.java b/src/main/java/freemarker/template/utility/NullArgumentException.java
index 02268fd..17caa6e 100644
--- a/src/main/java/freemarker/template/utility/NullArgumentException.java
+++ b/src/main/java/freemarker/template/utility/NullArgumentException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/NullWriter.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/NullWriter.java b/src/main/java/freemarker/template/utility/NullWriter.java
index 878d4fa..ba89a05 100644
--- a/src/main/java/freemarker/template/utility/NullWriter.java
+++ b/src/main/java/freemarker/template/utility/NullWriter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/NumberUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/NumberUtil.java b/src/main/java/freemarker/template/utility/NumberUtil.java
index 39a9b3b..a22deff 100644
--- a/src/main/java/freemarker/template/utility/NumberUtil.java
+++ b/src/main/java/freemarker/template/utility/NumberUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/ObjectConstructor.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/ObjectConstructor.java b/src/main/java/freemarker/template/utility/ObjectConstructor.java
index d7ca49f..1473160 100644
--- a/src/main/java/freemarker/template/utility/ObjectConstructor.java
+++ b/src/main/java/freemarker/template/utility/ObjectConstructor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/ObjectFactory.java b/src/main/java/freemarker/template/utility/ObjectFactory.java
index 75571b4..e622871 100644
--- a/src/main/java/freemarker/template/utility/ObjectFactory.java
+++ b/src/main/java/freemarker/template/utility/ObjectFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/ObjectWrapperWithAPISupport.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/ObjectWrapperWithAPISupport.java b/src/main/java/freemarker/template/utility/ObjectWrapperWithAPISupport.java
index c139ffe..7e27ee0 100644
--- a/src/main/java/freemarker/template/utility/ObjectWrapperWithAPISupport.java
+++ b/src/main/java/freemarker/template/utility/ObjectWrapperWithAPISupport.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/OptimizerUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/OptimizerUtil.java b/src/main/java/freemarker/template/utility/OptimizerUtil.java
index 89af48e..a7173f5 100644
--- a/src/main/java/freemarker/template/utility/OptimizerUtil.java
+++ b/src/main/java/freemarker/template/utility/OptimizerUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/RichObjectWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/RichObjectWrapper.java b/src/main/java/freemarker/template/utility/RichObjectWrapper.java
index f24f757..e6d19e4 100644
--- a/src/main/java/freemarker/template/utility/RichObjectWrapper.java
+++ b/src/main/java/freemarker/template/utility/RichObjectWrapper.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/SecurityUtilities.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/SecurityUtilities.java b/src/main/java/freemarker/template/utility/SecurityUtilities.java
index e17289f..a38d502 100644
--- a/src/main/java/freemarker/template/utility/SecurityUtilities.java
+++ b/src/main/java/freemarker/template/utility/SecurityUtilities.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/StandardCompress.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/StandardCompress.java b/src/main/java/freemarker/template/utility/StandardCompress.java
index 4a40acf..571afa7 100644
--- a/src/main/java/freemarker/template/utility/StandardCompress.java
+++ b/src/main/java/freemarker/template/utility/StandardCompress.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/StringUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/StringUtil.java b/src/main/java/freemarker/template/utility/StringUtil.java
index d807f90..33fe03b 100644
--- a/src/main/java/freemarker/template/utility/StringUtil.java
+++ b/src/main/java/freemarker/template/utility/StringUtil.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/ToCanonical.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/ToCanonical.java b/src/main/java/freemarker/template/utility/ToCanonical.java
index 8f15223..87752b8 100644
--- a/src/main/java/freemarker/template/utility/ToCanonical.java
+++ b/src/main/java/freemarker/template/utility/ToCanonical.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/UndeclaredThrowableException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/UndeclaredThrowableException.java b/src/main/java/freemarker/template/utility/UndeclaredThrowableException.java
index 137f3eb..ebbe8bd 100644
--- a/src/main/java/freemarker/template/utility/UndeclaredThrowableException.java
+++ b/src/main/java/freemarker/template/utility/UndeclaredThrowableException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/UnrecognizedTimeZoneException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/UnrecognizedTimeZoneException.java b/src/main/java/freemarker/template/utility/UnrecognizedTimeZoneException.java
index 5e7631f..6ed6726 100644
--- a/src/main/java/freemarker/template/utility/UnrecognizedTimeZoneException.java
+++ b/src/main/java/freemarker/template/utility/UnrecognizedTimeZoneException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/UnsupportedNumberClassException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/UnsupportedNumberClassException.java b/src/main/java/freemarker/template/utility/UnsupportedNumberClassException.java
index 891f824..739b185 100644
--- a/src/main/java/freemarker/template/utility/UnsupportedNumberClassException.java
+++ b/src/main/java/freemarker/template/utility/UnsupportedNumberClassException.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/WriteProtectable.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/WriteProtectable.java b/src/main/java/freemarker/template/utility/WriteProtectable.java
index cb38351..df919ae 100644
--- a/src/main/java/freemarker/template/utility/WriteProtectable.java
+++ b/src/main/java/freemarker/template/utility/WriteProtectable.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/XmlEscape.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/XmlEscape.java b/src/main/java/freemarker/template/utility/XmlEscape.java
index 11c300f..cbf823f 100644
--- a/src/main/java/freemarker/template/utility/XmlEscape.java
+++ b/src/main/java/freemarker/template/utility/XmlEscape.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/java/freemarker/template/utility/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/package.html b/src/main/java/freemarker/template/utility/package.html
index 03f8132..e90df61 100644
--- a/src/main/java/freemarker/template/utility/package.html
+++ b/src/main/java/freemarker/template/utility/package.html
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/misc/identifierChars/src/main/freemarker/adhoc/IdentifierCharGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/misc/identifierChars/src/main/freemarker/adhoc/IdentifierCharGenerator.java b/src/main/misc/identifierChars/src/main/freemarker/adhoc/IdentifierCharGenerator.java
index 3c4a726..7e047dc 100644
--- a/src/main/misc/identifierChars/src/main/freemarker/adhoc/IdentifierCharGenerator.java
+++ b/src/main/misc/identifierChars/src/main/freemarker/adhoc/IdentifierCharGenerator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/misc/overloadedNumberRules/README.txt
----------------------------------------------------------------------
diff --git a/src/main/misc/overloadedNumberRules/README.txt b/src/main/misc/overloadedNumberRules/README.txt
index a354dab..47f078b 100644
--- a/src/main/misc/overloadedNumberRules/README.txt
+++ b/src/main/misc/overloadedNumberRules/README.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/misc/overloadedNumberRules/config.fmpp
----------------------------------------------------------------------
diff --git a/src/main/misc/overloadedNumberRules/config.fmpp b/src/main/misc/overloadedNumberRules/config.fmpp
index fdd71ef..cf32e92 100644
--- a/src/main/misc/overloadedNumberRules/config.fmpp
+++ b/src/main/misc/overloadedNumberRules/config.fmpp
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/misc/overloadedNumberRules/generator.ftl
----------------------------------------------------------------------
diff --git a/src/main/misc/overloadedNumberRules/generator.ftl b/src/main/misc/overloadedNumberRules/generator.ftl
index 31aec37..2a2bfde 100644
--- a/src/main/misc/overloadedNumberRules/generator.ftl
+++ b/src/main/misc/overloadedNumberRules/generator.ftl
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/ext/beans/unsafeMethods.properties b/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
index f1f4e18..05c1981 100644
--- a/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
+++ b/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index 98ae1ad..c9fcce2 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 59282bb..c3e683a 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/manual/en_US/docgen-help/editors-readme.txt
----------------------------------------------------------------------
diff --git a/src/manual/en_US/docgen-help/editors-readme.txt b/src/manual/en_US/docgen-help/editors-readme.txt
index a270269..24436e8 100644
--- a/src/manual/en_US/docgen-help/editors-readme.txt
+++ b/src/manual/en_US/docgen-help/editors-readme.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/manual/en_US/docgen-originals/figures/odg-convert-howto.txt
----------------------------------------------------------------------
diff --git a/src/manual/en_US/docgen-originals/figures/odg-convert-howto.txt b/src/manual/en_US/docgen-originals/figures/odg-convert-howto.txt
index 5509678..e55acec 100644
--- a/src/manual/en_US/docgen-originals/figures/odg-convert-howto.txt
+++ b/src/manual/en_US/docgen-originals/figures/odg-convert-howto.txt
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/manual/zh_CN/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/zh_CN/book.xml b/src/manual/zh_CN/book.xml
index 327b239..59b19d4 100644
--- a/src/manual/zh_CN/book.xml
+++ b/src/manual/zh_CN/book.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/cache/FileTemplateLoaderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/cache/FileTemplateLoaderTest.java b/src/test/java/freemarker/cache/FileTemplateLoaderTest.java
index 9539d68..9c3024d 100644
--- a/src/test/java/freemarker/cache/FileTemplateLoaderTest.java
+++ b/src/test/java/freemarker/cache/FileTemplateLoaderTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/cache/MultiTemplateLoaderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/cache/MultiTemplateLoaderTest.java b/src/test/java/freemarker/cache/MultiTemplateLoaderTest.java
index 9286185..76d6d85 100644
--- a/src/test/java/freemarker/cache/MultiTemplateLoaderTest.java
+++ b/src/test/java/freemarker/cache/MultiTemplateLoaderTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/cache/TemplateCacheTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/cache/TemplateCacheTest.java b/src/test/java/freemarker/cache/TemplateCacheTest.java
index 0dcc9ad..16f61d5 100644
--- a/src/test/java/freemarker/cache/TemplateCacheTest.java
+++ b/src/test/java/freemarker/cache/TemplateCacheTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/cache/TemplateConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/cache/TemplateConfigurationFactoryTest.java b/src/test/java/freemarker/cache/TemplateConfigurationFactoryTest.java
index 663eed2..33bb738 100644
--- a/src/test/java/freemarker/cache/TemplateConfigurationFactoryTest.java
+++ b/src/test/java/freemarker/cache/TemplateConfigurationFactoryTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/cache/TemplateNameFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/cache/TemplateNameFormatTest.java b/src/test/java/freemarker/cache/TemplateNameFormatTest.java
index a2b02ad..5cba04c 100644
--- a/src/test/java/freemarker/cache/TemplateNameFormatTest.java
+++ b/src/test/java/freemarker/cache/TemplateNameFormatTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/cache/TemplateSourceMatcherTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/cache/TemplateSourceMatcherTest.java b/src/test/java/freemarker/cache/TemplateSourceMatcherTest.java
index 06d3f6d..95195f9 100644
--- a/src/test/java/freemarker/cache/TemplateSourceMatcherTest.java
+++ b/src/test/java/freemarker/cache/TemplateSourceMatcherTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/ASTBasedErrorMessagesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/ASTBasedErrorMessagesTest.java b/src/test/java/freemarker/core/ASTBasedErrorMessagesTest.java
index 3e18666..106b533 100644
--- a/src/test/java/freemarker/core/ASTBasedErrorMessagesTest.java
+++ b/src/test/java/freemarker/core/ASTBasedErrorMessagesTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/ASTPrinter.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/ASTPrinter.java b/src/test/java/freemarker/core/ASTPrinter.java
index 82d61a1..b84d779 100644
--- a/src/test/java/freemarker/core/ASTPrinter.java
+++ b/src/test/java/freemarker/core/ASTPrinter.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/ASTTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/ASTTest.java b/src/test/java/freemarker/core/ASTTest.java
index f31b53c..8a7dee1 100644
--- a/src/test/java/freemarker/core/ASTTest.java
+++ b/src/test/java/freemarker/core/ASTTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/AppMetaTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/AppMetaTemplateDateFormatFactory.java b/src/test/java/freemarker/core/AppMetaTemplateDateFormatFactory.java
index c7e4f13..fdb1cc6 100644
--- a/src/test/java/freemarker/core/AppMetaTemplateDateFormatFactory.java
+++ b/src/test/java/freemarker/core/AppMetaTemplateDateFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/BaseNTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/BaseNTemplateNumberFormatFactory.java b/src/test/java/freemarker/core/BaseNTemplateNumberFormatFactory.java
index a669bc8..acc81ef 100644
--- a/src/test/java/freemarker/core/BaseNTemplateNumberFormatFactory.java
+++ b/src/test/java/freemarker/core/BaseNTemplateNumberFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/BreakPlacementTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/BreakPlacementTest.java b/src/test/java/freemarker/core/BreakPlacementTest.java
index b969128..8844956 100644
--- a/src/test/java/freemarker/core/BreakPlacementTest.java
+++ b/src/test/java/freemarker/core/BreakPlacementTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/CamelCaseTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/CamelCaseTest.java b/src/test/java/freemarker/core/CamelCaseTest.java
index 16232c1..22b3008 100644
--- a/src/test/java/freemarker/core/CamelCaseTest.java
+++ b/src/test/java/freemarker/core/CamelCaseTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/CanonicalFormTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/CanonicalFormTest.java b/src/test/java/freemarker/core/CanonicalFormTest.java
index c97be29..79c1136 100644
--- a/src/test/java/freemarker/core/CanonicalFormTest.java
+++ b/src/test/java/freemarker/core/CanonicalFormTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/CoercionToTextualTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/CoercionToTextualTest.java b/src/test/java/freemarker/core/CoercionToTextualTest.java
index 7b5b23b..3525c50 100644
--- a/src/test/java/freemarker/core/CoercionToTextualTest.java
+++ b/src/test/java/freemarker/core/CoercionToTextualTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/CombinedMarkupOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/CombinedMarkupOutputFormatTest.java b/src/test/java/freemarker/core/CombinedMarkupOutputFormatTest.java
index fd2ce64..b80c681 100644
--- a/src/test/java/freemarker/core/CombinedMarkupOutputFormatTest.java
+++ b/src/test/java/freemarker/core/CombinedMarkupOutputFormatTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/ConfigurableTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/ConfigurableTest.java b/src/test/java/freemarker/core/ConfigurableTest.java
index b839bac..e0a79c0 100644
--- a/src/test/java/freemarker/core/ConfigurableTest.java
+++ b/src/test/java/freemarker/core/ConfigurableTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/CoreLocaleUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/CoreLocaleUtilsTest.java b/src/test/java/freemarker/core/CoreLocaleUtilsTest.java
index 144138e..35827d1 100644
--- a/src/test/java/freemarker/core/CoreLocaleUtilsTest.java
+++ b/src/test/java/freemarker/core/CoreLocaleUtilsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/CustomHTMLOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/CustomHTMLOutputFormat.java b/src/test/java/freemarker/core/CustomHTMLOutputFormat.java
index a9e1b97..bba9b9b 100644
--- a/src/test/java/freemarker/core/CustomHTMLOutputFormat.java
+++ b/src/test/java/freemarker/core/CustomHTMLOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/CustomTemplateHTMLModel.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/CustomTemplateHTMLModel.java b/src/test/java/freemarker/core/CustomTemplateHTMLModel.java
index 9ea6e15..a1ee196 100644
--- a/src/test/java/freemarker/core/CustomTemplateHTMLModel.java
+++ b/src/test/java/freemarker/core/CustomTemplateHTMLModel.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/DateFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/DateFormatTest.java b/src/test/java/freemarker/core/DateFormatTest.java
index 792b9b2..3f8a81c 100644
--- a/src/test/java/freemarker/core/DateFormatTest.java
+++ b/src/test/java/freemarker/core/DateFormatTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/DirectiveCallPlaceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/DirectiveCallPlaceTest.java b/src/test/java/freemarker/core/DirectiveCallPlaceTest.java
index 6fc03f3..2617afc 100644
--- a/src/test/java/freemarker/core/DirectiveCallPlaceTest.java
+++ b/src/test/java/freemarker/core/DirectiveCallPlaceTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/DummyOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/DummyOutputFormat.java b/src/test/java/freemarker/core/DummyOutputFormat.java
index e26c55f..c37f45e 100644
--- a/src/test/java/freemarker/core/DummyOutputFormat.java
+++ b/src/test/java/freemarker/core/DummyOutputFormat.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/EncodingOverrideTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/EncodingOverrideTest.java b/src/test/java/freemarker/core/EncodingOverrideTest.java
index 33ecd48..5fd4ccf 100644
--- a/src/test/java/freemarker/core/EncodingOverrideTest.java
+++ b/src/test/java/freemarker/core/EncodingOverrideTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/EnvironmentCustomStateTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/EnvironmentCustomStateTest.java b/src/test/java/freemarker/core/EnvironmentCustomStateTest.java
index cf60cb4..7ec8c01 100644
--- a/src/test/java/freemarker/core/EnvironmentCustomStateTest.java
+++ b/src/test/java/freemarker/core/EnvironmentCustomStateTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/EnvironmentGetTemplateVariantsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/EnvironmentGetTemplateVariantsTest.java b/src/test/java/freemarker/core/EnvironmentGetTemplateVariantsTest.java
index dc6eb34..45864e0 100644
--- a/src/test/java/freemarker/core/EnvironmentGetTemplateVariantsTest.java
+++ b/src/test/java/freemarker/core/EnvironmentGetTemplateVariantsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/EpochMillisDivTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/EpochMillisDivTemplateDateFormatFactory.java b/src/test/java/freemarker/core/EpochMillisDivTemplateDateFormatFactory.java
index ef6e7dd..00f56f3 100644
--- a/src/test/java/freemarker/core/EpochMillisDivTemplateDateFormatFactory.java
+++ b/src/test/java/freemarker/core/EpochMillisDivTemplateDateFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/EpochMillisTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/EpochMillisTemplateDateFormatFactory.java b/src/test/java/freemarker/core/EpochMillisTemplateDateFormatFactory.java
index 33fbcc3..b65f1a1 100644
--- a/src/test/java/freemarker/core/EpochMillisTemplateDateFormatFactory.java
+++ b/src/test/java/freemarker/core/EpochMillisTemplateDateFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/ExtendedDecimalFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/ExtendedDecimalFormatTest.java b/src/test/java/freemarker/core/ExtendedDecimalFormatTest.java
index 264c1ea..da77096 100644
--- a/src/test/java/freemarker/core/ExtendedDecimalFormatTest.java
+++ b/src/test/java/freemarker/core/ExtendedDecimalFormatTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/HTMLISOTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/HTMLISOTemplateDateFormatFactory.java b/src/test/java/freemarker/core/HTMLISOTemplateDateFormatFactory.java
index 8e28ad8..1e9d2ee 100644
--- a/src/test/java/freemarker/core/HTMLISOTemplateDateFormatFactory.java
+++ b/src/test/java/freemarker/core/HTMLISOTemplateDateFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/HTMLOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/HTMLOutputFormatTest.java b/src/test/java/freemarker/core/HTMLOutputFormatTest.java
index 7348ccd..a5491ea 100644
--- a/src/test/java/freemarker/core/HTMLOutputFormatTest.java
+++ b/src/test/java/freemarker/core/HTMLOutputFormatTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/HeaderParsingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/HeaderParsingTest.java b/src/test/java/freemarker/core/HeaderParsingTest.java
index bff0070..0d92821 100644
--- a/src/test/java/freemarker/core/HeaderParsingTest.java
+++ b/src/test/java/freemarker/core/HeaderParsingTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/HexTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/HexTemplateNumberFormatFactory.java b/src/test/java/freemarker/core/HexTemplateNumberFormatFactory.java
index 54fc0dc..4bca9c7 100644
--- a/src/test/java/freemarker/core/HexTemplateNumberFormatFactory.java
+++ b/src/test/java/freemarker/core/HexTemplateNumberFormatFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/IncludeAndImportConfigurableLayersTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/IncludeAndImportConfigurableLayersTest.java b/src/test/java/freemarker/core/IncludeAndImportConfigurableLayersTest.java
index 58c9420..84fda1f 100644
--- a/src/test/java/freemarker/core/IncludeAndImportConfigurableLayersTest.java
+++ b/src/test/java/freemarker/core/IncludeAndImportConfigurableLayersTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/IncludeAndImportTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/IncludeAndImportTest.java b/src/test/java/freemarker/core/IncludeAndImportTest.java
index 28161e5..79e0c0a 100644
--- a/src/test/java/freemarker/core/IncludeAndImportTest.java
+++ b/src/test/java/freemarker/core/IncludeAndImportTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/InterpretAndEvalTemplateNameTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/InterpretAndEvalTemplateNameTest.java b/src/test/java/freemarker/core/InterpretAndEvalTemplateNameTest.java
index 5a1b3a1..6f18c37 100644
--- a/src/test/java/freemarker/core/InterpretAndEvalTemplateNameTest.java
+++ b/src/test/java/freemarker/core/InterpretAndEvalTemplateNameTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/InterpretSettingInheritanceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/InterpretSettingInheritanceTest.java b/src/test/java/freemarker/core/InterpretSettingInheritanceTest.java
index 53db46c..e4ca477 100644
--- a/src/test/java/freemarker/core/InterpretSettingInheritanceTest.java
+++ b/src/test/java/freemarker/core/InterpretSettingInheritanceTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/IteratorIssuesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/IteratorIssuesTest.java b/src/test/java/freemarker/core/IteratorIssuesTest.java
index 0c43158..db595fd 100644
--- a/src/test/java/freemarker/core/IteratorIssuesTest.java
+++ b/src/test/java/freemarker/core/IteratorIssuesTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/LegacyFMParserConstructorsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/LegacyFMParserConstructorsTest.java b/src/test/java/freemarker/core/LegacyFMParserConstructorsTest.java
index 738d227..8c8678d 100644
--- a/src/test/java/freemarker/core/LegacyFMParserConstructorsTest.java
+++ b/src/test/java/freemarker/core/LegacyFMParserConstructorsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/core/ListErrorsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/ListErrorsTest.java b/src/test/java/freemarker/core/ListErrorsTest.java
index 0c322c6..60ca7e6 100644
--- a/src/test/java/freemarker/core/ListErrorsTest.java
+++ b/src/test/java/freemarker/core/ListErrorsTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[30/50] [abbrv] incubator-freemarker git commit: Set up Eclipse and
IntelliJ IDEA to organize imports on the same way (so that they don't fight
each other, generating unnecessary diffs on commit)
Posted by dd...@apache.org.
Set up Eclipse and IntelliJ IDEA to organize imports on the same way (so that they don't fight each other, generating unnecessary diffs on commit)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/f4d2ae37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/f4d2ae37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/f4d2ae37
Branch: refs/heads/2.3
Commit: f4d2ae3758bdef6d43560d8848215438bf426c88
Parents: 99c5a65
Author: ddekany <dd...@apache.org>
Authored: Sun Feb 26 22:39:55 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Feb 26 22:39:55 2017 +0100
----------------------------------------------------------------------
README | 10 +-
.../Formatter-profile-FreeMarker.xml | 313 -------------------
.../Eclipse/Formatter-profile-FreeMarker.xml | 313 +++++++++++++++++++
.../Java-code-style-FreeMarker.xml | 35 +++
.../freemarker/cache/TemplateCacheTest.java | 6 +-
.../cache/TemplateNameFormatTest.java | 8 +-
.../IncludeAndImportConfigurableLayersTest.java | 2 +-
.../core/OptInTemplateClassResolverTest.java | 4 +-
.../core/TagSyntaxVariationsTest.java | 2 +-
.../core/TemplateConfigurationTest.java | 1 -
.../AbstractParallelIntrospectionTest.java | 2 +-
.../ext/beans/BeansAPINewInstanceTest.java | 2 +-
.../ext/beans/BeansWrapperReadOnlyTest.java | 2 +-
.../CommonSupertypeForUnwrappingHintTest.java | 2 +-
.../ext/beans/MiscNumericalOperationsTest.java | 3 +-
.../freemarker/ext/beans/TypeFlagsTest.java | 2 +-
.../ext/dom/DOMConvenienceStaticsTest.java | 2 +-
src/test/java/freemarker/ext/dom/DOMTest.java | 6 +-
.../freemarker/template/ConfigurationTest.java | 12 +-
.../template/DefaultObjectWrapperTest.java | 1 -
.../java/freemarker/template/ExceptionTest.java | 2 +-
.../java/freemarker/template/GetSourceTest.java | 2 +-
.../template/IncudeFromNamelessTest.java | 2 +-
.../template/TemplateLookupStrategyTest.java | 6 +-
.../template/utility/DateUtilTest.java | 2 +-
.../template/utility/NumberUtilTest.java | 4 +-
.../freemarker/test/servlet/WebAppTestCase.java | 3 +-
.../test/templatesuite/TemplateTestSuite.java | 3 +-
.../test/templatesuite/models/Listables.java | 12 -
29 files changed, 385 insertions(+), 379 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/README
----------------------------------------------------------------------
diff --git a/README b/README
index 85f2c56..f51afad 100644
--- a/README
+++ b/README
@@ -150,10 +150,18 @@ apply it to your development environment:
- Insert space for tabs
- Show print margin, 120 columns
- Java -> Code Style -> Formatter -> Import...
- Select src\ide-settings\Eclipse-Mars\Formatter-profile-FreeMarker.xml
+ Select src\ide-settings\Eclipse\Formatter-profile-FreeMarker.xml
inside the FreeMarker project directory.
+ (On IntelliJ IDEA, import
+ src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml instead)
This profile uses space-only indentation policy and 120 character line
width, and formatting rules that are pretty much standard in modern Java.
+ - Java -> Code Style -> Organize imports
+ (On IntelliJ IDEA, this was already configured by the Java code style
+ import earlier.)
+ The order is this (the Eclipse default): java, javax, org, com.
+ Number of imports required for .*: 99
+ Number of static imports needed for .*: 1
- Java -> Installed JRE-s:
Ensure that you have JDK 6 installed, and that it was added to Eclipse.
Note that it's not JRE, but JDK.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/ide-settings/Eclipse-Mars/Formatter-profile-FreeMarker.xml
----------------------------------------------------------------------
diff --git a/src/ide-settings/Eclipse-Mars/Formatter-profile-FreeMarker.xml b/src/ide-settings/Eclipse-Mars/Formatter-profile-FreeMarker.xml
deleted file mode 100644
index e881eaa..0000000
--- a/src/ide-settings/Eclipse-Mars/Formatter-profile-FreeMarker.xml
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<profiles version="12">
-<profile kind="CodeFormatterProfile" name="FreeMarker" version="12">
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-</profile>
-</profiles>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/ide-settings/Eclipse/Formatter-profile-FreeMarker.xml
----------------------------------------------------------------------
diff --git a/src/ide-settings/Eclipse/Formatter-profile-FreeMarker.xml b/src/ide-settings/Eclipse/Formatter-profile-FreeMarker.xml
new file mode 100644
index 0000000..e881eaa
--- /dev/null
+++ b/src/ide-settings/Eclipse/Formatter-profile-FreeMarker.xml
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<profiles version="12">
+<profile kind="CodeFormatterProfile" name="FreeMarker" version="12">
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+</profile>
+</profiles>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
----------------------------------------------------------------------
diff --git a/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml b/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
new file mode 100644
index 0000000..9615559
--- /dev/null
+++ b/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
@@ -0,0 +1,35 @@
+<code_scheme name="FreeMarker">
+ <option name="LINE_SEPARATOR" value="
" />
+ <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+ <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="1" />
+ <option name="IMPORT_LAYOUT_TABLE">
+ <value>
+ <package name="" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="java" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="javax" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="org" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="com" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="" withSubpackages="true" static="false" />
+ <emptyLine />
+ </value>
+ </option>
+ <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
+ <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
+ <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
+ <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
+ <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
+ <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+ <option name="JD_PARAM_DESCRIPTION_ON_NEW_LINE" value="true" />
+ <option name="WRAP_COMMENTS" value="true" />
+ <JavaCodeStyleSettings>
+ <option name="CLASS_NAMES_IN_JAVADOC" value="2" />
+ </JavaCodeStyleSettings>
+ <codeStyleSettings language="JAVA">
+ <option name="RIGHT_MARGIN" value="120" />
+ </codeStyleSettings>
+</code_scheme>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/cache/TemplateCacheTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/cache/TemplateCacheTest.java b/src/test/java/freemarker/cache/TemplateCacheTest.java
index 417921a..0dcc9ad 100644
--- a/src/test/java/freemarker/cache/TemplateCacheTest.java
+++ b/src/test/java/freemarker/cache/TemplateCacheTest.java
@@ -19,11 +19,7 @@
package freemarker.cache;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import java.io.IOException;
import java.io.Reader;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/cache/TemplateNameFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/cache/TemplateNameFormatTest.java b/src/test/java/freemarker/cache/TemplateNameFormatTest.java
index 77f9274..a2b02ad 100644
--- a/src/test/java/freemarker/cache/TemplateNameFormatTest.java
+++ b/src/test/java/freemarker/cache/TemplateNameFormatTest.java
@@ -19,11 +19,9 @@
package freemarker.cache;
-import static freemarker.test.hamcerst.Matchers.containsStringIgnoringCase;
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static freemarker.test.hamcerst.Matchers.*;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
import java.io.IOException;
import java.util.Locale;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/core/IncludeAndImportConfigurableLayersTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/IncludeAndImportConfigurableLayersTest.java b/src/test/java/freemarker/core/IncludeAndImportConfigurableLayersTest.java
index 96259d3..58c9420 100644
--- a/src/test/java/freemarker/core/IncludeAndImportConfigurableLayersTest.java
+++ b/src/test/java/freemarker/core/IncludeAndImportConfigurableLayersTest.java
@@ -18,7 +18,7 @@
*/
package freemarker.core;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
import java.io.StringWriter;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/core/OptInTemplateClassResolverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/OptInTemplateClassResolverTest.java b/src/test/java/freemarker/core/OptInTemplateClassResolverTest.java
index d55f050..7a27b08 100644
--- a/src/test/java/freemarker/core/OptInTemplateClassResolverTest.java
+++ b/src/test/java/freemarker/core/OptInTemplateClassResolverTest.java
@@ -24,12 +24,12 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import freemarker.template.utility.ObjectConstructor;
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
public class OptInTemplateClassResolverTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/core/TagSyntaxVariationsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/TagSyntaxVariationsTest.java b/src/test/java/freemarker/core/TagSyntaxVariationsTest.java
index 1a51178..effeec5 100644
--- a/src/test/java/freemarker/core/TagSyntaxVariationsTest.java
+++ b/src/test/java/freemarker/core/TagSyntaxVariationsTest.java
@@ -23,11 +23,11 @@ import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
-import junit.framework.TestCase;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import freemarker.template.utility.StringUtil;
+import junit.framework.TestCase;
/**
* Test various generated templates (permutations), including some deliberately
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/core/TemplateConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/TemplateConfigurationTest.java b/src/test/java/freemarker/core/TemplateConfigurationTest.java
index 13a6405..3f69abc 100644
--- a/src/test/java/freemarker/core/TemplateConfigurationTest.java
+++ b/src/test/java/freemarker/core/TemplateConfigurationTest.java
@@ -35,7 +35,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/ext/beans/AbstractParallelIntrospectionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/AbstractParallelIntrospectionTest.java b/src/test/java/freemarker/ext/beans/AbstractParallelIntrospectionTest.java
index e278d97..6bfb19b 100644
--- a/src/test/java/freemarker/ext/beans/AbstractParallelIntrospectionTest.java
+++ b/src/test/java/freemarker/ext/beans/AbstractParallelIntrospectionTest.java
@@ -19,11 +19,11 @@
package freemarker.ext.beans;
-import junit.framework.TestCase;
import freemarker.template.TemplateHashModel;
import freemarker.template.TemplateMethodModel;
import freemarker.template.TemplateModelException;
import freemarker.template.TemplateNumberModel;
+import junit.framework.TestCase;
public abstract class AbstractParallelIntrospectionTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/ext/beans/BeansAPINewInstanceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansAPINewInstanceTest.java b/src/test/java/freemarker/ext/beans/BeansAPINewInstanceTest.java
index d8e5d3a..39a1a5a 100644
--- a/src/test/java/freemarker/ext/beans/BeansAPINewInstanceTest.java
+++ b/src/test/java/freemarker/ext/beans/BeansAPINewInstanceTest.java
@@ -19,9 +19,9 @@
package freemarker.ext.beans;
-import junit.framework.TestCase;
import freemarker.template.Configuration;
import freemarker.test.utility.TestUtil;
+import junit.framework.TestCase;
public class BeansAPINewInstanceTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/ext/beans/BeansWrapperReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansWrapperReadOnlyTest.java b/src/test/java/freemarker/ext/beans/BeansWrapperReadOnlyTest.java
index 1f20c4f..b70f7ee 100644
--- a/src/test/java/freemarker/ext/beans/BeansWrapperReadOnlyTest.java
+++ b/src/test/java/freemarker/ext/beans/BeansWrapperReadOnlyTest.java
@@ -25,11 +25,11 @@ import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import junit.framework.TestCase;
import freemarker.template.DefaultObjectWrapper;
import freemarker.template.ObjectWrapper;
import freemarker.template.utility.ClassUtil;
import freemarker.template.utility.WriteProtectable;
+import junit.framework.TestCase;
/**
* Tests if all JavaBean properties of the standard {@link ObjectWrapper} classes are locked by
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/ext/beans/CommonSupertypeForUnwrappingHintTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/CommonSupertypeForUnwrappingHintTest.java b/src/test/java/freemarker/ext/beans/CommonSupertypeForUnwrappingHintTest.java
index 9da1405..5b8cc2a 100644
--- a/src/test/java/freemarker/ext/beans/CommonSupertypeForUnwrappingHintTest.java
+++ b/src/test/java/freemarker/ext/beans/CommonSupertypeForUnwrappingHintTest.java
@@ -22,9 +22,9 @@ package freemarker.ext.beans;
import java.io.Serializable;
import java.util.List;
-import junit.framework.TestCase;
import freemarker.template.Configuration;
import freemarker.template.TemplateModelException;
+import junit.framework.TestCase;
public class CommonSupertypeForUnwrappingHintTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/ext/beans/MiscNumericalOperationsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/MiscNumericalOperationsTest.java b/src/test/java/freemarker/ext/beans/MiscNumericalOperationsTest.java
index 666b743..6313bb0 100644
--- a/src/test/java/freemarker/ext/beans/MiscNumericalOperationsTest.java
+++ b/src/test/java/freemarker/ext/beans/MiscNumericalOperationsTest.java
@@ -22,11 +22,10 @@ package freemarker.ext.beans;
import java.math.BigDecimal;
import java.math.BigInteger;
-import junit.framework.TestCase;
-
import org.junit.Assert;
import freemarker.template.Configuration;
+import junit.framework.TestCase;
public class MiscNumericalOperationsTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/ext/beans/TypeFlagsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/TypeFlagsTest.java b/src/test/java/freemarker/ext/beans/TypeFlagsTest.java
index 5c8575a..5701f72 100644
--- a/src/test/java/freemarker/ext/beans/TypeFlagsTest.java
+++ b/src/test/java/freemarker/ext/beans/TypeFlagsTest.java
@@ -34,8 +34,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import junit.framework.TestCase;
import freemarker.template.Configuration;
+import junit.framework.TestCase;
public class TypeFlagsTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/ext/dom/DOMConvenienceStaticsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/dom/DOMConvenienceStaticsTest.java b/src/test/java/freemarker/ext/dom/DOMConvenienceStaticsTest.java
index 03d01a7..d93a58c 100644
--- a/src/test/java/freemarker/ext/dom/DOMConvenienceStaticsTest.java
+++ b/src/test/java/freemarker/ext/dom/DOMConvenienceStaticsTest.java
@@ -18,7 +18,7 @@
*/
package freemarker.ext.dom;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
import java.io.IOException;
import java.io.StringReader;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/ext/dom/DOMTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/dom/DOMTest.java b/src/test/java/freemarker/ext/dom/DOMTest.java
index 8c7f35e..91fef3b 100644
--- a/src/test/java/freemarker/ext/dom/DOMTest.java
+++ b/src/test/java/freemarker/ext/dom/DOMTest.java
@@ -18,10 +18,8 @@
*/
package freemarker.ext.dom;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.startsWith;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
import java.io.IOException;
import java.io.StringReader;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/template/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/ConfigurationTest.java b/src/test/java/freemarker/template/ConfigurationTest.java
index 2cba054..25986a6 100644
--- a/src/test/java/freemarker/template/ConfigurationTest.java
+++ b/src/test/java/freemarker/template/ConfigurationTest.java
@@ -19,16 +19,8 @@
package freemarker.template;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.isIn;
-import static org.hamcrest.Matchers.lessThan;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
import java.io.IOException;
import java.io.StringWriter;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
index 77d513d..9482810 100644
--- a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
+++ b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
@@ -55,7 +55,6 @@ import com.google.common.collect.ImmutableMap;
import freemarker.ext.beans.BeansWrapper;
import freemarker.ext.beans.HashAdapter;
import freemarker.ext.util.WrapperTemplateModel;
-import freemarker.test.templatesuite.models.Listables;
public class DefaultObjectWrapperTest {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/template/ExceptionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/ExceptionTest.java b/src/test/java/freemarker/template/ExceptionTest.java
index 2faa601..ee20966 100644
--- a/src/test/java/freemarker/template/ExceptionTest.java
+++ b/src/test/java/freemarker/template/ExceptionTest.java
@@ -32,10 +32,10 @@ import java.io.StringWriter;
import java.util.Collections;
import java.util.Locale;
-import junit.framework.TestCase;
import freemarker.cache.StringTemplateLoader;
import freemarker.core.ParseException;
import freemarker.template.utility.NullWriter;
+import junit.framework.TestCase;
public class ExceptionTest extends TestCase {
public ExceptionTest(String name) {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/template/GetSourceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/GetSourceTest.java b/src/test/java/freemarker/template/GetSourceTest.java
index e6bfd88..e9a0ba1 100644
--- a/src/test/java/freemarker/template/GetSourceTest.java
+++ b/src/test/java/freemarker/template/GetSourceTest.java
@@ -18,7 +18,7 @@
*/
package freemarker.template;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/template/IncudeFromNamelessTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/IncudeFromNamelessTest.java b/src/test/java/freemarker/template/IncudeFromNamelessTest.java
index c85dd46..64fd8e8 100644
--- a/src/test/java/freemarker/template/IncudeFromNamelessTest.java
+++ b/src/test/java/freemarker/template/IncudeFromNamelessTest.java
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
-import junit.framework.TestCase;
import freemarker.cache.StringTemplateLoader;
+import junit.framework.TestCase;
public class IncudeFromNamelessTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/template/TemplateLookupStrategyTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/TemplateLookupStrategyTest.java b/src/test/java/freemarker/template/TemplateLookupStrategyTest.java
index 7d2f922..085814e 100644
--- a/src/test/java/freemarker/template/TemplateLookupStrategyTest.java
+++ b/src/test/java/freemarker/template/TemplateLookupStrategyTest.java
@@ -19,11 +19,7 @@
package freemarker.template;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import java.io.IOException;
import java.io.StringWriter;
[32/50] [abbrv] incubator-freemarker git commit: (Missing copyright
header.)
Posted by dd...@apache.org.
(Missing copyright header.)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/af5968e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/af5968e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/af5968e3
Branch: refs/heads/2.3
Commit: af5968e301e17cd4f204a6da0ae8af327bc7609a
Parents: bf58114
Author: ddekany <dd...@apache.org>
Authored: Mon Feb 27 19:06:21 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Mon Feb 27 19:06:21 2017 +0100
----------------------------------------------------------------------
.../IntelliJ-IDEA/Java-code-style-FreeMarker.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/af5968e3/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
----------------------------------------------------------------------
diff --git a/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml b/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
index 9615559..eed7028 100644
--- a/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
+++ b/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<code_scheme name="FreeMarker">
<option name="LINE_SEPARATOR" value="
" />
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
[17/50] [abbrv] incubator-freemarker git commit: (Some source code
cleanup.)
Posted by dd...@apache.org.
(Some source code cleanup.)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/6a3b9266
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/6a3b9266
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/6a3b9266
Branch: refs/heads/2.3
Commit: 6a3b926611132035970c1b326b3629d6826f64e7
Parents: dce7f38
Author: ddekany <dd...@apache.org>
Authored: Sat Feb 11 17:32:45 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Feb 11 18:39:31 2017 +0100
----------------------------------------------------------------------
.../freemarker/cache/FileTemplateLoader.java | 46 ++++++----------
.../java/freemarker/cache/TemplateCache.java | 3 +-
.../freemarker/cache/URLTemplateLoader.java | 57 ++++++++++----------
src/main/java/freemarker/template/Template.java | 9 +++-
.../cache/MultiTemplateLoaderTest.java | 18 +++----
.../CopyrightCommentRemoverTemplateLoader.java | 5 ++
6 files changed, 68 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a3b9266/src/main/java/freemarker/cache/FileTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/FileTemplateLoader.java b/src/main/java/freemarker/cache/FileTemplateLoader.java
index d14368f..a769146 100644
--- a/src/main/java/freemarker/cache/FileTemplateLoader.java
+++ b/src/main/java/freemarker/cache/FileTemplateLoader.java
@@ -83,8 +83,7 @@ public class FileTemplateLoader implements TemplateLoader {
* {@link FileTemplateLoader#FileTemplateLoader(File)} instead.
*/
@Deprecated
- public FileTemplateLoader()
- throws IOException {
+ public FileTemplateLoader() throws IOException {
this(new File(SecurityUtilities.getSystemProperty("user.dir")));
}
@@ -95,8 +94,7 @@ public class FileTemplateLoader implements TemplateLoader {
* the base directory.
* @param baseDir the base directory for loading templates
*/
- public FileTemplateLoader(final File baseDir)
- throws IOException {
+ public FileTemplateLoader(final File baseDir) throws IOException {
this(baseDir, false);
}
@@ -116,11 +114,10 @@ public class FileTemplateLoader implements TemplateLoader {
* outside the {@code baseDir}, set this parameter to {@code true}, but then be very careful with
* template paths that are supplied by the visitor or an external system.
*/
- public FileTemplateLoader(final File baseDir, final boolean disableCanonicalPathCheck)
- throws IOException {
+ public FileTemplateLoader(final File baseDir, final boolean disableCanonicalPathCheck) throws IOException {
try {
- Object[] retval = (Object[]) AccessController.doPrivileged(new PrivilegedExceptionAction() {
- public Object run() throws IOException {
+ Object[] retval = (Object[]) AccessController.doPrivileged(new PrivilegedExceptionAction<Object[]>() {
+ public Object[] run() throws IOException {
if (!baseDir.exists()) {
throw new FileNotFoundException(baseDir + " does not exist.");
}
@@ -153,11 +150,10 @@ public class FileTemplateLoader implements TemplateLoader {
}
}
- public Object findTemplateSource(final String name)
- throws IOException {
+ public Object findTemplateSource(final String name) throws IOException {
try {
- return AccessController.doPrivileged(new PrivilegedExceptionAction() {
- public Object run() throws IOException {
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<File>() {
+ public File run() throws IOException {
File source = new File(baseDir, SEP_IS_SLASH ? name :
name.replace('/', File.separatorChar));
if (!source.isFile()) {
@@ -170,8 +166,8 @@ public class FileTemplateLoader implements TemplateLoader {
String normalized = source.getCanonicalPath();
if (!normalized.startsWith(canonicalBasePath)) {
throw new SecurityException(source.getAbsolutePath()
- + " resolves to " + normalized + " which " +
- " doesn't start with " + canonicalBasePath);
+ + " resolves to " + normalized + " which "
+ + " doesn't start with " + canonicalBasePath);
}
}
@@ -188,23 +184,17 @@ public class FileTemplateLoader implements TemplateLoader {
}
public long getLastModified(final Object templateSource) {
- return ((Long) (AccessController.doPrivileged(new PrivilegedAction()
- {
- public Object run() {
+ return (AccessController.doPrivileged(new PrivilegedAction<Long>() {
+ public Long run() {
return Long.valueOf(((File) templateSource).lastModified());
}
- }))).longValue();
-
-
+ })).longValue();
}
- public Reader getReader(final Object templateSource, final String encoding)
- throws IOException {
+ public Reader getReader(final Object templateSource, final String encoding) throws IOException {
try {
- return (Reader) AccessController.doPrivileged(new PrivilegedExceptionAction()
- {
- public Object run()
- throws IOException {
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Reader>() {
+ public Reader run() throws IOException {
if (!(templateSource instanceof File)) {
throw new IllegalArgumentException(
"templateSource wasn't a File, but a: " +
@@ -219,9 +209,7 @@ public class FileTemplateLoader implements TemplateLoader {
}
/**
- * Called by {@link #findTemplateSource(String)} when {@link #getEmulateCaseSensitiveFileSystem()} is {@code true}. Should throw
- * {@link FileNotFoundException} if there's a mismatch; the error message should contain both the requested and the
- * correct file name.
+ * Called by {@link #findTemplateSource(String)} when {@link #getEmulateCaseSensitiveFileSystem()} is {@code true}.
*/
private boolean isNameCaseCorrect(File source) throws IOException {
final String sourcePath = source.getPath();
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a3b9266/src/main/java/freemarker/cache/TemplateCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/TemplateCache.java b/src/main/java/freemarker/cache/TemplateCache.java
index 469c7f9..ba37c57 100644
--- a/src/main/java/freemarker/cache/TemplateCache.java
+++ b/src/main/java/freemarker/cache/TemplateCache.java
@@ -155,7 +155,8 @@ public class TemplateCache {
/**
* @param templateLoader
- * The {@link TemplateLoader} to use. Can't be {@code null}.
+ * The {@link TemplateLoader} to use. Can be {@code null}, though then every request will result in
+ * {@link TemplateNotFoundException}.
* @param cacheStorage
* The {@link CacheStorage} to use. Can't be {@code null}.
* @param templateLookupStrategy
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a3b9266/src/main/java/freemarker/cache/URLTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/URLTemplateLoader.java b/src/main/java/freemarker/cache/URLTemplateLoader.java
index e975869..d8474dd 100644
--- a/src/main/java/freemarker/cache/URLTemplateLoader.java
+++ b/src/main/java/freemarker/cache/URLTemplateLoader.java
@@ -31,8 +31,7 @@ import freemarker.template.Configuration;
/**
* This is an abstract template loader that can load templates whose
* location can be described by an URL. Subclasses only need to override
- * the {@link #getURL(String)} method. Both {@link ClassTemplateLoader} and
- * {@link WebappTemplateLoader} are (quite trivial) subclasses of this class.
+ * the {@link #getURL(String)} method.
*/
public abstract class URLTemplateLoader implements TemplateLoader {
@@ -44,16 +43,6 @@ public abstract class URLTemplateLoader implements TemplateLoader {
return url == null ? null : new URLTemplateSource(url, getURLConnectionUsesCaches());
}
- /**
- * Given a template name (plus potential locale decorations) retrieves
- * an URL that points the template source.
- * @param name the name of the sought template, including the locale
- * decorations.
- * @return an URL that points to the template source, or null if it can
- * determine that the template source does not exist.
- */
- protected abstract URL getURL(String name);
-
public long getLastModified(Object templateSource) {
return ((URLTemplateSource) templateSource).lastModified();
}
@@ -71,23 +60,6 @@ public abstract class URLTemplateLoader implements TemplateLoader {
}
/**
- * Can be used by subclasses to canonicalize URL path prefixes.
- * @param prefix the path prefix to canonicalize
- * @return the canonicalized prefix. All backslashes are replaced with
- * forward slashes, and a trailing slash is appended if the original
- * prefix wasn't empty and didn't already end with a slash.
- */
- protected static String canonicalizePrefix(String prefix) {
- // make it foolproof
- prefix = prefix.replace('\\', '/');
- // ensure there's a trailing slash
- if (prefix.length() > 0 && !prefix.endsWith("/")) {
- prefix += "/";
- }
- return prefix;
- }
-
- /**
* Getter pair of {@link #setURLConnectionUsesCaches(Boolean)}.
*
* @since 2.3.21
@@ -115,5 +87,32 @@ public abstract class URLTemplateLoader implements TemplateLoader {
public void setURLConnectionUsesCaches(Boolean urlConnectionUsesCaches) {
this.urlConnectionUsesCaches = urlConnectionUsesCaches;
}
+
+ /**
+ * Given a template name (plus potential locale decorations) retrieves
+ * an URL that points the template source.
+ * @param name the name of the sought template, including the locale
+ * decorations.
+ * @return an URL that points to the template source, or null if it can
+ * determine that the template source does not exist.
+ */
+ protected abstract URL getURL(String name);
+
+ /**
+ * Can be used by subclasses to canonicalize URL path prefixes.
+ * @param prefix the path prefix to canonicalize
+ * @return the canonicalized prefix. All backslashes are replaced with
+ * forward slashes, and a trailing slash is appended if the original
+ * prefix wasn't empty and didn't already end with a slash.
+ */
+ protected static String canonicalizePrefix(String prefix) {
+ // make it foolproof
+ prefix = prefix.replace('\\', '/');
+ // ensure there's a trailing slash
+ if (prefix.length() > 0 && !prefix.endsWith("/")) {
+ prefix += "/";
+ }
+ return prefix;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a3b9266/src/main/java/freemarker/template/Template.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/Template.java b/src/main/java/freemarker/template/Template.java
index 5b19a33..ffef603 100644
--- a/src/main/java/freemarker/template/Template.java
+++ b/src/main/java/freemarker/template/Template.java
@@ -78,6 +78,8 @@ import freemarker.debug.impl.DebuggerService;
public class Template extends Configurable {
public static final String DEFAULT_NAMESPACE_PREFIX = "D";
public static final String NO_NS_PREFIX = "N";
+
+ private static final int READER_BUFFER_SIZE = 4096;
/** This is only non-null during parsing. It's used internally to make some information available through the
* Template API-s earlier than the parsing was finished. */
@@ -164,7 +166,10 @@ public class Template extends Configurable {
* See {@link #getSourceName()} for the meaning. Can be {@code null}, in which case
* {@link #getSourceName()} will return the same as {@link #getName()}.
* @param reader
- * The character stream to read from. It will always be closed ({@link Reader#close()}) by this method.
+ * The character stream to read from. It will always be closed ({@link Reader#close()}) by
+ * this method (this is for backward compatibility; later major versions may discontinue this behavior).
+ * The {@link Reader} need not be buffered, because this method ensures that it will be read in few
+ * kilobyte chunks, not byte by byte.
* @param cfg
* The Configuration object that this Template is associated with. If this is {@code null}, the "default"
* {@link Configuration} object is used, which is highly discouraged, because it can easily lead to
@@ -234,7 +239,7 @@ public class Template extends Configurable {
ParserConfiguration actualParserConfiguration = getParserConfiguration();
if (!(reader instanceof BufferedReader) && !(reader instanceof StringReader)) {
- reader = new BufferedReader(reader, 0x1000);
+ reader = new BufferedReader(reader, READER_BUFFER_SIZE);
}
ltbReader = new LineTableBuilder(reader, actualParserConfiguration);
reader = ltbReader;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a3b9266/src/test/java/freemarker/cache/MultiTemplateLoaderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/cache/MultiTemplateLoaderTest.java b/src/test/java/freemarker/cache/MultiTemplateLoaderTest.java
index e4b14f3..9286185 100644
--- a/src/test/java/freemarker/cache/MultiTemplateLoaderTest.java
+++ b/src/test/java/freemarker/cache/MultiTemplateLoaderTest.java
@@ -38,10 +38,10 @@ public class MultiTemplateLoaderTest {
stl2.putTemplate("both.ftl", "both 2");
MultiTemplateLoader mtl = new MultiTemplateLoader(new TemplateLoader[] { stl1, stl2 });
- assertEquals("1", getTemplate(mtl, "1.ftl"));
- assertEquals("2", getTemplate(mtl, "2.ftl"));
- assertEquals("both 1", getTemplate(mtl, "both.ftl"));
- assertNull(getTemplate(mtl, "neither.ftl"));
+ assertEquals("1", getTemplateContent(mtl, "1.ftl"));
+ assertEquals("2", getTemplateContent(mtl, "2.ftl"));
+ assertEquals("both 1", getTemplateContent(mtl, "both.ftl"));
+ assertNull(getTemplateContent(mtl, "neither.ftl"));
}
@Test
@@ -64,16 +64,16 @@ public class MultiTemplateLoaderTest {
MultiTemplateLoader mtl = new MultiTemplateLoader(new TemplateLoader[] { stl1, stl2 });
mtl.setSticky(sticky);
- assertEquals("both 1", getTemplate(mtl, "both.ftl"));
+ assertEquals("both 1", getTemplateContent(mtl, "both.ftl"));
assertTrue(stl1.removeTemplate("both.ftl"));
- assertEquals("both 2", getTemplate(mtl, "both.ftl"));
+ assertEquals("both 2", getTemplateContent(mtl, "both.ftl"));
stl1.putTemplate("both.ftl", "both 1");
- assertEquals(sticky ? "both 2" : "both 1", getTemplate(mtl, "both.ftl"));
+ assertEquals(sticky ? "both 2" : "both 1", getTemplateContent(mtl, "both.ftl"));
assertTrue(stl2.removeTemplate("both.ftl"));
- assertEquals("both 1", getTemplate(mtl, "both.ftl"));
+ assertEquals("both 1", getTemplateContent(mtl, "both.ftl"));
}
- private String getTemplate(TemplateLoader tl, String name) throws IOException {
+ private String getTemplateContent(TemplateLoader tl, String name) throws IOException {
Object tSrc = tl.findTemplateSource(name);
if (tSrc == null) {
return null;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a3b9266/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java b/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
index 8c4a48d..b6b058e 100644
--- a/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
+++ b/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
@@ -27,6 +27,11 @@ import org.apache.commons.io.IOUtils;
import freemarker.cache.TemplateLoader;
import freemarker.test.utility.TestUtil;
+/**
+ * Removes the Apache copyright boiler plate from the beginning of the template, so that they don't mess up the expected
+ * template output. This can interfere with tests that try to test I/O errors and such low level things, so use with
+ * care.
+ */
public class CopyrightCommentRemoverTemplateLoader implements TemplateLoader {
private final TemplateLoader innerTemplateLoader;