Fix some small things

1 files changed, 24 insertions, 7 deletions

diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/UploadingImageInfos.java b/src/main/java/org/openslx/imagemaster/serverconnection/UploadingImageInfos.java
index 17debbe..547916f 100644
--- a/src/main/java/org/openslx/imagemaster/serverconnection/UploadingImageInfos.java
+++ b/src/main/java/org/openslx/imagemaster/serverconnection/UploadingImageInfos.java
@@ -5,11 +5,14 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.openslx.imagemaster.db.DbImage;
+
 /**
  * Helper class for ImageProcessor to save some infos about the images in the process list.
  */
 public class UploadingImageInfos
 {
+
 	/**
 	 * Token for the satellite.
 	 */
@@ -25,13 +28,16 @@ public class UploadingImageInfos
 	private List<Integer> lastSentBlocks = new LinkedList<>();
 	private String serverSessionId;
 	private Timestamp ts; // when did the server something for the last time
+	private DbImage dbImage = null;	// the DB representation of this image
+	private String uuid;
 
-	protected UploadingImageInfos(String token, List<Integer> missingBlocks, String serverSessionId, Timestamp ts)
+	protected UploadingImageInfos(String token, List<Integer> missingBlocks, String serverSessionId, Timestamp ts, String uuid)
 	{
 		this.token = token;
 		this.missingBlocks = missingBlocks;
 		this.serverSessionId = serverSessionId;
 		this.ts = ts;
+		this.uuid = uuid;
 	}
 
 	protected void removeBlock( int number )
@@ -43,12 +49,14 @@ public class UploadingImageInfos
 	{
 		this.missingBlocks.removeAll( list );
 	}
-	
-	protected void setLastSentBlocks(List<Integer> list) {
+
+	protected void setLastSentBlocks( List<Integer> list )
+	{
 		this.lastSentBlocks = list;
 	}
-	
-	protected List<Integer> getLastSentBlocks() {
+
+	protected List<Integer> getLastSentBlocks()
+	{
 		return this.lastSentBlocks;
 	}
 
@@ -66,8 +74,17 @@ public class UploadingImageInfos
 	{
 		return this.serverSessionId;
 	}
-	
-	protected Timestamp getTimestamp() {
+
+	protected Timestamp getTimestamp()
+	{
 		return this.ts;
 	}
+
+	protected DbImage getDbImage()
+	{
+		if ( dbImage == null ) {
+			dbImage = DbImage.getImageByUUID( this.uuid );
+		}
+		return this.dbImage;
+	}
 }