Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/src/GUI/SearchImage_GUI.java
	Dozentenmodul/src/Models/person.java
	Dozentenmodul/src/Models/vm.java

3 files changed, 10 insertions, 5 deletions

diff --git a/Dozentenmodul/src/ftp/DownloadTask.java b/Dozentenmodul/src/ftp/DownloadTask.java
index 8a643325..83ad2c15 100644
--- a/Dozentenmodul/src/ftp/DownloadTask.java
+++ b/Dozentenmodul/src/ftp/DownloadTask.java
@@ -1,6 +1,6 @@
 package ftp;
 
-import gui.FTPDownloader_GUI;
+import gui.image.FTPDownloader_GUI;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/Dozentenmodul/src/ftp/FTPUtility.java b/Dozentenmodul/src/ftp/FTPUtility.java
index c62ba07d..7824440a 100644
--- a/Dozentenmodul/src/ftp/FTPUtility.java
+++ b/Dozentenmodul/src/ftp/FTPUtility.java
@@ -6,6 +6,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.SocketException;
 import java.security.NoSuchAlgorithmException;
+
+import models.Image;
+
 import org.apache.commons.net.ftp.FTP;
 import org.apache.commons.net.ftp.FTPFile;
 import org.apache.commons.net.ftp.FTPReply;
@@ -138,9 +141,10 @@ public class FTPUtility {
             if (!success) {
                 throw new FTPException("Could not set binary file type.");
             }
-             
-            outputStream = ftpClient.storeFileStream(uploadFile.getName());
-           // ftpClient.rename(uploadFile.getName(), vm.vl.getLaborname());
+            
+            outputStream = ftpClient.storeFileStream(Image.image.getNewName());
+            
+            //ftpClient.rename(uploadFile.getName(), );
         } catch (IOException ex) {
             throw new FTPException("Error uploading file: " + ex.getMessage());
         }
diff --git a/Dozentenmodul/src/ftp/UploadTask.java b/Dozentenmodul/src/ftp/UploadTask.java
index e5d8a817..67706169 100644
--- a/Dozentenmodul/src/ftp/UploadTask.java
+++ b/Dozentenmodul/src/ftp/UploadTask.java
@@ -19,7 +19,7 @@ public class UploadTask extends SwingWorker<Void, Void> {
     private int port;
     private String username;
     private String password;
-     
+   
     private String destDir;
     private File uploadFile;
      
@@ -31,6 +31,7 @@ public class UploadTask extends SwingWorker<Void, Void> {
         this.password = password;
         this.destDir = destDir;
         this.uploadFile = uploadFile;
+        
     }
  
     /**