Return-Path: X-Original-To: apmail-poi-dev-archive@www.apache.org Delivered-To: apmail-poi-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 775BE18189 for ; Mon, 19 Oct 2015 17:58:41 +0000 (UTC) Received: (qmail 83927 invoked by uid 500); 19 Oct 2015 17:58:35 -0000 Delivered-To: apmail-poi-dev-archive@poi.apache.org Received: (qmail 83883 invoked by uid 500); 19 Oct 2015 17:58:31 -0000 Mailing-List: contact dev-help@poi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "POI Developers List" Delivered-To: mailing list dev@poi.apache.org Received: (qmail 83861 invoked by uid 99); 19 Oct 2015 17:58:30 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Oct 2015 17:58:30 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 6DA28180E26 for ; Mon, 19 Oct 2015 17:58:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.78 X-Spam-Level: * X-Spam-Status: No, score=1.78 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id tNgIGEb1UGRy for ; Mon, 19 Oct 2015 17:58:17 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTPS id 9248B206E3 for ; Mon, 19 Oct 2015 17:58:17 +0000 (UTC) Received: from [128.89.89.114] ([128.89.89.114]) by mrelay.perfora.net (mreueus002) with ESMTPSA (Nemesis) id 0MThig-1Zx4P12UGO-00QUbd for ; Mon, 19 Oct 2015 19:58:15 +0200 Subject: Re: svn commit: r1709427 - /poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java To: dev@poi.apache.org References: <20151019145531.01C6B3A0032@svn01-us-west.apache.org> <036001d10a93$cd0e6d00$672b4700$@thetaphi.de> From: Dustin Spicuzza Openpgp: url=http://www.virtualroadside.com/key.asc Message-ID: <56252F2E.7050407@virtualroadside.com> Date: Mon, 19 Oct 2015 13:58:06 -0400 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <036001d10a93$cd0e6d00$672b4700$@thetaphi.de> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="UWVOSPOi9EARvMOeUbILLrhxVcXnurGUG" X-Provags-ID: V03:K0:k6dX9MZH9tQAEc0ZgBFoTG07Unhb7uPrQ/9YP6r8CtU5ZEtqFwQ QZsiHFpTik/bbnPxQj1ww8YQ107gLIIvGR4G6oMPPIexvSJKk+K5Nlk5Mki5vrZd68RruTA hSrPoj1et31RVuNpk1ayksCzhOrMYysvzqiuN0IkvEUjp4DYnkGvULTiW+D9BndDPfYVaG3 yiIoZIF6rMRXkbhBVATMw== X-UI-Out-Filterresults: notjunk:1;V01:K0:TTeJdo8rkk8=:zB5j/rCBscWIXzrbfetCv3 +7nXhxwpt4Kh9Nr+zHEuxfJ5W++Fo6FHhlcRQzUUl0Yl8wLibZohjJsdNo8/myIbj88oxRoi+ ADmWDjz5U5yziTunQnFcEOYW9WHgV5Myq9yeFBmV82AZzk5nY8Cxdm/++Bgus4lpvZVrkas6k 7VqE/mQ7VHqBVRCcOG6CdpCDt9RghzGS8nnMmFEUjAZj2tQdlccikz1yuT132+p+rnGBXLqXv +VR0Ik2aqZssfqszCBg7wbGwiGa8JaYihUG0O7h/47Wm+yLJQkG6FFxSj7+Ow2LHA7kaljCMh 4rfCAz+MXpbgTCj/UIX3v1y9mS5G/4ES3CGdaPOpZaOCoQCeSyCtupk+4ovmeBPq3tGDpI+qm 2OAv3MAmcL7etODt4NHRMtA30PE8vJUgFBSnPBihUX2MCpOioM4831r0SIahUPm6FvnznusJe nEoyk+AcRBHlzecvAEpYndlA2CqJKymfBmJE1YL02evoQLI/rqRoksBsgb5APEviBiRfJZ8Vs T9lkfUwLdulXjasP0H5xEXbKf0waLkEHrkyq6zUF9BPDX90bTl7ODS1DAaYEJdobO6+35C0BS buw9GXIwFA6287ETh0jYMh6UDC+eHEMTD+wShlws+v+CZNNPd91zz3IPPGhDd9L5wt2DJsyBT Q+hIaNZZ6ix/aS9aRg3SctrHwH+Tu2ZQ8f2YTZrg2HG7f92ZcoZUSV0qA+XExDQBf8EA= --UWVOSPOi9EARvMOeUbILLrhxVcXnurGUG Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Thanks, I was originally using Collections.emptyIterator(), but that's on= ly available in Java 7+. I'll do it your way, that sounds easier anyways.= :)=20 Dustin On 10/19/2015 1:30 PM, Uwe Schindler wrote: > Just unrelated to the original fix: >=20 > According to checks, the EmptyIterator should throw NoSuchElementExcept= ion. > But I would remove the impl completely! It is much simpler to just retu= rn Collections.emptySet().iterator() when empty iterators are required; t= his is also just returning a static singleton, so no speed improvement at= all! >=20 > Uwe >=20 > ----- > Uwe Schindler > H.-H.-Meier-Allee 63, D-28213 Bremen > http://www.thetaphi.de > eMail: uwe@thetaphi.de >=20 >=20 >> -----Original Message----- >> From: virtuald@apache.org [mailto:virtuald@apache.org] >> Sent: Monday, October 19, 2015 4:56 PM >> To: commits@poi.apache.org >> Subject: svn commit: r1709427 - >> /poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/Combi >> nedIterable.java >> >> Author: virtuald >> Date: Mon Oct 19 14:55:30 2015 >> New Revision: 1709427 >> >> URL: http://svn.apache.org/viewvc?rev=3D1709427&view=3Drev >> Log: >> XDGF: fix jdk < 1.8 compat >> >> Modified: >> >> poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/Combin >> edIterable.java >> >> Modified: >> poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/Combin >> edIterable.java >> URL: >> http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/x= d >> gf/usermodel/section/CombinedIterable.java?rev=3D1709427&r1=3D1709426&= r2 >> =3D1709427&view=3Ddiff >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- >> poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/Combin >> edIterable.java (original) >> +++ >> poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/Combi >> +++ nedIterable.java Mon Oct 19 14:55:30 2015 >> @@ -17,7 +17,6 @@ >> >> package org.apache.poi.xdgf.usermodel.section; >> >> -import java.util.Collections; >> import java.util.Iterator; >> import java.util.Map.Entry; >> import java.util.NoSuchElementException; @@ -35,14 +34,21 @@ public >> class CombinedIterable impleme >> >> private static final class EmptyIterator implements Iterator { >> >> + @Override >> public boolean hasNext() { >> return false; >> } >> >> + @Override >> public T next() { >> return null; >> } >> >> + @Override >> + public void remove() { >> + throw new UnsupportedOperationException(); >> + } >> + >> } >> >> public CombinedIterable(SortedMap baseItems, >> >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org >> For additional commands, e-mail: commits-help@poi.apache.org >=20 >=20 > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@poi.apache.org > For additional commands, e-mail: dev-help@poi.apache.org >=20 --=20 Innovation is just a problem away --UWVOSPOi9EARvMOeUbILLrhxVcXnurGUG Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (MingW32) iQIcBAEBAgAGBQJWJS8zAAoJENXGN37eUHhrDdsP/iMkeI9mGFpY7rrhEFaqkZjs C4f9SsNc9vQTvsdzXeJn8uai+KXlsImhw7BBfyLlmxajjgWub5R7djpMkUVyZDQv xEPaRq9Km+vrRbkJHF9TT2xt9BoEY4tp1pkb8OXv91jSZ2nJJmgrQDT+/c+Edb2j uWXuHjCOHPp7GaMAVzhAoaGMVFT9zZONGbMTKqMjA2ZzXPvtOXDosR/HDFiUhfEC zINTpxGsRCKi8Fo0qX1J2Q9Xb+LYD7nki6l6PjT0bP6g4pDnxzyJngyxZfM6BVJ5 mXgGWddzPFLDzzco42LzmObaZKY10QQ6uJmvH3XAZKWV3FsSUPhCABcZb1EUSvOh YH7mbGxVXUfYl5FZqPwDS6RhTx/WS4rOOPNPod1bD+t+xVYEHlOk5hlR3FXzFOPU ikVtRYYKF+iixAI/9ygk8oai/SdSy6FoMDVEC/D2EWcIY7rH/9PcL5+qu0mI6Z/U K9G2c2faEze6z5f/WQ5R/S4s1y9H3IkLAA/XF0RkBeLGnDeeJ8d/v6GAUSIgtb1T HDoTJ20V48WeqhKpajiXilEfHS2FPJqahpJaxVdn9EWx57z7Lc4PD566yVOgN5MY qe/CJK+XP/TfOEgB8X2yQHF5s2E2D4TQDwZdr8Y/xGWYIRhzzb2rzghXMcVur6I8 YynojIugOJSNdF93Cynm =Uh+b -----END PGP SIGNATURE----- --UWVOSPOi9EARvMOeUbILLrhxVcXnurGUG--