summaryrefslogtreecommitdiffstats
path: root/Dozentenmodul/src/gui
diff options
context:
space:
mode:
authorunknown2014-05-15 09:19:40 +0200
committerunknown2014-05-15 09:19:40 +0200
commitd6aa4290b083676f0e2c38eb2ddebce3a6516eaa (patch)
tree5d9b3fad24676abbf6549423c056251281e485dc /Dozentenmodul/src/gui
parentFTP-Server nicht mehr hard-coded sondern ausgelesen + diverse Kleinigkeiten (diff)
downloadtutor-module-d6aa4290b083676f0e2c38eb2ddebce3a6516eaa.tar.gz
tutor-module-d6aa4290b083676f0e2c38eb2ddebce3a6516eaa.tar.xz
tutor-module-d6aa4290b083676f0e2c38eb2ddebce3a6516eaa.zip
t
Diffstat (limited to 'Dozentenmodul/src/gui')
-rw-r--r--Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java2
-rw-r--r--Dozentenmodul/src/gui/intro/Login_GUI.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index 6d3872a0..8c14fa01 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -405,6 +405,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
btnUploadStarten.setText("Bitte warten");
try {
+ System.out.println("Test");
user = client.getFtpUser();
System.out.println("FTP name" + user.userName);
System.out.println("FTP path" + user.path);
@@ -427,6 +428,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
+ person.verantwortlicher.getUsername() + "_"
+ Image.image.getImagename() + ".vmdk");
System.out.println("Uploading to host: "+host);
+
task = new UploadTask(host, port, user.userName, user.password,
user.path+"temp/", uploadFile);
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index ead2bd11..b30a33a7 100644
--- a/Dozentenmodul/src/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/gui/intro/Login_GUI.java
@@ -232,8 +232,7 @@ public class Login_GUI extends JFrame {
.getAuthToken());
String hochschule = user.eMail.substring(
- user.eMail.indexOf("@") + 1,
- user.eMail.indexOf(".", user.eMail.indexOf("@")));
+ user.eMail.indexOf("@") + 1);
person.verantwortlicher.setUsername(lblusername.getText()
.substring(0, lblusername.getText().indexOf("@")));