Merge remote-tracking branch 'upstream/master' into fp-integration

[GpsPrune.git] / src / tim / prune / data / FileInfo.java

diff --git a/src/tim/prune/data/FileInfo.java b/src/tim/prune/data/FileInfo.java
index 41900cb8736df60d668238306079256bf2dca175..6ca812ef6db864e421505e478ba3b31c084bbd01 100644 (file)
--- a/src/tim/prune/data/FileInfo.java
+++ b/src/tim/prune/data/FileInfo.java
@@ -51,7 +51,9 @@ public class FileInfo
         */
        public void removeSource()
        {
-               _sources.remove(_sources.size()-1);
+               if (!_sources.isEmpty()) {
+                       _sources.remove(_sources.size()-1);
+               }
        }
 
        /**
@@ -74,6 +76,19 @@ public class FileInfo
                return "";
        }
 
+       /**
+        * @return The source names
+        */
+       public ArrayList<String> getFilenames()
+       {
+               ArrayList<String> filenames = new ArrayList<String>();
+               for (SourceInfo source : _sources)
+               {
+                       filenames.add(source.getName());
+               }
+               return filenames;
+       }
+
        /**
         * @param inIndex index number, starting from zero
         * @return source info object