X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=src%2Ftim%2Fprune%2Fload%2FFileLoader.java;h=ba1100581e90d2c371e28017eef7ad6386a100fb;hp=52bdef232942f0c5290d2c8160dccba45ce0ef92;hb=HEAD;hpb=1db53356139320890a8d10e982865a1899e11b81 diff --git a/src/tim/prune/load/FileLoader.java b/src/tim/prune/load/FileLoader.java index 52bdef2..ba11005 100644 --- a/src/tim/prune/load/FileLoader.java +++ b/src/tim/prune/load/FileLoader.java @@ -10,6 +10,7 @@ import javax.swing.JFrame; import tim.prune.App; import tim.prune.config.Config; import tim.prune.data.Photo; +import tim.prune.load.json.JsonFileLoader; import tim.prune.load.xml.GzipFileLoader; import tim.prune.load.xml.XmlFileLoader; import tim.prune.load.xml.ZipFileLoader; @@ -142,6 +143,10 @@ public class FileLoader _app.informPhotosLoaded(photoSet); _app.informNoDataLoaded(); // To trigger load of next file if any } + else if (fileExtension.equals("json")) + { + new JsonFileLoader(_app).openFile(inFile); + } else { // Use text loader for everything else