diff options
| author | unknown | 2014-04-03 12:03:03 +0200 |
|---|---|---|
| committer | unknown | 2014-04-03 12:03:03 +0200 |
| commit | 7a31f13cd386669298dfa0f91f90af63c9c2874a (patch) | |
| tree | 5f412adfb03ea616cfd24a8416efe2b988ba2a65 | |
| parent | Test (diff) | |
| download | tutor-module-7a31f13cd386669298dfa0f91f90af63c9c2874a.tar.gz tutor-module-7a31f13cd386669298dfa0f91f90af63c9c2874a.tar.xz tutor-module-7a31f13cd386669298dfa0f91f90af63c9c2874a.zip | |
Bearbeiten von Images funktioniert nun vollständig
279 files changed, 334 insertions, 292 deletions
diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class Binary files differindex e01e6b79..062a5aeb 100644 --- a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class +++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class Binary files differindex dc948767..9d0a3bea 100644 --- a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class +++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class Binary files differindex e248fd06..69507f5e 100644 --- a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class +++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class Binary files differindex 051431f2..e7af4c13 100644 --- a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class +++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class Binary files differindex c0a38325..2287ca1a 100644 --- a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class +++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class Binary files differindex b17e4eea..3ed6a8ca 100644 --- a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class +++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class Binary files differindex dcfd7111..c334f61e 100644 --- a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class +++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class Binary files differindex a0a6173c..0c45cb47 100644 --- a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class +++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class Binary files differindex f5d01268..6b0b0760 100644 --- a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class +++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class Binary files differindex 21658851..182e34ea 100644 --- a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class +++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class Binary files differindex dabb4fbf..3067718e 100644 --- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class +++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class Binary files differindex f030114b..41ad1e3f 100644 --- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class +++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class Binary files differindex b1f9edc1..2af3aa99 100644 --- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class +++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class Binary files differindex fbed3457..6f093d26 100644 --- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class +++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class Binary files differindex a6af82a6..0d64e048 100644 --- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class +++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI.class b/Dozentenmodul/bin/GUI/MainMenue_GUI.class Binary files differindex b39b43af..9c8c5535 100644 --- a/Dozentenmodul/bin/GUI/MainMenue_GUI.class +++ b/Dozentenmodul/bin/GUI/MainMenue_GUI.class diff --git a/Dozentenmodul/bin/Models/vm.class b/Dozentenmodul/bin/Models/vm.class Binary files differdeleted file mode 100644 index 58709544..00000000 --- a/Dozentenmodul/bin/Models/vm.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class Binary files differindex e01e6b79..062a5aeb 100644 --- a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class +++ b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class Binary files differindex dc948767..9d0a3bea 100644 --- a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class +++ b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class Binary files differindex e248fd06..69507f5e 100644 --- a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class +++ b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class Binary files differindex 051431f2..e7af4c13 100644 --- a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class +++ b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class Binary files differindex c0a38325..2287ca1a 100644 --- a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class Binary files differindex b17e4eea..3ed6a8ca 100644 --- a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class +++ b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class Binary files differindex dcfd7111..c334f61e 100644 --- a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class +++ b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class Binary files differindex a0a6173c..0c45cb47 100644 --- a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class +++ b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class Binary files differindex f5d01268..6b0b0760 100644 --- a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class +++ b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class Binary files differindex 21658851..182e34ea 100644 --- a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class +++ b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class Binary files differindex dabb4fbf..3067718e 100644 --- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class +++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class Binary files differindex f030114b..41ad1e3f 100644 --- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class +++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class Binary files differindex b1f9edc1..2af3aa99 100644 --- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class +++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class Binary files differindex fbed3457..6f093d26 100644 --- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class +++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class Binary files differdeleted file mode 100644 index ffe0c1c4..00000000 --- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class Binary files differindex a6af82a6..0d64e048 100644 --- a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class +++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class Binary files differindex 9fa18b77..3f952241 100644 --- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class +++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class Binary files differindex c79031a8..0bff908a 100644 --- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class +++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class Binary files differindex dc628f0a..7bafe65d 100644 --- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class +++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class Binary files differindex 7aa1908d..a0883626 100644 --- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class +++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class Binary files differindex 01834329..034411c3 100644 --- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class +++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class Binary files differindex 9ebb41ee..043a33a4 100644 --- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class +++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class Binary files differindex fc6e665a..a3da591f 100644 --- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class +++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class diff --git a/Dozentenmodul/bin/gui/Login_GUI$1.class b/Dozentenmodul/bin/gui/Login_GUI$1.class Binary files differindex 47818348..b4388d57 100644 --- a/Dozentenmodul/bin/gui/Login_GUI$1.class +++ b/Dozentenmodul/bin/gui/Login_GUI$1.class diff --git a/Dozentenmodul/bin/gui/Login_GUI$2.class b/Dozentenmodul/bin/gui/Login_GUI$2.class Binary files differindex 41243cbe..54cd4d69 100644 --- a/Dozentenmodul/bin/gui/Login_GUI$2.class +++ b/Dozentenmodul/bin/gui/Login_GUI$2.class diff --git a/Dozentenmodul/bin/gui/Login_GUI$3.class b/Dozentenmodul/bin/gui/Login_GUI$3.class Binary files differindex 3122e95a..46796de6 100644 --- a/Dozentenmodul/bin/gui/Login_GUI$3.class +++ b/Dozentenmodul/bin/gui/Login_GUI$3.class diff --git a/Dozentenmodul/bin/gui/Login_GUI$4.class b/Dozentenmodul/bin/gui/Login_GUI$4.class Binary files differindex 25dcca5e..22908f76 100644 --- a/Dozentenmodul/bin/gui/Login_GUI$4.class +++ b/Dozentenmodul/bin/gui/Login_GUI$4.class diff --git a/Dozentenmodul/bin/gui/Login_GUI$5.class b/Dozentenmodul/bin/gui/Login_GUI$5.class Binary files differindex 102f386f..e1bf5be2 100644 --- a/Dozentenmodul/bin/gui/Login_GUI$5.class +++ b/Dozentenmodul/bin/gui/Login_GUI$5.class diff --git a/Dozentenmodul/bin/gui/Login_GUI.class b/Dozentenmodul/bin/gui/Login_GUI.class Binary files differindex 90a674be..da10a7ca 100644 --- a/Dozentenmodul/bin/gui/Login_GUI.class +++ b/Dozentenmodul/bin/gui/Login_GUI.class diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI.class b/Dozentenmodul/bin/gui/MainMenue_GUI.class Binary files differindex b39b43af..9c8c5535 100644 --- a/Dozentenmodul/bin/gui/MainMenue_GUI.class +++ b/Dozentenmodul/bin/gui/MainMenue_GUI.class diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class Binary files differindex f7677e0d..4c8a49ba 100644 --- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class +++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class Binary files differindex 0e0f3195..0bb68dce 100644 --- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class +++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class Binary files differindex 3764900b..414b3a0c 100644 --- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class +++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class Binary files differindex e446614e..8ec22cf9 100644 --- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class +++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class Binary files differindex 1f2e2007..1758ada3 100644 --- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class +++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class Binary files differindex ae739673..b89857f4 100644 --- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class +++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class Binary files differindex 5ff30dec..ca1774f7 100644 --- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class +++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class Binary files differindex 2b56e122..08d744bd 100644 --- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class +++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class Binary files differindex 92895e7c..00e112de 100644 --- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class +++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI.class Binary files differindex ae28eddc..c562cc42 100644 --- a/Dozentenmodul/bin/gui/SearchEditImage_GUI.class +++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI.class diff --git a/Dozentenmodul/bin/models/SessionData.class b/Dozentenmodul/bin/models/SessionData.class Binary files differnew file mode 100644 index 00000000..f0ff4996 --- /dev/null +++ b/Dozentenmodul/bin/models/SessionData.class diff --git a/Dozentenmodul/bin/models/vm.class b/Dozentenmodul/bin/models/vm.class Binary files differdeleted file mode 100644 index 58709544..00000000 --- a/Dozentenmodul/bin/models/vm.class +++ /dev/null diff --git a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java index 34009fc7..1d30e9d0 100644 --- a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java @@ -67,6 +67,7 @@ public class EditImageAllgemein_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { //Beendet die Anwendung bei einem Klick auf das X + con.closeThriftConnection(); System.exit(0); } }); @@ -216,6 +217,7 @@ public class EditImageAllgemein_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { //Durch den Klick auf Button Hauptmenpü wird dieses Fenster unsichtbar und das Hauptmenü sichtbar + con.closeThriftConnection(); EditImageAllgemein_GUI.this.setVisible(false); MainMenue_GUI main=new MainMenue_GUI(); main.setVisible(true); @@ -254,7 +256,7 @@ public class EditImageAllgemein_GUI extends JFrame { //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar //Image.image.setImagename(imagename.getText()); - + con.closeThriftConnection(); MainMenue_GUI sr=new MainMenue_GUI(); sr.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java index e6d78898..3c6109ae 100644 --- a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java @@ -65,6 +65,7 @@ public class EditImageTechnisch_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { //Beendet die Anwendung bei Klick auf das X + System.exit(0); } diff --git a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java index b36f0818..cb53fc3d 100644 --- a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java @@ -31,6 +31,8 @@ import java.awt.Font; import javax.swing.JTextPane; import javax.swing.JSeparator; +import models.Image; + import org.apache.thrift.TException; import server.Server.Client; @@ -51,7 +53,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener int port = 21; String username = "openslx"; String password = "openslx-ng"; - String downloadPath = ""; + String downloadFile = ""; static String arg = ""; DownloadTask task; JLabel bytesreadlbl; @@ -64,7 +66,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener boolean taskrun = false; ThriftConnection thrift = new ThriftConnection(); Client client = thrift.getThriftConnection(); - JButton continueButton = new JButton("Fertigstellen"); + JButton buttonback = new JButton("Zur\u00FCck"); /** * Launch the application. @@ -86,6 +88,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener if (taskrun == true) { try { client.DeleteFtpUser(user.userName); + thrift.closeThriftConnection(); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -108,7 +111,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e.printStackTrace(); } - // filename=name; + setBackground(Color.WHITE); setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); @@ -263,8 +266,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane, BorderLayout.SOUTH); { - continueButton.setEnabled(false); - continueButton.addActionListener(new ActionListener() { + buttonback.setEnabled(false); + buttonback.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (taskrun == true) { task.cancel(true); @@ -275,24 +278,14 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e1.printStackTrace(); } } + thrift.closeThriftConnection(); + SearchEditImage_GUI se=new SearchEditImage_GUI(); + se.setVisible(true); dispose(); } }); - - JButton cancelButton = new JButton("Zur\u00FCck"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - - dispose(); - MainMenue_GUI m = new MainMenue_GUI(); - m.setVisible(true); - - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - continueButton.setActionCommand("Cancel"); - buttonPane.add(continueButton); + buttonback.setActionCommand("Cancel"); + buttonPane.add(buttonback); } } setVisible(true); @@ -305,14 +298,16 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener try { user = client.getFtpUser(); - // downloadPath=client.getPathOfImage(filename); + + downloadFile=client.getPathOfImage(Image.image.getImageId(),Image.image.getVersion()); + } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); } - + task = new DownloadTask(host, port, user.userName, user.password, - user.path, lblNewLabel.getText(), this); + downloadFile, lblNewLabel.getText(), this); task.addPropertyChangeListener(this); task.execute(); taskrun = true; @@ -326,9 +321,10 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener progress = (Integer) arg0.getNewValue(); progressBar.setValue(progress); if (progress == 100) { - continueButton.setEnabled(true); + buttonback.setEnabled(true); } } + if ("speed" == arg0.getPropertyName()) { speed = (double) arg0.getNewValue(); // if(speed<=1){ diff --git a/Dozentenmodul/src/GUI/Login_GUI.java b/Dozentenmodul/src/GUI/Login_GUI.java index 8ad73e20..172895d6 100644 --- a/Dozentenmodul/src/GUI/Login_GUI.java +++ b/Dozentenmodul/src/GUI/Login_GUI.java @@ -23,6 +23,8 @@ import javax.swing.JTextField; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; + +import models.SessionData; import models.person; import org.apache.thrift.TException; //import org.apache.thrift.protocol.TBinaryProtocol; @@ -185,7 +187,7 @@ public class Login_GUI extends JFrame { String passText = new String(pass.getPassword()); System.out.println(username.getText() + " " + passText); result = client.authenticate(username.getText(), passText); - + } catch (thrift.AuthenticationException e) { System.out.println("Authentifizierung fehlgeschlagen: " + e.message); JOptionPane.showMessageDialog(null, @@ -227,11 +229,12 @@ public class Login_GUI extends JFrame { setVisible(false); } else { UserInfo user = client.getUserFromToken(token); - + String hochschule = user.eMail.substring(user.eMail .indexOf("@") + 1, user.eMail.indexOf(".", user.eMail.indexOf("@"))); // System.out.println("hochschule="+hochschule); + person.verantwortlicher.setUsername(username.getText()); person.verantwortlicher.setName(user.lastName); person.verantwortlicher.setVorname(user.firstName); diff --git a/Dozentenmodul/src/GUI/MainMenue_GUI.java b/Dozentenmodul/src/GUI/MainMenue_GUI.java index 621f6561..e68e4bbd 100644 --- a/Dozentenmodul/src/GUI/MainMenue_GUI.java +++ b/Dozentenmodul/src/GUI/MainMenue_GUI.java @@ -355,7 +355,7 @@ public class MainMenue_GUI extends JFrame { + "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image <br>"
+ "\"Programmieren\".</html>");
lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class
- .getResource("/gui/Image_zu_Veranstaltung_gr\u00FCn.png")));
+ .getResource("/Image_zu_Veranstaltung_gr\u00FCn.png")));
// ToolTipp lange anzeigen - 60sec
ToolTipManager.sharedInstance().setDismissDelay(60000);
ToolTipManager.sharedInstance().registerComponent(lblGrafik);
diff --git a/Dozentenmodul/src/Models/vm.java b/Dozentenmodul/src/Models/vm.java deleted file mode 100644 index 34f9ffaa..00000000 --- a/Dozentenmodul/src/Models/vm.java +++ /dev/null @@ -1,69 +0,0 @@ -package models; - -import java.awt.List; -import java.util.Date; - - -public class vm { - - private String Laborname; - private String shortDesc; - private String longDesc; - private String comment; - private String OS; - private Date begin; - private Date end; - private List software; - - public static vm vl=new vm(); - public String getLaborname() { - return Laborname; - } - public void setLaborname(String laborname) { - Laborname = laborname; - } - public String getShortDesc() { - return shortDesc; - } - public void setShortDesc(String shortDesc) { - this.shortDesc = shortDesc; - } - public String getLongDesc() { - return longDesc; - } - public void setLongDesc(String longDesc) { - this.longDesc = longDesc; - } - public String getComment() { - return comment; - } - public void setComment(String comment) { - this.comment = comment; - } - public String getOS() { - return OS; - } - public void setOS(String oS) { - OS = oS; - } - public Date getBegin() { - return begin; - } - public void setBegin(Date begin) { - this.begin = begin; - } - public Date getEnd() { - return end; - } - public void setEnd(Date end) { - this.end = end; - } - public List getSoftware() { - return software; - } - public void setSoftware(List software) { - this.software = software; - } - - -} diff --git a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java index 34009fc7..1d30e9d0 100644 --- a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java @@ -67,6 +67,7 @@ public class EditImageAllgemein_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { //Beendet die Anwendung bei einem Klick auf das X + con.closeThriftConnection(); System.exit(0); } }); @@ -216,6 +217,7 @@ public class EditImageAllgemein_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { //Durch den Klick auf Button Hauptmenpü wird dieses Fenster unsichtbar und das Hauptmenü sichtbar + con.closeThriftConnection(); EditImageAllgemein_GUI.this.setVisible(false); MainMenue_GUI main=new MainMenue_GUI(); main.setVisible(true); @@ -254,7 +256,7 @@ public class EditImageAllgemein_GUI extends JFrame { //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar //Image.image.setImagename(imagename.getText()); - + con.closeThriftConnection(); MainMenue_GUI sr=new MainMenue_GUI(); sr.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java index e6d78898..3c6109ae 100644 --- a/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java @@ -65,6 +65,7 @@ public class EditImageTechnisch_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { //Beendet die Anwendung bei Klick auf das X + System.exit(0); } diff --git a/Dozentenmodul/src/gui/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/FTPDownloader_GUI.java index b36f0818..cb53fc3d 100644 --- a/Dozentenmodul/src/gui/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/FTPDownloader_GUI.java @@ -31,6 +31,8 @@ import java.awt.Font; import javax.swing.JTextPane; import javax.swing.JSeparator; +import models.Image; + import org.apache.thrift.TException; import server.Server.Client; @@ -51,7 +53,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener int port = 21; String username = "openslx"; String password = "openslx-ng"; - String downloadPath = ""; + String downloadFile = ""; static String arg = ""; DownloadTask task; JLabel bytesreadlbl; @@ -64,7 +66,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener boolean taskrun = false; ThriftConnection thrift = new ThriftConnection(); Client client = thrift.getThriftConnection(); - JButton continueButton = new JButton("Fertigstellen"); + JButton buttonback = new JButton("Zur\u00FCck"); /** * Launch the application. @@ -86,6 +88,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener if (taskrun == true) { try { client.DeleteFtpUser(user.userName); + thrift.closeThriftConnection(); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -108,7 +111,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e.printStackTrace(); } - // filename=name; + setBackground(Color.WHITE); setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); @@ -263,8 +266,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane, BorderLayout.SOUTH); { - continueButton.setEnabled(false); - continueButton.addActionListener(new ActionListener() { + buttonback.setEnabled(false); + buttonback.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (taskrun == true) { task.cancel(true); @@ -275,24 +278,14 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e1.printStackTrace(); } } + thrift.closeThriftConnection(); + SearchEditImage_GUI se=new SearchEditImage_GUI(); + se.setVisible(true); dispose(); } }); - - JButton cancelButton = new JButton("Zur\u00FCck"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - - dispose(); - MainMenue_GUI m = new MainMenue_GUI(); - m.setVisible(true); - - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - continueButton.setActionCommand("Cancel"); - buttonPane.add(continueButton); + buttonback.setActionCommand("Cancel"); + buttonPane.add(buttonback); } } setVisible(true); @@ -305,14 +298,16 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener try { user = client.getFtpUser(); - // downloadPath=client.getPathOfImage(filename); + + downloadFile=client.getPathOfImage(Image.image.getImageId(),Image.image.getVersion()); + } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); } - + task = new DownloadTask(host, port, user.userName, user.password, - user.path, lblNewLabel.getText(), this); + downloadFile, lblNewLabel.getText(), this); task.addPropertyChangeListener(this); task.execute(); taskrun = true; @@ -326,9 +321,10 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener progress = (Integer) arg0.getNewValue(); progressBar.setValue(progress); if (progress == 100) { - continueButton.setEnabled(true); + buttonback.setEnabled(true); } } + if ("speed" == arg0.getPropertyName()) { speed = (double) arg0.getNewValue(); // if(speed<=1){ diff --git a/Dozentenmodul/src/gui/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/FTPEditUploader_GUI.java index 9f073993..e7252898 100644 --- a/Dozentenmodul/src/gui/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/FTPEditUploader_GUI.java @@ -15,6 +15,10 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JFrame; @@ -30,6 +34,7 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import models.Image; +import models.person; //import models.person; import org.apache.thrift.TException; @@ -348,7 +353,11 @@ public class FTPEditUploader_GUI extends JFrame implements PropertyChangeListene // TODO Auto-generated catch block e.printStackTrace(); } - + DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); + Image.image.setNewName(formatter.format(new Date()) + "_" + + person.verantwortlicher.getHochschule() + "_" + + person.verantwortlicher.getUsername() + "_" + + Image.image.getImagename() + ".vmdk"); task=new UploadTask(host,port,user.userName,user.password,user.path, uploadFile); task.addPropertyChangeListener(this); diff --git a/Dozentenmodul/src/gui/Login_GUI.java b/Dozentenmodul/src/gui/Login_GUI.java index 8ad73e20..172895d6 100644 --- a/Dozentenmodul/src/gui/Login_GUI.java +++ b/Dozentenmodul/src/gui/Login_GUI.java @@ -23,6 +23,8 @@ import javax.swing.JTextField; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; + +import models.SessionData; import models.person; import org.apache.thrift.TException; //import org.apache.thrift.protocol.TBinaryProtocol; @@ -185,7 +187,7 @@ public class Login_GUI extends JFrame { String passText = new String(pass.getPassword()); System.out.println(username.getText() + " " + passText); result = client.authenticate(username.getText(), passText); - + } catch (thrift.AuthenticationException e) { System.out.println("Authentifizierung fehlgeschlagen: " + e.message); JOptionPane.showMessageDialog(null, @@ -227,11 +229,12 @@ public class Login_GUI extends JFrame { setVisible(false); } else { UserInfo user = client.getUserFromToken(token); - + String hochschule = user.eMail.substring(user.eMail .indexOf("@") + 1, user.eMail.indexOf(".", user.eMail.indexOf("@"))); // System.out.println("hochschule="+hochschule); + person.verantwortlicher.setUsername(username.getText()); person.verantwortlicher.setName(user.lastName); person.verantwortlicher.setVorname(user.firstName); diff --git a/Dozentenmodul/src/gui/MainMenue_GUI.java b/Dozentenmodul/src/gui/MainMenue_GUI.java index 9b10cb3c..11783d60 100644 --- a/Dozentenmodul/src/gui/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/MainMenue_GUI.java @@ -355,7 +355,7 @@ public class MainMenue_GUI extends JFrame { + "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image <br>" + "\"Programmieren\".</html>"); lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class - .getResource("/gui/Image_zu_Veranstaltung_gr\u00FCn.png"))); + .getResource("/Image_zu_Veranstaltung_gr\u00FCn.png"))); // ToolTipp lange anzeigen - 60sec ToolTipManager.sharedInstance().setDismissDelay(60000); ToolTipManager.sharedInstance().registerComponent(lblGrafik); diff --git a/Dozentenmodul/src/gui/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/SearchEditImage_GUI.java index dbe23115..dbc2562c 100644 --- a/Dozentenmodul/src/gui/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/SearchEditImage_GUI.java @@ -25,6 +25,7 @@ import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JScrollPane; @@ -44,6 +45,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import models.Image; +import models.person; //import models.person; import org.apache.thrift.TException; @@ -51,6 +53,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; + @SuppressWarnings("serial") public class SearchEditImage_GUI extends JFrame { @@ -269,14 +272,14 @@ public class SearchEditImage_GUI extends JFrame { System.out.println(tabbedPane.getSelectedIndex()); if(tabbedPane.getSelectedIndex()==0){ - - + String username= person.verantwortlicher.getName()+" "+person.verantwortlicher.getVorname(); + //String username="Spitzer Tobias"; + rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); } else if(tabbedPane.getSelectedIndex()==1){ - String username="Spitzer Tobias"; - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); + + - //rowSorterMyImages.toggleSortOrder(0); } } @@ -284,17 +287,7 @@ public class SearchEditImage_GUI extends JFrame { tabbedPane.setBounds(10, 197, 557, 300); contentPanel.add(tabbedPane); - - JScrollPane scrollPaneMyImage = new JScrollPane(); - tablemyImages=new JTable(); - tablemyImages.setModel(modelMyImages); - tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelMyImages); - tablemyImages.setRowSorter(rowSorterMyImages); JScrollPane scrollPaneAllImages = new JScrollPane(); tableAllImages=new JTable(); @@ -305,13 +298,23 @@ public class SearchEditImage_GUI extends JFrame { tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelAll); + + JScrollPane scrollPaneMyImage = new JScrollPane(); + tablemyImages=new JTable(); + tablemyImages.setModel(modelMyImages); + tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); + tablemyImages.setRowSorter(rowSorterMyImages); + + scrollPaneMyImage.setViewportView(tablemyImages); + tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); tableAllImages.setRowSorter(rowSorterAll); scrollPaneAllImages.setViewportView(tableAllImages); tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); - - scrollPaneMyImage.setViewportView(tablemyImages); - tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); JScrollPane scrollPaneCoopImages = new JScrollPane(); JTable tableCoopImages=new JTable(); @@ -359,10 +362,27 @@ public class SearchEditImage_GUI extends JFrame { btnDownload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { //Öffnet den Downloader - con.closeThriftConnection(); - FTPDownloader_GUI down=new FTPDownloader_GUI(); - down.setVisible(true); - SearchEditImage_GUI.this.setVisible(false); + + if(tablemyImages.getSelectedRow()!=-1) + { + String imageid=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7).toString(); + + Image.image.setImageId(imageid); + String imageversion=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 8).toString(); + + Image.image.setVersion(imageversion); + SearchEditImage_GUI.this.setVisible(false); + FTPDownloader_GUI down=new FTPDownloader_GUI(); + down.setVisible(true); + con.closeThriftConnection(); + + + + } + else{ + JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein Image für den Download aus", "Message", + JOptionPane.INFORMATION_MESSAGE); + } } }); btnDownload.setBounds(449, 508, 118, 23); @@ -395,7 +415,7 @@ public class SearchEditImage_GUI extends JFrame { con.closeThriftConnection(); //Image.image.setImageId(imageid); - + if(tabbedPane.getSelectedIndex()==0){ String imageid=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7).toString(); Image.image.setImageId(imageid); @@ -405,7 +425,12 @@ public class SearchEditImage_GUI extends JFrame { con.closeThriftConnection(); EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); ea.setVisible(true); - dispose(); + dispose(); + } + else{ + JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein eigenes Image aus", "Message", + JOptionPane.INFORMATION_MESSAGE); + } } }); cancelButton.setActionCommand("Cancel"); diff --git a/Dozentenmodul/src/models/SessionData.java b/Dozentenmodul/src/models/SessionData.java new file mode 100644 index 00000000..3b91e1a2 --- /dev/null +++ b/Dozentenmodul/src/models/SessionData.java @@ -0,0 +1,28 @@ +package models; + +public class SessionData { + private String sessionID; + private String authToken; + private String serverAdress; + public static SessionData session =new SessionData(); + public String getSessionID() { + return sessionID; + } + public void setSessionID(String sessionID) { + this.sessionID = sessionID; + } + public String getAuthToken() { + return authToken; + } + public void setAuthToken(String authToken) { + this.authToken = authToken; + } + public String getServerAdress() { + return serverAdress; + } + public void setServerAdress(String serverAdress) { + this.serverAdress = serverAdress; + } + + +} diff --git a/Dozentenmodul/src/models/vm.java b/Dozentenmodul/src/models/vm.java deleted file mode 100644 index 34f9ffaa..00000000 --- a/Dozentenmodul/src/models/vm.java +++ /dev/null @@ -1,69 +0,0 @@ -package models; - -import java.awt.List; -import java.util.Date; - - -public class vm { - - private String Laborname; - private String shortDesc; - private String longDesc; - private String comment; - private String OS; - private Date begin; - private Date end; - private List software; - - public static vm vl=new vm(); - public String getLaborname() { - return Laborname; - } - public void setLaborname(String laborname) { - Laborname = laborname; - } - public String getShortDesc() { - return shortDesc; - } - public void setShortDesc(String shortDesc) { - this.shortDesc = shortDesc; - } - public String getLongDesc() { - return longDesc; - } - public void setLongDesc(String longDesc) { - this.longDesc = longDesc; - } - public String getComment() { - return comment; - } - public void setComment(String comment) { - this.comment = comment; - } - public String getOS() { - return OS; - } - public void setOS(String oS) { - OS = oS; - } - public Date getBegin() { - return begin; - } - public void setBegin(Date begin) { - this.begin = begin; - } - public Date getEnd() { - return end; - } - public void setEnd(Date end) { - this.end = end; - } - public List getSoftware() { - return software; - } - public void setSoftware(List software) { - this.software = software; - } - - -} diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class Binary files differindex 54ae8fb1..c1800d22 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class Binary files differindex dcf9e658..48553784 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class Binary files differindex 636d50e6..b8323939 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class Binary files differindex 52b62ee2..5cb5de5d 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class Binary files differindex 47bcd119..63c6a21f 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class Binary files differindex b9cb1ea4..ddd3d393 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class Binary files differindex 2e0afed7..7950930a 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class Binary files differindex cd52da88..78eb762b 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class Binary files differindex 2c9e4c7e..21fe734c 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class Binary files differindex 590c2bcd..d859e5eb 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class Binary files differindex 7f8ae8c6..f640d332 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class Binary files differindex ad0574c6..fd5b9f34 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class Binary files differindex 13538c1f..271671b4 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient.class b/Dozentenmodulserver/bin/server/Server$AsyncClient.class Binary files differindex 635c53c0..7a20bd38 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncIface.class b/Dozentenmodulserver/bin/server/Server$AsyncIface.class Binary files differindex 3f738078..d71ce22c 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncIface.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncIface.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class Binary files differindex 6290a004..856e294b 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class Binary files differindex ba289f63..3cd6ad96 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class Binary files differindex 3fbb8677..39d581c1 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class Binary files differindex edb1bcec..bd52eea0 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class Binary files differindex 40306c0d..ba3bdbd2 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class Binary files differindex c732068a..da1f03e1 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class Binary files differindex 45589df3..d55d3ada 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class Binary files differindex b6a19652..ffaa56da 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class Binary files differindex 7088768e..5c3233af 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class Binary files differindex aa7ecc5b..1847f9fc 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class Binary files differindex dd89977c..0600e248 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class Binary files differindex 705a33c7..a8b40f25 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class Binary files differindex 89af670d..523a7cac 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class Binary files differindex 2471001a..41778940 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class Binary files differindex 693325cd..e6f24939 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class Binary files differindex ae81f238..9ac0adfc 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class Binary files differindex 61e06f52..8dbe83a5 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class Binary files differindex b2db8d99..6944248e 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class Binary files differindex c2c2ca58..e3710c4c 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class Binary files differindex 2d438884..b43c5d99 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class Binary files differindex f2b57fb7..85c70822 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class Binary files differindex 60246d3e..aa0c2bb0 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class Binary files differindex c495d813..84459dd2 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class Binary files differindex 08f594ca..beb8edc7 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class Binary files differindex 31a856b1..d2415e28 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class Binary files differindex 2fed4f2f..6e968f98 100644 --- a/Dozentenmodulserver/bin/server/Server$Client.class +++ b/Dozentenmodulserver/bin/server/Server$Client.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class Binary files differindex 0fb66c0d..9a167a57 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class Binary files differindex ce5024d6..03738f7d 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class Binary files differindex cda02dce..f20a6e31 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class Binary files differindex a53a5690..4670da03 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class Binary files differindex 4c817ea4..4db3ad31 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class Binary files differindex 0485efb4..3e6204bd 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class Binary files differindex 06122d58..a7bbdba0 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class Binary files differindex a39d1d63..c8b71d4b 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class Binary files differindex 69232dd9..6432b5c3 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class Binary files differindex 6b95e144..30f714b4 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class Binary files differindex b48d1db8..064806c5 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class Binary files differindex ba4b4c81..203f4dc5 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class diff --git a/Dozentenmodulserver/bin/server/Server$Iface.class b/Dozentenmodulserver/bin/server/Server$Iface.class Binary files differindex 974ce04a..49ac3bf2 100644 --- a/Dozentenmodulserver/bin/server/Server$Iface.class +++ b/Dozentenmodulserver/bin/server/Server$Iface.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class Binary files differindex af38e742..85a22072 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class Binary files differindex a190c32b..bd6b1acd 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class Binary files differindex 890e8213..5b8a4fd8 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class Binary files differindex 8d491ab8..7508d6ae 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class Binary files differindex f48d16cd..75ff5688 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class Binary files differindex 40177d04..9c351438 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class Binary files differindex d10aedf6..c3124a38 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class Binary files differindex 8c9f3d14..cd59b0f3 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class Binary files differindex c3cfe04b..2f1e0ac9 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class Binary files differindex 5af2dce3..9752e403 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class Binary files differindex 94eec707..1a9bac88 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class Binary files differindex 4b3ca880..f8d11519 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor.class b/Dozentenmodulserver/bin/server/Server$Processor.class Binary files differindex 8cb3e809..bf902019 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor.class +++ b/Dozentenmodulserver/bin/server/Server$Processor.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class Binary files differindex 16a4aceb..1057b97e 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class Binary files differindex abae47eb..578ade0f 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class Binary files differindex 4b06ae93..28058f19 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class Binary files differindex d01fdf1c..814bcfa6 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class Binary files differindex bb5e97c4..f5511eb0 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class Binary files differindex 42042b94..1c09f788 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class Binary files differindex f4fabf54..4d4fe750 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class Binary files differindex 348ca927..af2aa623 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class Binary files differindex 22764a7a..d8f6bbf0 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class Binary files differindex 6a582eda..f00be9db 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class Binary files differindex be92db51..3ace2f05 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class Binary files differindex e3af306c..eeb6040c 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class Binary files differindex 77822f8b..dbdae7d0 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class Binary files differindex d290e233..086d09f3 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class Binary files differindex 087be9cb..cacf4480 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class Binary files differindex 165ca1fd..8abcae75 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class Binary files differindex 01f278f2..6939ee7f 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class Binary files differindex 078a92a2..3e5a664e 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class Binary files differindex 1e27cb2b..fb65b77d 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class Binary files differindex cf9f1a46..4b018be0 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class Binary files differindex 910a07be..0795b7e9 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class Binary files differindex e0c90c41..4c6efd43 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class Binary files differindex ea0aac68..c6a6e919 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class Binary files differindex 1dc1acbe..fcd2a6e8 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class Binary files differindex b2b736b9..ff266614 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class Binary files differindex 46040508..6a169867 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class Binary files differindex 0261ca03..aa8c8782 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class Binary files differindex 61f1504d..eb813265 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class Binary files differindex 3968c27f..4e5db36b 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args.class b/Dozentenmodulserver/bin/server/Server$getImageData_args.class Binary files differindex 87f255d2..8c209f6e 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class Binary files differindex 6b0de404..b2aea627 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class Binary files differindex 0fddf45d..245feb39 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class Binary files differindex c33d93c8..bd467f21 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class Binary files differindex 5a78bea3..bd282c28 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class Binary files differindex 0a37b52c..41d42e5f 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result.class b/Dozentenmodulserver/bin/server/Server$getImageData_result.class Binary files differindex b32073e2..9aa46e2a 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class Binary files differindex c9602e72..c4c92fa2 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class Binary files differindex b094d83f..619c402c 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class Binary files differindex 4e0eac29..60297af0 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class Binary files differindex 37d2bfce..428fae5f 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class Binary files differindex d3a5e629..05f65927 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args.class b/Dozentenmodulserver/bin/server/Server$getImageList_args.class Binary files differindex 677cf6e7..34bbc442 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class Binary files differindex a0e50f65..f3420fe0 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class Binary files differindex de271782..a03c7f1c 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class Binary files differindex 2cff3f79..c261b461 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class Binary files differindex caf4f5ab..0c0ed4c5 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class Binary files differindex 4bc03b1b..45b70561 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result.class b/Dozentenmodulserver/bin/server/Server$getImageList_result.class Binary files differindex d421488d..f47d4cbc 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class Binary files differindex 4eec1f61..865faf19 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class Binary files differindex 25714de2..c090fc0e 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class Binary files differindex 9878f82f..a340c2d7 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class Binary files differindex 820047ed..9339c0ef 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class Binary files differindex e2615b10..0da12764 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class Binary files differindex a99172e0..f253f3a5 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class Binary files differindex a09507c2..5d53f238 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class Binary files differindex a9efd658..23866029 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class Binary files differindex c5d3070a..6dc7b5da 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class Binary files differindex f84046fd..41a74b93 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class Binary files differindex a0e39f19..dc7273ba 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class Binary files differindex 18f2f747..08ce25c0 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class Binary files differindex 23a1b04e..5333ed09 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class Binary files differindex 2bf508fe..6cbca529 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class Binary files differindex 72c0e132..be51def7 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class Binary files differindex 465e526f..8d0a0924 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class Binary files differindex 99a1ca2c..8482847c 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class Binary files differindex 3d83b674..5079da9c 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class Binary files differindex cf401688..b54cfa9d 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class Binary files differindex 20c33f69..a86952f3 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class Binary files differindex d39b5eaa..4bcff3bb 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class Binary files differindex cd64d091..367e4623 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class Binary files differindex a6a046a9..eee29d0f 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class Binary files differindex 5ca4e662..c13e4186 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class Binary files differindex 22767aa5..fc535bbf 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class Binary files differindex 8c3ee771..fc7ae567 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class Binary files differindex ec794b93..b5a7bc52 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class Binary files differindex 7f78ba17..1e0320f7 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class Binary files differindex 80170c5f..89abe9ff 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class Binary files differindex e36694de..1730bb78 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class Binary files differindex bafaca4a..730620cf 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class Binary files differindex 0e90f432..479b2e8b 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class Binary files differindex fe9789e5..f696fbb9 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class Binary files differindex 472541ab..fbf10c75 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class Binary files differindex 5784027a..25c867fd 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class Binary files differindex 1a12ac16..d4d78880 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class Binary files differindex 3b6a1df1..83f69338 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class Binary files differindex 11278b31..fcd686f3 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class Binary files differindex 2a2b9950..56520559 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class Binary files differindex bbc8f5de..688721d2 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class Binary files differindex 0e463eef..08600baa 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class Binary files differindex f6ac5397..5c6311ae 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class Binary files differindex f8694799..d0eba733 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class Binary files differindex 928375bd..d90eb444 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class Binary files differindex 883e1b4c..63a16e25 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class Binary files differindex 435037e1..80275e4d 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class Binary files differindex 63574fda..8ead4fa2 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class Binary files differindex 1503f186..df1529ae 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class Binary files differindex a1aecc8d..4ea61056 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class Binary files differindex 8f15a17a..964d6b01 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class Binary files differindex 09aeb14d..c1bec473 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class Binary files differindex d6f97faf..7d8a670d 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class Binary files differindex 12c2a78a..71b88e4a 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class Binary files differindex 2b2ce43d..086fee05 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class Binary files differindex 631bfe6d..a832a1e9 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class Binary files differindex 4fb7b29b..afcc0d29 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class Binary files differindex 57bf3c1c..6d3d00f4 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class Binary files differindex 21152e10..00d9d1cb 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class Binary files differindex 7b995a7c..1d8e43a3 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class Binary files differindex bb71f7a1..362cb964 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class Binary files differindex 4af3c48a..e258e397 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class Binary files differindex df06ff1d..ea44acdd 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class Binary files differindex de652ba4..5e2df842 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class Binary files differindex f17f52a2..04efdd42 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class Binary files differindex da9eda5a..2cc5730a 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class Binary files differindex adb3ed9f..ad694d39 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class Binary files differindex ee51aabf..7b8d6740 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class Binary files differindex 36303474..a614b4ac 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class Binary files differindex 718cff17..a00d86cc 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class Binary files differindex adf5624f..ce6b1b4e 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class Binary files differindex 6e02ab65..8cfc248d 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class Binary files differindex 2190e109..e166b718 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class Binary files differindex 9dcbd40e..aeaa0c9c 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class Binary files differindex eddcd8b6..ed7ec808 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class Binary files differindex b0441555..d303e701 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class Binary files differindex 9360cad9..9ceaa0f6 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class Binary files differindex 89beaed4..6e21638f 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class Binary files differindex 5e5afdca..aa46286f 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class Binary files differindex 94197262..4e5309b9 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class Binary files differindex b3416972..18c392c1 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class Binary files differindex ee35f096..0538e8bc 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class Binary files differindex 0106166e..71694b8e 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class Binary files differindex 8a73f7e2..cdd9ded1 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class Binary files differindex ed2fb7df..6ed4f413 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class Binary files differindex 4bb45a96..b9a7519e 100644 --- a/Dozentenmodulserver/bin/server/ServerHandler.class +++ b/Dozentenmodulserver/bin/server/ServerHandler.class diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class Binary files differindex c2a0c5c9..b3c6fccb 100644 --- a/Dozentenmodulserver/bin/sql/SQL.class +++ b/Dozentenmodulserver/bin/sql/SQL.class diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java index 9994fcb4..558729d1 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -40,7 +40,7 @@ public class Server { public long DeleteFtpUser(String user) throws org.apache.thrift.TException; - public String getPathOfImage(String name) throws org.apache.thrift.TException; + public String getPathOfImage(String image_id, String version) throws org.apache.thrift.TException; public boolean writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException; @@ -68,7 +68,7 @@ public class Server { public void DeleteFtpUser(String user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getPathOfImage(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getPathOfImage(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -155,16 +155,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "DeleteFtpUser failed: unknown result"); } - public String getPathOfImage(String name) throws org.apache.thrift.TException + public String getPathOfImage(String image_id, String version) throws org.apache.thrift.TException { - send_getPathOfImage(name); + send_getPathOfImage(image_id, version); return recv_getPathOfImage(); } - public void send_getPathOfImage(String name) throws org.apache.thrift.TException + public void send_getPathOfImage(String image_id, String version) throws org.apache.thrift.TException { getPathOfImage_args args = new getPathOfImage_args(); - args.setName(name); + args.setImage_id(image_id); + args.setVersion(version); sendBase("getPathOfImage", args); } @@ -494,24 +495,27 @@ public class Server { } } - public void getPathOfImage(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getPathOfImage(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getPathOfImage_call method_call = new getPathOfImage_call(name, resultHandler, this, ___protocolFactory, ___transport); + getPathOfImage_call method_call = new getPathOfImage_call(image_id, version, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getPathOfImage_call extends org.apache.thrift.async.TAsyncMethodCall { - private String name; - public getPathOfImage_call(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String image_id; + private String version; + public getPathOfImage_call(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); - this.name = name; + this.image_id = image_id; + this.version = version; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getPathOfImage", org.apache.thrift.protocol.TMessageType.CALL, 0)); getPathOfImage_args args = new getPathOfImage_args(); - args.setName(name); + args.setImage_id(image_id); + args.setVersion(version); args.write(prot); prot.writeMessageEnd(); } @@ -988,7 +992,7 @@ public class Server { public getPathOfImage_result getResult(I iface, getPathOfImage_args args) throws org.apache.thrift.TException { getPathOfImage_result result = new getPathOfImage_result(); - result.success = iface.getPathOfImage(args.name); + result.success = iface.getPathOfImage(args.image_id, args.version); return result; } } @@ -1355,7 +1359,7 @@ public class Server { } public void start(I iface, getPathOfImage_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException { - iface.getPathOfImage(args.name,resultHandler); + iface.getPathOfImage(args.image_id, args.version,resultHandler); } } @@ -3140,7 +3144,8 @@ public class Server { public static class getPathOfImage_args implements org.apache.thrift.TBase<getPathOfImage_args, getPathOfImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<getPathOfImage_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPathOfImage_args"); - private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField IMAGE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("image_id", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -3148,11 +3153,13 @@ public class Server { schemes.put(TupleScheme.class, new getPathOfImage_argsTupleSchemeFactory()); } - public String name; // required + public String image_id; // required + public String version; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - NAME((short)-1, "name"); + IMAGE_ID((short)-1, "image_id"), + VERSION((short)-2, "version"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -3167,8 +3174,10 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // NAME - return NAME; + case -1: // IMAGE_ID + return IMAGE_ID; + case -2: // VERSION + return VERSION; default: return null; } @@ -3212,7 +3221,9 @@ public class Server { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.IMAGE_ID, new org.apache.thrift.meta_data.FieldMetaData("image_id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPathOfImage_args.class, metaDataMap); @@ -3222,18 +3233,23 @@ public class Server { } public getPathOfImage_args( - String name) + String image_id, + String version) { this(); - this.name = name; + this.image_id = image_id; + this.version = version; } /** * Performs a deep copy on <i>other</i>. */ public getPathOfImage_args(getPathOfImage_args other) { - if (other.isSetName()) { - this.name = other.name; + if (other.isSetImage_id()) { + this.image_id = other.image_id; + } + if (other.isSetVersion()) { + this.version = other.version; } } @@ -3243,40 +3259,73 @@ public class Server { @Override public void clear() { - this.name = null; + this.image_id = null; + this.version = null; } - public String getName() { - return this.name; + public String getImage_id() { + return this.image_id; } - public getPathOfImage_args setName(String name) { - this.name = name; + public getPathOfImage_args setImage_id(String image_id) { + this.image_id = image_id; return this; } - public void unsetName() { - this.name = null; + public void unsetImage_id() { + this.image_id = null; } - /** Returns true if field name is set (has been assigned a value) and false otherwise */ - public boolean isSetName() { - return this.name != null; + /** Returns true if field image_id is set (has been assigned a value) and false otherwise */ + public boolean isSetImage_id() { + return this.image_id != null; } - public void setNameIsSet(boolean value) { + public void setImage_idIsSet(boolean value) { if (!value) { - this.name = null; + this.image_id = null; + } + } + + public String getVersion() { + return this.version; + } + + public getPathOfImage_args setVersion(String version) { + this.version = version; + return this; + } + + public void unsetVersion() { + this.version = null; + } + + /** Returns true if field version is set (has been assigned a value) and false otherwise */ + public boolean isSetVersion() { + return this.version != null; + } + + public void setVersionIsSet(boolean value) { + if (!value) { + this.version = null; } } public void setFieldValue(_Fields field, Object value) { switch (field) { - case NAME: + case IMAGE_ID: if (value == null) { - unsetName(); + unsetImage_id(); } else { - setName((String)value); + setImage_id((String)value); + } + break; + + case VERSION: + if (value == null) { + unsetVersion(); + } else { + setVersion((String)value); } break; @@ -3285,8 +3334,11 @@ public class Server { public Object getFieldValue(_Fields field) { switch (field) { - case NAME: - return getName(); + case IMAGE_ID: + return getImage_id(); + + case VERSION: + return getVersion(); } throw new IllegalStateException(); @@ -3299,8 +3351,10 @@ public class Server { } switch (field) { - case NAME: - return isSetName(); + case IMAGE_ID: + return isSetImage_id(); + case VERSION: + return isSetVersion(); } throw new IllegalStateException(); } @@ -3318,12 +3372,21 @@ public class Server { if (that == null) return false; - boolean this_present_name = true && this.isSetName(); - boolean that_present_name = true && that.isSetName(); - if (this_present_name || that_present_name) { - if (!(this_present_name && that_present_name)) + boolean this_present_image_id = true && this.isSetImage_id(); + boolean that_present_image_id = true && that.isSetImage_id(); + if (this_present_image_id || that_present_image_id) { + if (!(this_present_image_id && that_present_image_id)) return false; - if (!this.name.equals(that.name)) + if (!this.image_id.equals(that.image_id)) + return false; + } + + boolean this_present_version = true && this.isSetVersion(); + boolean that_present_version = true && that.isSetVersion(); + if (this_present_version || that_present_version) { + if (!(this_present_version && that_present_version)) + return false; + if (!this.version.equals(that.version)) return false; } @@ -3343,12 +3406,22 @@ public class Server { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName()); + lastComparison = Boolean.valueOf(isSetImage_id()).compareTo(other.isSetImage_id()); if (lastComparison != 0) { return lastComparison; } - if (isSetName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name); + if (isSetImage_id()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.image_id, other.image_id); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetVersion()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version); if (lastComparison != 0) { return lastComparison; } @@ -3373,11 +3446,19 @@ public class Server { StringBuilder sb = new StringBuilder("getPathOfImage_args("); boolean first = true; - sb.append("name:"); - if (this.name == null) { + sb.append("image_id:"); + if (this.image_id == null) { sb.append("null"); } else { - sb.append(this.name); + sb.append(this.image_id); + } + first = false; + if (!first) sb.append(", "); + sb.append("version:"); + if (this.version == null) { + sb.append("null"); + } else { + sb.append(this.version); } first = false; sb.append(")"); @@ -3423,10 +3504,18 @@ public class Server { break; } switch (schemeField.id) { - case -1: // NAME + case -1: // IMAGE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.name = iprot.readString(); - struct.setNameIsSet(true); + struct.image_id = iprot.readString(); + struct.setImage_idIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -2: // VERSION + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.version = iprot.readString(); + struct.setVersionIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -3446,9 +3535,14 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.name != null) { - oprot.writeFieldBegin(NAME_FIELD_DESC); - oprot.writeString(struct.name); + if (struct.version != null) { + oprot.writeFieldBegin(VERSION_FIELD_DESC); + oprot.writeString(struct.version); + oprot.writeFieldEnd(); + } + if (struct.image_id != null) { + oprot.writeFieldBegin(IMAGE_ID_FIELD_DESC); + oprot.writeString(struct.image_id); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -3469,22 +3563,32 @@ public class Server { public void write(org.apache.thrift.protocol.TProtocol prot, getPathOfImage_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetName()) { + if (struct.isSetImage_id()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); - if (struct.isSetName()) { - oprot.writeString(struct.name); + if (struct.isSetVersion()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetImage_id()) { + oprot.writeString(struct.image_id); + } + if (struct.isSetVersion()) { + oprot.writeString(struct.version); } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getPathOfImage_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.name = iprot.readString(); - struct.setNameIsSet(true); + struct.image_id = iprot.readString(); + struct.setImage_idIsSet(true); + } + if (incoming.get(1)) { + struct.version = iprot.readString(); + struct.setVersionIsSet(true); } } } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index dccda971..26a1967b 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -68,10 +68,20 @@ public class ServerHandler implements Server.Iface { return ret; } - @Override - public String getPathOfImage(String name) throws TException { - // TODO Auto-generated method stub + public String getPathOfImage(String image_id, String version) throws TException { + + try { + ResultSet rs=sql.getPathOfImage(con, image_id, version); + System.out.println("Path SQL erfolgreich"); + rs.next(); + System.out.println(rs.getString("image_path")); + return rs.getString("image_path"); + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return null; } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 7eca6952..a93f35b0 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -82,12 +82,12 @@ public class SQL { return null;
}
- public ResultSet getPathOfImage(Connection con, String image_name)
+ public ResultSet getPathOfImage(Connection con, String image_id, String version)
{
try {
Statement stm=con.createStatement();
- return stm.executeQuery("SELECT image_path FROM bwLehrpool.m_VLData_imageInfo where image_name like '"+image_name+"';");
+ return stm.executeQuery("SELECT image_path FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID='"+image_id+"' and imageVersion='"+version+"';");
} catch (SQLException e) {
diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index 4c9e51fa..7ed807fa 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -24,7 +24,7 @@ struct Image{ service Server{ User getFtpUser(), int DeleteFtpUser(string user), - string getPathOfImage(string name), + string getPathOfImage(string image_id,string version), bool writeVLdata(string imagename, string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu, string imagePath), list<Image> getImageList(), list<string> getAllOS(), |