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

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

Author: szimano
Date: 2006-06-13 03:55:30 -0400 (Tue, 13 Jun 2006)
New Revision: 4751

Modified:
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
Log:
utf8 issues


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 04:39:16 UTC (rev 4750)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java	2006-06-13 07:55:30 UTC (rev 4751)
@@ -26,8 +26,8 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -66,6 +66,8 @@
 
 	private static final String propModFileName = "fileMod.properties";
 
+	private static final String CHARSET = "UTF-8";
+
 	private String pathToMediaTrash;
 
 	private String pathToMedia;
@@ -182,7 +184,7 @@
 
 			// harddisk - add new
 			// version
-			Properties pageProps = getPageProps(uidTranslated);
+			Properties pageProps = getPageProps(uid);
 
 			pageProps.setProperty(page.getLastVersion() + ".author", page
 					.getLastAuthor().getName());
@@ -201,11 +203,11 @@
 			File pageOldFile = new File(pathToMedia + "/" + uidTranslated
 					+ ".txt");
 
-			FileWriter pageFileWriter;
+			PrintWriter pageFileWriter;
 			FileReader pageFileReader;
 
 			try {
-				pageFileWriter = new FileWriter(pageFile);
+				pageFileWriter = new PrintWriter(pageFile, CHARSET);
 				pageFileReader = new FileReader(pageOldFile);
 
 				int b;
@@ -220,13 +222,14 @@
 
 				pageOldFile.delete();
 
-				pageFileWriter = new FileWriter(pageOldFile);
+				pageFileWriter = new PrintWriter(pageOldFile, CHARSET);
 
 				String pageContent = page.getContent();
 
-				for (int i = 0; i < pageContent.length(); i++) {
+				pageFileWriter.write(pageContent);
+				/*for (int i = 0; i < pageContent.length(); i++) {
 					pageFileWriter.write((int) pageContent.charAt(i));
-				}
+				}*/
 
 				pageFileWriter.close();
 			} catch (FileNotFoundException fnfe) {
@@ -269,14 +272,16 @@
 
 				pageDir.mkdirs();
 
-				FileWriter pageWriter = new FileWriter(new File(pathToMedia
-						+ "/" + uidTranslated + ".txt"));
+				PrintWriter pageWriter = new PrintWriter(new File(pathToMedia
+						+ "/" + uidTranslated + ".txt"), CHARSET);
 
 				String pageContent = page.getContent();
 
-				for (int i = 0; i < pageContent.length(); i++) {
+				pageWriter.write(pageContent);
+				
+				/*for (int i = 0; i < pageContent.length(); i++) {
 					pageWriter.write((int) pageContent.charAt(i));
-				}
+				}*/
 
 				pageWriter.close();
 
@@ -298,21 +303,22 @@
 	public Properties getPageProps(String pageName) {
 		Properties pageProps = new Properties();
 
+		String translatedPageName = FileDSCommons.translateToFileName(pageName);
 		try {
 			FileInputStream fpi = new FileInputStream(new File(pathToMedia
-					+ "/OLD/" + pageName + "/page.properties"));
+					+ "/OLD/" + translatedPageName + "/page.properties"));
 			pageProps.load(fpi);
 			fpi.close();
 		} catch (IOException ioe) {
 			// There is no prop file for some reson - create one.
 
-			File pagePropsFile = new File(pathToMedia + "/OLD/" + pageName);
+			File pagePropsFile = new File(pathToMedia + "/OLD/" + translatedPageName);
 
 			// create dirs
 			pagePropsFile.mkdirs();
 
 			// create file
-			pagePropsFile = new File(pathToMedia + "/OLD/" + pageName
+			pagePropsFile = new File(pathToMedia + "/OLD/" + translatedPageName
 					+ "/page.properties");
 
 			try {
@@ -556,7 +562,7 @@
 			boolean loadContent, int version) {
 		StringBuilder ret = null;
 
-		File pageFile = new File(pathToMedia + "/OLD/" + uid + "/" + version
+		File pageFile = new File(pathToMedia + "/OLD/" + FileDSCommons.translateToFileName(uid) + "/" + version
 				+ ".txt");
 
 		if (loadContent) {