fixes #2595

GMOD · Mar 21, 2021 · a54917b · a54917b
1 parent 7b148ed
commit a54917b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/gwt/org/bbop/apollo/gwt/client/dto/GeneProductConverter.java b/src/gwt/org/bbop/apollo/gwt/client/dto/GeneProductConverter.java
@@ -41,7 +41,13 @@ public static GeneProduct convertFromJson(JSONObject object) {
       String withOrFromString = object.get("withOrFrom").isString().stringValue();
       JSONArray withOrFromArray = JSONParser.parseLenient(withOrFromString).isArray();
       for (int i = 0; i < withOrFromArray.size(); i++) {
-        WithOrFrom withOrFrom = new WithOrFrom(withOrFromArray.get(i).isString().stringValue());
+        WithOrFrom withOrFrom ;
+        if(withOrFromArray.get(i).isString()!=null){
+          withOrFrom = new WithOrFrom(withOrFromArray.get(i).isString().stringValue());
+        }
+        else{
+          withOrFrom = new WithOrFrom("Value is an error, please edit or delete: "+withOrFromArray.get(i));
+        }
         withOrFromList.add(withOrFrom);
       }
     }

diff --git a/src/gwt/org/bbop/apollo/gwt/client/dto/GoAnnotationConverter.java b/src/gwt/org/bbop/apollo/gwt/client/dto/GoAnnotationConverter.java
@@ -52,7 +52,13 @@ public static GoAnnotation convertFromJson(JSONObject object) {
       String withOrFromString = object.get("withOrFrom").isString().stringValue();
       JSONArray withOrFromArray = JSONParser.parseLenient(withOrFromString).isArray();
       for (int i = 0; i < withOrFromArray.size(); i++) {
-        WithOrFrom withOrFrom = new WithOrFrom(withOrFromArray.get(i).isString().stringValue());
+        WithOrFrom withOrFrom ;
+        if(withOrFromArray.get(i).isString()!=null){
+          withOrFrom = new WithOrFrom(withOrFromArray.get(i).isString().stringValue());
+        }
+        else{
+          withOrFrom = new WithOrFrom("Value is an error, please edit or delete: "+withOrFromArray.get(i));
+        }
         withOrFromList.add(withOrFrom);
       }
     }

diff --git a/src/gwt/org/bbop/apollo/gwt/client/dto/ProvenanceConverter.java b/src/gwt/org/bbop/apollo/gwt/client/dto/ProvenanceConverter.java
@@ -45,7 +45,13 @@ public static Provenance convertFromJson(JSONObject object) {
       String withOrFromString = object.get("withOrFrom").isString().stringValue();
       JSONArray withOrFromArray = JSONParser.parseLenient(withOrFromString).isArray();
       for (int i = 0; i < withOrFromArray.size(); i++) {
-        WithOrFrom withOrFrom = new WithOrFrom(withOrFromArray.get(i).isString().stringValue());
+        WithOrFrom withOrFrom ;
+        if(withOrFromArray.get(i).isString()!=null){
+          withOrFrom = new WithOrFrom(withOrFromArray.get(i).isString().stringValue());
+        }
+        else{
+          withOrFrom = new WithOrFrom("Value is an error, please edit or delete: "+withOrFromArray.get(i));
+        }
         withOrFromList.add(withOrFrom);
       }
     }