LicenseUpdate encoding problem fixed

This commit is contained in:
2015-01-13 20:54:31 +01:00
parent 83d7819cca
commit f93f0b23e6
4 changed files with 9 additions and 5 deletions
@@ -394,7 +394,7 @@ public class GenericTagTreePanel extends GenericTagPanel {
}
if (color != null) {
colorAdd = "<cite style=\"color:rgb(" + color.getRed() + "," + color.getGreen() + "," + color.getBlue() + ");\">●</cite> ";
colorAdd = "<cite style=\"color:rgb(" + color.getRed() + "," + color.getGreen() + "," + color.getBlue() + ");\">\u25cf</cite> ";
}
valStr += " = " + colorAdd + val.toString();
@@ -16,13 +16,15 @@
*/
package com.jpexs.decompiler.flash.gui;
import com.jpexs.helpers.utf8.Utf8Helper;
import com.jpexs.helpers.utf8.Utf8PrintWriter;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -100,7 +102,7 @@ public class LicenseUpdater {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintWriter pw = new Utf8PrintWriter(baos);
try {
try (BufferedReader br = new BufferedReader(new FileReader(f))) {
try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(f), Utf8Helper.charset))) {
String s;
boolean packageFound = false;
String author = defaultAuthor;