X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fload%2FFileCacher.java;h=da354aac8b253895324e84b8a2b67d0ed74bbcb3;hb=7f5ed2be62905bd37717376dc22d09e5ea7edb4d;hp=63c8b24eacfd5a4d9354e35f48a99f6794d9a8a4;hpb=da0b1f449260a0b4a94318006382a9039726ef3e;p=GpsPrune.git

diff --git a/tim/prune/load/FileCacher.java b/tim/prune/load/FileCacher.java
index 63c8b24..da354aa 100644
--- a/tim/prune/load/FileCacher.java
+++ b/tim/prune/load/FileCacher.java
@@ -12,7 +12,9 @@ import java.util.ArrayList;
  */
 public class FileCacher
 {
+	/** File to cache */
 	private File _file = null;
+	/** Array to hold lines of file */
 	private String[] _contentArray = null;
 
 
@@ -32,7 +34,7 @@ public class FileCacher
 	 */
 	private void loadFile()
 	{
-		ArrayList contentList = new ArrayList();
+		ArrayList<String> contentList = new ArrayList<String>();
 		if (_file != null && _file.exists() && _file.canRead())
 		{
 			BufferedReader reader = null;
@@ -40,8 +42,14 @@ public class FileCacher
 			{
 				reader = new BufferedReader(new FileReader(_file));
 				String currLine = reader.readLine();
+				if (currLine != null && currLine.startsWith("<?xml")) {
+					return; // it's an xml file, it shouldn't use this cacher
+				}
 				while (currLine != null)
 				{
+					if (currLine.indexOf('\0') >= 0) {
+						return; // it's a binary file, shouldn't use this cacher
+					}
 					if (currLine.trim().length() > 0)
 						contentList.add(currLine);
 					currLine = reader.readLine();
@@ -62,7 +70,7 @@ public class FileCacher
 		int numLines = contentList.size();
 		_contentArray = new String[numLines];
 		for (int i=0; i<numLines; i++)
-			_contentArray[i] = contentList.get(i).toString();
+			_contentArray[i] = contentList.get(i);
 	}