summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorGravatar Adrian Siekierka2019-06-29 00:42:25 +0200
committerGravatar Adrian Siekierka2019-06-29 00:42:25 +0200
commit51a5d53ef21ef1e4bd3ce847aaa6d5353be55a06 (patch)
tree6619ea14b4ec73595fbbd93fc5e3cf315b851cbe /src/main
parentProfile option for mappings to be saved by-obf instead of by-deobf (diff)
downloadenigma-51a5d53ef21ef1e4bd3ce847aaa6d5353be55a06.tar.gz
enigma-51a5d53ef21ef1e4bd3ce847aaa6d5353be55a06.tar.xz
enigma-51a5d53ef21ef1e4bd3ce847aaa6d5353be55a06.zip
fix yet another lovely Gson NPE
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/cuchaz/enigma/EnigmaProfile.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/cuchaz/enigma/EnigmaProfile.java b/src/main/java/cuchaz/enigma/EnigmaProfile.java
index a5904ee1..d091f53f 100644
--- a/src/main/java/cuchaz/enigma/EnigmaProfile.java
+++ b/src/main/java/cuchaz/enigma/EnigmaProfile.java
@@ -15,13 +15,14 @@ import java.util.Optional;
15public final class EnigmaProfile { 15public final class EnigmaProfile {
16 public static final EnigmaProfile EMPTY = new EnigmaProfile(ImmutableMap.of()); 16 public static final EnigmaProfile EMPTY = new EnigmaProfile(ImmutableMap.of());
17 17
18 private static final MappingSaveParameters DEFAULT_MAPPING_SAVE_PARAMETERS = new MappingSaveParameters(MappingFileNameFormat.BY_DEOBF);
18 private static final Gson GSON = new Gson(); 19 private static final Gson GSON = new Gson();
19 20
20 @SerializedName("services") 21 @SerializedName("services")
21 private final Map<String, Service> serviceProfiles; 22 private final Map<String, Service> serviceProfiles;
22 23
23 @SerializedName("mapping_save_parameters") 24 @SerializedName("mapping_save_parameters")
24 private final MappingSaveParameters mappingSaveParameters = new MappingSaveParameters(MappingFileNameFormat.BY_DEOBF); 25 private final MappingSaveParameters mappingSaveParameters = null;
25 26
26 private EnigmaProfile(Map<String, Service> serviceProfiles) { 27 private EnigmaProfile(Map<String, Service> serviceProfiles) {
27 this.serviceProfiles = serviceProfiles; 28 this.serviceProfiles = serviceProfiles;
@@ -37,7 +38,8 @@ public final class EnigmaProfile {
37 } 38 }
38 39
39 public MappingSaveParameters getMappingSaveParameters() { 40 public MappingSaveParameters getMappingSaveParameters() {
40 return mappingSaveParameters; 41 //noinspection ConstantConditions
42 return mappingSaveParameters != null ? EnigmaProfile.DEFAULT_MAPPING_SAVE_PARAMETERS : mappingSaveParameters;
41 } 43 }
42 44
43 public static class Service { 45 public static class Service {