X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fload%2FFileCacher.java;h=22383c6acb544f6f7e754f50e8b98eae1d645120;hb=8c8868ae29b3252f02e094c02307384cf61ba667;hp=ad0f0efb9088855696c898178bee335f25bfadaf;hpb=5625a1abadb5f2ca5f017fe7dbda1d5141cb637b;p=GpsPrune.git

diff --git a/tim/prune/load/FileCacher.java b/tim/prune/load/FileCacher.java
index ad0f0ef..22383c6 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,16 @@ 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)
+					{
+						try {reader.close();} catch (IOException ioe2) {}
+						return; // it's a binary file, shouldn't use this cacher
+					}
 					if (currLine.trim().length() > 0)
 						contentList.add(currLine);
 					currLine = reader.readLine();
@@ -62,7 +72,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);
 	}
 
 
@@ -77,7 +87,8 @@ public class FileCacher
 
 	/**
 	 * Get the top section of the file for preview
-	 * @param inSize number of lines to extract
+	 * @param inNumRows number of lines to extract
+	 * @param inMaxWidth max length of Strings (longer ones will be chopped)
 	 * @return String array containing non-blank lines from the file
 	 */
 	public String[] getSnippet(int inNumRows, int inMaxWidth)