From 8b87677709624a56a7557104dc31ee8cc2ece748 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 25 Sep 2014 14:50:56 +0200
Subject: Adapt to changed Thrift RPC

---
 .../java/org/openslx/imagemaster/server/ApiServer.java     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/main/java/org/openslx/imagemaster/server/ApiServer.java')

diff --git a/src/main/java/org/openslx/imagemaster/server/ApiServer.java b/src/main/java/org/openslx/imagemaster/server/ApiServer.java
index ee22493..ce20020 100644
--- a/src/main/java/org/openslx/imagemaster/server/ApiServer.java
+++ b/src/main/java/org/openslx/imagemaster/server/ApiServer.java
@@ -19,7 +19,7 @@ import org.openslx.imagemaster.thrift.iface.AuthenticationError;
 import org.openslx.imagemaster.thrift.iface.AuthenticationException;
 import org.openslx.imagemaster.thrift.iface.AuthorizationError;
 import org.openslx.imagemaster.thrift.iface.AuthorizationException;
-import org.openslx.imagemaster.thrift.iface.DownloadInfos;
+import org.openslx.imagemaster.thrift.iface.DownloadData;
 import org.openslx.imagemaster.thrift.iface.ImageData;
 import org.openslx.imagemaster.thrift.iface.ImageDataError;
 import org.openslx.imagemaster.thrift.iface.ImageDataException;
@@ -28,8 +28,8 @@ import org.openslx.imagemaster.thrift.iface.ServerAuthenticationError;
 import org.openslx.imagemaster.thrift.iface.ServerAuthenticationException;
 import org.openslx.imagemaster.thrift.iface.ServerSessionData;
 import org.openslx.imagemaster.thrift.iface.SessionData;
+import org.openslx.imagemaster.thrift.iface.UploadData;
 import org.openslx.imagemaster.thrift.iface.UploadException;
-import org.openslx.imagemaster.thrift.iface.UploadInfos;
 import org.openslx.imagemaster.thrift.iface.UserInfo;
 
 /**
@@ -85,18 +85,18 @@ public class ApiServer
 				session.getLastName(), session.getEMail() );
 	}
 
-	public static UploadInfos submitImage( String serverSessionId, ImageData imageDescription, List<Integer> crcSums )
+	public static UploadData submitImage( String serverSessionId, ImageData imageDescription, List<Integer> crcSums )
 			throws AuthorizationException, ImageDataException, UploadException
 	{
 		// first check session of server
 		if ( ServerSessionManager.getSession( serverSessionId ) == null ) {
-			throw new AuthorizationException( AuthorizationError.NOT_AUTHENTICATED, "No valid serverSessioId" );
+			throw new AuthorizationException( AuthorizationError.NOT_AUTHENTICATED, "No valid serverSessionId" );
 		}
 		// then let the image processor decide what to do
-		return ImageProcessor.getUploadInfos( serverSessionId, imageDescription, crcSums );
+		return ImageProcessor.getUploadInfos( imageDescription, crcSums );
 	}
 
-	public static DownloadInfos getImage( String uuid, String serverSessionId ) throws AuthorizationException, ImageDataException
+	public static DownloadData getImage( String uuid, String serverSessionId ) throws AuthorizationException, ImageDataException
 	{
 		// first check session of server
 		if ( ServerSessionManager.getSession( serverSessionId ) == null ) {
@@ -108,7 +108,7 @@ public class ApiServer
 		}
 
 		// then let the image processor decide what to do
-		return ImageProcessor.getDownloadInfos( serverSessionId, uuid, null );
+		return ImageProcessor.getDownloadInfos( uuid );
 	}
 
 	/**
-- 
cgit v1.2.3-55-g7522