diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java index 49a2b5a04..33e1153d0 100644 --- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java +++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java @@ -12,7 +12,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library. */ + * License along with this library. + */ package com.jpexs.decompiler.flash; import com.jpexs.decompiler.flash.action.Action; @@ -89,7 +90,7 @@ public class ActionScript2Test extends ActionStript2TestBase { @Test public void frame24_unicodeTest() { compareSrc(24, "trace(\"unicodeTest\");\r\n" - + "var k = \"היפופוטמי, או א\";\r\n" + + "var k = \"\u05d4\u05d9\u05e4\u05d5\u05e4\u05d5\u05d8\u05de\u05d9, \u05d0\u05d5 \u05d0\";\r\n" + "trace(k);\r\n" ); } diff --git a/src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java b/src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java index 4d1ec1248..e308004bf 100644 --- a/src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java +++ b/src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java @@ -394,7 +394,7 @@ public class GenericTagTreePanel extends GenericTagPanel { } if (color != null) { - colorAdd = " "; + colorAdd = "\u25cf "; } valStr += " = " + colorAdd + val.toString(); diff --git a/src/com/jpexs/decompiler/flash/gui/LicenseUpdater.java b/src/com/jpexs/decompiler/flash/gui/LicenseUpdater.java index 5dcc4836e..5951f8376 100644 --- a/src/com/jpexs/decompiler/flash/gui/LicenseUpdater.java +++ b/src/com/jpexs/decompiler/flash/gui/LicenseUpdater.java @@ -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; diff --git a/test/SampleTest.java b/test/SampleTest.java index 8b3c683fc..607f3837a 100644 --- a/test/SampleTest.java +++ b/test/SampleTest.java @@ -14,6 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +package sample; import org.testng.annotations.Test; /**