Fix for JSONObject migration

Author: bbimber

SequenceAnalysis/resources/web/SequenceAnalysis/panel/SequenceImportPanel.js

@@ -2422,6 +2422,7 @@ Ext4.define('SequenceAnalysis.panel.SequenceImportPanel', {
                             sequencePanel: this,
                             targetGrid: grid,
                             readsetStore: this.readsetStore,
+                            modal: true,
                             title: 'Infer Readset Id',
                             bodyStyle: 'padding: 5px;',
                             width: 500,

SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/SequencePipelineSettings.java

@@ -192,7 +192,9 @@ public SequenceReadsetImpl createReadsetModel(JSONObject o)
         model.setLibraryType(o.optString("librarytype"));
         model.setName(o.optString("readsetname"));
         if (StringUtils.trimToNull(o.optString("readset")) != null)
-            model.setRowId(getInt(o.getString("readset")));
+        {
+            model.setRowId(getInt(o.get("readset")));
+        }
 
         if (StringUtils.trimToNull(o.optString("instrument_run_id")) != null)
         {
@@ -275,7 +277,7 @@ private File resolveFile(JSONObject json, @Nullable SequenceJob job, boolean all
         return null;
     }
 
-    private Integer getInt(String v)
+    private Integer getInt(Object v)
     {
         return ConvertHelper.convert(v, Integer.class);
     }