projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First version of the new Verilog exporter
[Mograsim.git]
/
plugins
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
util
/
JsonHandler.java
diff --git
a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
index
950b953
..
4c49104
100644
(file)
--- a/
plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
+++ b/
plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
@@
-13,9
+13,12
@@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
+import net.mograsim.logic.core.types.BitVector;
+
public class JsonHandler
{
public class JsonHandler
{
- public final static Gson parser = new GsonBuilder().setPrettyPrinting().create();
+ public final static Gson parser = new GsonBuilder().registerTypeAdapter(BitVector.class, new BitVectorAdapter()).setPrettyPrinting()
+ .create();
public static <T> T readJson(String path, Class<T> type) throws IOException
{
public static <T> T readJson(String path, Class<T> type) throws IOException
{
@@
-42,6
+45,11
@@
public class JsonHandler
return parser.fromJson(src, type);
}
return parser.fromJson(src, type);
}
+ public static <T> T fromJson(JsonElement json, Class<T> type)
+ {
+ return parser.fromJson(json, type);
+ }
+
public static <T> T fromJsonTree(JsonElement src, Class<T> type)
{
return parser.fromJson(src, type);
public static <T> T fromJsonTree(JsonElement src, Class<T> type)
{
return parser.fromJson(src, type);