X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fsave%2FPhotoTableEntry.java;h=f42720ef5f05b6cdf1d490a0602961a1bea1ec23;hb=649c5da6ee1bbc590699e11a92316ece2ea8512d;hp=8c44f93b6643ed79d7e3e944b9bd5985950bc526;hpb=5625a1abadb5f2ca5f017fe7dbda1d5141cb637b;p=GpsPrune.git

diff --git a/tim/prune/save/PhotoTableEntry.java b/tim/prune/save/PhotoTableEntry.java
index 8c44f93..f42720e 100644
--- a/tim/prune/save/PhotoTableEntry.java
+++ b/tim/prune/save/PhotoTableEntry.java
@@ -2,7 +2,6 @@ package tim.prune.save;
 
 import tim.prune.I18nManager;
 import tim.prune.data.Photo;
-import tim.prune.data.PhotoStatus;
 
 /**
  * Class to represent a row of the photo table for saving exif
@@ -23,7 +22,7 @@ public class PhotoTableEntry
 		_photo = inPhoto;
 		if (inPhoto != null)
 		{
-			_photoName = inPhoto.getFile().getName();
+			_photoName = inPhoto.getName();
 			_status = getStatusString(inPhoto.getOriginalStatus(), inPhoto.getCurrentStatus());
 		}
 	}
@@ -35,16 +34,16 @@ public class PhotoTableEntry
 	 * @param inCurrentStatus current status of photo
 	 * @return status string for display
 	 */
-	private static String getStatusString (byte inOriginalStatus, byte inCurrentStatus)
+	private static String getStatusString (Photo.Status inOriginalStatus, Photo.Status inCurrentStatus)
 	{
 		if (inOriginalStatus != inCurrentStatus)
 		{
-			if (inOriginalStatus == PhotoStatus.NOT_CONNECTED)
+			if (inOriginalStatus == Photo.Status.NOT_CONNECTED)
 			{
 				// originally didn't have a point, now it has
 				return I18nManager.getText("dialog.saveexif.photostatus.connected");
 			}
-			if (inCurrentStatus == PhotoStatus.NOT_CONNECTED)
+			if (inCurrentStatus == Photo.Status.NOT_CONNECTED)
 			{
 				// originally had a point, now it doesn't
 				return I18nManager.getText("dialog.saveexif.photostatus.disconnected");