projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JsonHandler now supports Unicode (used in Am2904muSR)
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
util
/
JsonHandler.java
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
index
0f151b9
..
20491ce
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
@@
-6,6
+6,7
@@
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.util.stream.Collectors;
import com.google.gson.Gson;
import java.util.stream.Collectors;
import com.google.gson.Gson;
@@
-29,7
+30,8
@@
public class JsonHandler
*/
public static <T> T readJson(InputStream input, Class<T> type) throws IOException
{
*/
public static <T> T readJson(InputStream input, Class<T> type) throws IOException
{
- try (InputStreamReader reader = new InputStreamReader(input); BufferedReader bf = new BufferedReader(reader))
+ try (InputStreamReader reader = new InputStreamReader(input, StandardCharsets.UTF_8);
+ BufferedReader bf = new BufferedReader(reader))
{
return fromJson(bf.lines().collect(Collectors.joining("\n")), type);
}
{
return fromJson(bf.lines().collect(Collectors.joining("\n")), type);
}
@@
-64,4
+66,4
@@
public class JsonHandler
{
return parser.toJsonTree(o);
}
{
return parser.toJsonTree(o);
}
-}
+}
\ No newline at end of file