(Organize imports)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/ace88bf8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/ace88bf8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/ace88bf8 Branch: refs/heads/3 Commit: ace88bf8bd85f8b629e2b03599c77f4ab2b5617b Parents: 583c855 Author: ddekany <[email protected]> Authored: Thu Feb 23 23:52:33 2017 +0100 Committer: ddekany <[email protected]> Committed: Thu Feb 23 23:52:33 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/freemarker/core/ASTDirList.java | 1 - .../core/AliasTemplateDateFormatFactory.java | 2 +- .../core/AliasTemplateNumberFormatFactory.java | 2 +- .../core/BuiltInWithParseTimeParameters.java | 2 -- .../apache/freemarker/core/BuiltInsForSequences.java | 2 +- .../core/BuiltInsWithParseTimeParameters.java | 1 - .../java/org/apache/freemarker/core/Configurable.java | 2 +- .../java/org/apache/freemarker/core/Configuration.java | 13 +++++++++++-- .../freemarker/core/ISOLikeTemplateDateFormat.java | 2 +- .../org/apache/freemarker/core/ParseException.java | 2 -- src/main/java/org/apache/freemarker/core/Template.java | 11 ++++++++++- .../freemarker/core/debug/impl/DebuggerServer.java | 2 +- .../freemarker/core/debug/impl/RmiDebuggerService.java | 2 +- .../org/apache/freemarker/core/model/Constants.java | 9 --------- .../core/model/ObjectWrapperWithAPISupport.java | 5 ----- .../freemarker/core/model/RichObjectWrapper.java | 4 ---- .../core/model/impl/DefaultIterableAdapter.java | 2 +- .../freemarker/core/model/impl/DefaultListAdapter.java | 4 ++-- .../freemarker/core/model/impl/DefaultMapAdapter.java | 2 +- .../model/impl/DefaultNonListCollectionAdapter.java | 2 +- .../core/model/impl/MapKeyValuePairIterator.java | 4 ++-- .../freemarker/core/model/impl/SimpleSequence.java | 10 +++++++++- .../core/model/impl/beans/SimpleMapModel.java | 2 +- .../core/util/_UnmodifiableCompositeSet.java | 2 -- .../apache/freemarker/servlet/FreemarkerServlet.java | 4 ++-- .../freemarker/servlet/WebAppTemplateLoader.java | 6 +++--- .../java/org/apache/freemarker/core/ASTPrinter.java | 8 -------- .../freemarker/core/ActualNamingConvetionTest.java | 4 +--- .../apache/freemarker/core/ActualTagSyntaxTest.java | 4 +--- .../core/AppMetaTemplateDateFormatFactory.java | 8 -------- .../core/BaseNTemplateNumberFormatFactory.java | 7 ------- .../org/apache/freemarker/core/BreakPlacementTest.java | 2 -- .../org/apache/freemarker/core/CanonicalFormTest.java | 4 ---- .../apache/freemarker/core/CoercionToTextualTest.java | 2 +- .../org/apache/freemarker/core/ConfigurableTest.java | 3 --- .../apache/freemarker/core/CoreLocaleUtilsTest.java | 3 ++- .../apache/freemarker/core/DirectiveCallPlaceTest.java | 6 ------ .../apache/freemarker/core/EncodingOverrideTest.java | 3 --- .../freemarker/core/EnvironmentCustomStateTest.java | 3 --- .../core/EnvironmentGetTemplateVariantsTest.java | 5 ----- .../core/EpochMillisDivTemplateDateFormatFactory.java | 8 -------- .../core/EpochMillisTemplateDateFormatFactory.java | 7 ------- .../freemarker/core/ExtendedDecimalFormatTest.java | 12 ++++++------ .../core/HTMLISOTemplateDateFormatFactory.java | 2 +- .../org/apache/freemarker/core/HeaderParsingTest.java | 2 -- .../core/HexTemplateNumberFormatFactory.java | 6 ------ .../core/IncludeAndImportConfigurableLayersTest.java | 5 ----- .../apache/freemarker/core/IncludeAndImportTest.java | 4 ---- .../apache/freemarker/core/IncudeFromNamelessTest.java | 3 --- .../core/InterpretAndEvalTemplateNameTest.java | 1 - .../core/InterpretSettingInheritanceTest.java | 2 -- .../org/apache/freemarker/core/IteratorIssuesTest.java | 1 - .../freemarker/core/JavaCCExceptionAsEOFFixTest.java | 5 ++--- .../org/apache/freemarker/core/ListErrorsTest.java | 2 -- .../LocAndTZSensitiveTemplateDateFormatFactory.java | 8 -------- .../LocaleSensitiveTemplateNumberFormatFactory.java | 6 ------ .../org/apache/freemarker/core/NumberFormatTest.java | 9 --------- .../core/OptInTemplateClassResolverTest.java | 7 ------- .../org/apache/freemarker/core/OutputFormatTest.java | 2 +- .../freemarker/core/ParsingErrorMessagesTest.java | 3 --- .../core/PrintfGTemplateNumberFormatFactory.java | 2 +- .../org/apache/freemarker/core/SQLTimeZoneTest.java | 1 - .../apache/freemarker/core/SettingDirectiveTest.java | 5 ++--- .../java/org/apache/freemarker/core/TabSizeTest.java | 5 ----- .../freemarker/core/TagSyntaxVariationsTest.java | 4 ---- .../apache/freemarker/core/TemplatGetEncodingTest.java | 5 ----- .../freemarker/core/TemplateConfigurationTest.java | 2 +- .../TemplateConfigurationWithTemplateResolverTest.java | 5 ----- .../apache/freemarker/core/TemplateLevelSettings.java | 4 ---- .../core/TemplateNameSpecialVariablesTest.java | 3 --- .../freemarker/core/TheadInterruptingSupportTest.java | 5 ----- .../apache/freemarker/core/UnclosedCommentTest.java | 2 -- .../java/org/apache/freemarker/core/VersionTest.java | 7 +++++-- .../freemarker/core/WhitespaceStrippingTest.java | 2 -- .../apache/freemarker/core/XHTMLOutputFormatTest.java | 4 ++-- .../apache/freemarker/core/XMLOutputFormatTest.java | 4 ++-- .../model/impl/beans/AlphabeticalMethodSorter.java | 2 -- .../core/model/impl/beans/ErrorMessagesTest.java | 4 ++-- .../beans/GetlessMethodsAsPropertyGettersRule.java | 2 -- .../impl/beans/IsMoreSpecificParameterTypeTest.java | 2 -- .../model/impl/beans/Java7MembersOnlyBeansWrapper.java | 2 -- .../model/impl/beans/OverloadedNumberUtilTest.java | 3 --- .../templateresolver/DefaultTemplateResolverTest.java | 2 -- .../core/templateresolver/MultiTemplateLoaderTest.java | 4 ---- .../core/templateresolver/TemplateNameFormatTest.java | 1 - .../templateresolver/TemplateSourceMatcherTest.java | 11 +++-------- .../apache/freemarker/core/util/NumberUtilTest.java | 5 ++--- .../manualtest/ConfigureOutputFormatExamples.java | 4 ++-- .../org/apache/freemarker/manualtest/ExamplesTest.java | 1 - .../manualtest/TemplateConfigurationExamples.java | 6 +++--- .../apache/freemarker/servlet/InitParamParserTest.java | 1 - .../servlet/jsp/JspTestFreemarkerServlet.java | 1 - .../apache/freemarker/servlet/jsp/TLDParsingTest.java | 1 - .../freemarker/servlet/jsp/TaglibMethodUtilTest.java | 3 +-- .../org/apache/freemarker/test/ResourcesExtractor.java | 1 - 95 files changed, 91 insertions(+), 282 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/ASTDirList.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ASTDirList.java b/src/main/java/org/apache/freemarker/core/ASTDirList.java index 4d9f54a..df4bbd8 100644 --- a/src/main/java/org/apache/freemarker/core/ASTDirList.java +++ b/src/main/java/org/apache/freemarker/core/ASTDirList.java @@ -31,7 +31,6 @@ import org.apache.freemarker.core.model.TemplateHashModelEx2; import org.apache.freemarker.core.model.TemplateHashModelEx2.KeyValuePair; import org.apache.freemarker.core.model.TemplateHashModelEx2.KeyValuePairIterator; import org.apache.freemarker.core.model.TemplateModel; -import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateModelIterator; import org.apache.freemarker.core.model.TemplateScalarModel; import org.apache.freemarker.core.model.TemplateSequenceModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/AliasTemplateDateFormatFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/AliasTemplateDateFormatFactory.java b/src/main/java/org/apache/freemarker/core/AliasTemplateDateFormatFactory.java index 2334680..5e6333c 100644 --- a/src/main/java/org/apache/freemarker/core/AliasTemplateDateFormatFactory.java +++ b/src/main/java/org/apache/freemarker/core/AliasTemplateDateFormatFactory.java @@ -22,8 +22,8 @@ import java.util.Locale; import java.util.Map; import java.util.TimeZone; -import org.apache.freemarker.core.util._StringUtil; import org.apache.freemarker.core.util._LocaleUtil; +import org.apache.freemarker.core.util._StringUtil; /** * Creates an alias to another format, so that the format can be referred to with a simple name in the template, rather http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/AliasTemplateNumberFormatFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/AliasTemplateNumberFormatFactory.java b/src/main/java/org/apache/freemarker/core/AliasTemplateNumberFormatFactory.java index 9fcf6d0..6b00223 100644 --- a/src/main/java/org/apache/freemarker/core/AliasTemplateNumberFormatFactory.java +++ b/src/main/java/org/apache/freemarker/core/AliasTemplateNumberFormatFactory.java @@ -21,8 +21,8 @@ package org.apache.freemarker.core; import java.util.Locale; import java.util.Map; -import org.apache.freemarker.core.util._StringUtil; import org.apache.freemarker.core.util._LocaleUtil; +import org.apache.freemarker.core.util._StringUtil; /** * Creates an alias to another format, so that the format can be referred to with a simple name in the template, rather http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/BuiltInWithParseTimeParameters.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/BuiltInWithParseTimeParameters.java b/src/main/java/org/apache/freemarker/core/BuiltInWithParseTimeParameters.java index 60910b3..ac9e8cd 100644 --- a/src/main/java/org/apache/freemarker/core/BuiltInWithParseTimeParameters.java +++ b/src/main/java/org/apache/freemarker/core/BuiltInWithParseTimeParameters.java @@ -20,8 +20,6 @@ package org.apache.freemarker.core; import java.util.List; -import org.apache.freemarker.core.Token; - abstract class BuiltInWithParseTimeParameters extends SpecialBuiltIn { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java b/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java index 39ae949..54479e7 100644 --- a/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java +++ b/src/main/java/org/apache/freemarker/core/BuiltInsForSequences.java @@ -27,6 +27,7 @@ import java.util.Comparator; import java.util.Date; import java.util.List; +import org.apache.freemarker.core.model.Constants; import org.apache.freemarker.core.model.TemplateBooleanModel; import org.apache.freemarker.core.model.TemplateCollectionModel; import org.apache.freemarker.core.model.TemplateDateModel; @@ -43,7 +44,6 @@ import org.apache.freemarker.core.model.impl.SimpleNumber; import org.apache.freemarker.core.model.impl.SimpleScalar; import org.apache.freemarker.core.model.impl.TemplateModelListSequence; import org.apache.freemarker.core.model.impl.beans.CollectionModel; -import org.apache.freemarker.core.model.Constants; import org.apache.freemarker.core.util.BugException; import org.apache.freemarker.core.util._StringUtil; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/BuiltInsWithParseTimeParameters.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/BuiltInsWithParseTimeParameters.java b/src/main/java/org/apache/freemarker/core/BuiltInsWithParseTimeParameters.java index a3b5689..1fc03a9 100644 --- a/src/main/java/org/apache/freemarker/core/BuiltInsWithParseTimeParameters.java +++ b/src/main/java/org/apache/freemarker/core/BuiltInsWithParseTimeParameters.java @@ -21,7 +21,6 @@ package org.apache.freemarker.core; import java.util.ArrayList; import java.util.List; -import org.apache.freemarker.core.Token; import org.apache.freemarker.core.model.TemplateModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/Configurable.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/Configurable.java b/src/main/java/org/apache/freemarker/core/Configurable.java index 6ae277c..b4fc5bf 100644 --- a/src/main/java/org/apache/freemarker/core/Configurable.java +++ b/src/main/java/org/apache/freemarker/core/Configurable.java @@ -46,7 +46,7 @@ import org.apache.freemarker.core.model.impl.DefaultObjectWrapperBuilder; import org.apache.freemarker.core.model.impl.SimpleObjectWrapper; import org.apache.freemarker.core.model.impl._StaticObjectWrappers; import org.apache.freemarker.core.model.impl.beans.BeansWrapper; -import org.apache.freemarker.core.outputformat.*; +import org.apache.freemarker.core.outputformat.OutputFormat; import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; import org.apache.freemarker.core.outputformat.impl.PlainTextOutputFormat; import org.apache.freemarker.core.outputformat.impl.RTFOutputFormat; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/Configuration.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/Configuration.java b/src/main/java/org/apache/freemarker/core/Configuration.java index edf1184..af86664 100644 --- a/src/main/java/org/apache/freemarker/core/Configuration.java +++ b/src/main/java/org/apache/freemarker/core/Configuration.java @@ -48,8 +48,17 @@ import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateModelIterator; import org.apache.freemarker.core.model.TemplateScalarModel; import org.apache.freemarker.core.model.impl.DefaultObjectWrapperBuilder; -import org.apache.freemarker.core.outputformat.*; -import org.apache.freemarker.core.outputformat.impl.*; +import org.apache.freemarker.core.outputformat.MarkupOutputFormat; +import org.apache.freemarker.core.outputformat.OutputFormat; +import org.apache.freemarker.core.outputformat.UnregisteredOutputFormatException; +import org.apache.freemarker.core.outputformat.impl.CombinedMarkupOutputFormat; +import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; +import org.apache.freemarker.core.outputformat.impl.JSONOutputFormat; +import org.apache.freemarker.core.outputformat.impl.PlainTextOutputFormat; +import org.apache.freemarker.core.outputformat.impl.RTFOutputFormat; +import org.apache.freemarker.core.outputformat.impl.UndefinedOutputFormat; +import org.apache.freemarker.core.outputformat.impl.XHTMLOutputFormat; +import org.apache.freemarker.core.outputformat.impl.XMLOutputFormat; import org.apache.freemarker.core.templateresolver.CacheStorage; import org.apache.freemarker.core.templateresolver.GetTemplateResult; import org.apache.freemarker.core.templateresolver.MalformedTemplateNameException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/ISOLikeTemplateDateFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ISOLikeTemplateDateFormat.java b/src/main/java/org/apache/freemarker/core/ISOLikeTemplateDateFormat.java index ca6ec02..bc48a98 100644 --- a/src/main/java/org/apache/freemarker/core/ISOLikeTemplateDateFormat.java +++ b/src/main/java/org/apache/freemarker/core/ISOLikeTemplateDateFormat.java @@ -26,10 +26,10 @@ import org.apache.freemarker.core.model.TemplateDateModel; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.util.BugException; import org.apache.freemarker.core.util._DateUtil; -import org.apache.freemarker.core.util._StringUtil; import org.apache.freemarker.core.util._DateUtil.CalendarFieldsToDateConverter; import org.apache.freemarker.core.util._DateUtil.DateParseException; import org.apache.freemarker.core.util._DateUtil.DateToISO8601CalendarFactory; +import org.apache.freemarker.core.util._StringUtil; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/ParseException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ParseException.java b/src/main/java/org/apache/freemarker/core/ParseException.java index 2b5eef2..9f224ff 100644 --- a/src/main/java/org/apache/freemarker/core/ParseException.java +++ b/src/main/java/org/apache/freemarker/core/ParseException.java @@ -24,8 +24,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.apache.freemarker.core.FMParserConstants; -import org.apache.freemarker.core.Token; import org.apache.freemarker.core.util._SecurityUtil; import org.apache.freemarker.core.util._StringUtil; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/Template.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/Template.java b/src/main/java/org/apache/freemarker/core/Template.java index 6c863c6..7fb0483 100644 --- a/src/main/java/org/apache/freemarker/core/Template.java +++ b/src/main/java/org/apache/freemarker/core/Template.java @@ -19,7 +19,16 @@ package org.apache.freemarker.core; -import java.io.*; +import java.io.BufferedReader; +import java.io.FilterReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintStream; +import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; +import java.io.Writer; import java.lang.reflect.UndeclaredThrowableException; import java.util.ArrayList; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/debug/impl/DebuggerServer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/debug/impl/DebuggerServer.java b/src/main/java/org/apache/freemarker/core/debug/impl/DebuggerServer.java index 799bff4..ccd2bee 100644 --- a/src/main/java/org/apache/freemarker/core/debug/impl/DebuggerServer.java +++ b/src/main/java/org/apache/freemarker/core/debug/impl/DebuggerServer.java @@ -33,8 +33,8 @@ import java.util.Random; import org.apache.freemarker.core._CoreLogs; import org.apache.freemarker.core.debug.Debugger; -import org.apache.freemarker.core.util._SecurityUtil; import org.apache.freemarker.core.util.UndeclaredThrowableException; +import org.apache.freemarker.core.util._SecurityUtil; import org.slf4j.Logger; /** http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerService.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerService.java b/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerService.java index a944d8b..54ce9a3 100644 --- a/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerService.java +++ b/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerService.java @@ -37,9 +37,9 @@ import java.util.Map; import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.Template; +import org.apache.freemarker.core._ASTDebugBreak; import org.apache.freemarker.core._ASTElement; import org.apache.freemarker.core._CoreAPI; -import org.apache.freemarker.core._ASTDebugBreak; import org.apache.freemarker.core.debug.Breakpoint; import org.apache.freemarker.core.debug.DebuggerListener; import org.apache.freemarker.core.debug.EnvironmentSuspendedEvent; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/model/Constants.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/Constants.java b/src/main/java/org/apache/freemarker/core/model/Constants.java index 1438c0d..010a0c0 100644 --- a/src/main/java/org/apache/freemarker/core/model/Constants.java +++ b/src/main/java/org/apache/freemarker/core/model/Constants.java @@ -21,15 +21,6 @@ package org.apache.freemarker.core.model; import java.io.Serializable; -import org.apache.freemarker.core.model.TemplateBooleanModel; -import org.apache.freemarker.core.model.TemplateCollectionModel; -import org.apache.freemarker.core.model.TemplateHashModelEx; -import org.apache.freemarker.core.model.TemplateModel; -import org.apache.freemarker.core.model.TemplateModelException; -import org.apache.freemarker.core.model.TemplateModelIterator; -import org.apache.freemarker.core.model.TemplateNumberModel; -import org.apache.freemarker.core.model.TemplateScalarModel; -import org.apache.freemarker.core.model.TemplateSequenceModel; import org.apache.freemarker.core.model.impl.SimpleNumber; /** http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/model/ObjectWrapperWithAPISupport.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/ObjectWrapperWithAPISupport.java b/src/main/java/org/apache/freemarker/core/model/ObjectWrapperWithAPISupport.java index 19c3602..7ca2e59 100644 --- a/src/main/java/org/apache/freemarker/core/model/ObjectWrapperWithAPISupport.java +++ b/src/main/java/org/apache/freemarker/core/model/ObjectWrapperWithAPISupport.java @@ -19,11 +19,6 @@ package org.apache.freemarker.core.model; -import org.apache.freemarker.core.model.ObjectWrapper; -import org.apache.freemarker.core.model.TemplateHashModel; -import org.apache.freemarker.core.model.TemplateModel; -import org.apache.freemarker.core.model.TemplateModelException; - /** * <b>Experimental - subject to change:</b> Implemented by {@link ObjectWrapper}-s to help {@link TemplateModel}-s to * implement the {@code someValue?api} operation. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/model/RichObjectWrapper.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/RichObjectWrapper.java b/src/main/java/org/apache/freemarker/core/model/RichObjectWrapper.java index 2f24014..02e8db0 100644 --- a/src/main/java/org/apache/freemarker/core/model/RichObjectWrapper.java +++ b/src/main/java/org/apache/freemarker/core/model/RichObjectWrapper.java @@ -19,10 +19,6 @@ package org.apache.freemarker.core.model; -import org.apache.freemarker.core.model.ObjectWrapper; -import org.apache.freemarker.core.model.ObjectWrapperAndUnwrapper; -import org.apache.freemarker.core.model.ObjectWrapperWithAPISupport; - /** * <b>Experimental - subject to change:</b> Union of the interfaces that a typical feature rich {@link ObjectWrapper} is * expected to implement. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java index 56fe283..571ea6e 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java @@ -26,6 +26,7 @@ import java.util.Iterator; import org.apache.freemarker.core.model.AdapterTemplateModel; import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.ObjectWrapperAndUnwrapper; +import org.apache.freemarker.core.model.ObjectWrapperWithAPISupport; import org.apache.freemarker.core.model.TemplateCollectionModel; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; @@ -33,7 +34,6 @@ import org.apache.freemarker.core.model.TemplateModelIterator; import org.apache.freemarker.core.model.TemplateModelWithAPISupport; import org.apache.freemarker.core.model.WrapperTemplateModel; import org.apache.freemarker.core.model.WrappingTemplateModel; -import org.apache.freemarker.core.model.ObjectWrapperWithAPISupport; /** * Adapts an {@link Iterable} to the corresponding {@link TemplateModel} interface(s), most importantly to http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java index 1ebd3e1..bf5ff40 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java @@ -25,6 +25,8 @@ import java.util.List; import org.apache.freemarker.core.model.AdapterTemplateModel; import org.apache.freemarker.core.model.ObjectWrapper; +import org.apache.freemarker.core.model.ObjectWrapperWithAPISupport; +import org.apache.freemarker.core.model.RichObjectWrapper; import org.apache.freemarker.core.model.TemplateCollectionModel; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; @@ -33,8 +35,6 @@ import org.apache.freemarker.core.model.TemplateModelWithAPISupport; import org.apache.freemarker.core.model.TemplateSequenceModel; import org.apache.freemarker.core.model.WrapperTemplateModel; import org.apache.freemarker.core.model.WrappingTemplateModel; -import org.apache.freemarker.core.model.ObjectWrapperWithAPISupport; -import org.apache.freemarker.core.model.RichObjectWrapper; /** * Adapts a {@link List} to the corresponding {@link TemplateModel} interface(s), most importantly to http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java index fe163ed..8bf8d03 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java @@ -27,6 +27,7 @@ import org.apache.freemarker.core._DelayedJQuote; import org.apache.freemarker.core._TemplateModelException; import org.apache.freemarker.core.model.AdapterTemplateModel; import org.apache.freemarker.core.model.ObjectWrapper; +import org.apache.freemarker.core.model.ObjectWrapperWithAPISupport; import org.apache.freemarker.core.model.TemplateCollectionModel; import org.apache.freemarker.core.model.TemplateHashModelEx; import org.apache.freemarker.core.model.TemplateHashModelEx2; @@ -35,7 +36,6 @@ import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateModelWithAPISupport; import org.apache.freemarker.core.model.WrapperTemplateModel; import org.apache.freemarker.core.model.WrappingTemplateModel; -import org.apache.freemarker.core.model.ObjectWrapperWithAPISupport; /** * Adapts a {@link Map} to the corresponding {@link TemplateModel} interface(s), most importantly to http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java index 4345f70..417b8fc 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java @@ -28,6 +28,7 @@ import org.apache.freemarker.core._TemplateModelException; import org.apache.freemarker.core.model.AdapterTemplateModel; import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.ObjectWrapperAndUnwrapper; +import org.apache.freemarker.core.model.ObjectWrapperWithAPISupport; import org.apache.freemarker.core.model.TemplateCollectionModelEx; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; @@ -35,7 +36,6 @@ import org.apache.freemarker.core.model.TemplateModelIterator; import org.apache.freemarker.core.model.TemplateModelWithAPISupport; import org.apache.freemarker.core.model.WrapperTemplateModel; import org.apache.freemarker.core.model.WrappingTemplateModel; -import org.apache.freemarker.core.model.ObjectWrapperWithAPISupport; /** * <b>Experimental - subject to change:</b> Adapts a non-{@link List} Java {@link Collection} to the corresponding http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java b/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java index e8797e7..9e4c215 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java @@ -24,10 +24,10 @@ import java.util.Map.Entry; import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.TemplateHashModelEx2; -import org.apache.freemarker.core.model.TemplateModel; -import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateHashModelEx2.KeyValuePair; import org.apache.freemarker.core.model.TemplateHashModelEx2.KeyValuePairIterator; +import org.apache.freemarker.core.model.TemplateModel; +import org.apache.freemarker.core.model.TemplateModelException; /** * Implementation of {@link KeyValuePairIterator} for a {@link TemplateHashModelEx2} that wraps or otherwise uses a http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java b/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java index 8f86f3f..b0d5b81 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java @@ -24,7 +24,15 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.freemarker.core.model.*; +import org.apache.freemarker.core.model.ObjectWrapper; +import org.apache.freemarker.core.model.RichObjectWrapper; +import org.apache.freemarker.core.model.TemplateBooleanModel; +import org.apache.freemarker.core.model.TemplateCollectionModel; +import org.apache.freemarker.core.model.TemplateModel; +import org.apache.freemarker.core.model.TemplateModelException; +import org.apache.freemarker.core.model.TemplateModelIterator; +import org.apache.freemarker.core.model.TemplateSequenceModel; +import org.apache.freemarker.core.model.WrappingTemplateModel; import org.apache.freemarker.core.model.impl.beans.BeansWrapper; /** http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java index d8ce069..80e04f7 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java @@ -24,6 +24,7 @@ import java.util.Map; import org.apache.freemarker.core.model.AdapterTemplateModel; import org.apache.freemarker.core.model.ObjectWrapper; +import org.apache.freemarker.core.model.RichObjectWrapper; import org.apache.freemarker.core.model.TemplateCollectionModel; import org.apache.freemarker.core.model.TemplateHashModelEx2; import org.apache.freemarker.core.model.TemplateMethodModelEx; @@ -35,7 +36,6 @@ import org.apache.freemarker.core.model.WrappingTemplateModel; import org.apache.freemarker.core.model.impl.CollectionAndSequence; import org.apache.freemarker.core.model.impl.MapKeyValuePairIterator; import org.apache.freemarker.core.model.impl.SimpleSequence; -import org.apache.freemarker.core.model.RichObjectWrapper; /** * Model used by {@link BeansWrapper} when <tt>simpleMapWrapper</tt> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/core/util/_UnmodifiableCompositeSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/util/_UnmodifiableCompositeSet.java b/src/main/java/org/apache/freemarker/core/util/_UnmodifiableCompositeSet.java index b194a06..8a551d2 100644 --- a/src/main/java/org/apache/freemarker/core/util/_UnmodifiableCompositeSet.java +++ b/src/main/java/org/apache/freemarker/core/util/_UnmodifiableCompositeSet.java @@ -22,8 +22,6 @@ package org.apache.freemarker.core.util; import java.util.Iterator; import java.util.Set; -import org.apache.freemarker.core.util._UnmodifiableSet; - /** Don't use this; used internally by FreeMarker, might changes without notice. */ public class _UnmodifiableCompositeSet<E> extends _UnmodifiableSet<E> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java b/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java index 31ad038..25d09e5 100644 --- a/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java +++ b/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java @@ -45,8 +45,6 @@ import org.apache.freemarker.core.Configurable; import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core.ConfigurationException; import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.outputformat.OutputFormat; -import org.apache.freemarker.core.outputformat.impl.UndefinedOutputFormat; import org.apache.freemarker.core.Template; import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.core.TemplateExceptionHandler; @@ -56,6 +54,8 @@ import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.impl._StaticObjectWrappers; +import org.apache.freemarker.core.outputformat.OutputFormat; +import org.apache.freemarker.core.outputformat.impl.UndefinedOutputFormat; import org.apache.freemarker.core.templateresolver.TemplateLoader; import org.apache.freemarker.core.templateresolver.impl.ClassTemplateLoader; import org.apache.freemarker.core.templateresolver.impl.FileTemplateLoader; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java b/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java index 3fce797..70ca20c 100644 --- a/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java +++ b/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java @@ -35,13 +35,13 @@ import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core._CoreLogs; import org.apache.freemarker.core.templateresolver.TemplateLoader; import org.apache.freemarker.core.templateresolver.TemplateLoaderSession; -import org.apache.freemarker.core.util._CollectionUtil; -import org.apache.freemarker.core.util._NullArgumentException; -import org.apache.freemarker.core.util._StringUtil; import org.apache.freemarker.core.templateresolver.TemplateLoadingResult; import org.apache.freemarker.core.templateresolver.TemplateLoadingSource; import org.apache.freemarker.core.templateresolver.impl.URLTemplateLoader; import org.apache.freemarker.core.templateresolver.impl._TemplateLoaderUtils; +import org.apache.freemarker.core.util._CollectionUtil; +import org.apache.freemarker.core.util._NullArgumentException; +import org.apache.freemarker.core.util._StringUtil; import org.slf4j.Logger; /** http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/ASTPrinter.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ASTPrinter.java b/src/test/java/org/apache/freemarker/core/ASTPrinter.java index c615734..f4baf3f 100644 --- a/src/test/java/org/apache/freemarker/core/ASTPrinter.java +++ b/src/test/java/org/apache/freemarker/core/ASTPrinter.java @@ -38,14 +38,6 @@ import java.util.Enumeration; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ASTExpression; -import org.apache.freemarker.core.ASTImplicitParent; -import org.apache.freemarker.core.ParameterRole; -import org.apache.freemarker.core.ParseException; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core._ASTElement; -import org.apache.freemarker.core.ASTNode; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.util.FTLUtil; import org.apache.freemarker.core.util._ClassUtil; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/ActualNamingConvetionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ActualNamingConvetionTest.java b/src/test/java/org/apache/freemarker/core/ActualNamingConvetionTest.java index 72cb0d6..efaa828 100644 --- a/src/test/java/org/apache/freemarker/core/ActualNamingConvetionTest.java +++ b/src/test/java/org/apache/freemarker/core/ActualNamingConvetionTest.java @@ -19,12 +19,10 @@ package org.apache.freemarker.core; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.io.IOException; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Template; import org.junit.Test; public class ActualNamingConvetionTest { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/ActualTagSyntaxTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ActualTagSyntaxTest.java b/src/test/java/org/apache/freemarker/core/ActualTagSyntaxTest.java index 85a4cd0..a3dfa35 100644 --- a/src/test/java/org/apache/freemarker/core/ActualTagSyntaxTest.java +++ b/src/test/java/org/apache/freemarker/core/ActualTagSyntaxTest.java @@ -19,12 +19,10 @@ package org.apache.freemarker.core; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.io.IOException; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Template; import org.junit.Test; public class ActualTagSyntaxTest { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/AppMetaTemplateDateFormatFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/AppMetaTemplateDateFormatFactory.java b/src/test/java/org/apache/freemarker/core/AppMetaTemplateDateFormatFactory.java index 94c8dff..592dc65 100644 --- a/src/test/java/org/apache/freemarker/core/AppMetaTemplateDateFormatFactory.java +++ b/src/test/java/org/apache/freemarker/core/AppMetaTemplateDateFormatFactory.java @@ -22,14 +22,6 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.InvalidFormatParametersException; -import org.apache.freemarker.core.TemplateDateFormat; -import org.apache.freemarker.core.TemplateDateFormatFactory; -import org.apache.freemarker.core.TemplateFormatUtil; -import org.apache.freemarker.core.UnformattableValueException; -import org.apache.freemarker.core.UnknownDateTypeFormattingUnsupportedException; -import org.apache.freemarker.core.UnparsableValueException; import org.apache.freemarker.core.model.TemplateDateModel; import org.apache.freemarker.core.model.TemplateModelException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/BaseNTemplateNumberFormatFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/BaseNTemplateNumberFormatFactory.java b/src/test/java/org/apache/freemarker/core/BaseNTemplateNumberFormatFactory.java index 576063b..e1b8980 100644 --- a/src/test/java/org/apache/freemarker/core/BaseNTemplateNumberFormatFactory.java +++ b/src/test/java/org/apache/freemarker/core/BaseNTemplateNumberFormatFactory.java @@ -20,13 +20,6 @@ package org.apache.freemarker.core; import java.util.Locale; -import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.InvalidFormatParametersException; -import org.apache.freemarker.core.TemplateFormatUtil; -import org.apache.freemarker.core.TemplateNumberFormat; -import org.apache.freemarker.core.TemplateNumberFormatFactory; -import org.apache.freemarker.core.TemplateValueFormatException; -import org.apache.freemarker.core.UnformattableValueException; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateNumberModel; import org.apache.freemarker.core.util._NumberUtil; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/BreakPlacementTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/BreakPlacementTest.java b/src/test/java/org/apache/freemarker/core/BreakPlacementTest.java index 0278a40..4e3a9c6 100644 --- a/src/test/java/org/apache/freemarker/core/BreakPlacementTest.java +++ b/src/test/java/org/apache/freemarker/core/BreakPlacementTest.java @@ -21,8 +21,6 @@ package org.apache.freemarker.core; import java.io.IOException; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.test.TemplateTest; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/CanonicalFormTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/CanonicalFormTest.java b/src/test/java/org/apache/freemarker/core/CanonicalFormTest.java index 1ca5de5..2498e89 100644 --- a/src/test/java/org/apache/freemarker/core/CanonicalFormTest.java +++ b/src/test/java/org/apache/freemarker/core/CanonicalFormTest.java @@ -22,10 +22,6 @@ package org.apache.freemarker.core; import java.io.IOException; import java.io.StringWriter; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ParseException; -import org.apache.freemarker.core.TemplateNotFoundException; -import org.apache.freemarker.core.templateresolver.MalformedTemplateNameException; import org.apache.freemarker.core.templateresolver.impl.ClassTemplateLoader; import org.apache.freemarker.test.CopyrightCommentRemoverTemplateLoader; import org.apache.freemarker.test.util.FileTestCase; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/CoercionToTextualTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/CoercionToTextualTest.java b/src/test/java/org/apache/freemarker/core/CoercionToTextualTest.java index 3cc052d..47de779 100644 --- a/src/test/java/org/apache/freemarker/core/CoercionToTextualTest.java +++ b/src/test/java/org/apache/freemarker/core/CoercionToTextualTest.java @@ -22,10 +22,10 @@ import java.io.IOException; import java.util.Collections; import java.util.Date; -import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; import org.apache.freemarker.core.model.TemplateDateModel; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.impl.SimpleDate; +import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; import org.apache.freemarker.test.TemplateTest; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/ConfigurableTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ConfigurableTest.java b/src/test/java/org/apache/freemarker/core/ConfigurableTest.java index 8e2abd8..1af878d 100644 --- a/src/test/java/org/apache/freemarker/core/ConfigurableTest.java +++ b/src/test/java/org/apache/freemarker/core/ConfigurableTest.java @@ -34,9 +34,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.freemarker.core.Configurable; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Template; import org.apache.freemarker.core.util._StringUtil; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java b/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java index 3993c1e..d8ae7ae 100644 --- a/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java +++ b/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java @@ -18,7 +18,8 @@ */ package org.apache.freemarker.core; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import java.util.Locale; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/DirectiveCallPlaceTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/DirectiveCallPlaceTest.java b/src/test/java/org/apache/freemarker/core/DirectiveCallPlaceTest.java index 057b7dc..e4700bf 100644 --- a/src/test/java/org/apache/freemarker/core/DirectiveCallPlaceTest.java +++ b/src/test/java/org/apache/freemarker/core/DirectiveCallPlaceTest.java @@ -26,12 +26,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.freemarker.core.CallPlaceCustomDataInitializationException; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.DirectiveCallPlace; -import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.TemplateException; -import org.apache.freemarker.core.ASTDirUserDefined; import org.apache.freemarker.core.model.TemplateDirectiveBody; import org.apache.freemarker.core.model.TemplateDirectiveModel; import org.apache.freemarker.core.model.TemplateModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/EncodingOverrideTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/EncodingOverrideTest.java b/src/test/java/org/apache/freemarker/core/EncodingOverrideTest.java index b5a1f1a..efb64ec 100644 --- a/src/test/java/org/apache/freemarker/core/EncodingOverrideTest.java +++ b/src/test/java/org/apache/freemarker/core/EncodingOverrideTest.java @@ -25,9 +25,6 @@ import java.io.IOException; import java.io.StringWriter; import java.util.Collections; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateException; import org.junit.Test; public class EncodingOverrideTest { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/EnvironmentCustomStateTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/EnvironmentCustomStateTest.java b/src/test/java/org/apache/freemarker/core/EnvironmentCustomStateTest.java index e7df6e7..d4ed869 100644 --- a/src/test/java/org/apache/freemarker/core/EnvironmentCustomStateTest.java +++ b/src/test/java/org/apache/freemarker/core/EnvironmentCustomStateTest.java @@ -21,9 +21,6 @@ package org.apache.freemarker.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.Template; import org.junit.Test; public class EnvironmentCustomStateTest { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/EnvironmentGetTemplateVariantsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/EnvironmentGetTemplateVariantsTest.java b/src/test/java/org/apache/freemarker/core/EnvironmentGetTemplateVariantsTest.java index 52508f9..30a49ed 100644 --- a/src/test/java/org/apache/freemarker/core/EnvironmentGetTemplateVariantsTest.java +++ b/src/test/java/org/apache/freemarker/core/EnvironmentGetTemplateVariantsTest.java @@ -26,11 +26,6 @@ import java.io.Writer; import java.util.Collections; import java.util.Map; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateException; -import org.apache.freemarker.core.Version; import org.apache.freemarker.core.model.TemplateDirectiveBody; import org.apache.freemarker.core.model.TemplateDirectiveModel; import org.apache.freemarker.core.model.TemplateModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/EpochMillisDivTemplateDateFormatFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/EpochMillisDivTemplateDateFormatFactory.java b/src/test/java/org/apache/freemarker/core/EpochMillisDivTemplateDateFormatFactory.java index 15be994..3e1f06d 100644 --- a/src/test/java/org/apache/freemarker/core/EpochMillisDivTemplateDateFormatFactory.java +++ b/src/test/java/org/apache/freemarker/core/EpochMillisDivTemplateDateFormatFactory.java @@ -22,14 +22,6 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.InvalidFormatParametersException; -import org.apache.freemarker.core.TemplateDateFormat; -import org.apache.freemarker.core.TemplateDateFormatFactory; -import org.apache.freemarker.core.TemplateFormatUtil; -import org.apache.freemarker.core.UnformattableValueException; -import org.apache.freemarker.core.UnknownDateTypeFormattingUnsupportedException; -import org.apache.freemarker.core.UnparsableValueException; import org.apache.freemarker.core.model.TemplateDateModel; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.util._StringUtil; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/EpochMillisTemplateDateFormatFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/EpochMillisTemplateDateFormatFactory.java b/src/test/java/org/apache/freemarker/core/EpochMillisTemplateDateFormatFactory.java index dd2c311..2200166 100644 --- a/src/test/java/org/apache/freemarker/core/EpochMillisTemplateDateFormatFactory.java +++ b/src/test/java/org/apache/freemarker/core/EpochMillisTemplateDateFormatFactory.java @@ -22,13 +22,6 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.InvalidFormatParametersException; -import org.apache.freemarker.core.TemplateDateFormat; -import org.apache.freemarker.core.TemplateDateFormatFactory; -import org.apache.freemarker.core.TemplateFormatUtil; -import org.apache.freemarker.core.UnformattableValueException; -import org.apache.freemarker.core.UnparsableValueException; import org.apache.freemarker.core.model.TemplateDateModel; import org.apache.freemarker.core.model.TemplateModelException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/ExtendedDecimalFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ExtendedDecimalFormatTest.java b/src/test/java/org/apache/freemarker/core/ExtendedDecimalFormatTest.java index 9842e61..cc9e136 100644 --- a/src/test/java/org/apache/freemarker/core/ExtendedDecimalFormatTest.java +++ b/src/test/java/org/apache/freemarker/core/ExtendedDecimalFormatTest.java @@ -18,18 +18,18 @@ */ package org.apache.freemarker.core; -import static org.apache.freemarker.test.hamcerst.Matchers.*; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.apache.freemarker.test.hamcerst.Matchers.containsStringIgnoringCase; +import static org.hamcrest.Matchers.allOf; +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.text.DecimalFormat; import java.text.ParseException; import java.util.Locale; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ExtendedDecimalFormatParser; -import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.test.TemplateTest; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/HTMLISOTemplateDateFormatFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/HTMLISOTemplateDateFormatFactory.java b/src/test/java/org/apache/freemarker/core/HTMLISOTemplateDateFormatFactory.java index 0d8cad9..dbe84eb 100644 --- a/src/test/java/org/apache/freemarker/core/HTMLISOTemplateDateFormatFactory.java +++ b/src/test/java/org/apache/freemarker/core/HTMLISOTemplateDateFormatFactory.java @@ -22,9 +22,9 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; import org.apache.freemarker.core.model.TemplateDateModel; import org.apache.freemarker.core.model.TemplateModelException; +import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; import org.apache.freemarker.core.util._DateUtil; import org.apache.freemarker.core.util._DateUtil.CalendarFieldsToDateConverter; import org.apache.freemarker.core.util._DateUtil.DateParseException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/HeaderParsingTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/HeaderParsingTest.java b/src/test/java/org/apache/freemarker/core/HeaderParsingTest.java index b2f69ff..33e443f 100644 --- a/src/test/java/org/apache/freemarker/core/HeaderParsingTest.java +++ b/src/test/java/org/apache/freemarker/core/HeaderParsingTest.java @@ -21,8 +21,6 @@ package org.apache.freemarker.core; import java.io.IOException; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.test.TemplateTest; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/HexTemplateNumberFormatFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/HexTemplateNumberFormatFactory.java b/src/test/java/org/apache/freemarker/core/HexTemplateNumberFormatFactory.java index 9e2020c..287b75c 100644 --- a/src/test/java/org/apache/freemarker/core/HexTemplateNumberFormatFactory.java +++ b/src/test/java/org/apache/freemarker/core/HexTemplateNumberFormatFactory.java @@ -20,12 +20,6 @@ package org.apache.freemarker.core; import java.util.Locale; -import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.InvalidFormatParametersException; -import org.apache.freemarker.core.TemplateFormatUtil; -import org.apache.freemarker.core.TemplateNumberFormat; -import org.apache.freemarker.core.TemplateNumberFormatFactory; -import org.apache.freemarker.core.UnformattableValueException; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateNumberModel; import org.apache.freemarker.core.util._NumberUtil; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/IncludeAndImportConfigurableLayersTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/IncludeAndImportConfigurableLayersTest.java b/src/test/java/org/apache/freemarker/core/IncludeAndImportConfigurableLayersTest.java index 750a701..49e8577 100644 --- a/src/test/java/org/apache/freemarker/core/IncludeAndImportConfigurableLayersTest.java +++ b/src/test/java/org/apache/freemarker/core/IncludeAndImportConfigurableLayersTest.java @@ -22,11 +22,6 @@ import static org.junit.Assert.assertEquals; import java.io.StringWriter; -import org.apache.freemarker.core.Configurable; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateConfiguration; import org.apache.freemarker.core.templateresolver.ConditionalTemplateConfigurationFactory; import org.apache.freemarker.core.templateresolver.FileNameGlobMatcher; import org.apache.freemarker.test.TemplateTest; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/IncludeAndImportTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/IncludeAndImportTest.java b/src/test/java/org/apache/freemarker/core/IncludeAndImportTest.java index 7c1372b..1faa16f 100644 --- a/src/test/java/org/apache/freemarker/core/IncludeAndImportTest.java +++ b/src/test/java/org/apache/freemarker/core/IncludeAndImportTest.java @@ -28,10 +28,6 @@ import java.io.IOException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.InvalidReferenceException; -import org.apache.freemarker.core.TemplateException; -import org.apache.freemarker.core.TemplateNotFoundException; import org.apache.freemarker.core.Environment.LazilyInitializedNamespace; import org.apache.freemarker.core.Environment.Namespace; import org.apache.freemarker.core.model.WrappingTemplateModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/IncudeFromNamelessTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/IncudeFromNamelessTest.java b/src/test/java/org/apache/freemarker/core/IncudeFromNamelessTest.java index 0f887c5..d628bf4 100644 --- a/src/test/java/org/apache/freemarker/core/IncudeFromNamelessTest.java +++ b/src/test/java/org/apache/freemarker/core/IncudeFromNamelessTest.java @@ -23,9 +23,6 @@ import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader; import junit.framework.TestCase; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/InterpretAndEvalTemplateNameTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/InterpretAndEvalTemplateNameTest.java b/src/test/java/org/apache/freemarker/core/InterpretAndEvalTemplateNameTest.java index 7c08ec3..8fcea40 100644 --- a/src/test/java/org/apache/freemarker/core/InterpretAndEvalTemplateNameTest.java +++ b/src/test/java/org/apache/freemarker/core/InterpretAndEvalTemplateNameTest.java @@ -20,7 +20,6 @@ package org.apache.freemarker.core; import java.io.IOException; -import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader; import org.apache.freemarker.test.TemplateTest; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/InterpretSettingInheritanceTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/InterpretSettingInheritanceTest.java b/src/test/java/org/apache/freemarker/core/InterpretSettingInheritanceTest.java index 0e8f2a2..efb661d 100644 --- a/src/test/java/org/apache/freemarker/core/InterpretSettingInheritanceTest.java +++ b/src/test/java/org/apache/freemarker/core/InterpretSettingInheritanceTest.java @@ -20,8 +20,6 @@ package org.apache.freemarker.core; import java.io.IOException; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.test.TemplateTest; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/IteratorIssuesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/IteratorIssuesTest.java b/src/test/java/org/apache/freemarker/core/IteratorIssuesTest.java index 8eccc07..224ff7d 100644 --- a/src/test/java/org/apache/freemarker/core/IteratorIssuesTest.java +++ b/src/test/java/org/apache/freemarker/core/IteratorIssuesTest.java @@ -21,7 +21,6 @@ package org.apache.freemarker.core; import java.util.Arrays; import java.util.Iterator; -import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core.model.impl.DefaultObjectWrapper; import org.apache.freemarker.core.model.impl.DefaultObjectWrapperBuilder; import org.apache.freemarker.core.model.impl.beans.BeansWrapper; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/JavaCCExceptionAsEOFFixTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/JavaCCExceptionAsEOFFixTest.java b/src/test/java/org/apache/freemarker/core/JavaCCExceptionAsEOFFixTest.java index 6c33b81..5b518a1 100644 --- a/src/test/java/org/apache/freemarker/core/JavaCCExceptionAsEOFFixTest.java +++ b/src/test/java/org/apache/freemarker/core/JavaCCExceptionAsEOFFixTest.java @@ -18,13 +18,12 @@ */ package org.apache.freemarker.core; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.io.IOException; import java.io.Reader; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Template; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/ListErrorsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ListErrorsTest.java b/src/test/java/org/apache/freemarker/core/ListErrorsTest.java index db0965a..509260e 100644 --- a/src/test/java/org/apache/freemarker/core/ListErrorsTest.java +++ b/src/test/java/org/apache/freemarker/core/ListErrorsTest.java @@ -21,8 +21,6 @@ package org.apache.freemarker.core; import java.io.IOException; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.core.model.impl.DefaultObjectWrapper; import org.apache.freemarker.test.TemplateTest; import org.apache.freemarker.test.templatesuite.models.Listables; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/LocAndTZSensitiveTemplateDateFormatFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/LocAndTZSensitiveTemplateDateFormatFactory.java b/src/test/java/org/apache/freemarker/core/LocAndTZSensitiveTemplateDateFormatFactory.java index e2fc454..954fda3 100644 --- a/src/test/java/org/apache/freemarker/core/LocAndTZSensitiveTemplateDateFormatFactory.java +++ b/src/test/java/org/apache/freemarker/core/LocAndTZSensitiveTemplateDateFormatFactory.java @@ -22,14 +22,6 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.InvalidFormatParametersException; -import org.apache.freemarker.core.TemplateDateFormat; -import org.apache.freemarker.core.TemplateDateFormatFactory; -import org.apache.freemarker.core.TemplateFormatUtil; -import org.apache.freemarker.core.UnformattableValueException; -import org.apache.freemarker.core.UnknownDateTypeFormattingUnsupportedException; -import org.apache.freemarker.core.UnparsableValueException; import org.apache.freemarker.core.model.TemplateDateModel; import org.apache.freemarker.core.model.TemplateModelException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/LocaleSensitiveTemplateNumberFormatFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/LocaleSensitiveTemplateNumberFormatFactory.java b/src/test/java/org/apache/freemarker/core/LocaleSensitiveTemplateNumberFormatFactory.java index 3f4b7a1..052f0c4 100644 --- a/src/test/java/org/apache/freemarker/core/LocaleSensitiveTemplateNumberFormatFactory.java +++ b/src/test/java/org/apache/freemarker/core/LocaleSensitiveTemplateNumberFormatFactory.java @@ -20,12 +20,6 @@ package org.apache.freemarker.core; import java.util.Locale; -import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.InvalidFormatParametersException; -import org.apache.freemarker.core.TemplateFormatUtil; -import org.apache.freemarker.core.TemplateNumberFormat; -import org.apache.freemarker.core.TemplateNumberFormatFactory; -import org.apache.freemarker.core.UnformattableValueException; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateNumberModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/NumberFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/NumberFormatTest.java b/src/test/java/org/apache/freemarker/core/NumberFormatTest.java index 18293ee..f3d0c3e 100644 --- a/src/test/java/org/apache/freemarker/core/NumberFormatTest.java +++ b/src/test/java/org/apache/freemarker/core/NumberFormatTest.java @@ -31,15 +31,6 @@ import java.util.Collections; import java.util.Locale; import java.util.Map; -import org.apache.freemarker.core.AliasTemplateNumberFormatFactory; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateConfiguration; -import org.apache.freemarker.core.TemplateException; -import org.apache.freemarker.core.TemplateNumberFormat; -import org.apache.freemarker.core.TemplateNumberFormatFactory; -import org.apache.freemarker.core.UndefinedCustomFormatException; import org.apache.freemarker.core.model.TemplateDirectiveBody; import org.apache.freemarker.core.model.TemplateDirectiveModel; import org.apache.freemarker.core.model.TemplateModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java b/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java index 44507d3..6e4c3cc 100644 --- a/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java +++ b/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java @@ -24,13 +24,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ConfigurationException; -import org.apache.freemarker.core.OptInTemplateClassResolver; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateClassResolver; -import org.apache.freemarker.core.TemplateException; - import junit.framework.AssertionFailedError; import junit.framework.TestCase; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/OutputFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/OutputFormatTest.java b/src/test/java/org/apache/freemarker/core/OutputFormatTest.java index 4ff47b6..e988477 100644 --- a/src/test/java/org/apache/freemarker/core/OutputFormatTest.java +++ b/src/test/java/org/apache/freemarker/core/OutputFormatTest.java @@ -28,8 +28,8 @@ import java.io.StringWriter; import java.io.Writer; import java.util.Collections; -import org.apache.freemarker.core.outputformat.*; import org.apache.freemarker.core.model.TemplateModelException; +import org.apache.freemarker.core.outputformat.OutputFormat; import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; import org.apache.freemarker.core.outputformat.impl.PlainTextOutputFormat; import org.apache.freemarker.core.outputformat.impl.RTFOutputFormat; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java b/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java index 99af659..6044a7a 100644 --- a/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java +++ b/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java @@ -23,9 +23,6 @@ import static org.junit.Assert.fail; import java.io.IOException; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ParseException; -import org.apache.freemarker.core.Template; import org.apache.freemarker.core.util._StringUtil; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/PrintfGTemplateNumberFormatFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/PrintfGTemplateNumberFormatFactory.java b/src/test/java/org/apache/freemarker/core/PrintfGTemplateNumberFormatFactory.java index c24b2bb..15031a4 100644 --- a/src/test/java/org/apache/freemarker/core/PrintfGTemplateNumberFormatFactory.java +++ b/src/test/java/org/apache/freemarker/core/PrintfGTemplateNumberFormatFactory.java @@ -22,9 +22,9 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.Locale; -import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateNumberModel; +import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; import org.apache.freemarker.core.util._StringUtil; /** http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java b/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java index ba18c08..ef558c5 100644 --- a/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java +++ b/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java @@ -31,7 +31,6 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core.util._DateUtil; import org.apache.freemarker.test.TemplateTest; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/SettingDirectiveTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/SettingDirectiveTest.java b/src/test/java/org/apache/freemarker/core/SettingDirectiveTest.java index 8b4a957..f21adf6 100644 --- a/src/test/java/org/apache/freemarker/core/SettingDirectiveTest.java +++ b/src/test/java/org/apache/freemarker/core/SettingDirectiveTest.java @@ -19,10 +19,9 @@ package org.apache.freemarker.core; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.Matchers.greaterThan; +import static org.junit.Assert.assertThat; -import org.apache.freemarker.core.ASTDirSetting; import org.junit.Test; public class SettingDirectiveTest { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/TabSizeTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/TabSizeTest.java b/src/test/java/org/apache/freemarker/core/TabSizeTest.java index 1af42e0..e2fc6de 100644 --- a/src/test/java/org/apache/freemarker/core/TabSizeTest.java +++ b/src/test/java/org/apache/freemarker/core/TabSizeTest.java @@ -23,11 +23,6 @@ import static org.junit.Assert.fail; import java.io.IOException; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ParseException; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateNotFoundException; -import org.apache.freemarker.core.templateresolver.MalformedTemplateNameException; import org.apache.freemarker.test.TemplateTest; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java b/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java index b3660e6..b64430d 100644 --- a/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java +++ b/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java @@ -23,10 +23,6 @@ import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ParseException; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.core.util._StringUtil; import junit.framework.TestCase; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java b/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java index 88602ed..fbe68e5 100644 --- a/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java +++ b/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java @@ -26,11 +26,6 @@ import static org.junit.Assert.assertSame; import java.io.IOException; import java.nio.charset.StandardCharsets; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ParseException; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateNotFoundException; -import org.apache.freemarker.core.templateresolver.MalformedTemplateNameException; import org.apache.freemarker.core.templateresolver.impl.ByteArrayTemplateLoader; import org.apache.freemarker.core.templateresolver.impl.StrongCacheStorage; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java b/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java index 07b815b..cfb17b0 100644 --- a/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java +++ b/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java @@ -49,10 +49,10 @@ import java.util.Set; import java.util.TimeZone; import org.apache.commons.collections.ListUtils; +import org.apache.freemarker.core.model.impl.SimpleObjectWrapper; import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; import org.apache.freemarker.core.outputformat.impl.UndefinedOutputFormat; import org.apache.freemarker.core.outputformat.impl.XMLOutputFormat; -import org.apache.freemarker.core.model.impl.SimpleObjectWrapper; import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader; import org.apache.freemarker.core.util._NullArgumentException; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/TemplateConfigurationWithTemplateResolverTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/TemplateConfigurationWithTemplateResolverTest.java b/src/test/java/org/apache/freemarker/core/TemplateConfigurationWithTemplateResolverTest.java index 20ee4f3..270219f 100644 --- a/src/test/java/org/apache/freemarker/core/TemplateConfigurationWithTemplateResolverTest.java +++ b/src/test/java/org/apache/freemarker/core/TemplateConfigurationWithTemplateResolverTest.java @@ -26,11 +26,6 @@ import java.io.StringWriter; import java.io.UnsupportedEncodingException; import java.util.Locale; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.CustomAttribute; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateConfiguration; -import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.core.templateresolver.ConditionalTemplateConfigurationFactory; import org.apache.freemarker.core.templateresolver.FileNameGlobMatcher; import org.apache.freemarker.core.templateresolver.FirstMatchTemplateConfigurationFactory; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/TemplateLevelSettings.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/TemplateLevelSettings.java b/src/test/java/org/apache/freemarker/core/TemplateLevelSettings.java index e6beba7..f493733 100644 --- a/src/test/java/org/apache/freemarker/core/TemplateLevelSettings.java +++ b/src/test/java/org/apache/freemarker/core/TemplateLevelSettings.java @@ -24,10 +24,6 @@ import static org.junit.Assert.assertEquals; import java.io.IOException; import java.io.StringWriter; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateException; -import org.apache.freemarker.core.Version; import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader; import org.apache.freemarker.core.templateresolver.impl.StrongCacheStorage; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/TemplateNameSpecialVariablesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/TemplateNameSpecialVariablesTest.java b/src/test/java/org/apache/freemarker/core/TemplateNameSpecialVariablesTest.java index 13f075f..9b0e4e6 100644 --- a/src/test/java/org/apache/freemarker/core/TemplateNameSpecialVariablesTest.java +++ b/src/test/java/org/apache/freemarker/core/TemplateNameSpecialVariablesTest.java @@ -20,9 +20,6 @@ package org.apache.freemarker.core; import java.io.IOException; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.core.templateresolver.TemplateLoader; import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader; import org.apache.freemarker.test.TemplateTest; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java b/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java index b14a111..5517630 100644 --- a/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java +++ b/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java @@ -24,11 +24,6 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.Map; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Environment; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateException; -import org.apache.freemarker.core._CoreAPI; import org.apache.freemarker.core.ThreadInterruptionSupportTemplatePostProcessor.TemplateProcessingThreadInterruptedException; import org.apache.freemarker.core.model.TemplateDirectiveBody; import org.apache.freemarker.core.model.TemplateDirectiveModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/UnclosedCommentTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/UnclosedCommentTest.java b/src/test/java/org/apache/freemarker/core/UnclosedCommentTest.java index 9e532bd..741213d 100644 --- a/src/test/java/org/apache/freemarker/core/UnclosedCommentTest.java +++ b/src/test/java/org/apache/freemarker/core/UnclosedCommentTest.java @@ -21,8 +21,6 @@ package org.apache.freemarker.core; import java.io.IOException; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.test.TemplateTest; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/VersionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/VersionTest.java b/src/test/java/org/apache/freemarker/core/VersionTest.java index f29ec72..2ae4dcd 100644 --- a/src/test/java/org/apache/freemarker/core/VersionTest.java +++ b/src/test/java/org/apache/freemarker/core/VersionTest.java @@ -19,11 +19,14 @@ package org.apache.freemarker.core; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.sql.Date; -import org.apache.freemarker.core.Version; import org.junit.Test; @SuppressWarnings("boxing") http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/WhitespaceStrippingTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/WhitespaceStrippingTest.java b/src/test/java/org/apache/freemarker/core/WhitespaceStrippingTest.java index 06f1805..5a0603b 100644 --- a/src/test/java/org/apache/freemarker/core/WhitespaceStrippingTest.java +++ b/src/test/java/org/apache/freemarker/core/WhitespaceStrippingTest.java @@ -21,8 +21,6 @@ package org.apache.freemarker.core; import java.io.IOException; -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.test.TemplateTest; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/XHTMLOutputFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/XHTMLOutputFormatTest.java b/src/test/java/org/apache/freemarker/core/XHTMLOutputFormatTest.java index 1bc49e2..e97e1f9 100644 --- a/src/test/java/org/apache/freemarker/core/XHTMLOutputFormatTest.java +++ b/src/test/java/org/apache/freemarker/core/XHTMLOutputFormatTest.java @@ -18,8 +18,8 @@ */ package org.apache.freemarker.core; -import static org.apache.freemarker.core.outputformat.impl.XHTMLOutputFormat.*; -import static org.junit.Assert.*; +import static org.apache.freemarker.core.outputformat.impl.XHTMLOutputFormat.INSTANCE; +import static org.junit.Assert.assertEquals; import java.io.IOException; import java.io.StringWriter;
