X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fdata%2Fsort%2FPhotoComparer.java;fp=tim%2Fprune%2Ffunction%2FPhotoComparer.java;h=5a20a90492ea511653063e804ec40c811d5fd915;hp=b15d57c981653e884266124fd82ace0058cd1035;hb=a6197ddcaac11c0b943183da7d46169742d024af;hpb=88f2c3647ed9e055090484f01a959d4581f85e7d

diff --git a/tim/prune/function/PhotoComparer.java b/tim/prune/data/sort/PhotoComparer.java
similarity index 91%
rename from tim/prune/function/PhotoComparer.java
rename to tim/prune/data/sort/PhotoComparer.java
index b15d57c..5a20a90 100644
--- a/tim/prune/function/PhotoComparer.java
+++ b/tim/prune/data/sort/PhotoComparer.java
@@ -1,20 +1,18 @@
-package tim.prune.function;
+package tim.prune.data.sort;
 
 import java.util.Comparator;
 
 import tim.prune.data.DataPoint;
 
+
 /**
  * Class for comparing photos to sort them by name or timestamp
  */
 public class PhotoComparer implements Comparator<DataPoint>
 {
-	public enum SortMode {
-		SORTBY_NAME, SORTBY_TIME
-	};
-
 	/** Sort mode */
-	private SortMode _sortMode = SortMode.SORTBY_NAME;
+	private SortMode _sortMode;
+
 
 	/**
 	 * Constructor
@@ -79,7 +77,7 @@ public class PhotoComparer implements Comparator<DataPoint>
 		if (!inP2.hasTimestamp()) return -1;
 		if (!inP1.hasTimestamp()) return 1;
 		// Compare the timestamps
-		long secDiff = inP1.getPhoto().getTimestamp().getSecondsSince(inP2.getPhoto().getTimestamp());
+		long secDiff = inP1.getPhoto().getTimestamp().getMillisecondsSince(inP2.getPhoto().getTimestamp());
 		return (secDiff<0?-1:(secDiff==0?0:1));
 	}