From cf6c2c775a74131e78eda8cbd63b1e4a29babffe Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <cpm@devinsy.fr>
Date: Fri, 26 Mar 2010 12:51:34 +0100
Subject: [PATCH] Replace StringBuffer out by Writer.

---
 .../classes/fr/devinsy/xid/DomPresenter.class | Bin 2549 -> 2740 bytes
 .../fr/devinsy/xid/FilePresenter.class        | Bin 3248 -> 3347 bytes
 build/classes/fr/devinsy/xid/Presenter.class  | Bin 18483 -> 18248 bytes
 .../fr/devinsy/xid/StringPresenter.class      | Bin 3263 -> 3397 bytes
 src/fr/devinsy/xid/DomPresenter.java          |  12 ++-
 src/fr/devinsy/xid/FilePresenter.java         |   5 +-
 src/fr/devinsy/xid/Presenter.java             |  82 ++++++------------
 src/fr/devinsy/xid/StringPresenter.java       |   5 +-
 8 files changed, 39 insertions(+), 65 deletions(-)

diff --git a/build/classes/fr/devinsy/xid/DomPresenter.class b/build/classes/fr/devinsy/xid/DomPresenter.class
index b1eb8b03e4110fa3878a8141fc35b26d7b64bb5b..06f6aa43258b8b09fffe1c22eebc227efe190a2e 100644
GIT binary patch
delta 664
zcmY+AOKVe65P-jv=H@=Q7278DRiRC*q>orNi`ZTev<3>+SlXHzt&f=Arm1P7$yHDn
zT?#6woSz`Lwot5C5ZC?&!Hs{xtvGp9^ehfDXTCY}F~9nDV$QeUpT7WSsct(f;d9ZA
z!sEhZxi+~N)XUY<a=je*b%%Kd9lBU@Npnq+NzCnYZNk%2M#{{YEGzo;+i?GxW>4Pb
z1~(N}P-}muh$cqct(8Kx)EVMA<jCsp;mdJrJ=m<w)K-1@=I@AqRXlydC=U59Ym^k`
zgL<v#HyVly{~PITBXz8)P<GkizQQi~!No^wYkpmEG%>2*gb(YV#&f#|i$l0LI*6q0
zLBhnb8P+?Ix$aTP#wD8|N>X>5vql<&X`Qu>=!SX9n33#~es3<=a}s4a$W^VZStBpm
zicm|+*YB*9{Z%#>mK}Tghc&#FO^)p_H2#UjJ#zWvN3QR(a%JL!09_2oeNsk34U>mB
z)aju?AA!`KFv3%kJY$M2jth03h}<5-QfVHK47X6i+nnY$At6JZ$f1`zY`HRKgcx@z
zNOVt{x=;hcrzy60L{>2^bD=E7rh06T`TQ;mA}{8vV!hs04z-kfThI&H<x39mO2)r#
d>5a9U>6X{#iIItS{PwLZDYjJ<6+uF5{s9)XebN8`

delta 455
zcmXYs%SxM36otQ&KPUgisHusfpfz4V>z%4ZokdXMB_Q5!t%^7lHJ0k2;7~#6<UBwf
zbzDKPRPX_O3SYvhbeVV#9QIy&?R~y|SO1cZo?ibw0-xEtjke>a!R;g((h&<}BRrOq
z<XABjyItNkx*I!eR$Z%|b3g4~W;@9jz8d`F($W6G>8W9+VoN86-1o#~SW7@XNdlMf
zbKytgWC>|=)Bb#Qm$FaFddSf0e)$DEie=0_2Tjff12(U0(v1a+;jE&0QWTvF3U*D|
zrd-Qr-;IXD;crpKwZNb|2|F%|eLZ)y_5Nk4?~g=}X1(pgfJ1zah&bj0C!{H<c19=X
z^z(xjIYu;EgXoa@b_SVZ6(euR5NpJwSG`9Ob*yVOj}19JOtVb6Z*0mnE+wwM3H^j7
zc)E~!U}58)MInlBtIQWG^VO8=m!iC)hU+p*w$ekjl(&<5X9?u0uo!lv$JqT3r$9kg

diff --git a/build/classes/fr/devinsy/xid/FilePresenter.class b/build/classes/fr/devinsy/xid/FilePresenter.class
index 0e555c50408c9f58cc7f2380bf7dc914d9819602..ee698d81ceb4474dd799169dfd4cfdc87ea714cf 100644
GIT binary patch
delta 574
zcmYk2OHUI~6vuye+L>X-ViicG^;L?G+LjPqsjQT^g0ewlq6;(X6pJXN8Jge=ANW8-
zEf-Dv0EWa>iKM6tKY(k$03XARdZrE4%{}M*?>)cszo(wmDfh?kZ{L9vyjypDv%6=~
zt9paw>A~@!QocQLu~H87f_b^?Ty}K(Ce-}Oklu<Wblf_y*JYABG466t;Y|3!+1XOb
zuP9R4V|vT%)dN=bWXFx**3|IybzhNagZ_;WoT76)@UGn~dNb#}t5d$sb3y3iRw`n%
zsDD}`YFVf48MX4cW?wO!I#Db!{#E~SKBiBbNi(;>!TcAhNwdLRu~3)G2njhak<bmd
zIKRd$>r~lfjy<B6a6<t79FiDjr?`(IBYKVp7+h#)n^LtjlMUwS5O$nTJmirW>7|Fq
zqM3}evo*SS!h&c|g`Fh2{|^OB8)fqhn-?}iviI%`4tZYc+K#@lrD8!fcr}_2%^OYg
zJ7o}pail5EV$*oKsqN;7j6~FyHQBz@ujMmF6ZvK()|Xit8^{Z>wT}OZtMcZ(^nTF8
lvHqjsXScf}yUvj1tt_Hb=!YdLiDs@rO)tmx*;*=t)xVALae)8;

delta 468
zcmYjNxk^J(5Iy%LH`nAvqeSCEP?NZXyx7=D3Q1!VpN$)WAW@P=1rZhZJ?={}2x2Li
zO3<JLvG4=LZxH+g3u|@WL&fIK%;C&AXD-#<)_R^lAD;lU<Fw$(ND-h;SAe$VkY+|H
z>GaENHZz@|H)nvPtKK0Hq!%qnv#!C4(%zZ$*tnUV>PwGKWE3_?s0Oh`A(axlG^wV<
z(cP;W(cBks!o?m1>hfIGnDN*>8jJ_b#cvsOAi(bcsz}$(wLE5VgLzalHVn75gb13r
zT3rVgAP|NJF)Ttu|6iAf{)0(eV+kd!>%%3MvBKsxsKhE`5~;s#jTLL*{6ZX3K`5+4
z!MCZ9;Lq@f+1tQ2edwW{oEaBI>~tGeT+NPK#`3@xlX7gcXUA={u?n=X5g66%K!Q0X
z%xL1-lH8{;Zz!DWX){>Tw142gBr)lXm(MBhjkH=f{;oU9lZfJg?=NNfX0C#(j1_T6
M@7|y~=1IfJH;%|q*Z=?k

diff --git a/build/classes/fr/devinsy/xid/Presenter.class b/build/classes/fr/devinsy/xid/Presenter.class
index ff98787a9b02f25ceb24032ef24b7714c1f23860..5404eb7d647f74c3f2c52c2e87568b039fc2867d 100644
GIT binary patch
delta 8542
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
Ze6UuIS)RBW>(z}X1zEsvQmb9w{{s$Jujc>&

delta 8548
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
Biwyt(

diff --git a/build/classes/fr/devinsy/xid/StringPresenter.class b/build/classes/fr/devinsy/xid/StringPresenter.class
index 8e160a5fee3ced41685888ec046bd4ba72b62c82..8dd411fb3b49d9b958e8d4ab63afbd81a66349e9 100644
GIT binary patch
delta 694
zcmYL_OGs2v9L9fl=04_LCq`{D?+~el;-i>~AhIaz0YSM^$QFeIjnkAmavQbmF}*FD
z9(JGzX3=BOE{wp$pjJI;5w(e+MJs91!hK}_tK)PQ=lsw2o%4PF|M%K`6LUWPoqh#u
z;LbDWi@r2^G%=Kjr!(=6te5Uj?f24IHLK?;cQ@`^WPB{?ZBYrWN<A=Y-ENMD$ug*6
zr;^zngFQV-Pb1dYq<$LJj)TT<m=l~-?~Pri#VL&{_1UZnI*h1@xp!6QNVczcXXbEH
zh?2>Fd*7<dT&rIZP4&=-smJCX^IDh&#?-7itlfH^wzdWACUi_0<d>STM<bJXt-7nf
zBc!!Ip;K*l;_GZzmwKhEPchVLxJHp&@{*AQuJMA??Q14PAV^g9Lo8PXrzMvnPnvO#
zahE<G(a%#dOf$e+JU%hRSDEb_BmCejGhAeu{2rjpZ-p9a<@BqKoRJ`usMpK803S-#
z_fj<@_yW6CupA+RIl8D^C`F)`bDS3{&p|GTj4tL;u?%5wNo+c?H(7I3qg!Yem$BFk
zb5sy00&;1=D6!p^G)~<3L%BSi!(QYBw-DAATF?eYRhwNCo#Lt=QD8nIQwD;(`dwD1
zjj2euPP?wwhpRj8$%p$yD9lIEEL|cUSkk4xDvD7=O2gX1<Rz$Jc^j*_A*z0O^>X_9
SM)M>$RUy2>x-GW=<NpAZ-;NOg

delta 621
zcmZ9I-Afcv7{-5R_ROA{adK63am8rG4B2gyB8Vb_zzZW*sH^H~Ly8dlw5_bRwe7=F
zp^JkO^aprb2o?oNR0Q5w;<fl6g!j?*j=L?<aORxnywCgboabxTaw=H){r)3xfay2E
znpR2s-A&ppU2^jMcGc~)=Or}nrai@Y$W4lN%N_Ir3Y<`M+iRxV7ULQFIi6Jy?9ccG
z|6#};DvBYSFuiutoKjPZYv!2ahiF`xv}sepl=lr!<rg?@)4{+#FDGzk?j1Ld=#;Kg
zJ3df2o6>K&mEZeX>SDCZevYJVZpxM~G0iA17~>U}S>OtbTxFT-e4)q+w^?O^bxLed
zp+hP!5=7J4MOw}X9h5A^taR?<4i29h=tl!>NW8`#mDmKH>}O~z*I|hf?n-e?Mz(WL
zXw7|TK8%0JROv(;lo1t%!%(Faryh{Y?tj<<4Cr4ZB(IA9moOA$Nk3mqEsK<X!CFMy
zlVP%LGP1?lwk0kxn6cwwkE+<Yu&4ZJIG0^wf6cpEQnSc}d1>~Ng!mS@l96_ZEF;pR
vueI(<qVaBDn8)H-tmQbpJdr_7lGi6^G}6s1@$`QkijEfH9QhT`w$bxHLn~=j

diff --git a/src/fr/devinsy/xid/DomPresenter.java b/src/fr/devinsy/xid/DomPresenter.java
index a79d0da..7775b5e 100644
--- a/src/fr/devinsy/xid/DomPresenter.java
+++ b/src/fr/devinsy/xid/DomPresenter.java
@@ -1,5 +1,7 @@
 package fr.devinsy.xid;
 
+import java.io.StringWriter;
+
 import org.w3c.dom.*;
 
 /**
@@ -116,8 +118,9 @@ public class DomPresenter extends Presenter
 		else
 		{
 			// Build the web page.
-			result = new StringBuffer ();
-			Presenter.doXid (result, this.doc, datas);
+			StringWriter htmlCode = new StringWriter();
+			Presenter.doXid (htmlCode, this.doc, datas);
+			result = new StringBuffer (htmlCode.toString());
 		}
 
 		//
@@ -132,8 +135,9 @@ public class DomPresenter extends Presenter
 	{
 		StringBuffer result;
 
-		result = new StringBuffer();
-		Presenter.process (result, doc, datas);
+		StringWriter htmlCode = new StringWriter();
+		Presenter.process (htmlCode, doc, datas);
+		result = htmlCode.getBuffer();
 
 		//
 		return (result);
diff --git a/src/fr/devinsy/xid/FilePresenter.java b/src/fr/devinsy/xid/FilePresenter.java
index 9bf879b..d748307 100644
--- a/src/fr/devinsy/xid/FilePresenter.java
+++ b/src/fr/devinsy/xid/FilePresenter.java
@@ -113,8 +113,9 @@ public class FilePresenter extends DomPresenter
 		}
 
 		// Build the web page.
-		result = new StringBuffer (Presenter.estimatedTargetLength(source.length()));
-		Presenter.doXid (result, doc, datas);
+		StringWriter htmlCode = new StringWriter(Presenter.estimatedTargetLength(source.length()));
+		Presenter.doXid (htmlCode, doc, datas);
+		result = htmlCode.getBuffer();
 
 		//
 		return (result);
diff --git a/src/fr/devinsy/xid/Presenter.java b/src/fr/devinsy/xid/Presenter.java
index 19c24e6..be2ee26 100644
--- a/src/fr/devinsy/xid/Presenter.java
+++ b/src/fr/devinsy/xid/Presenter.java
@@ -25,7 +25,7 @@ public class Presenter
 	/*
 	 * Xid a file with data.
 	 */
-	static public void doXid (StringBuffer result, Document doc, IdsDataById datas) throws Exception
+	static public void doXid (Writer result, Document doc, IdsDataById datas) throws Exception
 	{
 		Presenter.process (result, doc, datas);
 	}
@@ -82,11 +82,11 @@ public class Presenter
 		{
 			result = new Attributes (target);
 
-			Iterator iterator = source.entrySet().iterator();
+			Iterator<Map.Entry<String, String>> iterator = source.entrySet().iterator();
 
 			while (iterator.hasNext())
 			{
-				Map.Entry<String, String> attribute = (Map.Entry<String, String>) iterator.next();
+				Map.Entry<String, String> attribute = iterator.next();
 
 				String currentValue = target.get (attribute.getKey ());
 
@@ -109,10 +109,11 @@ public class Presenter
 		return (result);
 	}
 
+	
 	/*
 	 *
 	 */
-	static protected void processChildren (StringBuffer result, Node node, IdsDataById datas) throws Exception
+	static protected void processChildren (Writer result, Node node, IdsDataById datas) throws Exception
 	{
 		processChildren (result, node, datas, "");
 	}
@@ -121,10 +122,7 @@ public class Presenter
 	/*
 	 *
 	 */
-	static protected void processChildren (StringBuffer result,
-												   Node node,
-												   IdsDataById datas,
-												   String suffix) throws Exception
+	static protected void processChildren (Writer result, Node node, IdsDataById datas, String suffix) throws Exception
 	{
 		// Get the iteration strategy.
 		IdData.IterationStrategy strategy;
@@ -267,18 +265,10 @@ public class Presenter
 	 * @param idAttr
 	 *            The ID.
 	 */
-	static protected StringBuffer processElementWithId (Node node,
-														NamedNodeMap attrs,
-														Node idAttr,
-														IdsDataById datas) throws Exception
+	static protected void processElementWithId (Writer result, Node node, NamedNodeMap attrs, Node idAttr,	IdsDataById datas) throws Exception
 
 	{
-		StringBuffer result;
-
-		result = processElementWithId (node, attrs, idAttr, datas, "");
-
-		//
-		return (result);
+		processElementWithId (result, node, attrs, idAttr, datas, "");
 	}
 
 
@@ -293,18 +283,11 @@ public class Presenter
 	 * @param idAttr
 	 *            The ID.
 	 */
-	static protected StringBuffer processElementWithId (Node node,
-														NamedNodeMap attrs,
-														Node idAttr,
-														IdsDataById datas,
-														String suffix) throws Exception
+	static protected void processElementWithId (Writer result, Node node, NamedNodeMap attrs, Node idAttr,	IdsDataById datas, String suffix) throws Exception
 	{
-		StringBuffer result;
-		result = new StringBuffer ();
-
 		String tag = node.getNodeName();
 
-		String idValue = idAttr.getNodeValue();
+		// String idValue = idAttr.getNodeValue();
 
 		logger.debug ("tag=" + tag);
 
@@ -313,7 +296,7 @@ public class Presenter
 
 		if (dataCore == null)
 		{
-			result.append (Presenter.processElementBasically (node, datas, suffix));
+			Presenter.processElementBasically (result, node, datas, suffix);
 		}
 		else if (dataCore instanceof IdData)
 		{
@@ -420,7 +403,7 @@ public class Presenter
 					// Manage a Hashmap.
 					IdsDataById data = (IdsDataById) tags.elementAt (nLine);
 
-					result.append (Presenter.processElementWithId (node, attrs, idAttr, data, Integer.toString (nLine)));
+					Presenter.processElementWithId (result, node, attrs, idAttr, data, Integer.toString (nLine));
 					result.append ('\n');
 				}
 			}
@@ -432,7 +415,6 @@ public class Presenter
 
 		//
 		logger.debug ("Exit");
-		return (result);
 	}
 
 
@@ -440,7 +422,7 @@ public class Presenter
 	/**
 	 * 
 	 */
-	static protected void process (StringBuffer result, Node node, IdsDataById datas) throws Exception
+	static protected void process (Writer result, Node node, IdsDataById datas) throws Exception
 	{
 		Presenter.process (result, node, datas, "");
 	}
@@ -450,7 +432,7 @@ public class Presenter
 	 * Recursive method that processes a node and any child nodes.
 	 * 
 	 */
-	static protected void process (StringBuffer result, Node node, IdsDataById datas, String suffix) throws Exception
+	static protected void process (Writer result, Node node, IdsDataById datas, String suffix) throws Exception
 	{
 		logger.debug ("process - started");
 		String TRANSITIONAL_DTD = "xhtml1-transitional.dtd";
@@ -479,7 +461,7 @@ public class Presenter
 	
 						if (dt != null)
 						{
-							String publicId = dt.getPublicId();
+							// String publicId = dt.getPublicId();
 							String systemId = dt.getSystemId();
 	
 							if (systemId.equals(TRANSITIONAL_DTD))
@@ -505,15 +487,11 @@ public class Presenter
 	
 						if (idAttr != null)
 						{
-							result.append (Presenter.processElementWithId (node,
-																		   attrs,
-																		   idAttr,
-																		   datas,
-																		   suffix));
+							Presenter.processElementWithId (result, node, attrs, idAttr, datas, suffix);
 						}
 						else
 						{
-							result.append (Presenter.processElementBasically (node, datas, suffix));
+							Presenter.processElementBasically (result, node, datas, suffix);
 						}
 	
 						break;
@@ -579,25 +557,18 @@ public class Presenter
 	/*
 	 *
 	 */
-	static StringBuffer processElementBasically (Node node, IdsDataById datas) throws Exception
+	static void processElementBasically (Writer result, Node node, IdsDataById datas) throws Exception
 	{
-		StringBuffer result;
-
-		result = processElementBasically (node, datas, "");
-
-		//
-		return (result);
+		processElementBasically (result, node, datas, "");
 	}
 
 
 	/*
 	 *
 	 */
-	static StringBuffer processElementBasically (Node node, IdsDataById datas, String suffix) throws Exception
+	static void processElementBasically (Writer result, Node node, IdsDataById datas, String suffix) throws Exception
 	{
-		StringBuffer result;
 		logger.debug("processElementBasically - started");
-		result = new StringBuffer ();
 
 		// Open the tag.
 		result.append ('<');
@@ -605,7 +576,7 @@ public class Presenter
 
 		
 		// Build the tag attributes.
-		Attributes tagAttributes;
+		//Attributes tagAttributes;
 
 		result.append (processAttributes (node.getAttributes (),
 				      					  null,
@@ -628,9 +599,6 @@ public class Presenter
 		}
 
 		logger.debug("processElementBasically - ended");
-
-		//
-		return (result);
 	}
 
 
@@ -981,11 +949,11 @@ public class Presenter
 		// Put model attributes in the merged attributes list.
 		if (dataAttributes != null)
 		{
-			Iterator iterator = dataAttributes.entrySet().iterator();
+			Iterator<Map.Entry<String, String>> iterator = dataAttributes.entrySet().iterator();
 
 			while (iterator.hasNext())
 			{
-				Map.Entry<String, String> attribute = (Map.Entry<String, String>) iterator.next();
+				Map.Entry<String, String> attribute = iterator.next();
 
 				if (mergedAttributes.containsKey (attribute.getKey ()))
 				{
@@ -1006,10 +974,10 @@ public class Presenter
 		}
 
 		// Display the attributes
-		Iterator iterator = mergedAttributes.entrySet().iterator();
+		Iterator<Map.Entry<String, String>> iterator = mergedAttributes.entrySet().iterator();
 		while (iterator.hasNext ())
 		{
-			Map.Entry<String, String> attribute = (Map.Entry<String, String>) iterator.next();
+			Map.Entry<String, String> attribute = iterator.next();
 
 			if ((attribute.getKey ().equals ("id")) && (suffix.length () != 0))
 			{
diff --git a/src/fr/devinsy/xid/StringPresenter.java b/src/fr/devinsy/xid/StringPresenter.java
index 8091f2d..36eb0c0 100644
--- a/src/fr/devinsy/xid/StringPresenter.java
+++ b/src/fr/devinsy/xid/StringPresenter.java
@@ -98,8 +98,9 @@ public class StringPresenter extends DomPresenter
 			doc = buildTree (new ByteArrayInputStream (htmlSource.getBytes ()));
 		}
 
-		StringBuffer htmlTarget = new StringBuffer (Presenter.estimatedTargetLength(this.html.length()));
-		Presenter.doXid (htmlTarget, doc, datas);
+		StringWriter htmlCode = new StringWriter(Presenter.estimatedTargetLength(this.html.length()));
+		Presenter.doXid (htmlCode, doc, datas);
+		StringBuffer htmlTarget = htmlCode.getBuffer();
 
 		if (htmlTarget == null)
 		{