summaryrefslogtreecommitdiffstats
path: root/Dozentenmodul
diff options
context:
space:
mode:
authorunknown2014-05-13 13:50:12 +0200
committerunknown2014-05-13 13:50:12 +0200
commit4acda73b9fe642681cd7d1e60ace3bd5341f6d14 (patch)
tree3b791af64b66c5d8c4234d8a8c1aed4316154ed8 /Dozentenmodul
parentFTP-Server nicht mehr hard-coded sondern aus SessionData ausgelesen (diff)
downloadtutor-module-4acda73b9fe642681cd7d1e60ace3bd5341f6d14.tar.gz
tutor-module-4acda73b9fe642681cd7d1e60ace3bd5341f6d14.tar.xz
tutor-module-4acda73b9fe642681cd7d1e60ace3bd5341f6d14.zip
FTP-Server nicht mehr hard-coded sondern ausgelesen + diverse Kleinigkeiten
Diffstat (limited to 'Dozentenmodul')
-rw-r--r--Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.classbin13159 -> 13293 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.classbin1887 -> 1887 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.classbin1303 -> 1303 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.classbin1167 -> 1167 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.classbin785 -> 785 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.classbin1325 -> 1325 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.classbin1327 -> 1327 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/FTPDownloader_GUI.classbin11061 -> 11146 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.classbin1434 -> 1434 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.classbin799 -> 799 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.classbin12774 -> 12853 bytes
-rw-r--r--Dozentenmodul/bin/gui/intro/Login_GUI$1.classbin1190 -> 1190 bytes
-rw-r--r--Dozentenmodul/bin/gui/intro/Login_GUI$2.classbin665 -> 665 bytes
-rw-r--r--Dozentenmodul/bin/gui/intro/Login_GUI$4.classbin677 -> 677 bytes
-rw-r--r--Dozentenmodul/bin/gui/intro/Login_GUI.classbin9658 -> 9658 bytes
-rw-r--r--Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java5
-rw-r--r--Dozentenmodul/src/gui/image/FTPDownloader_GUI.java3
-rw-r--r--Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java3
-rw-r--r--Dozentenmodul/src/gui/intro/Login_GUI.java60
19 files changed, 10 insertions, 61 deletions
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
index 505a0886..6c4219ce 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class
index e2be756c..2053e90e 100644
--- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class
+++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class
index b8a6fad4..bc570ca9 100644
--- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class
+++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class
index 001d50ef..2aab4d53 100644
--- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class
+++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class
index d345024c..765b22bf 100644
--- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class
+++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class
index aac529c9..dbc4fc9f 100644
--- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class
+++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class
index 457d19d5..2153646f 100644
--- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class
+++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
index 3a0bf56a..a39211bb 100644
--- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class
index 77e1a9bf..74aaef08 100644
--- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class
+++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class
index 64d6d21e..aa1b5a70 100644
--- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class
+++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
index 6311839a..910cc1d1 100644
--- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class
index 0f948630..780e5fd1 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class
index 37d3827f..6ecad17e 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class
index 50bac1aa..6db87dc2 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class
index d25020ec..683a9b1a 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class
Binary files differ
diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index f36a4c5d..6d3872a0 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -36,6 +36,7 @@ import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import models.Image;
import models.Links;
+import models.SessionData;
import models.person;
import org.apache.thrift.TException;
import server.Server.Client;
@@ -56,8 +57,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
private final JPanel contentPanel = new JPanel();
JLabel lblPath;
JProgressBar progressBar;
- //String host = "141.79.128.121";
- String host = "141.79.128.102";
+ String host = SessionData.session.getServerAdress();
int port = 21;
server.User user;
String filename = "";
@@ -426,6 +426,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
+ person.verantwortlicher.getHochschule() + "_"
+ 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/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
index 671b2170..1deb6cff 100644
--- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
@@ -34,6 +34,7 @@ import javax.swing.JTextPane;
import javax.swing.JSeparator;
import models.Image;
import models.Links;
+import models.SessionData;
import org.apache.thrift.TException;
import server.Server.Client;
@@ -55,7 +56,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
JLabel downspeed;
User user;
JProgressBar progressBar;
- String host = "141.79.128.102";
+ String host = SessionData.session.getServerAdress();
int port = 21;
String downloadFile = "";
static String arg = "";
diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index 3c17a3e5..6b2e0d66 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -36,6 +36,7 @@ import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import models.Image;
import models.Links;
+import models.SessionData;
import models.person;
import org.apache.thrift.TException;
import server.Server.Client;
@@ -55,7 +56,7 @@ public class FTPEditUploader_GUI extends JFrame implements
private final JPanel contentPanel = new JPanel();
JLabel lblPath;
JProgressBar progressBar;
- String host = "141.79.128.102";
+ String host = SessionData.session.getServerAdress();
int port = 21;
server.User user;
String filename = "";
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index 75320b58..ead2bd11 100644
--- a/Dozentenmodul/src/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/gui/intro/Login_GUI.java
@@ -12,8 +12,6 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
import java.io.IOException;
-import java.util.UUID;
-
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JFrame;
@@ -91,7 +89,7 @@ public class Login_GUI extends JFrame {
// Fenster darf nicht vergrößert werden
setResizable(false);
-
+
try {
// Setzt das Look and Feel auf System
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
@@ -216,15 +214,6 @@ public class Login_GUI extends JFrame {
+ ", mein Token für den Satelliten "
+ result.authToken);
- /*
- // show received information
- JOptionPane.showMessageDialog(null, "Freiburg liefert:"
- + "\nSession-ID = " + result.sessionId + "\nToken = "
- + result.authToken + "\nSatellit = "
- + result.serverAddress, "Rückgabewerte aus Freiburg",
- JOptionPane.INFORMATION_MESSAGE);
- */
-
if (login == true) {
/*
*
@@ -253,52 +242,9 @@ public class Login_GUI extends JFrame {
person.verantwortlicher.setEMail(user.eMail);
person.verantwortlicher.setHochschule(hochschule);
- /*
- // show processed information
- JOptionPane
- .showMessageDialog(
- null,
- "--Werte aus Session--"
- + "\nHochschule = "
- + user.eMail.substring(
- user.eMail.indexOf("@") + 1,
- user.eMail
- .indexOf(
- ".",
- user.eMail
- .indexOf("@")))
- + "\nUsername = "
- + lblusername.getText().substring(
- 0,
- lblusername.getText()
- .indexOf("@"))
- + "\nName = "
- + user.lastName
- + "\nVorname = "
- + user.firstName
- + "\nE-Mail = "
- + user.eMail
- + "\n\n--Werte aus gespeichertem Objekt ausgelesen--"
- + "\nHochschule = "
- + person.verantwortlicher
- .getHochschule()
- + "\nUsername = "
- + person.verantwortlicher
- .getUsername()
- + "\nName = "
- + person.verantwortlicher.getName()
- + "\nVorname = "
- + person.verantwortlicher
- .getVorname()
- + "\nE-Mail = "
- + person.verantwortlicher
- .getEMail(),
- "Werte vergleichen",
- JOptionPane.INFORMATION_MESSAGE);
- */
-
try {
- //Lege config File an und entscheide welches Fenster als nächstes geöffnet wird
+ // Lege config File an und entscheide welches Fenster
+ // als nächstes geöffnet wird
Wini ini = new Wini(
new File(
"C:\\Users\\"
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-06-01 03:23:16 +0200