[Jboss-svn-commits] JBL Code SVN: r4752 - labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki

[<jbo...@li...>]

Author: szimano
Date: 2006-06-13 04:34:05 -0400 (Tue, 13 Jun 2006)
New Revision: 4752

Modified:
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
Log:
utf problems fixed


Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java	2006-06-13 07:55:30 UTC (rev 4751)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java	2006-06-13 08:34:05 UTC (rev 4752)
@@ -22,11 +22,12 @@
 package org.jboss.wiki;
 
 import java.io.File;
+import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.Date;
 import java.util.HashMap;
@@ -204,11 +205,11 @@
 					+ ".txt");
 
 			PrintWriter pageFileWriter;
-			FileReader pageFileReader;
+			InputStreamReader pageFileReader;
 
 			try {
 				pageFileWriter = new PrintWriter(pageFile, CHARSET);
-				pageFileReader = new FileReader(pageOldFile);
+				pageFileReader = new InputStreamReader(new FileInputStream(pageOldFile), CHARSET);
 
 				int b;
 
@@ -457,7 +458,7 @@
 				StringBuilder pageContent = new StringBuilder();
 
 				try {
-					FileReader input = new FileReader(pageFile);
+					InputStreamReader input = new InputStreamReader(new FileInputStream(pageFile), CHARSET);
 					// FileInputStream input = new FileInputStream(pageFile);
 
 					int nextChr = input.read();
@@ -567,8 +568,9 @@
 
 		if (loadContent) {
 			try {
-				FileReader input = new FileReader(pageFile);
-
+				
+				InputStreamReader input = new InputStreamReader(new FileInputStream(pageFile), CHARSET);
+				
 				int nextChr = input.read();
 
 				ret = new StringBuilder();