diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java b/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java index 81a3e75..1d627fc 100644 --- a/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java +++ b/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java @@ -57,11 +57,11 @@ public class ImageProcessor throws UploadException, ImageDataException { // check image data - if ( imageData.imageName == null || imageData.imageName.isEmpty() ) + if ( imageData.title == null || imageData.title.isEmpty() ) throw new ImageDataException( ImageDataError.INVALID_DATA, "Image name not set." ); - if ( imageData.imageOwner == null || !DbUser.exists( imageData.imageOwner ) ) + if ( imageData.ownerLogin == null || !DbUser.exists( imageData.ownerLogin ) ) throw new ImageDataException( ImageDataError.INVALID_DATA, "Invalid image owner." ); - if ( imageData.contentOperatingSystem == null || imageData.contentOperatingSystem.isEmpty() ) + if ( imageData.operatingSystem == null || imageData.operatingSystem.isEmpty() ) throw new ImageDataException( ImageDataError.INVALID_DATA, "Content operating system not set." ); if ( imageData.fileSize <= 0 ) throw new ImageDataException( ImageDataError.INVALID_DATA, "File size is too small." ); @@ -71,7 +71,7 @@ public class ImageProcessor final String uuid = imageData.uuid; final String filepathRelative; final CrcFile crcFile; - if ( crcSums == null) { + if ( crcSums == null ) { crcFile = null; } else { crcFile = new CrcFile( crcSums ); @@ -123,13 +123,13 @@ public class ImageProcessor public static void removeFinishedUploads() { - for (Iterator<UploadingImage> it = uploadingImages.values().iterator(); it.hasNext(); ) { + for ( Iterator<UploadingImage> it = uploadingImages.values().iterator(); it.hasNext(); ) { UploadingImage image = it.next(); - if (image.allBlocksValid()) { + if ( image.allBlocksValid() ) { synchronized ( imagesToCheck ) { imagesToCheck.remove( image.getUuid() ); image.updateMissingBlocks( null ); - } + } it.remove(); } } @@ -163,7 +163,7 @@ public class ImageProcessor */ public static String generateFilepathOfImage( ImageData imageData ) { - return generateFilePathOfImage( imageData.uuid, imageData.imageName, imageData.imageVersion ); + return generateFilePathOfImage( imageData.uuid, imageData.title, imageData.revision ); } public static String generateFilePathOfImage( String uuid, String imageName, int imageVersion ) |