Merge branch 'master' of git.openslx.org:bwlp/masterserver

Conflicts:
	src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java

3 files changed, 7 insertions, 6 deletions

diff --git a/src/main/java/org/openslx/imagemaster/db/DbFtpUser.java b/src/main/java/org/openslx/imagemaster/db/DbFtpUser.java
index 088109e..b30f504 100644
--- a/src/main/java/org/openslx/imagemaster/db/DbFtpUser.java
+++ b/src/main/java/org/openslx/imagemaster/db/DbFtpUser.java
@@ -3,6 +3,7 @@ package org.openslx.imagemaster.db;
 import java.sql.Timestamp;
 import java.util.List;
 
+// TODO: Still needed?
 
 public class DbFtpUser
 {
diff --git a/src/main/java/org/openslx/imagemaster/db/DbImage.java b/src/main/java/org/openslx/imagemaster/db/DbImage.java
index d34fdb3..21d2017 100644
--- a/src/main/java/org/openslx/imagemaster/db/DbImage.java
+++ b/src/main/java/org/openslx/imagemaster/db/DbImage.java
@@ -89,11 +89,7 @@ public class DbImage
 	 */
 	public static boolean exists( String uuid )
 	{
-		if ( MySQL.findUniqueOrNull( DbImage.class, "SELECT images.UUID FROM images WHERE images.UUID = ?", uuid ) == null ) {
-			return false;
-		} else {
-			return true;
-		}
+		return getImageByUUID( uuid ) != null;
 	}
 
 	/**
@@ -135,11 +131,14 @@ public class DbImage
 		return this.UUID;
 	}
 
+	// TODO: updateLocation? Also make all these update/delete methods non-static,
+	// so you can call them on an instance you retreived earlier.
 	public static int update( String uuid, String location )
 	{
 		return MySQL.update( "UPDATE images SET images.image_path = ? WHERE images.UUID = ?", location, uuid );
 	}
 	
+	// TODO: Consistency: variable names should be lowerCamelCase
 	public static int updateMissingBlocks( String UUID, List<Integer> missingBlocks)
 	{
 		String missingBlocksList = "";
@@ -166,7 +165,7 @@ public class DbImage
 	}
 	
 	/**
-	 * Creates a package of image data of this DbImage object.
+	 * Creates an instance of the thrift ImageData class of this DbImage object.
 	 * @return The corresponding image data
 	 */
 	public ImageData getImageData() {
diff --git a/src/main/java/org/openslx/imagemaster/db/DbKey.java b/src/main/java/org/openslx/imagemaster/db/DbKey.java
index b57065f..837b9de 100644
--- a/src/main/java/org/openslx/imagemaster/db/DbKey.java
+++ b/src/main/java/org/openslx/imagemaster/db/DbKey.java
@@ -10,6 +10,7 @@ public class DbKey
 		this.bytes = bytes;
 	}
 	
+	// TODO: One class per db-table (or per join). This should just be part of DbSatellite
 	public static DbKey fromOrganization(String organization) {
 		return MySQL.findUniqueOrNull( DbKey.class, "SELECT publickey FROM satellite WHERE organization = ?",	organization );
 	}