[izpack-changes] r1680 - in izpack-src/trunk: . src/lib/com/izforge/izpack/event src/lib/com/izforge/izpack/util

Sat Jan 6 12:55:04 CET 2007

Author: jponge
Date: 2007-01-06 12:54:55 +0100 (Sat, 06 Jan 2007)
New Revision: 1680

Modified:
   izpack-src/trunk/Versions.txt
   izpack-src/trunk/src/lib/com/izforge/izpack/event/SummaryLoggerInstallerListener.java
   izpack-src/trunk/src/lib/com/izforge/izpack/util/SummaryProcessor.java
Log:
Non-English installation path could be displayed garbled in InstallSummary.html (Vladimir Ralev, JBoss/RedHat, via Julien Ponge)

Modified: izpack-src/trunk/Versions.txt
===================================================================

--- izpack-src/trunk/Versions.txt	2007-01-06 11:51:55 UTC (rev 1679)
+++ izpack-src/trunk/Versions.txt	2007-01-06 11:54:55 UTC (rev 1680)
@@ -33,6 +33,8 @@
   Ubuntu (Vladimir Ralev, JBoss/RedHat, via Julien Ponge)
 - Installations could fail if the installation path contained non-english characters
   (Vladimir Ralev, JBoss/RedHat, via Julien Ponge)
+- Non-English installation path could be displayed garbled in InstallSummary.html
+  (Vladimir Ralev, JBoss/RedHat, via Julien Ponge)
 
   > 3.9.0 (build 2006.09.25)
 - Fix NullPointerException in CompilerConfig, if you specify a 

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/event/SummaryLoggerInstallerListener.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/event/SummaryLoggerInstallerListener.java	2007-01-06 11:51:55 UTC (rev 1679)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/event/SummaryLoggerInstallerListener.java	2007-01-06 11:54:55 UTC (rev 1680)
@@ -74,18 +74,12 @@
         {
             parent.mkdirs();
         }
-        PrintWriter logfile = null;
-        try
-        {
-            logfile = new PrintWriter(new FileOutputStream(path), true);
-        }
-        catch (IOException e)
-        {
-            Debug.error(e);
-        }
+      
         String summary = SummaryProcessor.getSummary(getInstalldata());
-        logfile.print(summary);
-        logfile.close();
+        java.io.OutputStream out = new FileOutputStream(path);
+        
+        out.write(summary.getBytes("utf-8"));
+        out.close();
     }
 
 }

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/util/SummaryProcessor.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/util/SummaryProcessor.java	2007-01-06 11:51:55 UTC (rev 1679)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/util/SummaryProcessor.java	2007-01-06 11:54:55 UTC (rev 1680)
@@ -54,7 +54,8 @@
         // Initialize HTML header and footer.
         StringBuffer sb = new StringBuffer(256);
         sb.append("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n").append(
-                "<html>\n<head>\n<STYLE TYPE=\"text/css\" media=screen,print>\n").append(
+                "<html>\n" + "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">" +
+                "<head>\n<STYLE TYPE=\"text/css\" media=screen,print>\n").append(
                 "h1{\n  font-size: 100%;\n  margin: 1em 0 0 0;\n  padding: 0;\n}\n").append(
                 "div.body {\n  font-size: 100%;\n  margin: 0mm 2mm 0  8mm;\n  padding: 0;\n}\n")
                 .append("</STYLE>\n</head>\n<body>\n");


