Make public method to generate jsonfile trackId

Author: bbimber

jbrowse/src/org/labkey/jbrowse/model/JBrowseSession.java

@@ -311,7 +311,7 @@ public JSONObject getDefaultSessionJson(List<JsonFile> tracks, @Nullable List<St
         {
             boolean visibleByDefault = jf.isVisibleByDefault() || jf.matchesTrackSelector(additionalActiveTracks);
             if (visibleByDefault) {
-                String trackId = jf.getObjectId();
+                String trackId = jf.getJsonTrackId();
                 defaultTracks.put(new JSONObject(){{
                     put("type", jf.getTrackType());
                     put("configuration", trackId);

jbrowse/src/org/labkey/jbrowse/model/JsonFile.java

@@ -501,8 +501,7 @@ private JSONObject getVcfTrack(Logger log, ExpData targetFile, ReferenceGenome r
     {
         JSONObject ret = new JSONObject();
         ret.put("type", getTrackType());
-        final File finalLocation = getLocationOfProcessedTrack(false);
-        ret.put("trackId", finalLocation == null ? null : finalLocation.getName());
+        ret.put("trackId", getJsonTrackId());
         ret.put("name", getLabel());
         ret.put("assemblyNames", new JSONArray(){{
             put(JBrowseSession.getAssemblyName(rg));
@@ -564,12 +563,17 @@ public boolean matchesTrackSelector(List<String> toTest)
         return toTest.contains(getObjectId()) || toTest.contains(getLabel());
     }
 
+    public String getJsonTrackId()
+    {
+        final File finalLocation = getLocationOfProcessedTrack(false);
+        return finalLocation == null ? null : finalLocation.getName();
+    }
+
     private JSONObject getBamTrack(Logger log, ExpData targetFile, ReferenceGenome rg)
     {
         JSONObject ret = new JSONObject();
         ret.put("type", getTrackType());
-        final File finalLocation = getLocationOfProcessedTrack(false);
-        ret.put("trackId", finalLocation == null ? null : finalLocation.getName());
+        ret.put("trackId", getJsonTrackId());
         ret.put("name", getLabel());
         ret.put("category", new JSONArray(){{
             put(getCategory());
@@ -653,8 +657,7 @@ private JSONObject getTabixTrack(Logger log, ExpData targetFile, ReferenceGenome
     {
         JSONObject ret = new JSONObject();
         ret.put("type", getTrackType());
-        final File finalLocation = getLocationOfProcessedTrack(false);
-        ret.put("trackId", finalLocation == null ? null : finalLocation.getName());
+        ret.put("trackId", getJsonTrackId());
         ret.put("name", getLabel());
         ret.put("category", new JSONArray(){{
             put(getCategory());