From 8a5a90de7ed9712ad823dd60f0eecabddfd096bb Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 29 Sep 2014 18:15:35 +0200
Subject: [Db*] Fix SELECT for DbImage, change Timestamp to long, load public
 key from DB for satellite

---
 src/main/java/org/openslx/imagemaster/db/DbImage.java | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/main/java/org/openslx/imagemaster/db/DbImage.java')

diff --git a/src/main/java/org/openslx/imagemaster/db/DbImage.java b/src/main/java/org/openslx/imagemaster/db/DbImage.java
index a7a2adb..18a1cc8 100644
--- a/src/main/java/org/openslx/imagemaster/db/DbImage.java
+++ b/src/main/java/org/openslx/imagemaster/db/DbImage.java
@@ -1,6 +1,5 @@
 package org.openslx.imagemaster.db;
 
-import java.sql.Timestamp;
 import java.util.List;
 
 import org.openslx.imagemaster.Globals;
@@ -22,8 +21,8 @@ public class DbImage
 	 * Relative path of image file (relative to Globals.getImageDir())
 	 */
 	public final String imagePath;
-	public final Timestamp imageCreateTime;
-	public final Timestamp imageUpdateTime;
+	public final long imageCreateTime;
+	public final long imageUpdateTime;
 	public final int imageOwnerId;
 	public final String contentOperatingSystem;
 	public final boolean isValid;
@@ -39,8 +38,8 @@ public class DbImage
 		this.imageVersion = 0;
 		this.imageName = null;
 		this.imagePath = null;
-		this.imageCreateTime = null;
-		this.imageUpdateTime = null;
+		this.imageCreateTime = 0;
+		this.imageUpdateTime = 0;
 		this.imageOwnerId = 0;
 		this.contentOperatingSystem = null;
 		this.isValid = false;
@@ -52,7 +51,7 @@ public class DbImage
 	}
 
 	public DbImage( String uuid, int imageVersion, String imageName, String imagePath,
-			Timestamp imageCreateTime, Timestamp imageUpdateTime, int imageOwnerId, String contentOperatingSystem,
+			long imageCreateTime, long imageUpdateTime, int imageOwnerId, String contentOperatingSystem,
 			boolean isValid, boolean isDeleted, String shortDescription, String longDescription,
 			long fileSize, String missingBlocksList )
 	{
@@ -192,7 +191,7 @@ public class DbImage
 		return MySQL
 				.findUniqueOrNull(
 						DbImage.class,
-						"SELECT images.UUID, images.image_version, images.image_name, images.image_path, images.image_createTime, images.image_updateTime, images.image_owner, images.content_operatingSystem, images.status_isValid, images.status_isDeleted, images.image_shortDescription, images.image_longDescription, images.timestamp, images.fileSize, images.token, images.missingBlocks, images.serverSessionId FROM images WHERE uuid = ?",
+						"SELECT images.UUID, images.image_version, images.image_name, images.image_path, images.image_createTime, images.image_updateTime, images.image_owner, images.content_operatingSystem, images.status_isValid, images.status_isDeleted, images.image_shortDescription, images.image_longDescription, images.fileSize, images.missingBlocks FROM images WHERE uuid = ?",
 						uuid );
 	}
 
@@ -207,8 +206,8 @@ public class DbImage
 		DbUser user = DbUser.forLogin( this.imageOwnerId );
 		if (user != null)
 			owner = user.getLogin();
-		return new ImageData( this.uuid, this.imageVersion, this.imageName, this.imageCreateTime.getTime(),
-				this.imageUpdateTime.getTime(), owner, this.contentOperatingSystem, this.isValid,
+		return new ImageData( this.uuid, this.imageVersion, this.imageName, this.imageCreateTime,
+				this.imageUpdateTime, owner, this.contentOperatingSystem, this.isValid,
 				this.isDeleted, this.shortDescription, this.longDescription, this.fileSize );
 	}
 	
-- 
cgit v1.2.3-55-g7522