diff options
| author | Simon Rettberg | 2015-03-06 18:30:38 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2015-03-06 18:30:38 +0100 |
| commit | 3231fee56ce50facd8483e7af4d7f9ff63c5bc38 (patch) | |
| tree | 9d76b3aeb94ab560e518e3a55b051702761f5118 /dozentenmodul/src/main/java/ftp | |
| parent | MACHETE KILLT CODEZEILEN (diff) | |
| download | tutor-module-3231fee56ce50facd8483e7af4d7f9ff63c5bc38.tar.gz tutor-module-3231fee56ce50facd8483e7af4d7f9ff63c5bc38.tar.xz tutor-module-3231fee56ce50facd8483e7af4d7f9ff63c5bc38.zip | |
Aua, aua...
Diffstat (limited to 'dozentenmodul/src/main/java/ftp')
| -rw-r--r-- | dozentenmodul/src/main/java/ftp/DownloadTask.java | 8 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/ftp/FTPUtility.java | 2 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/ftp/UploadTask.java | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/dozentenmodul/src/main/java/ftp/DownloadTask.java b/dozentenmodul/src/main/java/ftp/DownloadTask.java index 9bcccdf7..ef95b8da 100644 --- a/dozentenmodul/src/main/java/ftp/DownloadTask.java +++ b/dozentenmodul/src/main/java/ftp/DownloadTask.java @@ -156,11 +156,11 @@ public class DownloadTask extends SwingWorker<Void, Void> { // now we replace the placeholder variables with the real data // for this, we first need to get the image information from the server - LOGGER.debug("Image's ID: " + Image.image.getImageId()); + LOGGER.debug("Image's ID: " + Image.ImageId); Map<String, String> imageData = null; try { imageData = ThriftManager.getSatClient().getImageData( - Image.image.getImageId(), Image.image.getVersion(), + Image.ImageId, Image.Version, SessionData.authToken); } catch (TException e) { LOGGER.error("Thrift exception during transfer, see trace: ", e); @@ -170,8 +170,8 @@ public class DownloadTask extends SwingWorker<Void, Void> { // sanity check, shouldn't happen. if (imageData == null) { LOGGER.error("Could not query the image information from the server!"); - LOGGER.error("Image's ID: " + Image.image.getImageId()); - LOGGER.error("Image's version: " + Image.image.getVersion()); + LOGGER.error("Image's ID: " + Image.ImageId); + LOGGER.error("Image's version: " + Image.Version); return false; } int hardwareVersion = extractHardwareVersion(saveDir + File.separator diff --git a/dozentenmodul/src/main/java/ftp/FTPUtility.java b/dozentenmodul/src/main/java/ftp/FTPUtility.java index 464df1b0..a7f48e4d 100644 --- a/dozentenmodul/src/main/java/ftp/FTPUtility.java +++ b/dozentenmodul/src/main/java/ftp/FTPUtility.java @@ -142,7 +142,7 @@ public class FTPUtility { throw new FTPException("Could not set binary file type."); } - outputStream = ftpClient.storeFileStream(Image.image.getNewName()); + outputStream = ftpClient.storeFileStream(Image.NewName); // ftpClient.rename(uploadFile.getName(), ); } catch (IOException ex) { diff --git a/dozentenmodul/src/main/java/ftp/UploadTask.java b/dozentenmodul/src/main/java/ftp/UploadTask.java index 2579b125..61f81c3b 100644 --- a/dozentenmodul/src/main/java/ftp/UploadTask.java +++ b/dozentenmodul/src/main/java/ftp/UploadTask.java @@ -60,7 +60,7 @@ public class UploadTask extends SwingWorker<Void, Void> { // show filesize in the GUI long fileSize = uploadFile.length(); - Image.image.setFilesize(fileSize); + Image.Filesize = fileSize; firePropertyChange("filesize", 0, fileSize); // prepare input stream |