summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorunknown2014-04-03 08:32:08 +0200
committerunknown2014-04-03 08:32:08 +0200
commitdce56362f906138e0509c9e21331aec01ba23e11 (patch)
tree865ec22ba68e89127f5f9122f037a1463affa7dd
parentDiverse kleine Bugfixes (diff)
downloadtutor-module-dce56362f906138e0509c9e21331aec01ba23e11.tar.gz
tutor-module-dce56362f906138e0509c9e21331aec01ba23e11.tar.xz
tutor-module-dce56362f906138e0509c9e21331aec01ba23e11.zip
Test
Diffstat
-rw-r--r--Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.classbin1266 -> 1237 bytes
-rw-r--r--Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.classbin1211 -> 1206 bytes
-rw-r--r--Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.classbin778 -> 749 bytes
-rw-r--r--Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.classbin1292 -> 1263 bytes
-rw-r--r--Dozentenmodul/bin/GUI/FTPDownloader_GUI.classbin9504 -> 9431 bytes
-rw-r--r--Dozentenmodul/bin/gui/DeleteImage_GUI$7.classbin831 -> 790 bytes
-rw-r--r--Dozentenmodul/bin/gui/FTPDownloader_GUI$1.classbin1266 -> 1237 bytes
-rw-r--r--Dozentenmodul/bin/gui/FTPDownloader_GUI$2.classbin1211 -> 1206 bytes
-rw-r--r--Dozentenmodul/bin/gui/FTPDownloader_GUI$3.classbin778 -> 749 bytes
-rw-r--r--Dozentenmodul/bin/gui/FTPDownloader_GUI$4.classbin1292 -> 1263 bytes
-rw-r--r--Dozentenmodul/bin/gui/FTPDownloader_GUI$5.classbin834 -> 805 bytes
-rw-r--r--Dozentenmodul/bin/gui/FTPDownloader_GUI.classbin9504 -> 9431 bytes
-rw-r--r--Dozentenmodul/bin/gui/SearchEditImage_GUI$1.classbin698 -> 819 bytes
-rw-r--r--Dozentenmodul/bin/gui/SearchEditImage_GUI$2.classbin1249 -> 1249 bytes
-rw-r--r--Dozentenmodul/bin/gui/SearchEditImage_GUI$3.classbin766 -> 887 bytes
-rw-r--r--Dozentenmodul/bin/gui/SearchEditImage_GUI$4.classbin1252 -> 1252 bytes
-rw-r--r--Dozentenmodul/bin/gui/SearchEditImage_GUI$5.classbin775 -> 896 bytes
-rw-r--r--Dozentenmodul/bin/gui/SearchEditImage_GUI$6.classbin1340 -> 1340 bytes
-rw-r--r--Dozentenmodul/bin/gui/SearchEditImage_GUI$7.classbin855 -> 935 bytes
-rw-r--r--Dozentenmodul/bin/gui/SearchEditImage_GUI$8.classbin817 -> 938 bytes
-rw-r--r--Dozentenmodul/bin/gui/SearchEditImage_GUI$9.classbin1594 -> 1608 bytes
-rw-r--r--Dozentenmodul/bin/gui/SearchEditImage_GUI.classbin11819 -> 11819 bytes
-rw-r--r--Dozentenmodul/bin/gui/SearchImage_GUI$7.classbin831 -> 790 bytes
-rw-r--r--Dozentenmodul/src/GUI/FTPDownloader_GUI.java7
-rw-r--r--Dozentenmodul/src/GUI/SearchImage_GUI.java2
-rw-r--r--Dozentenmodul/src/gui/DeleteImage_GUI.java2
-rw-r--r--Dozentenmodul/src/gui/FTPDownloader_GUI.java7
-rw-r--r--Dozentenmodul/src/gui/SearchEditImage_GUI.java9
-rw-r--r--Dozentenmodul/src/gui/SearchImage_GUI.java2
29 files changed, 16 insertions, 13 deletions
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class
index f8d1dc16..dabb4fbf 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class
Binary files differ
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class
index a98b364b..f030114b 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class
Binary files differ
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class
index 3bffc15f..b1f9edc1 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class
Binary files differ
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class
index 3fbd58bc..fbed3457 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class
Binary files differ
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class
index 89fbdc61..a6af82a6 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$7.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$7.class
index a943d210..b2bd5495 100644
--- a/Dozentenmodul/bin/gui/DeleteImage_GUI$7.class
+++ b/Dozentenmodul/bin/gui/DeleteImage_GUI$7.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class
index f8d1dc16..dabb4fbf 100644
--- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class
+++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class
index a98b364b..f030114b 100644
--- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class
+++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class
index 3bffc15f..b1f9edc1 100644
--- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class
+++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class
index 3fbd58bc..fbed3457 100644
--- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class
+++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class
index e7013a51..ffe0c1c4 100644
--- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class
+++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class
index 89fbdc61..a6af82a6 100644
--- a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class
+++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class
index 146e6128..f7677e0d 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class
index 67c15bd2..0e0f3195 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class
index 2911e439..3764900b 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class
index 06e83799..e446614e 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class
index aef24317..1f2e2007 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class
index 9c479610..ae739673 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class
index 8ede1444..5ff30dec 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class
index 416f6b61..2b56e122 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class
index e397e5a0..92895e7c 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI.class
index d3e3c942..ae28eddc 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$7.class b/Dozentenmodul/bin/gui/SearchImage_GUI$7.class
index c68c74e6..3a1e2f3a 100644
--- a/Dozentenmodul/bin/gui/SearchImage_GUI$7.class
+++ b/Dozentenmodul/bin/gui/SearchImage_GUI$7.class
Binary files differ
diff --git a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
index ead5a020..b36f0818 100644
--- a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
@@ -47,12 +47,11 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
JLabel downspeed;
User user;
JProgressBar progressBar;
- String host = "141.79.1+ü28.121";
+ String host = "141.79.128.121";
int port = 21;
String username = "openslx";
String password = "openslx-ng";
String downloadPath = "";
- String filename = "";
static String arg = "";
DownloadTask task;
JLabel bytesreadlbl;
@@ -80,7 +79,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
/**
* Create the frame.
*/
- public FTPDownloader_GUI(String name) {
+ public FTPDownloader_GUI() {
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) {
@@ -99,7 +98,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
setResizable(false);
// setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
- filename = name;
+
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
diff --git a/Dozentenmodul/src/GUI/SearchImage_GUI.java b/Dozentenmodul/src/GUI/SearchImage_GUI.java
index ee7727c3..9fc66add 100644
--- a/Dozentenmodul/src/GUI/SearchImage_GUI.java
+++ b/Dozentenmodul/src/GUI/SearchImage_GUI.java
@@ -356,7 +356,7 @@ public class SearchImage_GUI extends JFrame {
btnDownload.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
// Öffnet den Downloader
- FTPDownloader_GUI down = new FTPDownloader_GUI("Test");
+ FTPDownloader_GUI down = new FTPDownloader_GUI();
down.setVisible(true);
SearchImage_GUI.this.setVisible(false);
}
diff --git a/Dozentenmodul/src/gui/DeleteImage_GUI.java b/Dozentenmodul/src/gui/DeleteImage_GUI.java
index de6d4123..93859e33 100644
--- a/Dozentenmodul/src/gui/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/DeleteImage_GUI.java
@@ -354,7 +354,7 @@ public class DeleteImage_GUI extends JFrame {
btnDelete.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
//Öffnet den Downloader
- FTPDownloader_GUI down=new FTPDownloader_GUI("Test");
+ FTPDownloader_GUI down=new FTPDownloader_GUI();
down.setVisible(true);
DeleteImage_GUI.this.setVisible(false);
}
diff --git a/Dozentenmodul/src/gui/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/FTPDownloader_GUI.java
index ead5a020..b36f0818 100644
--- a/Dozentenmodul/src/gui/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/FTPDownloader_GUI.java
@@ -47,12 +47,11 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
JLabel downspeed;
User user;
JProgressBar progressBar;
- String host = "141.79.1+ü28.121";
+ String host = "141.79.128.121";
int port = 21;
String username = "openslx";
String password = "openslx-ng";
String downloadPath = "";
- String filename = "";
static String arg = "";
DownloadTask task;
JLabel bytesreadlbl;
@@ -80,7 +79,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
/**
* Create the frame.
*/
- public FTPDownloader_GUI(String name) {
+ public FTPDownloader_GUI() {
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) {
@@ -99,7 +98,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
setResizable(false);
// setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
- filename = name;
+
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
diff --git a/Dozentenmodul/src/gui/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/SearchEditImage_GUI.java
index c40a287e..dbe23115 100644
--- a/Dozentenmodul/src/gui/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/SearchEditImage_GUI.java
@@ -92,6 +92,7 @@ public class SearchEditImage_GUI extends JFrame {
@Override
public void windowClosing(WindowEvent arg0) {
//Beendet die Anwendung nach klick auf X
+ con.closeThriftConnection();
System.exit(0);
}
});
@@ -189,6 +190,7 @@ public class SearchEditImage_GUI extends JFrame {
@Override
public void mouseClicked(MouseEvent arg0) {
//Öffnet das Fenster Extended GUI
+ con.closeThriftConnection();
ExtendedSearch_GUI es=new ExtendedSearch_GUI();
es.setVisible(true);
}
@@ -234,6 +236,7 @@ public class SearchEditImage_GUI extends JFrame {
@Override
public void mouseClicked(MouseEvent arg0) {
//Öffnet das Hauütmenü
+ con.closeThriftConnection();
SearchEditImage_GUI.this.setVisible(false);
MainMenue_GUI main=new MainMenue_GUI();
main.setVisible(true);
@@ -356,7 +359,8 @@ public class SearchEditImage_GUI extends JFrame {
btnDownload.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
//Öffnet den Downloader
- FTPDownloader_GUI down=new FTPDownloader_GUI("Test");
+ con.closeThriftConnection();
+ FTPDownloader_GUI down=new FTPDownloader_GUI();
down.setVisible(true);
SearchEditImage_GUI.this.setVisible(false);
}
@@ -374,7 +378,7 @@ public class SearchEditImage_GUI extends JFrame {
okButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
//Öffnet das Hauptmenü
-
+ con.closeThriftConnection();
MainMenue_GUI main=new MainMenue_GUI();
main.setVisible(true);
dispose();
@@ -398,6 +402,7 @@ public class SearchEditImage_GUI extends JFrame {
String imageversion=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 8).toString();
Image.image.setVersion(imageversion);
+ con.closeThriftConnection();
EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();
ea.setVisible(true);
dispose();
diff --git a/Dozentenmodul/src/gui/SearchImage_GUI.java b/Dozentenmodul/src/gui/SearchImage_GUI.java
index ee7727c3..9fc66add 100644
--- a/Dozentenmodul/src/gui/SearchImage_GUI.java
+++ b/Dozentenmodul/src/gui/SearchImage_GUI.java
@@ -356,7 +356,7 @@ public class SearchImage_GUI extends JFrame {
btnDownload.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
// Öffnet den Downloader
- FTPDownloader_GUI down = new FTPDownloader_GUI("Test");
+ FTPDownloader_GUI down = new FTPDownloader_GUI();
down.setVisible(true);
SearchImage_GUI.this.setVisible(false);
}
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-03-06 18:28:33 +0100