Change int to long again

2 files changed, 13 insertions, 13 deletions

diff --git a/src/main/java/org/openslx/filetransfer/Downloader.java b/src/main/java/org/openslx/filetransfer/Downloader.java
index c860f5e..dccee8f 100644
--- a/src/main/java/org/openslx/filetransfer/Downloader.java
+++ b/src/main/java/org/openslx/filetransfer/Downloader.java
@@ -135,7 +135,7 @@ public class Downloader
 	 * @param a
 	 * @param b
 	 */
-	public Boolean sendRange( int a, int b )
+	public Boolean sendRange( long a, long b )
 	{
 		try {
 			RANGE = a + ":" + b;
@@ -188,11 +188,11 @@ public class Downloader
 	 * 
 	 * @return
 	 */
-	public int getStartOfRange()
+	public long getStartOfRange()
 	{
 		if ( RANGE != null ) {
 			String[] splitted = RANGE.split( ":" );
-			return Integer.parseInt( splitted[0] );
+			return Long.parseLong( splitted[0] );
 		}
 		return -1;
 	}
@@ -220,7 +220,7 @@ public class Downloader
 	 */
 	public int getDiffOfRange()
 	{
-		int diff = Math.abs( getEndOfRange() - getStartOfRange() );
+		int diff = Math.abs( (int) ( getEndOfRange() - getStartOfRange() ) );
 		return diff;
 	}
 
@@ -240,11 +240,11 @@ public class Downloader
 				// First get length.
 				int retLengthByte;
 				retLengthByte = dataFromServer.read( incoming, 0, 1 );
-				if (retLengthByte != 1) {
+				if ( retLengthByte != 1 ) {
 					this.close();
 					return false;
 				}
-				
+
 				int length = incoming[0] & 0xFF;
 				log.info( "length (downloader): " + length );
 
@@ -312,7 +312,7 @@ public class Downloader
 		RandomAccessFile file = null;
 		try {
 			int length = getDiffOfRange();
-			byte[] incoming = new byte[ 4000 ]; 
+			byte[] incoming = new byte[ 4000 ];
 			int hasRead = 0;
 			file = new RandomAccessFile( new File( outputFilename ), "rw" );
 			file.seek( getStartOfRange() );
diff --git a/src/main/java/org/openslx/filetransfer/Uploader.java b/src/main/java/org/openslx/filetransfer/Uploader.java
index 1aea702..d0d6efc 100644
--- a/src/main/java/org/openslx/filetransfer/Uploader.java
+++ b/src/main/java/org/openslx/filetransfer/Uploader.java
@@ -178,11 +178,11 @@ public class Uploader
 	 * 
 	 * @return
 	 */
-	public int getStartOfRange()
+	public long getStartOfRange()
 	{
 		if ( RANGE != null ) {
 			String[] splitted = RANGE.split( ":" );
-			return Integer.parseInt( splitted[0] );
+			return Long.parseLong( splitted[0] );
 		}
 		return -1;
 	}
@@ -193,11 +193,11 @@ public class Uploader
 	 * 
 	 * @return
 	 */
-	public int getEndOfRange()
+	public long getEndOfRange()
 	{
 		if ( RANGE != null ) {
 			String[] splitted = RANGE.split( ":" );
-			return Integer.parseInt( splitted[1] );
+			return Long.parseLong( splitted[1] );
 		}
 		return -1;
 	}
@@ -213,7 +213,7 @@ public class Uploader
 		if ( getStartOfRange() == -1 || getEndOfRange() == -1 ) {
 			return -1;
 		}
-		int diff = Math.abs( getEndOfRange() - getStartOfRange() );
+		int diff = Math.abs( (int) ( getEndOfRange() - getStartOfRange() ) );
 		return diff;
 	}
 
@@ -302,7 +302,7 @@ public class Uploader
 			byte[] data = new byte[ 4000 ];
 			int hasRead = 0;
 			int length = getDiffOfRange();
-//			System.out.println( "diff of Range: " + length );
+			//			System.out.println( "diff of Range: " + length );
 			while ( hasRead < length ) {
 				int ret = file.read( data, 0, Math.min( length - hasRead, data.length ) );
 				if ( ret == -1 ) {