From e0e6b82b54bef667d077efe933d1b7b35983a2cd Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 18 Apr 2016 18:03:01 +0200
Subject: [*] Display sat->master progress in client

---
 .../java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java     | 5 -----
 .../java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java     | 3 +--
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'dozentenmodulserver/src/main/java/org')

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
index 0276e0cd..3530a8fd 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
@@ -22,7 +22,6 @@ import org.openslx.bwlp.thrift.iface.ImagePublishData;
 import org.openslx.bwlp.thrift.iface.ImageVersionWrite;
 import org.openslx.bwlp.thrift.iface.TransferInformation;
 import org.openslx.bwlp.thrift.iface.TransferState;
-import org.openslx.bwlp.thrift.iface.TransferStatus;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.filetransfer.Downloader;
 import org.openslx.filetransfer.util.FileChunk;
@@ -250,10 +249,6 @@ public class IncomingDataTransfer extends IncomingTransferBase {
 		return this.owner;
 	}
 
-	public synchronized TransferStatus getStatus() {
-		return new TransferStatus(getChunks().getStatusArray(), getState());
-	}
-
 	@Override
 	public boolean isActive() {
 		return getState() == TransferState.IDLE || getState() == TransferState.WORKING;
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java
index 581d7ba5..e2276908 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java
@@ -6,7 +6,6 @@ import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 
 import org.apache.log4j.Logger;
@@ -50,7 +49,7 @@ public class OutgoingDataTransfer extends AbstractTransfer {
 	 * @param absFile file to send to master server
 	 */
 	public OutgoingDataTransfer(TransferInformation transferInfo, File absFile) {
-		super(UUID.randomUUID().toString());
+		super(transferInfo.token);
 		this.masterTransferInfo = transferInfo;
 		this.sourceFile = absFile;
 	}
-- 
cgit v1.2.3-55-g7522