summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorNils Schwabe2014-07-23 15:11:04 +0200
committerNils Schwabe2014-07-23 15:11:04 +0200
commit59ca577e9f246059eaa69c43adf8299c1a01445e (patch)
tree1a0e5d08a821a1fa9cfb995e5a432d73c7eac86d /src/main/java/org
parentAdd class test (diff)
parentUsed log.info() instead of System.out.println(). (diff)
downloadmaster-sync-shared-59ca577e9f246059eaa69c43adf8299c1a01445e.tar.gz
master-sync-shared-59ca577e9f246059eaa69c43adf8299c1a01445e.tar.xz
master-sync-shared-59ca577e9f246059eaa69c43adf8299c1a01445e.zip
Merge branch 'master' of git.openslx.org:bwlp/master-sync-shared
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/openslx/filetransfer/Downloader.java6
-rw-r--r--src/main/java/org/openslx/filetransfer/Uploader.java6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/org/openslx/filetransfer/Downloader.java b/src/main/java/org/openslx/filetransfer/Downloader.java
index 542e58e..c860f5e 100644
--- a/src/main/java/org/openslx/filetransfer/Downloader.java
+++ b/src/main/java/org/openslx/filetransfer/Downloader.java
@@ -274,17 +274,17 @@ public class Downloader
if ( splitted[0] != null && splitted[0].equals( "TOKEN" ) ) {
if ( splitted[1] != null )
TOKEN = splitted[1];
- System.out.println( "TOKEN: " + TOKEN );
+ log.info( "TOKEN: " + TOKEN );
}
else if ( splitted[0].equals( "RANGE" ) ) {
if ( splitted[1] != null )
RANGE = splitted[1];
- System.out.println( "RANGE: '" + RANGE + "'" );
+ log.info( "RANGE: '" + RANGE + "'" );
}
else if ( splitted[0].equals( "ERROR" ) ) {
if ( splitted[1] != null )
ERROR = splitted[1];
- System.err.println( "ERROR: " + ERROR );
+ log.info( "ERROR: " + ERROR );
return false;
}
}
diff --git a/src/main/java/org/openslx/filetransfer/Uploader.java b/src/main/java/org/openslx/filetransfer/Uploader.java
index 825c75e..60b9dd6 100644
--- a/src/main/java/org/openslx/filetransfer/Uploader.java
+++ b/src/main/java/org/openslx/filetransfer/Uploader.java
@@ -256,17 +256,17 @@ public class Uploader
if ( splitted[0] != null && splitted[0].equals( "TOKEN" ) ) {
if ( splitted[1] != null )
TOKEN = splitted[1];
- System.out.println( "TOKEN: " + TOKEN );
+ log.info( "TOKEN: " + TOKEN );
}
else if ( splitted[0].equals( "RANGE" ) ) {
if ( splitted[1] != null )
RANGE = splitted[1];
- System.out.println( "RANGE: " + RANGE );
+ log.info( "RANGE: " + RANGE );
}
else if ( splitted[0].equals( "ERROR" ) ) {
if ( splitted[1] != null )
ERROR = splitted[1];
- System.err.println( "ERROR: " + ERROR );
+ log.info( "ERROR: " + ERROR );
return false;
}
}