From a44ecca93247398c29b47c250c8725ebfa9e7e59 Mon Sep 17 00:00:00 2001 From: emaiannone Date: Sat, 18 Jan 2020 12:11:41 +0100 Subject: [PATCH 1/2] Refactor Member Ignoring Method smell in ConditionSerializer class --- .../backend/json/condition/ConditionSerializer.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/ryey/easer/core/data/storage/backend/json/condition/ConditionSerializer.java b/app/src/main/java/ryey/easer/core/data/storage/backend/json/condition/ConditionSerializer.java index 334a54fa3..5da63ef1e 100644 --- a/app/src/main/java/ryey/easer/core/data/storage/backend/json/condition/ConditionSerializer.java +++ b/app/src/main/java/ryey/easer/core/data/storage/backend/json/condition/ConditionSerializer.java @@ -44,10 +44,10 @@ public String serialize(ConditionStructure data) throws UnableToSerializeExcepti } } - private JSONObject serialize_condition(ConditionData condition) throws JSONException { - JSONObject json_situation = new JSONObject(); - json_situation.put(C.SPEC, LocalSkillRegistry.getInstance().condition().findSkill(condition).id()); - json_situation.put(C.DATA, condition.serialize(PluginDataFormat.JSON)); - return json_situation; - } + private static JSONObject serialize_condition(ConditionData condition) throws JSONException { + JSONObject json_situation = new JSONObject(); + json_situation.put(C.SPEC, LocalSkillRegistry.getInstance().condition().findSkill(condition).id()); + json_situation.put(C.DATA, condition.serialize(PluginDataFormat.JSON)); + return json_situation; + } } From fa30b326bab238df08226458bda129cc239028ea Mon Sep 17 00:00:00 2001 From: Rui Zhao Date: Mon, 3 Feb 2020 22:27:58 +0000 Subject: [PATCH 2/2] Update ConditionSerializer.java --- .../backend/json/condition/ConditionSerializer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/ryey/easer/core/data/storage/backend/json/condition/ConditionSerializer.java b/app/src/main/java/ryey/easer/core/data/storage/backend/json/condition/ConditionSerializer.java index 5da63ef1e..dd831b6c3 100644 --- a/app/src/main/java/ryey/easer/core/data/storage/backend/json/condition/ConditionSerializer.java +++ b/app/src/main/java/ryey/easer/core/data/storage/backend/json/condition/ConditionSerializer.java @@ -45,9 +45,9 @@ public String serialize(ConditionStructure data) throws UnableToSerializeExcepti } private static JSONObject serialize_condition(ConditionData condition) throws JSONException { - JSONObject json_situation = new JSONObject(); - json_situation.put(C.SPEC, LocalSkillRegistry.getInstance().condition().findSkill(condition).id()); - json_situation.put(C.DATA, condition.serialize(PluginDataFormat.JSON)); - return json_situation; - } + JSONObject json_situation = new JSONObject(); + json_situation.put(C.SPEC, LocalSkillRegistry.getInstance().condition().findSkill(condition).id()); + json_situation.put(C.DATA, condition.serialize(PluginDataFormat.JSON)); + return json_situation; + } }