Add implementation for the new up- and download protocoll

Remove some old stuff that is not needed anymore
Fix some small bugs

1 files changed, 7 insertions, 15 deletions

diff --git a/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java b/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java
index b32589c..458788d 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java
@@ -7,6 +7,7 @@ import org.apache.thrift.TException;
 import org.openslx.imagemaster.server.ApiServer;
 import org.openslx.imagemaster.thrift.iface.AuthenticationException;
 import org.openslx.imagemaster.thrift.iface.AuthorizationException;
+import org.openslx.imagemaster.thrift.iface.DownloadInfos;
 import org.openslx.imagemaster.thrift.iface.FtpCredentials;
 import org.openslx.imagemaster.thrift.iface.ImageData;
 import org.openslx.imagemaster.thrift.iface.ImageDataException;
@@ -15,6 +16,8 @@ import org.openslx.imagemaster.thrift.iface.InvalidTokenException;
 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.UploadException;
+import org.openslx.imagemaster.thrift.iface.UploadInfos;
 import org.openslx.imagemaster.thrift.iface.UserInfo;
 
 public class ImageServerHandler implements ImageServer.Iface
@@ -60,27 +63,16 @@ public class ImageServerHandler implements ImageServer.Iface
 	}
 
 	@Override
-	public FtpCredentials submitImage( String serverSessionId, ImageData imageDescription ) throws AuthorizationException, ImageDataException
+	public UploadInfos submitImage( String serverSessionId, ImageData imageDescription ) throws AuthorizationException, ImageDataException, UploadException, TException
 	{
 		return ApiServer.submitImage( serverSessionId, imageDescription );
 	}
 
 	@Override
-	public boolean finishedUpload( String ftpUser, ImageData imageDescription ) throws ImageDataException
+	public DownloadInfos getImage( String uuid, String serverSessionId ) throws AuthorizationException, ImageDataException, TException
 	{
-		return ApiServer.finishedUpload( ftpUser, imageDescription );
-	}
-
-	@Override
-	public FtpCredentials getImage( String uuid, String serverSessionId ) throws AuthorizationException, ImageDataException
-	{
-		return ApiServer.getImage( uuid, serverSessionId );
-	}
-
-	@Override
-	public boolean finishedDownload( String ftpUser ) throws TException
-	{
-		return ApiServer.finishedDownload( ftpUser );
+		// TODO Auto-generated method stub
+		return null;
 	}
 
 }