[freemarker] branch 2.3-gae updated: (Fixed import code style inconsistencies.)

[dd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch 2.3-gae
in repository https://gitbox.apache.org/repos/asf/freemarker.git


The following commit(s) were added to refs/heads/2.3-gae by this push:
     new 2e98593  (Fixed import code style inconsistencies.)
2e98593 is described below

commit 2e98593c5afc0085604a6568f816888728a1ebdf
Author: ddekany <dd...@apache.org>
AuthorDate: Sat Jul 20 17:34:05 2019 +0200

    (Fixed import code style inconsistencies.)
---
 src/main/java/freemarker/core/Environment.java     | 60 +++++++++++++----
 src/main/java/freemarker/core/FreeMarkerTree.java  |  2 +-
 src/main/java/freemarker/core/LocalContext.java    |  4 +-
 src/main/java/freemarker/core/Macro.java           | 12 +++-
 .../ext/jsp/_FreeMarkerPageContext2.java           | 15 +++--
 .../java/freemarker/template/Configuration.java    | 78 +++++++++++++++++++---
 .../java/freemarker/core/NullTransparencyTest.java | 15 +++--
 .../freemarker/template/ConfigurationTest.java     | 66 +++++++++++++++---
 .../template/SimpleObjectWrapperTest.java          |  4 +-
 src/test/java/freemarker/test/TreeView.java        |  4 +-
 10 files changed, 205 insertions(+), 55 deletions(-)

diff --git a/src/main/java/freemarker/core/Environment.java b/src/main/java/freemarker/core/Environment.java
index aba344c..a1bc38c 100644
--- a/src/main/java/freemarker/core/Environment.java
+++ b/src/main/java/freemarker/core/Environment.java
@@ -19,18 +19,6 @@
 
 package freemarker.core;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import freemarker.cache.TemplateNameFormat;
-import freemarker.cache._CacheAPI;
-import freemarker.ext.beans.BeansWrapper;
-import freemarker.log.Logger;
-import freemarker.template.*;
-import freemarker.template.utility.DateUtil;
-import freemarker.template.utility.DateUtil.DateToISO8601CalendarFactory;
-import freemarker.template.utility.NullWriter;
-import freemarker.template.utility.StringUtil;
-import freemarker.template.utility.UndeclaredThrowableException;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -41,7 +29,53 @@ import java.text.Collator;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import freemarker.cache.TemplateNameFormat;
+import freemarker.cache._CacheAPI;
+import freemarker.ext.beans.BeansWrapper;
+import freemarker.log.Logger;
+import freemarker.template.Configuration;
+import freemarker.template.MalformedTemplateNameException;
+import freemarker.template.ObjectWrapper;
+import freemarker.template.SimpleHash;
+import freemarker.template.SimpleSequence;
+import freemarker.template.Template;
+import freemarker.template.TemplateCollectionModel;
+import freemarker.template.TemplateDateModel;
+import freemarker.template.TemplateDirectiveBody;
+import freemarker.template.TemplateDirectiveModel;
+import freemarker.template.TemplateException;
+import freemarker.template.TemplateExceptionHandler;
+import freemarker.template.TemplateHashModel;
+import freemarker.template.TemplateHashModelEx;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
+import freemarker.template.TemplateModelIterator;
+import freemarker.template.TemplateNodeModel;
+import freemarker.template.TemplateNumberModel;
+import freemarker.template.TemplateScalarModel;
+import freemarker.template.TemplateSequenceModel;
+import freemarker.template.TemplateTransformModel;
+import freemarker.template.TransformControl;
+import freemarker.template._TemplateAPI;
+import freemarker.template.utility.DateUtil;
+import freemarker.template.utility.DateUtil.DateToISO8601CalendarFactory;
+import freemarker.template.utility.NullWriter;
+import freemarker.template.utility.StringUtil;
+import freemarker.template.utility.UndeclaredThrowableException;
 
 /**
  * Object that represents the runtime environment during template processing. For every invocation of a
diff --git a/src/main/java/freemarker/core/FreeMarkerTree.java b/src/main/java/freemarker/core/FreeMarkerTree.java
index ed2005f..d56d93f 100644
--- a/src/main/java/freemarker/core/FreeMarkerTree.java
+++ b/src/main/java/freemarker/core/FreeMarkerTree.java
@@ -23,7 +23,7 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.swing.JTree;
+import javax.swing.*;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
 
diff --git a/src/main/java/freemarker/core/LocalContext.java b/src/main/java/freemarker/core/LocalContext.java
index 734b6cc..bb2b351 100644
--- a/src/main/java/freemarker/core/LocalContext.java
+++ b/src/main/java/freemarker/core/LocalContext.java
@@ -19,12 +19,12 @@
 
 package freemarker.core;
 
+import java.util.Collection;
+
 import freemarker.template.Configuration;
 import freemarker.template.TemplateModel;
 import freemarker.template.TemplateModelException;
 
-import java.util.Collection;
-
 /**
  * Represents a local context (a set of local variables); should be internal, but left public for backward
  * compatibility. This is used as the abstraction for accessing the local variables of a macro/function invocation,
diff --git a/src/main/java/freemarker/core/Macro.java b/src/main/java/freemarker/core/Macro.java
index a0e355f..d01fef1 100644
--- a/src/main/java/freemarker/core/Macro.java
+++ b/src/main/java/freemarker/core/Macro.java
@@ -19,9 +19,17 @@
 
 package freemarker.core;
 
-import freemarker.template.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 
-import java.util.*;
+import freemarker.template.TemplateException;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
+import freemarker.template.TemplateModelIterator;
+import freemarker.template.TemplateScalarModel;
 
 /**
  * An element representing a macro declaration.
diff --git a/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext2.java b/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext2.java
index e091342..b7df303 100644
--- a/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext2.java
+++ b/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext2.java
@@ -19,16 +19,17 @@
 
 package freemarker.ext.jsp;
 
-import freemarker.log.Logger;
-import freemarker.template.TemplateModelException;
+import java.io.IOException;
 
-import javax.servlet.jsp.el.ExpressionEvaluator;
-import javax.servlet.jsp.el.VariableResolver;
-import javax.servlet.jsp.el.ELException;
+import javax.servlet.ServletException;
 import javax.servlet.jsp.JspFactory;
 import javax.servlet.jsp.PageContext;
-import javax.servlet.ServletException;
-import java.io.IOException;
+import javax.servlet.jsp.el.ELException;
+import javax.servlet.jsp.el.ExpressionEvaluator;
+import javax.servlet.jsp.el.VariableResolver;
+
+import freemarker.log.Logger;
+import freemarker.template.TemplateModelException;
 
 /**
  * Don't use this class; it's only public to work around Google App Engine Java
diff --git a/src/main/java/freemarker/template/Configuration.java b/src/main/java/freemarker/template/Configuration.java
index 1149879..a814a73 100644
--- a/src/main/java/freemarker/template/Configuration.java
+++ b/src/main/java/freemarker/template/Configuration.java
@@ -19,14 +19,6 @@
 
 package freemarker.template;
 
-import freemarker.cache.*;
-import freemarker.cache.TemplateCache.MaybeMissingTemplate;
-import freemarker.core.*;
-import freemarker.ext.beans.BeansWrapper;
-import freemarker.ext.beans.BeansWrapperBuilder;
-import freemarker.log.Logger;
-import freemarker.template.utility.*;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
@@ -34,11 +26,79 @@ import java.lang.reflect.InvocationTargetException;
 import java.net.URLConnection;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import freemarker.cache.CacheStorage;
+import freemarker.cache.ClassTemplateLoader;
+import freemarker.cache.FileTemplateLoader;
+import freemarker.cache.MruCacheStorage;
+import freemarker.cache.MultiTemplateLoader;
+import freemarker.cache.SoftCacheStorage;
+import freemarker.cache.TemplateCache;
+import freemarker.cache.TemplateCache.MaybeMissingTemplate;
+import freemarker.cache.TemplateConfigurationFactory;
+import freemarker.cache.TemplateLoader;
+import freemarker.cache.TemplateLookupContext;
+import freemarker.cache.TemplateLookupStrategy;
+import freemarker.cache.TemplateNameFormat;
+import freemarker.cache.URLTemplateLoader;
+import freemarker.core.BugException;
+import freemarker.core.CSSOutputFormat;
+import freemarker.core.CombinedMarkupOutputFormat;
+import freemarker.core.Configurable;
+import freemarker.core.Environment;
+import freemarker.core.HTMLOutputFormat;
+import freemarker.core.JSONOutputFormat;
+import freemarker.core.JavaScriptOutputFormat;
+import freemarker.core.MarkupOutputFormat;
+import freemarker.core.OutputFormat;
+import freemarker.core.ParseException;
+import freemarker.core.ParserConfiguration;
+import freemarker.core.PlainTextOutputFormat;
+import freemarker.core.RTFOutputFormat;
+import freemarker.core.TemplateConfiguration;
+import freemarker.core.TemplateMarkupOutputModel;
+import freemarker.core.UndefinedOutputFormat;
+import freemarker.core.UnregisteredOutputFormatException;
+import freemarker.core.XHTMLOutputFormat;
+import freemarker.core.XMLOutputFormat;
+import freemarker.core._CoreAPI;
+import freemarker.core._DelayedJQuote;
+import freemarker.core._MiscTemplateException;
+import freemarker.core._ObjectBuilderSettingEvaluator;
+import freemarker.core._SettingEvaluationEnvironment;
+import freemarker.core._SortedArraySet;
+import freemarker.core._UnmodifiableCompositeSet;
+import freemarker.ext.beans.BeansWrapper;
+import freemarker.ext.beans.BeansWrapperBuilder;
+import freemarker.log.Logger;
+import freemarker.template.utility.CaptureOutput;
+import freemarker.template.utility.ClassUtil;
+import freemarker.template.utility.Constants;
+import freemarker.template.utility.HtmlEscape;
+import freemarker.template.utility.NormalizeNewlines;
+import freemarker.template.utility.NullArgumentException;
+import freemarker.template.utility.SecurityUtilities;
+import freemarker.template.utility.StandardCompress;
+import freemarker.template.utility.StringUtil;
+import freemarker.template.utility.XmlEscape;
+
 /**
  * <b>The main entry point into the FreeMarker API</b>; encapsulates the configuration settings of FreeMarker,
  * also serves as a central template-loading and caching service.
diff --git a/src/test/java/freemarker/core/NullTransparencyTest.java b/src/test/java/freemarker/core/NullTransparencyTest.java
index e9d63ee..bde9957 100644
--- a/src/test/java/freemarker/core/NullTransparencyTest.java
+++ b/src/test/java/freemarker/core/NullTransparencyTest.java
@@ -19,14 +19,19 @@
 
 package freemarker.core;
 
-import freemarker.template.TemplateException;
-import freemarker.test.TemplateTest;
-import org.junit.Test;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+import freemarker.template.TemplateException;
+import freemarker.test.TemplateTest;
 
 public class NullTransparencyTest extends TemplateTest {
 
diff --git a/src/test/java/freemarker/template/ConfigurationTest.java b/src/test/java/freemarker/template/ConfigurationTest.java
index 80c2805..c18e47c 100644
--- a/src/test/java/freemarker/template/ConfigurationTest.java
+++ b/src/test/java/freemarker/template/ConfigurationTest.java
@@ -19,28 +19,72 @@
 
 package freemarker.template;
 
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+
+import org.junit.Test;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import freemarker.cache.*;
-import freemarker.core.*;
+import freemarker.cache.CacheStorageWithGetSize;
+import freemarker.cache.FileTemplateLoader;
+import freemarker.cache.NullCacheStorage;
+import freemarker.cache.SoftCacheStorage;
+import freemarker.cache.StringTemplateLoader;
+import freemarker.cache.StrongCacheStorage;
+import freemarker.cache.TemplateCache;
+import freemarker.cache.TemplateLookupContext;
+import freemarker.cache.TemplateLookupResult;
+import freemarker.cache.TemplateLookupStrategy;
+import freemarker.cache.TemplateNameFormat;
+import freemarker.core.BaseNTemplateNumberFormatFactory;
+import freemarker.core.CombinedMarkupOutputFormat;
+import freemarker.core.Configurable;
 import freemarker.core.Configurable.SettingValueAssignmentException;
 import freemarker.core.Configurable.UnknownSettingException;
+import freemarker.core.ConfigurableTest;
+import freemarker.core.CustomHTMLOutputFormat;
+import freemarker.core.DefaultTruncateBuiltinAlgorithm;
+import freemarker.core.DummyOutputFormat;
+import freemarker.core.Environment;
+import freemarker.core.EpochMillisDivTemplateDateFormatFactory;
+import freemarker.core.EpochMillisTemplateDateFormatFactory;
+import freemarker.core.HTMLOutputFormat;
+import freemarker.core.HexTemplateNumberFormatFactory;
+import freemarker.core.MarkupOutputFormat;
+import freemarker.core.OptInTemplateClassResolver;
+import freemarker.core.OutputFormat;
+import freemarker.core.ParseException;
+import freemarker.core.RTFOutputFormat;
+import freemarker.core.TemplateClassResolver;
+import freemarker.core.TemplateDateFormatFactory;
+import freemarker.core.TemplateNumberFormatFactory;
+import freemarker.core.UndefinedOutputFormat;
+import freemarker.core.UnregisteredOutputFormatException;
+import freemarker.core.XHTMLOutputFormat;
+import freemarker.core.XMLOutputFormat;
+import freemarker.core._CoreStringUtils;
 import freemarker.ext.beans.BeansWrapperBuilder;
 import freemarker.ext.beans.StringModel;
 import freemarker.template.utility.DateUtil;
 import freemarker.template.utility.NullArgumentException;
 import freemarker.template.utility.NullWriter;
 import junit.framework.TestCase;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.lang.reflect.Field;
-import java.util.*;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
 
 public class ConfigurationTest extends TestCase {
 
diff --git a/src/test/java/freemarker/template/SimpleObjectWrapperTest.java b/src/test/java/freemarker/template/SimpleObjectWrapperTest.java
index 39c9fcf..0f13df7 100644
--- a/src/test/java/freemarker/template/SimpleObjectWrapperTest.java
+++ b/src/test/java/freemarker/template/SimpleObjectWrapperTest.java
@@ -22,8 +22,6 @@ package freemarker.template;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
-import freemarker.template.DefaultObjectWrapperTest.TestBean;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
@@ -42,6 +40,8 @@ import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
+import freemarker.template.DefaultObjectWrapperTest.TestBean;
+
 public class SimpleObjectWrapperTest {
     
     @Test
diff --git a/src/test/java/freemarker/test/TreeView.java b/src/test/java/freemarker/test/TreeView.java
index 0c89f5f..896b09c 100644
--- a/src/test/java/freemarker/test/TreeView.java
+++ b/src/test/java/freemarker/test/TreeView.java
@@ -23,9 +23,7 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.FileReader;
 
-import javax.swing.JFrame;
-import javax.swing.JScrollPane;
-import javax.swing.JTree;
+import javax.swing.*;
 
 import freemarker.core.FreeMarkerTree;
 import freemarker.template.Template;