1 files changed, 28 insertions, 30 deletions

diff --git a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileDownloadWorker.java b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileDownloadWorker.java
index a6431f5..f15cbb5 100644
--- a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileDownloadWorker.java
+++ b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileDownloadWorker.java
@@ -8,49 +8,47 @@ import org.apache.log4j.Logger;
 import org.openslx.filetransfer.Downloader;
 import org.openslx.imagemaster.thrift.iface.DownloadInfos;
 import org.openslx.satellitedaemon.Globals;
-import org.openslx.satellitedaemon.Globals.PropInt;
-import org.openslx.satellitedaemon.Globals.PropString;
 import org.openslx.satellitedaemon.db.DbImage;
 
-
-public class FileDownloadWorker implements Runnable
-{
-	private static Logger log = Logger.getLogger( FileUploadWorker.class );
+public class FileDownloadWorker implements Runnable {
+	private static Logger log = Logger.getLogger(FileUploadWorker.class);
 
 	@Override
-	public void run()
-	{
-		while ( true ) {
+	public void run() {
+		while (true) {
 			List<DbImage> imageList = DbImage.getAllMarkedForDownload();
-			log.info( "imageList Contains " + imageList.size() + " items." );
-			for ( DbImage image : imageList ) {
+			log.info("imageList Contains " + imageList.size() + " items.");
+			for (DbImage image : imageList) {
 
 				List<Integer> range = new ArrayList<Integer>();
-				for (long i = 0; i < (image.fileSize / Globals.getPropertyInt( PropInt.BLOCKSIZE )); i++) {
-					range.add( (int) i );
+				for (long i = 0; i < (image.fileSize / Globals.BLOCKSIZE); i++) {
+					range.add((int) i);
 				}
-				DownloadInfos downInfos = ThriftConnection.getDownloadInfos( image, range );
-				if ( downInfos == null ) {
-					log.error( "The DownloadInfos returned by ThriftConnection class are null" );
+				DownloadInfos downInfos = ThriftConnection.getDownloadInfos(
+						image, range);
+				if (downInfos == null) {
+					log.error("The DownloadInfos returned by ThriftConnection class are null");
 					continue;
 				}
 
-					Downloader d;
-					try {
-						d = new Downloader( Globals.getPropertyString( PropString.FILETRANSFERSERVERIP ), downInfos.port, Globals.getMasterServerSslContext() );
-					} catch ( IOException e ) {
-						log.warn( "Could not connect for download: " + e.toString() );
-						e.printStackTrace();
-						continue;
-					}
-					d.sendToken( downInfos.token );
-					d.setOutputFilename( "/home/michael/Downloads/tescht.whatever" );
-					while ( d.readMetaData() ) // TODO: Request range...
-						d.receiveBinary();
+				Downloader d;
+				try {
+					d = new Downloader(Globals.getMasterserverHost(),
+							downInfos.port, Globals.getMasterServerSslContext());
+				} catch (IOException e) {
+					log.warn("Could not connect for download: " + e.toString());
+					e.printStackTrace();
+					continue;
+				}
+				d.sendToken(downInfos.token);
+				d.setOutputFilename("/home/michael/Downloads/tescht.whatever");
+				while (d.readMetaData())
+					// TODO: Request range...
+					d.receiveBinary();
 			}
 			try {
-				Thread.sleep( 5 * 60 * 1000 );
-			} catch ( InterruptedException e ) {
+				Thread.sleep(5 * 60 * 1000);
+			} catch (InterruptedException e) {
 				Thread.currentThread().interrupt();
 				return;
 			}