From 41b3777b24160890b6972a2113180309f9fab529 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 1 Apr 2016 22:40:55 -0400 Subject: [PATCH] Remove deob.gson which isn't used --- .../deobfuscators/arithmetic/Encryption.java | 12 ---------- .../runelite/deob/gson/ClassSerializer.java | 20 ---------------- .../runelite/deob/gson/FieldSerializer.java | 22 ------------------ .../net/runelite/deob/gson/GsonFactory.java | 18 --------------- .../runelite/deob/gson/MethodSerializer.java | 23 ------------------- .../net/runelite/deob/util/NameMappings.java | 17 -------------- 6 files changed, 112 deletions(-) delete mode 100644 src/main/java/net/runelite/deob/gson/ClassSerializer.java delete mode 100644 src/main/java/net/runelite/deob/gson/FieldSerializer.java delete mode 100644 src/main/java/net/runelite/deob/gson/GsonFactory.java delete mode 100644 src/main/java/net/runelite/deob/gson/MethodSerializer.java diff --git a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Encryption.java b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Encryption.java index d831203288..80e6bc5842 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Encryption.java +++ b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Encryption.java @@ -6,7 +6,6 @@ import java.io.FileWriter; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import net.runelite.deob.gson.GsonFactory; import net.runelite.asm.pool.Field; public class Encryption @@ -32,15 +31,4 @@ public class Encryption { return fields.get(field); } - - public void save(File file) throws IOException - { - Gson g = GsonFactory.gson; - String str = g.toJson(fields); - - try (FileWriter fw = new FileWriter(file)) - { - fw.write(str); - } - } } diff --git a/src/main/java/net/runelite/deob/gson/ClassSerializer.java b/src/main/java/net/runelite/deob/gson/ClassSerializer.java deleted file mode 100644 index 8fd4a9c9f2..0000000000 --- a/src/main/java/net/runelite/deob/gson/ClassSerializer.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.runelite.deob.gson; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; -import java.lang.reflect.Type; -import net.runelite.asm.pool.Class; - -public class ClassSerializer implements JsonSerializer -{ - @Override - public JsonElement serialize(Class src, Type typeOfSrc, JsonSerializationContext context) - { - JsonObject object = new JsonObject(); - object.addProperty("name", src.getName()); - return object; - } - -} diff --git a/src/main/java/net/runelite/deob/gson/FieldSerializer.java b/src/main/java/net/runelite/deob/gson/FieldSerializer.java deleted file mode 100644 index a912bf0f25..0000000000 --- a/src/main/java/net/runelite/deob/gson/FieldSerializer.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.runelite.deob.gson; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; -import java.lang.reflect.Type; -import net.runelite.asm.pool.Field; - -public class FieldSerializer implements JsonSerializer -{ - @Override - public JsonElement serialize(Field src, Type typeOfSrc, JsonSerializationContext context) - { - JsonObject object = new JsonObject(); - object.addProperty("class", src.getClassEntry().getName()); - object.addProperty("name", src.getNameAndType().getName()); - object.add("type", context.serialize(src.getNameAndType().getDescriptorType())); - return object; - } - -} diff --git a/src/main/java/net/runelite/deob/gson/GsonFactory.java b/src/main/java/net/runelite/deob/gson/GsonFactory.java deleted file mode 100644 index 22068517fe..0000000000 --- a/src/main/java/net/runelite/deob/gson/GsonFactory.java +++ /dev/null @@ -1,18 +0,0 @@ -package net.runelite.deob.gson; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import net.runelite.asm.pool.Field; -import net.runelite.asm.pool.Method; -import net.runelite.asm.pool.Class; - -public class GsonFactory -{ - public static final Gson gson = new GsonBuilder() - .registerTypeAdapter(Field.class, new FieldSerializer()) - .registerTypeAdapter(Method.class, new MethodSerializer()) - .registerTypeAdapter(Class.class, new ClassSerializer()) - .enableComplexMapKeySerialization() - .setPrettyPrinting() - .create(); -} diff --git a/src/main/java/net/runelite/deob/gson/MethodSerializer.java b/src/main/java/net/runelite/deob/gson/MethodSerializer.java deleted file mode 100644 index 595e76cd7b..0000000000 --- a/src/main/java/net/runelite/deob/gson/MethodSerializer.java +++ /dev/null @@ -1,23 +0,0 @@ -package net.runelite.deob.gson; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; -import java.lang.reflect.Type; -import net.runelite.asm.pool.Method; - - -public class MethodSerializer implements JsonSerializer -{ - @Override - public JsonElement serialize(Method src, Type typeOfSrc, JsonSerializationContext context) - { - JsonObject object = new JsonObject(); - object.addProperty("class", src.getClassEntry().getName()); - object.addProperty("name", src.getNameAndType().getName()); - object.add("type", context.serialize(src.getNameAndType().getDescriptor())); - return object; - } - -} diff --git a/src/main/java/net/runelite/deob/util/NameMappings.java b/src/main/java/net/runelite/deob/util/NameMappings.java index a8ff7a9de2..1a23451db7 100644 --- a/src/main/java/net/runelite/deob/util/NameMappings.java +++ b/src/main/java/net/runelite/deob/util/NameMappings.java @@ -1,13 +1,7 @@ package net.runelite.deob.util; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; import java.util.HashMap; import java.util.Map; -import net.runelite.deob.gson.GsonFactory; import net.runelite.asm.pool.Class; import net.runelite.asm.pool.Field; import net.runelite.asm.pool.Method; @@ -40,15 +34,4 @@ public class NameMappings { return map; } - - public void save(File file) throws IOException - { - Gson g = GsonFactory.gson; - String str = g.toJson(map); - - try (FileWriter fw = new FileWriter(file)) - { - fw.write(str); - } - } }