X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FTemplate.java;fp=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FTemplate.java;h=2dfbacfeb1092780f81686762eb6bf10bb6ee37f;hp=e247e27962e6fe6d94d0a913a3a2afcadaa5c0dd;hb=074a83257de30c3cd7409b0840ab6f27ed0e93b5;hpb=efe7b5989ac8a72375a1abfaf9aa3f50a18ea58d

diff --git a/src/be/nikiroo/fanfix/library/Template.java b/src/be/nikiroo/fanfix/library/Template.java
index e247e27..2dfbacf 100644
--- a/src/be/nikiroo/fanfix/library/Template.java
+++ b/src/be/nikiroo/fanfix/library/Template.java
@@ -1,6 +1,5 @@
 package be.nikiroo.fanfix.library;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
@@ -8,7 +7,6 @@ import java.util.List;
 import java.util.Map;
 
 import be.nikiroo.utils.IOUtils;
-import be.nikiroo.utils.StringUtils;
 import be.nikiroo.utils.streams.ReplaceInputStream;
 
 public class Template {
@@ -60,26 +58,24 @@ public class Template {
 					valueOne.close();
 				}
 			}
+
 			from[i] = "${" + key + "}";
 			to[i] = value.toString();
 
 			i++;
 		}
-
+		
 		InputStream in = IOUtils.openResource(location, name);
 		
-		//TODO: pending fix in replace stream
-		String data = IOUtils.readSmallStream(in);
-		in.close();
-		for(i = 0 ; i < from.length;i++) {
-			data=data.replace(from[i], to[i]);
-		}
+		InputStream stream;
+		
+		stream = IOUtils.openResource(location, name);
+		System.out.println("SOURCE = (("  + IOUtils.readSmallStream(stream) + "))");
+		stream=new ReplaceInputStream(IOUtils.openResource(location, name), from, to);
+		System.out.println("RESULT = (("  + IOUtils.readSmallStream(stream) + "))");
 		
-		//in = new ReplaceInputStream(in, from, to);
-		in = new ByteArrayInputStream(StringUtils.getBytes(data));
-		// END TODO
 		
-		return in;
+		return new ReplaceInputStream(in, from, to);
 	}
 
 	public synchronized Template set(String key, String value) {