[picocontainer-scm] [scm-git][1/2] Minor function rewrite to modern code.

Michael Rimov <git-yCVjj/[email protected]> Fri, 14 Jun 2013 17:50:22 -0500 (CDT)
Newsgroups gmane.comp.java.picocontainer.cvs
Message-ID <[email protected]> 
--f5ff2c902496f4567c9d1dfbf444d0a22a3e7c68
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

commit d28fd0bae222fb12da444cd331db2f0100cc921d=0AAuthor:     Michael Rimov=
 <[email protected]>=0AAuthorDate: Fri, 14 Jun 2013 15:48:58 -0700=
=0ACommit:     Michael Rimov <[email protected]>=0ACommitDate: Fri,=
 14 Jun 2013 15:48:58 -0700=0A=0A    Minor function rewrite to modern code.=
=0A=0Adiff --git a/pico/container/src/java/org/picocontainer/DefaultPicoCon=
tainer.java b/pico/container/src/java/org/picocontainer/DefaultPicoContaine=
r.java=0Aindex 3fff0a9..3db3fac 100644=0A--- a/pico/container/src/java/org/=
picocontainer/DefaultPicoContainer.java=0A+++ b/pico/container/src/java/org=
/picocontainer/DefaultPicoContainer.java=0A@@ -1302,12 +1302,9 @@ public cl=
ass DefaultPicoContainer implements MutablePicoContainer, Converting, C=0A =
        public AsPropertiesPicoContainer(final Properties... props) {=0A   =
          super(DefaultPicoContainer.this);=0A             properties =3D (=
Properties) containerProperties.clone();=0A-            for (Properties c :=
 props) {=0A-                Enumeration<?> e =3D c.propertyNames();=0A-   =
             while (e.hasMoreElements()) {=0A-                    String s =
=3D (String) e.nextElement();=0A-                    properties.setProperty=
(s, c.getProperty(s));=0A-                }=0A+            =0A+            =
for (Properties eachProperty : props) {=0A+            	properties.putAll(e=
achProperty);=0A             }=0A         }=0A =0A=0A=0A=0A=

--f5ff2c902496f4567c9d1dfbf444d0a22a3e7c68
Content-Type: text/html; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w=
3.org/TR/REC-html40/loose.dtd">=0A<html style=3D"font-size: 12px;">=0A<head=
><meta http-equiv=3D"Content-type" content=3D"text/html; charset=3Dutf-8"><=
/head>=0A<body style=3D"font-size: 12px;">=0A<style type=3D"text/css">=0Adt=
:after { content: ':' !important; }=0A></style>=0A<dl class=3D"title" style=
=3D"font-size: 12px; font-family: Verdana; background-color: #ddd; padding:=
 10px;">=0A<dt style=3D"font-size: 12px; float: left; font-weight: bold; mi=
n-width: 6em;">Commit</dt>=0A<dd style=3D"font-size: 12px;">d28fd0bae222fb1=
2da444cd331db2f0100cc921d</dd>=0A<dt style=3D"font-size: 12px; float: left;=
 font-weight: bold; min-width: 6em;">Branch</dt>=0A<dd style=3D"font-size: =
12px;">master</dd>=0A<dt style=3D"font-size: 12px; float: left; font-weight=
: bold; min-width: 6em;">Author</dt>=0A<dd style=3D"font-size: 12px;">Micha=
el Rimov &lt;[email protected]&gt;</dd>=0A<dt style=3D"font-size: 1=
2px; float: left; font-weight: bold; min-width: 6em;">Date</dt>=0A<dd style=
=3D"font-size: 12px;">Fri, 14 Jun 2013 15:48:58 -0700</dd>=0A<dt style=3D"f=
ont-size: 12px; float: left; font-weight: bold; min-width: 6em;">Message</d=
t>=0A<dd class=3D"" style=3D"font-size: 12px;">Minor function rewrite to mo=
dern code.</dd>=0A</dl>=0A<h2 id=3D"pico/container/src/java/org/picocontain=
er/DefaultPicoContainer.java" style=3D"font-size: 12px; font-family: Verdan=
a; font-weight: bold; line-height: 25px; margin-bottom: 2px; padding-left: =
5px; background-color: #bbb;">Changed file pico/container/src/java/org/pico=
container/DefaultPicoContainer.java</h2>=0A=0A<table style=3D"font-size: 12=
px; width: 100%; border-collapse: collapse;">=0A<tr style=3D"font-size: 12p=
x;">=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family:=
 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text=
-align: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">13=
02</td>=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-fami=
ly: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; t=
ext-align: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc"=
>1302</td>=0A<td style=3D"font-size: 12px; color: #000; font-family: 'Bitst=
ream Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0public=C2=A0AsPropertiesPicoContainer(fina=
l=C2=A0Properties...=C2=A0props)=C2=A0{</td>=0A</tr>=0A<tr style=3D"font-si=
ze: 12px;">=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-=
family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width: 23p=
x; text-align: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#=
ccc">1303</td>=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; fo=
nt-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width: =
23px; text-align: right; background-color: #ccc;" align=3D"right" bgcolor=
=3D"#ccc">1303</td>=0A<td style=3D"font-size: 12px; color: #000; font-famil=
y: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0super(Def=
aultPicoContainer.this);</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<=
td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstr=
eam Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: =
right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">1304</td>=
=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bi=
tstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-ali=
gn: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">1304</=
td>=0A<td style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Ve=
ra Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0properties=C2=A0=3D=C2=A0(P=
roperties)=C2=A0containerProperties.clone();</td>=0A</tr>=0A<tr class=3D"r"=
 style=3D"font-size: 12px; background-color: #fdd;" bgcolor=3D"#fdd">=0A<td=
 class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstrea=
m Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: ri=
ght; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">1305</td>=0A=
<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitst=
ream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-align:=
 right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc"></td>=0A<=
td style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans=
 Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0for=C2=A0(Properties=C2=A0c=C2=A0=
:=C2=A0props)=C2=A0{</td>=0A</tr>=0A<tr class=3D"r" style=3D"font-size: 12p=
x; background-color: #fdd;" bgcolor=3D"#fdd">=0A<td class=3D"ln" style=3D"f=
ont-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monac=
o','Courier',monospace; width: 23px; text-align: right; background-color: #=
ccc;" align=3D"right" bgcolor=3D"#ccc">1306</td>=0A<td class=3D"ln" style=
=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','=
Monaco','Courier',monospace; width: 23px; text-align: right; background-col=
or: #ccc;" align=3D"right" bgcolor=3D"#ccc"></td>=0A<td style=3D"font-size:=
 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Couri=
er',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Enumeration&lt;?&gt;=C2=A0e=C2=
=A0=3D=C2=A0c.propertyNames();</td>=0A</tr>=0A<tr class=3D"r" style=3D"font=
-size: 12px; background-color: #fdd;" bgcolor=3D"#fdd">=0A<td class=3D"ln" =
style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mo=
no','Monaco','Courier',monospace; width: 23px; text-align: right; backgroun=
d-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">1307</td>=0A<td class=3D"l=
n" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans=
 Mono','Monaco','Courier',monospace; width: 23px; text-align: right; backgr=
ound-color: #ccc;" align=3D"right" bgcolor=3D"#ccc"></td>=0A<td style=3D"fo=
nt-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco=
','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0while=C2=A0(e.hasMoreEle=
ments())=C2=A0{</td>=0A</tr>=0A<tr class=3D"r" style=3D"font-size: 12px; ba=
ckground-color: #fdd;" bgcolor=3D"#fdd">=0A<td class=3D"ln" style=3D"font-s=
ize: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','C=
ourier',monospace; width: 23px; text-align: right; background-color: #ccc;"=
 align=3D"right" bgcolor=3D"#ccc">1308</td>=0A<td class=3D"ln" style=3D"fon=
t-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco'=
,'Courier',monospace; width: 23px; text-align: right; background-color: #cc=
c;" align=3D"right" bgcolor=3D"#ccc"></td>=0A<td style=3D"font-size: 12px; =
color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',mon=
ospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0String=C2=A0s=
=C2=A0=3D=C2=A0(String)=C2=A0e.nextElement();</td>=0A</tr>=0A<tr class=3D"r=
" style=3D"font-size: 12px; background-color: #fdd;" bgcolor=3D"#fdd">=0A<t=
d class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstre=
am Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: r=
ight; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">1309</td>=
=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bi=
tstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-ali=
gn: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc"></td>=
=0A<td style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera =
Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0properties.setProperty(s,=C2=A0c.getProperty(s));</td>=0A=
</tr>=0A<tr class=3D"r" style=3D"font-size: 12px; background-color: #fdd;" =
bgcolor=3D"#fdd">=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000;=
 font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; widt=
h: 23px; text-align: right; background-color: #ccc;" align=3D"right" bgcolo=
r=3D"#ccc">1310</td>=0A<td class=3D"ln" style=3D"font-size: 12px; color: #0=
00; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; w=
idth: 23px; text-align: right; background-color: #ccc;" align=3D"right" bgc=
olor=3D"#ccc"></td>=0A<td style=3D"font-size: 12px; color: #000; font-famil=
y: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0}</td>=0A</tr>=0A<tr class=3D"a" style=3D"font-size: 12px; b=
ackground-color: #dfd;" bgcolor=3D"#dfd">=0A<td class=3D"ln" style=3D"font-=
size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','=
Courier',monospace; width: 23px; text-align: right; background-color: #ccc;=
" align=3D"right" bgcolor=3D"#ccc"></td>=0A<td class=3D"ln" style=3D"font-s=
ize: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','C=
ourier',monospace; width: 23px; text-align: right; background-color: #ccc;"=
 align=3D"right" bgcolor=3D"#ccc">1305</td>=0A<td style=3D"font-size: 12px;=
 color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',mo=
nospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0</td>=0A</tr>=0A<tr class=3D"a" style=3D"font-size: 12px; ba=
ckground-color: #dfd;" bgcolor=3D"#dfd">=0A<td class=3D"ln" style=3D"font-s=
ize: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','C=
ourier',monospace; width: 23px; text-align: right; background-color: #ccc;"=
 align=3D"right" bgcolor=3D"#ccc"></td>=0A<td class=3D"ln" style=3D"font-si=
ze: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Co=
urier',monospace; width: 23px; text-align: right; background-color: #ccc;" =
align=3D"right" bgcolor=3D"#ccc">1306</td>=0A<td style=3D"font-size: 12px; =
color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',mon=
ospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0for=C2=A0(Properties=C2=A0eachProperty=C2=A0:=C2=A0props)=C2=A0=
{</td>=0A</tr>=0A<tr class=3D"a" style=3D"font-size: 12px; background-color=
: #dfd;" bgcolor=3D"#dfd">=0A<td class=3D"ln" style=3D"font-size: 12px; col=
or: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monosp=
ace; width: 23px; text-align: right; background-color: #ccc;" align=3D"righ=
t" bgcolor=3D"#ccc"></td>=0A<td class=3D"ln" style=3D"font-size: 12px; colo=
r: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospa=
ce; width: 23px; text-align: right; background-color: #ccc;" align=3D"right=
" bgcolor=3D"#ccc">1307</td>=0A<td style=3D"font-size: 12px; color: #000; f=
ont-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0properties.putAll(eachProperty);</td>=0A</tr>=0A<tr=
 style=3D"font-size: 12px;">=0A<td class=3D"ln" style=3D"font-size: 12px; c=
olor: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',mono=
space; width: 23px; text-align: right; background-color: #ccc;" align=3D"ri=
ght" bgcolor=3D"#ccc">1311</td>=0A<td class=3D"ln" style=3D"font-size: 12px=
; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',m=
onospace; width: 23px; text-align: right; background-color: #ccc;" align=3D=
"right" bgcolor=3D"#ccc">1308</td>=0A<td style=3D"font-size: 12px; color: #=
000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;"=
>=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0}</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" s=
tyle=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mon=
o','Monaco','Courier',monospace; width: 23px; text-align: right; background=
-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">1312</td>=0A<td class=3D"ln=
" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans =
Mono','Monaco','Courier',monospace; width: 23px; text-align: right; backgro=
und-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">1309</td>=0A<td style=3D=
"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Mon=
aco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0}</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" s=
tyle=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mon=
o','Monaco','Courier',monospace; width: 23px; text-align: right; background=
-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">1313</td>=0A<td class=3D"ln=
" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans =
Mono','Monaco','Courier',monospace; width: 23px; text-align: right; backgro=
und-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">1310</td>=0A<td style=3D=
"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Mon=
aco','Courier',monospace;">=C2=A0</td>=0A</tr>=0A</table>=0A<br style=3D"fo=
nt-size: 12px;"><br style=3D"font-size: 12px;">=0A</body>=0A</html>=0A=

--f5ff2c902496f4567c9d1dfbf444d0a22a3e7c68--