Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B1938200C01 for ; Thu, 19 Jan 2017 10:47:41 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B0121160B54; Thu, 19 Jan 2017 09:47:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 82799160B42 for ; Thu, 19 Jan 2017 10:47:40 +0100 (CET) Received: (qmail 5925 invoked by uid 500); 19 Jan 2017 09:47:39 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 5916 invoked by uid 99); 19 Jan 2017 09:47:39 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jan 2017 09:47:39 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 016EE1A02FA for ; Thu, 19 Jan 2017 09:47:39 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 0veNt-pwwQxz for ; Thu, 19 Jan 2017 09:47:35 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 701CA5FB45 for ; Thu, 19 Jan 2017 09:47:34 +0000 (UTC) Received: (qmail 5882 invoked by uid 99); 19 Jan 2017 09:47:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jan 2017 09:47:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 65A25DFB86; Thu, 19 Jan 2017 09:47:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-freemarker git commit: (Organize imports) Date: Thu, 19 Jan 2017 09:47:33 +0000 (UTC) archived-at: Thu, 19 Jan 2017 09:47:41 -0000 Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae 780351258 -> 6a0867daf (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/6a0867da Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/6a0867da Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/6a0867da Branch: refs/heads/2.3-gae Commit: 6a0867daf3a88c6d4ea36beb7937908bdbf761fc Parents: 7803512 Author: ddekany Authored: Thu Jan 19 10:47:21 2017 +0100 Committer: ddekany Committed: Thu Jan 19 10:47:21 2017 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/core/BuiltIn.java | 4 +-- .../java/freemarker/core/BuiltInForNodeEx.java | 5 +++- .../java/freemarker/core/BuiltInsForNodes.java | 9 +++++-- src/main/java/freemarker/core/Environment.java | 1 - src/main/java/freemarker/core/EvalUtil.java | 1 - src/main/java/freemarker/core/HashLiteral.java | 1 - .../java/freemarker/core/IteratorBlock.java | 1 - .../core/NonSequenceOrCollectionException.java | 2 -- src/main/java/freemarker/core/_CoreAPI.java | 1 - .../freemarker/ext/beans/SimpleMapModel.java | 1 - .../java/freemarker/ext/dom/DocumentModel.java | 1 - .../ext/dom/SunInternalXalanXPathSupport.java | 28 +++++++++++++++----- .../java/freemarker/ext/util/ModelCache.java | 3 +-- .../java/freemarker/template/Configuration.java | 1 - .../template/DefaultIterableAdapter.java | 3 --- .../DefaultNonListCollectionAdapter.java | 1 - 16 files changed, 35 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/core/BuiltIn.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/BuiltIn.java b/src/main/java/freemarker/core/BuiltIn.java index 5edcb20..fbe0842 100644 --- a/src/main/java/freemarker/core/BuiltIn.java +++ b/src/main/java/freemarker/core/BuiltIn.java @@ -33,10 +33,12 @@ import freemarker.core.BuiltInsForMarkupOutputs.markup_stringBI; import freemarker.core.BuiltInsForMultipleTypes.is_dateLikeBI; import freemarker.core.BuiltInsForNodes.ancestorsBI; import freemarker.core.BuiltInsForNodes.childrenBI; +import freemarker.core.BuiltInsForNodes.nextSiblingBI; import freemarker.core.BuiltInsForNodes.node_nameBI; import freemarker.core.BuiltInsForNodes.node_namespaceBI; import freemarker.core.BuiltInsForNodes.node_typeBI; import freemarker.core.BuiltInsForNodes.parentBI; +import freemarker.core.BuiltInsForNodes.previousSiblingBI; import freemarker.core.BuiltInsForNodes.rootBI; import freemarker.core.BuiltInsForNumbers.absBI; import freemarker.core.BuiltInsForNumbers.byteBI; @@ -62,8 +64,6 @@ import freemarker.core.BuiltInsForSequences.seq_index_ofBI; import freemarker.core.BuiltInsForSequences.sortBI; import freemarker.core.BuiltInsForSequences.sort_byBI; import freemarker.core.BuiltInsForStringsMisc.evalBI; -import freemarker.core.BuiltInsForNodes.previousSiblingBI; -import freemarker.core.BuiltInsForNodes.nextSiblingBI; import freemarker.template.Configuration; import freemarker.template.TemplateDateModel; import freemarker.template.TemplateModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/core/BuiltInForNodeEx.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/BuiltInForNodeEx.java b/src/main/java/freemarker/core/BuiltInForNodeEx.java index 79ba429..5acd339 100644 --- a/src/main/java/freemarker/core/BuiltInForNodeEx.java +++ b/src/main/java/freemarker/core/BuiltInForNodeEx.java @@ -18,7 +18,10 @@ */ package freemarker.core; -import freemarker.template.*; +import freemarker.template.TemplateException; +import freemarker.template.TemplateModel; +import freemarker.template.TemplateModelException; +import freemarker.template.TemplateNodeModelEx; public abstract class BuiltInForNodeEx extends BuiltIn { @Override http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/core/BuiltInsForNodes.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/BuiltInsForNodes.java b/src/main/java/freemarker/core/BuiltInsForNodes.java index 33670da..9b72f8e 100644 --- a/src/main/java/freemarker/core/BuiltInsForNodes.java +++ b/src/main/java/freemarker/core/BuiltInsForNodes.java @@ -23,8 +23,13 @@ import java.util.List; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import freemarker.ext.dom._ExtDomApi; -import freemarker.template.*; -import freemarker.template.utility.StringUtil; +import freemarker.template.SimpleScalar; +import freemarker.template.SimpleSequence; +import freemarker.template.TemplateMethodModel; +import freemarker.template.TemplateModel; +import freemarker.template.TemplateModelException; +import freemarker.template.TemplateNodeModel; +import freemarker.template.TemplateNodeModelEx; /** * A holder for builtins that operate exclusively on (XML-)node left-hand value. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/core/Environment.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/Environment.java b/src/main/java/freemarker/core/Environment.java index 517aba6..3e454d6 100644 --- a/src/main/java/freemarker/core/Environment.java +++ b/src/main/java/freemarker/core/Environment.java @@ -60,7 +60,6 @@ import freemarker.template.TemplateException; import freemarker.template.TemplateExceptionHandler; import freemarker.template.TemplateHashModel; import freemarker.template.TemplateHashModelEx; -import freemarker.template.TemplateHashModelEx2.KeyValuePairIterator; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; import freemarker.template.TemplateModelIterator; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/core/EvalUtil.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/EvalUtil.java b/src/main/java/freemarker/core/EvalUtil.java index 5580a40..061ae19 100644 --- a/src/main/java/freemarker/core/EvalUtil.java +++ b/src/main/java/freemarker/core/EvalUtil.java @@ -27,7 +27,6 @@ import freemarker.template.TemplateBooleanModel; import freemarker.template.TemplateCollectionModel; import freemarker.template.TemplateDateModel; import freemarker.template.TemplateException; -import freemarker.template.TemplateHashModel; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; import freemarker.template.TemplateNumberModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/core/HashLiteral.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/HashLiteral.java b/src/main/java/freemarker/core/HashLiteral.java index 794ade0..6d2c1c7 100644 --- a/src/main/java/freemarker/core/HashLiteral.java +++ b/src/main/java/freemarker/core/HashLiteral.java @@ -27,7 +27,6 @@ import java.util.ListIterator; import freemarker.template.SimpleSequence; import freemarker.template.TemplateCollectionModel; import freemarker.template.TemplateException; -import freemarker.template.TemplateHashModelEx; import freemarker.template.TemplateHashModelEx2; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/core/IteratorBlock.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/IteratorBlock.java b/src/main/java/freemarker/core/IteratorBlock.java index 07b0ef3..61ca93b 100644 --- a/src/main/java/freemarker/core/IteratorBlock.java +++ b/src/main/java/freemarker/core/IteratorBlock.java @@ -28,7 +28,6 @@ import freemarker.template.SimpleNumber; import freemarker.template.TemplateBooleanModel; import freemarker.template.TemplateCollectionModel; import freemarker.template.TemplateException; -import freemarker.template.TemplateHashModel; import freemarker.template.TemplateHashModelEx; import freemarker.template.TemplateHashModelEx2; import freemarker.template.TemplateHashModelEx2.KeyValuePair; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/core/NonSequenceOrCollectionException.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/NonSequenceOrCollectionException.java b/src/main/java/freemarker/core/NonSequenceOrCollectionException.java index 2487b61..d83ff9d 100644 --- a/src/main/java/freemarker/core/NonSequenceOrCollectionException.java +++ b/src/main/java/freemarker/core/NonSequenceOrCollectionException.java @@ -20,11 +20,9 @@ package freemarker.core; import freemarker.ext.util.WrapperTemplateModel; -import freemarker.template.DefaultObjectWrapper; import freemarker.template.TemplateCollectionModel; import freemarker.template.TemplateModel; import freemarker.template.TemplateSequenceModel; -import freemarker.template.WrappingTemplateModel; import freemarker.template.utility.CollectionUtils; /** http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/core/_CoreAPI.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/_CoreAPI.java b/src/main/java/freemarker/core/_CoreAPI.java index 3fb39e3..df95196 100644 --- a/src/main/java/freemarker/core/_CoreAPI.java +++ b/src/main/java/freemarker/core/_CoreAPI.java @@ -22,7 +22,6 @@ package freemarker.core; import java.io.Writer; import java.util.Collection; import java.util.Collections; -import java.util.Map; import java.util.Set; import java.util.TreeSet; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/ext/beans/SimpleMapModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/ext/beans/SimpleMapModel.java b/src/main/java/freemarker/ext/beans/SimpleMapModel.java index 24a2540..fab7805 100644 --- a/src/main/java/freemarker/ext/beans/SimpleMapModel.java +++ b/src/main/java/freemarker/ext/beans/SimpleMapModel.java @@ -30,7 +30,6 @@ import freemarker.template.MapKeyValuePairIterator; import freemarker.template.ObjectWrapper; import freemarker.template.SimpleSequence; import freemarker.template.TemplateCollectionModel; -import freemarker.template.TemplateHashModelEx; import freemarker.template.TemplateHashModelEx2; import freemarker.template.TemplateMethodModelEx; import freemarker.template.TemplateModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/ext/dom/DocumentModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/ext/dom/DocumentModel.java b/src/main/java/freemarker/ext/dom/DocumentModel.java index 06fe9dc..d1ad828 100644 --- a/src/main/java/freemarker/ext/dom/DocumentModel.java +++ b/src/main/java/freemarker/ext/dom/DocumentModel.java @@ -26,7 +26,6 @@ import freemarker.core.Environment; import freemarker.template.TemplateHashModel; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; -import freemarker.template.utility.StringUtil; /** * A class that wraps the root node of a parsed XML document, using http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/ext/dom/SunInternalXalanXPathSupport.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/ext/dom/SunInternalXalanXPathSupport.java b/src/main/java/freemarker/ext/dom/SunInternalXalanXPathSupport.java index e570293..593a031 100644 --- a/src/main/java/freemarker/ext/dom/SunInternalXalanXPathSupport.java +++ b/src/main/java/freemarker/ext/dom/SunInternalXalanXPathSupport.java @@ -19,16 +19,30 @@ package freemarker.ext.dom; -import freemarker.template.*; -import freemarker.core.Environment; +import java.util.List; -import org.w3c.dom.*; +import javax.xml.transform.TransformerException; + +import org.w3c.dom.Node; import org.w3c.dom.traversal.NodeIterator; -import com.sun.org.apache.xpath.internal.*; -import com.sun.org.apache.xpath.internal.objects.*; + import com.sun.org.apache.xml.internal.utils.PrefixResolver; -import java.util.List; -import javax.xml.transform.TransformerException; +import com.sun.org.apache.xpath.internal.XPath; +import com.sun.org.apache.xpath.internal.XPathContext; +import com.sun.org.apache.xpath.internal.objects.XBoolean; +import com.sun.org.apache.xpath.internal.objects.XNodeSet; +import com.sun.org.apache.xpath.internal.objects.XNull; +import com.sun.org.apache.xpath.internal.objects.XNumber; +import com.sun.org.apache.xpath.internal.objects.XObject; +import com.sun.org.apache.xpath.internal.objects.XString; + +import freemarker.core.Environment; +import freemarker.template.SimpleNumber; +import freemarker.template.SimpleScalar; +import freemarker.template.Template; +import freemarker.template.TemplateBooleanModel; +import freemarker.template.TemplateModel; +import freemarker.template.TemplateModelException; /** * This is just the XalanXPathSupport class using the sun internal http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/ext/util/ModelCache.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/ext/util/ModelCache.java b/src/main/java/freemarker/ext/util/ModelCache.java index 52ac7d1..db07691 100644 --- a/src/main/java/freemarker/ext/util/ModelCache.java +++ b/src/main/java/freemarker/ext/util/ModelCache.java @@ -21,9 +21,8 @@ package freemarker.ext.util; import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; -import java.util.Map; - import java.util.IdentityHashMap; +import java.util.Map; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelAdapter; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/template/Configuration.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/template/Configuration.java b/src/main/java/freemarker/template/Configuration.java index 3d9ec04..2b88bde 100644 --- a/src/main/java/freemarker/template/Configuration.java +++ b/src/main/java/freemarker/template/Configuration.java @@ -25,7 +25,6 @@ import java.io.InputStream; import java.net.URLConnection; import java.text.DecimalFormat; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Date; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/template/DefaultIterableAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/template/DefaultIterableAdapter.java b/src/main/java/freemarker/template/DefaultIterableAdapter.java index 46b1e7a..3bca9c3 100644 --- a/src/main/java/freemarker/template/DefaultIterableAdapter.java +++ b/src/main/java/freemarker/template/DefaultIterableAdapter.java @@ -22,10 +22,7 @@ package freemarker.template; import java.io.Serializable; import java.util.Collection; import java.util.Iterator; -import java.util.List; -import freemarker.core._DelayedShortClassName; -import freemarker.core._TemplateModelException; import freemarker.ext.util.WrapperTemplateModel; import freemarker.template.utility.ObjectWrapperWithAPISupport; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6a0867da/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java b/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java index d14c507..30d2df7 100644 --- a/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java +++ b/src/main/java/freemarker/template/DefaultNonListCollectionAdapter.java @@ -21,7 +21,6 @@ package freemarker.template; import java.io.Serializable; import java.util.Collection; -import java.util.Iterator; import java.util.List; import freemarker.core._DelayedShortClassName;