#14 Force encoding for exported JSON and CSV to be UTF-8

System default encoding was used, forced to use UTF-8.
dmosen · Jun 10, 2013 · 70a0a49 · 70a0a49
1 parent c8e8661
commit 70a0a49
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/wiki-analysis/src/utils/WikipediaAnalysis.java b/wiki-analysis/src/utils/WikipediaAnalysis.java
@@ -9,8 +9,9 @@
 
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 
 import schemas.categoryschema.Category;
@@ -43,7 +44,8 @@ public static void saveGraphAsJSON(Graph graph, File file)
 		dfs.addVisitor(visitor);
 		dfs.execute();
 
-		BufferedWriter jsonWriter = new BufferedWriter(new FileWriter(file));
+		BufferedWriter jsonWriter = new BufferedWriter(new OutputStreamWriter(
+				new FileOutputStream(file), "UTF-8"));
 		jsonWriter.write(visitor.getJSON().toJSONString());
 		jsonWriter.close();
 	}

diff --git a/wiki-analysis/src/visualisation/view/table/TableDialog.java b/wiki-analysis/src/visualisation/view/table/TableDialog.java
@@ -6,8 +6,9 @@
 import java.awt.event.ActionListener;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 
 import javax.swing.JButton;
 import javax.swing.JDialog;
@@ -141,14 +142,14 @@ public TableDialog(CategoryGraph graph) {
 			}
 			buttonPane.add(okButton, "6, 2, left, top");
 		}
-		
+
 		fc.setFileFilter(new FileFilter() {
-			
+
 			@Override
 			public String getDescription() {
 				return "CSV files";
 			}
-			
+
 			@Override
 			public boolean accept(File f) {
 				if (f.isDirectory()) {
@@ -157,7 +158,7 @@ public boolean accept(File f) {
 				return f.getName().toLowerCase().endsWith(CSV_SUFFIX);
 			}
 		});
-		
+
 		addComponentListeners();
 	}
 
@@ -225,7 +226,8 @@ public void actionPerformed(ActionEvent e) {
 	}
 
 	private void writeCSVFile(File file) throws IOException {
-		BufferedWriter bw = new BufferedWriter(new FileWriter(file));
+		BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(
+				new FileOutputStream(file), "UTF-8"));
 
 		for (int col = 0; col < table.getColumnCount(); col++) {
 			bw.write(table.getColumnName(col));
@@ -274,9 +276,9 @@ private void saveCSVFile() {
 
 			int override = JOptionPane.YES_OPTION;
 			if (file.exists()) {
-				override = JOptionPane.showConfirmDialog(this, "\"" + file.getPath()
-						+ "\" already exists. Ovewrite?", "File exists",
-						JOptionPane.YES_NO_OPTION);
+				override = JOptionPane.showConfirmDialog(this,
+						"\"" + file.getPath() + "\" already exists. Overwrite?",
+						"File exists", JOptionPane.YES_NO_OPTION);
 			}
 
 			if (override == JOptionPane.YES_OPTION) {